X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Findex.php;h=ee5942e0df6303bb885d1ebbac318bb77244b1f2;hb=4cbdccb22145e23fab22225a972b490842209c24;hp=551dd7949e7d64b46fc7760dc14650f85369fddb;hpb=29a83e580080f589142bc8639d8a757503fd3175;p=brisk.git

diff --git a/web/index.php b/web/index.php
index 551dd79..ee5942e 100644
--- a/web/index.php
+++ b/web/index.php
@@ -28,7 +28,6 @@ require_once("Obj/brisk.phh");
 require_once("Obj/auth.phh");
 require_once("Obj/proxyscan.phh");
 
-
 $mlang_room = array( 'userpasserr'  => array('it' => 'Utente e/o password errati.',
                                              'en' => 'Wrong user and/or password.'),
                      'userpassmust' => array('it' => 'Il nickname deve contenere almeno una lettera o una cifra.',
@@ -225,7 +224,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 +233,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();
+      $sem = Room::lock_data(TRUE);
       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 +282,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 +309,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 */