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

[brisk.git] / web / index.php

diff --git a/web/index.php b/web/index.php
index 551dd79..90191d5 100644 (file)
--- a/web/index.php
+++ b/web/index.php
@@ -225,7 +225,7 @@ function main()
   GLOBAL $G_with_topbanner, $G_topbanner, $G_is_local;
   GLOBAL $G_with_sidebanner, $G_sidebanner; 
   GLOBAL $G_with_sidebanner2, $G_sidebanner2; 
-  GLOBAL $G_with_poll, $G_false;
+  GLOBAL $G_with_poll;
   GLOBAL $sess, $name, $pass_private, $table_idx, $table_token, $BRISK_SHOWHTML, $BRISK_DEBUG, $_SERVER;
   GLOBAL $G_lang, $G_lng, $mlang_room;
   $is_login = FALSE;
@@ -234,13 +234,14 @@ function main()
   $standup = "";
   $ACTION = "login";
   
-  error_log("main: G_false: [".$G_false."]", 0);
-
   if (isset($BRISK_SHOWHTML) == FALSE) {
       $is_table = FALSE;
       $sem = Room::lock_data();
       log_main("lock Room");
-      $room = &Room::load_data();
+      if (($room = Room::load_data()) == FALSE) {
+          log_crit("load_data failed");
+          exit();
+      }
       $curtime = time();
       
       /* Actions */
@@ -282,7 +283,7 @@ function main()
           
           $room->garbage_manager(TRUE);
           /* try login */
-          if (($user = &$room->add_user(&$sess, &$idx, $name, $pass_private, $_SERVER['REMOTE_ADDR'])) != FALSE) {
+          if (($user = $room->add_user(&$sess, &$idx, $name, $pass_private, $_SERVER['REMOTE_ADDR'])) != FALSE) {
               $ACTION = "room";
               if ($idx < 0) {
                   $idx = -$idx - 1;
@@ -309,10 +310,10 @@ function main()
               // setcookie ("sess", "", time() + 180);      
               $room->standup_update(&$user);
               
-       if (Room::save_data(&$room) == FALSE) {
-            echo "ERRORE SALVATAGGIO\n";
-            exit;
-       }
+              if (Room::save_data($room) == FALSE) {
+                  echo "ERRORE SALVATAGGIO\n";
+                  exit;
+              }
           }
           else {
               /* Login Rendering */