partial remove of 'by reference' operator on class objects passed to function or...

[brisk.git] / web / index_wr.php

diff --git a/web/index_wr.php b/web/index_wr.php
index 9ac86bf..1348c12 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 {
@@ -491,7 +494,7 @@ else if ($user->stat == 'room') {
   else if ($user->subst == 'standup') {
    
     if ($argz[0] == 'sitdown') {
-      log_wr("SITDOWN command");
+        log_wr("SITDOWN command");
 
       if ($user->the_end == TRUE) {
        log_wr("INFO:SKIP:argz == sitdown && the_end == TRUE => ignore request.");
@@ -568,7 +571,7 @@ else if ($user->stat == 'room') {
        //
 
         // Create new spawned table
-        $bri_sem = Briskin5::lock_data($table_idx);
+        $bri_sem = Bin5::lock_data($table_idx);
         $table_token = uniqid("");
         $room->table[$table_idx]->table_token = $table_token;
         $room->table[$table_idx]->table_start = $curtime;
@@ -579,15 +582,17 @@ else if ($user->stat == 'room') {
         }
         log_legal($curtime, $user, "STAT:CREATE_GAME", $plist);
 
-        if (($bri =& new Briskin5(&$room, $table_idx, $table_token)) == FALSE)
+        log_wr("pre new Bin5");
+        if (($bri = new Bin5($room, $table_idx, $table_token)) == FALSE)
           log_wr("bri create: FALSE");
         else
           log_wr("bri create: ".serialize($bri));
        
+        log_wr("pre init table");
         // init table
-        $bri_table =& $bri->table[0];
-        $bri_table->init(&$bri->user);
-        $bri_table->game_init(&$bri->user);
+        $bri_table = $bri->table[0];
+        $bri_table->init($bri->user);
+        $bri_table->game_init($bri->user);
         //
         // Init spawned users.
         //
@@ -595,8 +600,8 @@ else if ($user->stat == 'room') {
         // 
         log_wr("game_init after");
         for ($i = 0 ; $i < $table->player_n ; $i++) {
-          $bri_user_cur = &$bri->user[$i];
-          $user_cur = &$room->user[$table->player[$i]];
+          $bri_user_cur = $bri->user[$i];
+          $user_cur = $room->user[$table->player[$i]];
           
           $bri_user_cur->stat_set('table');
           $bri_user_cur->subst = 'asta';
@@ -606,7 +611,6 @@ else if ($user->stat == 'room') {
           $bri_user_cur->comm[$bri_user_cur->step % COMM_N] = "";
           $bri_user_cur->step_inc();
           $bri_user_cur->comm[$bri_user_cur->step % COMM_N] = show_table(&$bri,&$bri_user_cur,$bri_user_cur->step+1,TRUE, FALSE);
-          
           $bri_user_cur->step_inc();
           
           log_wr("TRY PRESAVE: ".$bri_user_cur->step." TRANS STEP: ".$bri_user_cur->trans_step);
@@ -624,15 +628,14 @@ else if ($user->stat == 'room') {
           $user_cur->trans_step = $user_cur->step + 1;
           log_wr("TRANS ATTIVATO");
           
-          
           $user_cur->stat_set('table');
           $user_cur->subst = 'asta';
           $user_cur->laccwr = $curtime;
           $user_cur->step_inc();
         }
         log_wr("presave bri");
-        Briskin5::save_data($bri);
-        Briskin5::unlock_data($bri_sem);
+        Bin5::save_data($bri);
+        Bin5::unlock_data($bri_sem);
         log_wr("postsave bri");
       }
       // change room
@@ -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;