X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Findex_rd.php;h=51986e1e82b7f6c5d0e3090414a66317b6c2d8e5;hb=03b56b29d58cbd66c9d6fefebe842221ceaa5e62;hp=e2516eae242c4017f86fdc4c8707c5cccee2e526;hpb=8861498f64b33d632aaf4f0b3b54a01503307531;p=brisk.git

diff --git a/web/index_rd.php b/web/index_rd.php
index e2516ea..51986e1 100644
--- a/web/index_rd.php
+++ b/web/index_rd.php
@@ -89,13 +89,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);
   }
@@ -107,7 +108,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 {
@@ -124,7 +125,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);
@@ -183,9 +184,14 @@ 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 .= show_room(&$room, $user->step, &$user);
+
+      // TODO uncomment and test
+      // while (array_pop($user->comm) != NULL);
+      // $new_step = -1;
+      // $user->step_inc(COMM_N + 1);
+      // Room::save_data($room);
       /* NOTE the sets went common */
       $new_stat =  $user->stat;
       $new_subst = $user->subst;
@@ -219,10 +225,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" ? "briskin5/index.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++) {