From dcbd9de538dd8a20069475b22c5201279ac4e95b Mon Sep 17 00:00:00 2001
From: "Matteo Nastasi (mop)" <nastasi@alternativeoutput.it>
Date: Fri, 20 May 2011 09:02:51 +0200
Subject: [PATCH] uset user  moved before load ancestor data

---
 web/briskin5/index_rd.php | 11 +++++++----
 web/index_rd.php          |  9 ++++++---
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/web/briskin5/index_rd.php b/web/briskin5/index_rd.php
index 2da54a8..0e273a1 100644
--- a/web/briskin5/index_rd.php
+++ b/web/briskin5/index_rd.php
@@ -175,6 +175,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
          */
+        
+        /* unset the $user var to reload it from main structure */
+        unset($user);
+
         ignore_user_abort(TRUE);
         $sem = Bin5::lock_data(TRUE, $table_idx);
         if (($bri = Bin5::load_data($table_idx, $table_token)) == FALSE) {
@@ -183,9 +187,7 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
             return (blocking_error(TRUE));
         }
         $S_load_stat['R_minusone']++;
-        
-        /* unset the $user var to reload it from main structure */
-        unset($user);
+
         if (($user = $bri->get_user($sess, $idx)) == FALSE) {
             Bin5::unlock_data($sem);
             ignore_user_abort(FALSE);
@@ -274,6 +276,8 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
             if ($user->the_end == TRUE) {
                 log_rd2("LOGOUT BYE BYE!!");
                 log_auth($user->sess, "Explicit logout.");
+
+                unset($user);
                 
                 $S_load_stat['R_the_end']++;
                 if (($bri = Bin5::load_data($table_idx, $table_token)) == FALSE) {
@@ -281,7 +285,6 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
                     ignore_user_abort(FALSE);
                     return (blocking_error(TRUE));
                 }
-                unset($user);
                 if (($user = $bri->get_user($sess, $idx)) == FALSE) {
                     Bin5::unlock_data($sem);
                     ignore_user_abort(FALSE);
diff --git a/web/index_rd.php b/web/index_rd.php
index a8a4126..efc1dd9 100644
--- 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
          */
+
+        /* 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) {
@@ -204,8 +208,6 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
         }
         $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);
@@ -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.");
                 
+                unset($user);
+
                 $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));
                 }
 
-                unset($user);
                 if (($user = $room->get_user($sess, $idx)) == FALSE) {
                     Room::unlock_data($sem);
                     ignore_user_abort(FALSE);
-- 
2.17.1