X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Findex_rd.php;h=ec0f47cb08d4635066d8b7c7e3d6fff5c385254d;hb=b4451fb7ba081a9ad657b77f0c5054cf6b54c2bd;hp=ad4a874d7d4aa95ecd2f71ccbe325728609e6a74;hpb=2eb746e4d086669b4bbfbf8e4dfa00a493bc7a27;p=brisk.git diff --git a/web/index_rd.php b/web/index_rd.php index ad4a874..ec0f47c 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 @@ -23,7 +23,7 @@ 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; @@ -46,9 +46,18 @@ function unrecerror() GLOBAL $is_page_streaming; $is_page_streaming = TRUE; + 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)); +} @@ -58,29 +67,31 @@ 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) { + 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); } @@ -88,12 +99,34 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su return (FALSE); } + if (($proxy_step = step_get($sess)) != FALSE) { + // log_rd2($sess, "Postget".$proxy_step."zizi"); + + if ($cur_step == $proxy_step) { + log_rd2($sess, "P"); + return (FALSE); + } + } + + 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); @@ -164,6 +197,12 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su 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; @@ -180,7 +219,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; @@ -221,6 +263,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); @@ -246,7 +292,7 @@ for ($i = 0 ; time() < $endtime ; $i++) { $old_step = $step; // log_rd($sess, "POST MAIN ".$step);; usleep(200000); - if (($i % 5) == 0) { + if (($i % 10) == 0) { // log_rd2($sess, "TIME: ".time()); echo '_'; flush();