projects
/
brisk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
uset user moved before load ancestor data
[brisk.git]
/
web
/
index_rd.php
diff --git
a/web/index_rd.php
b/web/index_rd.php
index
a8a4126
..
efc1dd9
100644
(file)
--- a/
web/index_rd.php
+++ b/
web/index_rd.php
@@
-195,6
+195,10
@@
function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
/*
* if $cur_step == -1 load the current state from the main struct
*/
/*
* if $cur_step == -1 load the current state from the main struct
*/
+
+ /* unset the $user var to reload it from main structure */
+ unset($user);
+
ignore_user_abort(TRUE);
$sem = Room::lock_data(TRUE);
if (($room = Room::load_data()) == FALSE) {
ignore_user_abort(TRUE);
$sem = Room::lock_data(TRUE);
if (($room = Room::load_data()) == FALSE) {
@@
-204,8
+208,6
@@
function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
}
$S_load_stat['R_minusone']++;
}
$S_load_stat['R_minusone']++;
- /* unset the $user var to reload it from main structure */
- unset($user);
if (($user = $room->get_user($sess, $idx)) == FALSE) {
Room::unlock_data($sem);
ignore_user_abort(FALSE);
if (($user = $room->get_user($sess, $idx)) == FALSE) {
Room::unlock_data($sem);
ignore_user_abort(FALSE);
@@
-322,6
+324,8
@@
function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
log_rd2("LOGOUT BYE BYE!!");
log_auth($user->sess, "Explicit logout.");
log_rd2("LOGOUT BYE BYE!!");
log_auth($user->sess, "Explicit logout.");
+ unset($user);
+
$S_load_stat['R_the_end']++;
if (($room = Room::load_data()) == FALSE) {
Room::unlock_data($sem);
$S_load_stat['R_the_end']++;
if (($room = Room::load_data()) == FALSE) {
Room::unlock_data($sem);
@@
-329,7
+333,6
@@
function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
return (blocking_error(TRUE));
}
return (blocking_error(TRUE));
}
- unset($user);
if (($user = $room->get_user($sess, $idx)) == FALSE) {
Room::unlock_data($sem);
ignore_user_abort(FALSE);
if (($user = $room->get_user($sess, $idx)) == FALSE) {
Room::unlock_data($sem);
ignore_user_abort(FALSE);