X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Findex_rd.php;h=b88ce9949d592e183c9e440013cc5359b021810f;hb=8866b31f28b69c5dd2857960ddeea08bcb9725d5;hp=240891b1d642957530090bebf3e670539a22b328;hpb=9441f09e33850c2a74e00ec909da4522c451abb6;p=brisk.git diff --git a/web/index_rd.php b/web/index_rd.php index 240891b..b88ce99 100644 --- a/web/index_rd.php +++ b/web/index_rd.php @@ -2,7 +2,7 @@ /* * brisk - index_rd.php * - * Copyright (C) 2006 matteo.nastasi@milug.org + * Copyright (C) 2006-2007 matteo.nastasi@milug.org * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,11 +17,13 @@ * not, write to the Free Software Foundation, Inc, 59 Temple Place - * Suite 330, Boston, MA 02111-1307, USA. * + * $Id$ + * */ require_once("brisk.phh"); -log_load($sess, "LOAD: index_rd.php"); +log_load($sess, "LOAD: index_rd.php ".$QUERY_STRING); $first_loop = TRUE; $the_end = FALSE; @@ -44,9 +46,18 @@ function unrecerror() GLOBAL $is_page_streaming; $is_page_streaming = TRUE; - return (sprintf('the_end=true; document.location.assign("index.php");')); + log_rd2("XXX", "UNREC_ERROR"); + return (sprintf('the_end=true; window.onunload = null; document.location.assign("index.php");')); } +function page_sync($sess, $page) +{ + GLOBAL $is_page_streaming; + + $is_page_streaming = TRUE; + log_rd2($sess, "PAGE_SYNC"); + return (sprintf('the_end=true; window.onunload = null; document.location.assign("%s");', $page)); +} @@ -56,48 +67,84 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su GLOBAL $is_page_streaming, $first_loop; $ret = FALSE; - - + $bri = FALSE; + + log_rd2($sess, "M"); /* Sync check (read only without modifications */ + ignore_user_abort(TRUE); if (($sem = lock_data()) != FALSE) { - $bri = &load_data(); // Aggiorna l'expire time lato server if ($first_loop == TRUE) { - if (($user = &get_user($bri, $sess, $idx)) == FALSE) { + log_only($sess, "F"); + $bri = &load_data(); + if (($user = &$bri->get_user($sess, $idx)) == FALSE) { + unlock_data($sem); + ignore_user_abort(FALSE); return (unrecerror()); } log_auth($sess, "update lacc"); - $user->lacc = time() + EXPIRE_TIME; - save_data($bri); - $first_loop = FALSE; - - + $user->lacc = time(); + $bri->garbage_manager(FALSE); save_data($bri); + $first_loop = FALSE; } + + log_only($sess, "U"); unlock_data($sem); + ignore_user_abort(FALSE); } else { - unlock_data($sem); return (FALSE); } - if (($user = &get_user(&$bri, $sess, $idx)) == FALSE) { + if (($proxy_step = step_get($sess)) != FALSE) { + // log_rd2($sess, "Postget".$proxy_step."zizi"); + + if ($cur_step == $proxy_step) { + log_only2($sess, "P"); + return (FALSE); + } + else { + log_only2($sess, "R"); + } + } + else { + log_only2($sess, "R"); + } + + if ($bri == FALSE) { + ignore_user_abort(TRUE); + if (($sem = lock_data()) != FALSE) { + log_only($sess, "P"); + $bri = &load_data(); + unlock_data($sem); + ignore_user_abort(FALSE); + } + else { + return (FALSE); + } + } + + if (($user = &$bri->get_user($sess, $idx)) == FALSE) { return (unrecerror()); } /* Nothing changed, return. */ - if ($cur_stat == $user->stat && $cur_step == $user->step) + if ($cur_step == $user->step) return; log_rd2($sess, "do other ++".$cur_stat."++".$user->stat."++".$cur_step."++".$user->step); if ($cur_step == -1) { // FUNZIONE from_scratch DA QUI + ignore_user_abort(TRUE); $sem = lock_data(); $bri = &load_data(); - if (($user = &get_user($bri, $sess, $idx)) == FALSE) { + if (($user = &$bri->get_user($sess, $idx)) == FALSE) { + unlock_data($sem); + ignore_user_abort(FALSE); return (unrecerror()); } if ($user->the_end) @@ -112,10 +159,12 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su save_data($bri); unlock_data($sem); + ignore_user_abort(FALSE); } else { log_rd2($sess, "TRANS NON ATTIVATO"); unlock_data($sem); + ignore_user_abort(FALSE); } } @@ -141,18 +190,25 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su $new_stat = $user->stat; $new_subst = $user->subst; $new_step = $user->step; - - unlock_data($sem); } else { + ignore_user_abort(TRUE); $sem = lock_data(); $bri = &load_data(); - if (($user = &get_user($bri, $sess, $idx)) == FALSE) { + if (($user = &$bri->get_user($sess, $idx)) == FALSE) { + unlock_data($sem); + ignore_user_abort(FALSE); return (unrecerror()); } if ($cur_step < $user->step) { do { if ($cur_step + COMM_N < $user->step) { + if (($cur_stat != $user->stat)) { + $to_stat = $user->stat; + unlock_data($sem); + ignore_user_abort(FALSE); + return (page_sync($user->sess, $to_stat == "table" ? "table.php" : "index.php")); + } log_rd2($sess, "lost history, refresh from scratch"); $new_step = -1; break; @@ -169,7 +225,10 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su if ($user->the_end == TRUE) { log_rd2($sess, "LOGOUT BYE BYE!!"); log_auth($user->sess, "Explicit logout."); + $tmp_sess = $user->sess; $user->sess = ""; + step_unproxy($tmp_sess); + $user->name = ""; $user->the_end = FALSE; @@ -185,6 +244,7 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su } unlock_data($sem); + ignore_user_abort(FALSE); } @@ -209,6 +269,10 @@ $is_page_streaming = ((stristr($HTTP_USER_AGENT, "linux") && header("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1 header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); // Date in the past +if (!isset($myfrom)) + $myfrom = ""; +if (!isset($subst)) + $subst = ""; log_rd2($sess, "FROM OUTSIDE - STAT: ".$stat." SUBST: ".$subst." STEP: ".$step." MYFROM: ".$myfrom. "IS_PAGE:" . $is_page_streaming); @@ -233,7 +297,7 @@ for ($i = 0 ; time() < $endtime ; $i++) { $old_subst = $subst; $old_step = $step; // log_rd($sess, "POST MAIN ".$step);; - usleep(200000); + usleep(400000); if (($i % 5) == 0) { // log_rd2($sess, "TIME: ".time()); echo '_';