load_data return allways, all exit() calls removed, all load_data calls are protected

[brisk.git] / web / index_rd.php

diff --git a/web/index_rd.php b/web/index_rd.php
index fc8aa0c..0850a36 100644 (file)
--- a/web/index_rd.php
+++ b/web/index_rd.php
@@ -119,7 +119,7 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
             // Aggiorna l'expire time lato server
             $S_load_stat['U_first_loop']++;
             if (($user = User::load_data($proxy_step['i'], $sess)) == FALSE) {
-                Room::unlock_data();
+                Room::unlock_data($sem);
                 ignore_user_abort(FALSE);
                 return (unrecerror());
             }
@@ -131,7 +131,7 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
                 
                 $S_load_stat['R_garbage']++;
                 if (($room = Room::load_data()) == FALSE) {
-                    Room::unlock_data();
+                    Room::unlock_data($sem);
                     ignore_user_abort(FALSE);
                     return (unrecerror());
                 }
@@ -196,7 +196,11 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
          */
         ignore_user_abort(TRUE);
         $sem = Room::lock_data();
-        $room = Room::load_data();
+        if (($room = Room::load_data()) == FALSE) {
+            Room::unlock_data($sem);
+            ignore_user_abort(FALSE);
+            return (unrecerror());
+        }
         $S_load_stat['R_minusone']++;
         
         /* unset the $user var to reload it from main structure */
@@ -282,7 +286,7 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
         $sem = Room::lock_data();
         $S_load_stat['U_heavy']++;
         if (($user = User::load_data($proxy_step['i'], $sess)) == FALSE) {
-            Room::unlock_data();
+            Room::unlock_data($sem);
             ignore_user_abort(FALSE);
             return (unrecerror());
         }
@@ -318,7 +322,12 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
                 log_auth($user->sess, "Explicit logout.");
                 
                 $S_load_stat['R_the_end']++;
-                $room = Room::load_data();
+                if (($room = Room::load_data()) == FALSE) {
+                    Room::unlock_data($sem);
+                    ignore_user_abort(FALSE);
+                    return (unrecerror());
+                }
+
                 unset($user);
                 if (($user = $room->get_user($sess, $idx)) == FALSE) {
                     Room::unlock_data($sem);