factorized user reset (and comm array clean added)

[brisk.git] / web / index_wr.php

diff --git a/web/index_wr.php b/web/index_wr.php
index 808b020..d7ccac2 100644 (file)
--- a/web/index_wr.php
+++ b/web/index_wr.php
@@ -57,12 +57,18 @@ log_wr('POSTSPLIT: '.$argz[0]);
 
 if ($argz[0] == 'shutdown') {
   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);
@@ -192,7 +198,7 @@ else if ($user->stat == 'room') {
            
 //          ARRAY_POP DISABLED
 //         // CHECK
-//         while (array_pop($user_cur->comm) != NULL);
+           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);