X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Findex_wr.php;h=ea364cd9eba871edc86dc69fe13bd9db6dad972f;hb=2ae8dac72522528be1c05fea5de272555d5330cf;hp=57142d6317b668a9e47916f4b17caa07cb5c267e;hpb=8861498f64b33d632aaf4f0b3b54a01503307531;p=brisk.git

diff --git a/web/index_wr.php b/web/index_wr.php
index 57142d6..ea364cd 100644
--- a/web/index_wr.php
+++ b/web/index_wr.php
@@ -39,7 +39,12 @@ $is_spawn = FALSE;
 log_wr('COMM: '.$mesg);
 
 $sem = Room::lock_data();
-$room = &Room::load_data();
+if (($room = &Room::load_data()) == FALSE) {
+  echo "Load data error";
+  log_wr("Load data error");
+  Room::unlock_data($sem);
+  exit;
+}
 if (($user = &$room->get_user($sess, &$idx)) == FALSE) {
   echo "Get User Error";
   log_wr("Get User Error");
@@ -51,7 +56,7 @@ $argz = explode('|', $mesg);
 log_wr('POSTSPLIT: '.$argz[0]);
 
 if ($argz[0] == 'shutdown') {
-  log_auth($user_cur->sess, "Shutdown session.");
+  log_auth($user->sess, "Shutdown session.");
   $tmp_sess = $user->sess;
   $user->sess = "";
   step_unproxy($tmp_sess);
@@ -111,7 +116,7 @@ else if ($user->stat == 'room') {
       /* TODO: refact to a function */
       if ($user->bantime > $user->laccwr) {
 	$user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; ";
-	$user->comm[$user->step % COMM_N] .= show_notify("<br>Ti sei alzato da un tavolo senza il consenso degli altri giocatori. Dovrai aspettare ancora ".secstoword($user->bantime - $user->laccwr)." prima di poterti sedere nuovamente.", 2000, "Torna in piedi.", 400, 100);
+	$user->comm[$user->step % COMM_N] .= show_notify("<br>Ti sei alzato da un tavolo senza il consenso degli altri giocatori. Dovrai aspettare ancora ".secstoword($user->bantime - $user->laccwr)." prima di poterti sedere nuovamente.", 2000, "resta in piedi.", 400, 100);
 	
 	$user->step_inc();
 	Room::save_data($room);
@@ -185,6 +190,10 @@ else if ($user->stat == 'room') {
 
 	    log_wr("Pre if!");
 	    
+//          ARRAY_POP DISABLED
+// 	    // CHECK
+ 	    while (array_pop($user_cur->comm) != NULL);
+
 	    $ret = "";
 	    $ret .= sprintf('gst.st_loc++; gst.st=%d; createCookie("table_idx", %d, 24*365, cookiepath); createCookie("table_token", "%s", 24*365, cookiepath); the_end=true; window.onunload = null ; document.location.assign("briskin5/index.php");|', $user_cur->step+1, $table_idx, $table_token);