sources cleanup

[brisk.git] / web / index.php

diff --git a/web/index.php b/web/index.php
index f0b05c7..ee5942e 100644 (file)
--- a/web/index.php
+++ b/web/index.php
@@ -22,11 +22,12 @@
  *
  */
 
+$G_base = "";
+
 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.',
@@ -234,9 +235,12 @@ function main()
   
   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 */
@@ -278,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;
@@ -305,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 */