X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Findex_rd.php;h=8b25ae0f222f312ac4d4cf691d1085a503b361e3;hb=29ef3f7db6bc1d39c658a15d95d22e45bbd59c16;hp=a335462979f308a06b231523d0ef23688d945da4;hpb=3a38798bd66e565b82f3e53f7f12aef7e70e2c82;p=brisk.git diff --git a/web/index_rd.php b/web/index_rd.php index a335462..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,14 @@ */ require_once("Obj/brisk.phh"); +// require_once("Obj/proxyscan.phh"); require_once("briskin5/Obj/briskin5.phh"); +// Use of proxies isn't allowed. +// if (is_proxy()) { +// sleep(5); +// exit; +//} log_load("index_rd.php"); $first_loop = TRUE; @@ -51,15 +60,16 @@ function unrecerror() 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("PAGE_SYNC"); - return (sprintf('the_end=true; window.onunload = null; document.location.assign("%s");', $page)); + 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)); } @@ -88,13 +98,14 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su log_auth($sess, "update lacc"); $user->lacc = time(); + log_main("pre garbage_manager TRE"); $room->garbage_manager(FALSE); Room::save_data($room); $first_loop = FALSE; } - log_only("U"); + log_lock("U"); Room::unlock_data($sem); ignore_user_abort(FALSE); } @@ -106,7 +117,7 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su // log_rd2("Postget".$proxy_step."zizi"); if ($cur_step == $proxy_step) { - log_only2("P"); + log_lock("P"); return (FALSE); } else { @@ -123,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("P"); + log_lock("P"); if (($room = &Room::load_data()) == FALSE) break; } while (0); @@ -142,7 +153,7 @@ 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("do other ++".$cur_stat."++".$user->stat."++".$cur_step."++".$user->step); @@ -172,9 +183,18 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su ignore_user_abort(FALSE); } else { - log_rd2("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); } } @@ -182,9 +202,10 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su log_rd2("PRE-NEWSTAT: ".$user->stat); if ($user->stat == 'room') { - log_rd("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; @@ -195,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("SENDED TO THE STREAM: ".$ret); - - - $new_stat = $user->stat; - $new_subst = $user->subst; - $new_step = $user->step; - */ - log_rd2("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("NEWSTAT: ".$user->stat); - } else { ignore_user_abort(TRUE); @@ -232,10 +239,10 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su Room::unlock_data($sem); ignore_user_abort(FALSE); log_load("RESYNC"); - return (page_sync($user->sess, $to_stat == "table" ? "table.php" : "index.php")); + return (page_sync($user->sess, ($to_stat == "table" ? "briskin5/index.php" : "index.php"), $user->table, $user->table_token)); } log_rd2("lost history, refresh from scratch"); - $new_step = -1; + $new_step = -1; break; } for ($i = $cur_step ; $i < $user->step ; $i++) { @@ -250,13 +257,9 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su if ($user->the_end == TRUE) { 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("ROOM WAKEUP"); $room->room_wakeup(&$user); @@ -295,6 +298,9 @@ $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 = "";