reference operator removed because class are passed by reference as default in php5

[brisk.git] / web / index_wr.php

diff --git a/web/index_wr.php b/web/index_wr.php
index 9ac86bf..50fed58 100644 (file)
--- a/web/index_wr.php
+++ b/web/index_wr.php
@@ -118,35 +118,38 @@ if (($user = &$room->get_user($sess, &$idx)) == FALSE) {
   $argz = explode('|', xcapemesg($mesg));
 
   if ($argz[0] == 'getchallenge') {
-    GLOBAL $cli_name;
-    if (($a_sem = Challenges::lock_data()) != FALSE) { 
-      log_main("chal lock data success");
-      
-      if (($chals = &Challenges::load_data()) != FALSE) {
-
-        $token =  uniqid("");
-        // echo '2|'.$argz[1].'|'.$token.'|'.$_SERVER['REMOTE_ADDR'].'|'.$curtime.'|';
-        // exit;
-
-        if (($login_new = validate_name(urldecode($cli_name))) != FALSE) {
-          if ($chals->add($login_new, $token, $_SERVER['REMOTE_ADDR'], $curtime) != FALSE) {
-            echo '0|'.$token;
-          }
-          else {
-            echo '1|';
+      GLOBAL $cli_name;
+      if (($a_sem = Challenges::lock_data()) != FALSE) { 
+          log_main("chal lock data success");
+          
+          if (($chals = &Challenges::load_data()) != FALSE) {
+              
+              $token =  uniqid("");
+              // echo '2|'.$argz[1].'|'.$token.'|'.$_SERVER['REMOTE_ADDR'].'|'.$curtime.'|';
+              // exit;
+              
+              if (($login_new = validate_name(urldecode($cli_name))) != FALSE) {
+                  if ($chals->add($login_new, $token, $_SERVER['REMOTE_ADDR'], $curtime) != FALSE) {
+                      log_send("SUCCESS: token:".$token);
+                      echo '0|'.$token;
+                  }
+                  else {
+                      log_send("getchallenge FAILED");
+                      echo '1|';
+                  }
+              }
+              else {
+                  log_send("getchallenge FAILED");
+                  echo '1|';
+              }
+              if ($chals->ismod()) {
+                  Challenges::save_data(&$chals);
+              }
           }
-        }
-        else {
-          echo '1|';
-        }
-        if ($chals->ismod()) {
-          Challenges::save_data(&$chals);
-        }
+          
+          
+          Challenges::unlock_data($a_sem);
       }
-      
-
-      Challenges::unlock_data($a_sem);
-    }
   }
   else if ($argz[0] == 'auth') {
     printf("challenge|ok");
@@ -192,7 +195,7 @@ if ($argz[0] == 'shutdown') {
 
   log_rd2("AUTO LOGOUT.");
   if ($user->subst == 'sitdown' || $user->stat == 'table')
-    $room->room_wakeup(&$user);
+    $room->room_wakeup($user);
   else if ($user->subst == 'standup')
     $room->room_outstandup(&$user);
   else {
@@ -656,10 +659,10 @@ else if ($user->stat == 'room') {
    **********************/
   else if ($user->subst == 'sitdown') {
     if ($argz[0] == 'wakeup') {
-      $room->room_wakeup(&$user);      
+      $room->room_wakeup($user);      
     }
     else if ($argz[0] == 'logout') {
-      $room->room_wakeup(&$user);      
+      $room->room_wakeup($user);      
       $user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; ";
       $user->comm[$user->step % COMM_N] .= 'postact_logout();';
       $user->the_end = TRUE;