X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Findex_rd.php;h=8b25ae0f222f312ac4d4cf691d1085a503b361e3;hb=29ef3f7db6bc1d39c658a15d95d22e45bbd59c16;hp=d9031f56156766b80adec9db919e98d8e0e884d4;hpb=a2924d2335ec5325dc322600fe373625575ac8e2;p=brisk.git diff --git a/web/index_rd.php b/web/index_rd.php index d9031f5..8b25ae0 100644 --- a/web/index_rd.php +++ b/web/index_rd.php @@ -2,7 +2,10 @@ /* * brisk - index_rd.php * - * Copyright (C) 2006-2007 matteo.nastasi@milug.org + * Copyright (C) 2006-2008 Matteo Nastasi + * mailto: nastasi@alternativeoutput.it + * matteo.nastasi@milug.org + * web: http://www.alternativeoutput.it * * 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 @@ -22,8 +25,15 @@ */ require_once("Obj/brisk.phh"); +// require_once("Obj/proxyscan.phh"); +require_once("briskin5/Obj/briskin5.phh"); -log_load($sess, "LOAD: index_rd.php ".$QUERY_STRING); +// Use of proxies isn't allowed. +// if (is_proxy()) { +// sleep(5); +// exit; +//} +log_load("index_rd.php"); $first_loop = TRUE; $the_end = FALSE; @@ -35,7 +45,7 @@ if (DEBUGGING == "local" && $_SERVER['REMOTE_ADDR'] != '127.0.0.1') { function shutta() { - log_rd2("SHUTTA!", connection_status()); + log_rd2("SHUTTA!".connection_status()); } @@ -46,17 +56,20 @@ function unrecerror() GLOBAL $is_page_streaming; $is_page_streaming = TRUE; - log_rd2("XXX", "UNREC_ERROR"); + log_rd2("UNREC_ERROR:".var_export(debug_backtrace())); return (sprintf('the_end=true; window.onunload = null; document.location.assign("index.php");')); } -function page_sync($sess, $page) +function page_sync($sess, $page, $table_idx, $table_token) { GLOBAL $is_page_streaming; + log_rd2("page_sync:".var_export(debug_backtrace())); + $is_page_streaming = TRUE; - log_rd2($sess, "PAGE_SYNC"); - return (sprintf('the_end=true; window.onunload = null; document.location.assign("%s");', $page)); + + log_rd2("PAGE_SYNC"); + return (sprintf('createCookie("table_idx", %d, 24*365, cookiepath); createCookie("table_token", "%s", 24*365, cookiepath); the_end=true; window.onunload = null; document.location.assign("%s");', $table_idx, $table_token, $page)); } @@ -69,13 +82,13 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su $ret = FALSE; $room = FALSE; - // log_rd2($sess, "M"); + // log_rd2("M"); /* Sync check (read only without modifications */ ignore_user_abort(TRUE); if (($sem = Room::lock_data()) != FALSE) { // Aggiorna l'expire time lato server if ($first_loop == TRUE) { - log_only($sess, "F"); + log_only("F"); $room = &Room::load_data(); if (($user = &$room->get_user($sess, $idx)) == FALSE) { Room::unlock_data($sem); @@ -85,13 +98,14 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su log_auth($sess, "update lacc"); $user->lacc = time(); - // FIXME uncomment $room->garbage_manager(FALSE); + log_main("pre garbage_manager TRE"); + $room->garbage_manager(FALSE); Room::save_data($room); $first_loop = FALSE; } - log_only($sess, "U"); + log_lock("U"); Room::unlock_data($sem); ignore_user_abort(FALSE); } @@ -100,18 +114,18 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su } if (($proxy_step = step_get($sess)) != FALSE) { - // log_rd2($sess, "Postget".$proxy_step."zizi"); + // log_rd2("Postget".$proxy_step."zizi"); if ($cur_step == $proxy_step) { - log_only2($sess, "P"); + log_lock("P"); return (FALSE); } else { - log_only2($sess, "R"); + log_only2("R"); } } else { - log_only2($sess, "R"); + log_only2("R"); } if ($room == FALSE) { @@ -120,7 +134,7 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su if (($sem = Room::lock_data()) == FALSE) break; - log_only($sess, "P"); + log_lock("P"); if (($room = &Room::load_data()) == FALSE) break; } while (0); @@ -139,9 +153,9 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su /* Nothing changed, return. */ if ($cur_step == $user->step) - return; + return (FALSE); - log_rd2($sess, "do other ++".$cur_stat."++".$user->stat."++".$cur_step."++".$user->step); + log_rd2("do other ++".$cur_stat."++".$user->stat."++".$cur_step."++".$user->step); if ($cur_step == -1) { // FUNZIONE from_scratch DA QUI @@ -153,12 +167,13 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su ignore_user_abort(FALSE); return (unrecerror()); } - if ($user->the_end) + if ($user->the_end) { + log_rd2("main_check: the end".var_export(debug_backtrace())); $is_page_streaming = TRUE; - + } if ($user->trans_step != -1) { - log_rd2($sess, "TRANS USATO ".$user->trans_step); + log_rd2("TRANS USATO ".$user->trans_step); $cur_step = $user->trans_step; $user->trans_step = -1; @@ -168,19 +183,29 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su ignore_user_abort(FALSE); } else { - log_rd2($sess, "TRANS NON ATTIVATO"); - Room::unlock_data($sem); - ignore_user_abort(FALSE); + log_rd2("TRANS NON ATTIVATO"); +// ARRAY_POP DISABLED +// log_rd2("TRANS NON ATTIVATO, clean del comm array"); +// while (($el = array_pop($user->comm)) != NULL) { +// log_rd2("clean element [".$el."]"); +// } +// // $user->step_inc(COMM_N + 1); +// Room::save_data($room); +// // $new_step = $user->step; + + Room::unlock_data($sem); + ignore_user_abort(FALSE); } } if ($cur_step == -1) { - log_rd2($sess, "PRE-NEWSTAT: ".$user->stat); + log_rd2("PRE-NEWSTAT: ".$user->stat); if ($user->stat == 'room') { - log_rd($sess, "roomma"); - $ret .= show_room(&$room, &$user); + log_rd("roomma ".$user->step); + $ret .= $room->show_room($user->step, &$user); + // TODO uncomment and test /* NOTE the sets went common */ $new_stat = $user->stat; $new_subst = $user->subst; @@ -191,25 +216,11 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su * TABLE * * * ***************/ - else if ($user->stat == 'table') { - /* FIXME we need to decide what do in this case - - if ($user->subst != "shutdowned" && $user->subst != "shutdowner") - $ret = show_table(&$room,&$user,$user->step,FALSE,FALSE); - - log_rd2($sess, "SENDED TO THE STREAM: ".$ret); - - - $new_stat = $user->stat; - $new_subst = $user->subst; - $new_step = $user->step; - */ - log_rd2($sess, "ALL COMMENTED: ".$ret); - - + else if ($user->stat == 'table') { + log_load("RESYNC"); + return (page_sync($user->sess, "briskin5/index.php", $user->table, $user->table_token)); } - log_rd2($sess, "NEWSTAT: ".$user->stat); - + log_rd2("NEWSTAT: ".$user->stat); } else { ignore_user_abort(TRUE); @@ -227,15 +238,15 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su $to_stat = $user->stat; Room::unlock_data($sem); ignore_user_abort(FALSE); - log_load($user->sess, "RESYNC"); - return (page_sync($user->sess, $to_stat == "table" ? "table.php" : "index.php")); + log_load("RESYNC"); + return (page_sync($user->sess, ($to_stat == "table" ? "briskin5/index.php" : "index.php"), $user->table, $user->table_token)); } - log_rd2($sess, "lost history, refresh from scratch"); - $new_step = -1; + log_rd2("lost history, refresh from scratch"); + $new_step = -1; break; } for ($i = $cur_step ; $i < $user->step ; $i++) { - log_rd2($sess, "ADDED TO THE STREAM: ".$user->comm[$i % COMM_N]); + log_rd2("ADDED TO THE STREAM: ".$user->comm[$i % COMM_N]); $ret .= $user->comm[$i % COMM_N]; } $new_stat = $user->stat; @@ -244,23 +255,19 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su } while (0); if ($user->the_end == TRUE) { - log_rd2($sess, "LOGOUT BYE BYE!!"); + log_rd2("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; - + + $user->reset(); + if ($user->subst == 'sitdown') { - log_load($user->sess, "ROOM WAKEUP"); + log_load("ROOM WAKEUP"); $room->room_wakeup(&$user); } else if ($user->subst == 'standup') $room->room_outstandup(&$user); else - log_rd2($sess, "LOGOUT FROM WHAT ???"); + log_rd2("LOGOUT FROM WHAT ???"); Room::save_data($room); } @@ -291,12 +298,15 @@ $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 +header('Content-type: application/xml; charset="utf-8"',true); +// header('Content-type: text/plain; charset="utf-8"',true); +// header('Content-type: text/html; charset="utf-8"',true); 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); +log_rd2("FROM OUTSIDE - STAT: ".$stat." SUBST: ".$subst." STEP: ".$step." MYFROM: ".$myfrom. "IS_PAGE:" . $is_page_streaming); $endtime = time() + STREAM_TIMEOUT; @@ -305,13 +315,13 @@ $old_subst = $subst; $old_step = $ext_step = $step; for ($i = 0 ; time() < $endtime ; $i++) { - // log_rd($sess, "PRE MAIN ".$step);; + // log_rd("PRE MAIN ".$step);; if (($ret = maincheck($sess, $old_stat, $old_subst, $old_step, &$stat, &$subst, &$step)) != FALSE) { echo '@BEGIN@'; - // log_rd2($sess, sprintf("\nSESS: [%s]\nOLD_STAT: [%s] OLD_SUBST: [%s] OLD_STEP: [%s] \nSTAT: [%s] SUBST: [%s] STEP: [%s] \nCOMM: [%s]\n", $sess, $old_stat, $old_subst, $old_step, $stat, $subst, $step, $ret)); + // log_rd2(sprintf("\nSESS: [%s]\nOLD_STAT: [%s] OLD_SUBST: [%s] OLD_STEP: [%s] \nSTAT: [%s] SUBST: [%s] STEP: [%s] \nCOMM: [%s]\n", $sess, $old_stat, $old_subst, $old_step, $stat, $subst, $step, $ret)); echo "$ret"; echo ' @END@'; - log_send($sess, "EXT_STEP: ".$ext_step." ENDTIME: [".$endtime."] ".$ret); + log_send("IS_PAGE: ".($is_page_streaming == TRUE ? "TRUE" : "FALSE")."EXT_STEP: ".$ext_step." ENDTIME: [".$endtime."] ".$ret); flush(); if ($is_page_streaming) break; @@ -319,10 +329,10 @@ for ($i = 0 ; time() < $endtime ; $i++) { $old_stat = $stat; $old_subst = $subst; $old_step = $step; - // log_rd($sess, "POST MAIN ".$step);; + // log_rd("POST MAIN ".$step);; usleep(400000); if (($i % 5) == 0) { - // log_rd2($sess, "TIME: ".time()); + // log_rd2("TIME: ".time()); echo '_'; flush(); }