X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Findex_wr.php;h=d7ccac2d88a892f8447d6baa61de40422b08dbdc;hb=fe9731feb6b13e286b60b25c99f7436760a221d9;hp=3e2c027baa5621812bee2fbb627131dd9e06cc29;hpb=196926208788f38d8ca9813860f59bf2c4a33d2e;p=brisk.git

diff --git a/web/index_wr.php b/web/index_wr.php
index 3e2c027..d7ccac2 100644
--- a/web/index_wr.php
+++ b/web/index_wr.php
@@ -56,13 +56,19 @@ $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.");
+
+  $user->reset();
+  /* factorized with ->reset()
   $tmp_sess = $user->sess;
   $user->sess = "";
   step_unproxy($tmp_sess);
   $user->name = "";
+  while (array_pop($user->comm) != NULL);
+  $user->step = 0;
   $user->the_end = FALSE;
-  
+  */
+
   log_rd2("AUTO LOGOUT.");
   if ($user->subst == 'sitdown' || $user->stat == 'table')
     $room->room_wakeup(&$user);
@@ -116,7 +122,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);
@@ -190,6 +196,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);