X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Findex_rd.php;h=51986e1e82b7f6c5d0e3090414a66317b6c2d8e5;hb=73da829130f1d1e82bbdf16474ad8628419db1f9;hp=4e03b7443e46ad232a97ede1b55ee77581d5f863;hpb=f835315ba162c3dd448a2201eb07128634d7bde0;p=brisk.git diff --git a/web/index_rd.php b/web/index_rd.php index 4e03b74..51986e1 100644 --- a/web/index_rd.php +++ b/web/index_rd.php @@ -96,7 +96,7 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su $first_loop = FALSE; } - log_only("U"); + log_lock("U"); Room::unlock_data($sem); ignore_user_abort(FALSE); } @@ -108,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 { @@ -125,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); @@ -187,6 +187,11 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su 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; @@ -223,7 +228,7 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su 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++) {