to verify the equality of users use users idx instead of users reference

[brisk.git] / web / Obj / brisk.phh

diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index 3f65f17..794c1e3 100644 (file)
--- a/web/Obj/brisk.phh
+++ b/web/Obj/brisk.phh
@@ -694,8 +694,10 @@ class User {
 
     $i_start = (1 > ($from->step - COMM_N) ? 1 : ($from->step - COMM_N)); 
     for ($i = $i_start ; $i < $from->step ; $i++) {
-      $ii = $i % COMM_N;
-      $this->comm[$ii] = $from->comm[$ii];
+        $ii = $i % COMM_N;
+        if (isset($from->comm[$ii])) {
+            $this->comm[$ii] = $from->comm[$ii];
+        }
     }
     $this->asta_card  = $from->asta_card;
     $this->asta_pnt   = $from->asta_pnt;
@@ -1267,7 +1269,7 @@ class Room {
        $user_cur = &$this->user[$table->player[$i]];
        log_main("PREIMPOST: INLOOP name: ".$user_cur->name);
 
-       if ($user_cur != $user) {
+       if ($user->idx_get() != $table->player[$i]) {
          $user_cur->stat_set("room");
          $user_cur->subst = "sitdown";
          $user_cur->laccwr = $curtime;
@@ -1304,7 +1306,7 @@ class Room {
       // log_main("VALORI: name: ".$user_cur->name."from_table: ".$from_table."  tab: ".$user_cur->table." taix: ".$table_idx."  ucur: ".$user_cur."  us: ".$user);
 
       $ret = "gst.st = ".($user_cur->step+1)."; ".($remove_wagon ? sprintf("tra.rem(%d);",$table_idx) : "");
-      if ($from_table && ($user_cur->table == $table_idx || $user_cur == $user)) {
+      if ($from_table && ($user_cur->table == $table_idx || $user->idx_get() == $i)) {
        $ret .= 'gst.st_loc++; the_end=true; window.onunload = null; window.onbeforeunload = null; document.location.assign("index.php");|';
        // $ret .= 'gst.st_loc++; document.location.assign("index.php");|';
        log_main("DOCUMENT.index.php: from table");
@@ -1318,7 +1320,7 @@ class Room {
        // $ret .= table_act_content(FALSE, 0, $table_idx, $user->table, FALSE);
        $ret .= $table->act_content($user);
 
-       if ($user_cur == $user) {
+       if ($user->idx_get() == $i) {
          // set the new status 
          $ret .=  'subst = "standup"; tra.show(); ';
          // clean the action buttons in other tables
@@ -1374,13 +1376,13 @@ class Room {
          $user_cur->table = -1;
          $user_wup[$user_wup_n++] = &$user_cur;
           
-          $remove_wagon = false;
-          if($table->wag_own == $user_cur) {
-            $remove_wagon = true;
+          $remove_wagon = FALSE;
+          if($table->wag_own == $table->player[$i]) {
+            $remove_wagon = TRUE;
             $table->wag_reset($curtime);
           }
        }
-       $user_tab[$user_tab_n++] = &$user_cur;
+       $user_tab[$user_tab_n++] = $table->player[$i];
       }
     }
 
@@ -1413,8 +1415,8 @@ class Room {
 
 
        for ($tab_idx = 0 ; $tab_idx < $user_tab_n  ; $tab_idx++)
-         if ($user_cur == $user_tab[$tab_idx]) 
-           break;
+            if ($user_tab[$tab_idx] == $i) 
+                break;
 
        // for users that wakeup the room will be reconstructed by index_rd.php
        if ($tab_idx < $user_tab_n) {
@@ -1472,7 +1474,7 @@ class Room {
       if ($table_idx > -1)
        $ret .= $this->table_content($user_cur, $table_idx);
       
-      if ($user_cur == $user) {
+      if ($user->idx_get() == $i) {
         $itin = ($user->flags & USER_FLAG_AUTH ? "<i>" : "");
         $itou = ($user->flags & USER_FLAG_AUTH ? "</i>" : "");
        $ret .= sprintf('$("myname").innerHTML = "<b>%s%s%s</b>: ";', $itin, xcape($user->name), $itou);
@@ -1516,7 +1518,7 @@ class Room {
       $ret .= $this->table_content($user_cur, $table_idx);
       $ret .= $this->standup_content($user_cur);
       
-      if ($user_cur == $user) {
+      if ($user->idx_get() == $i) {
        $ret .=  'subst = "sitdown"; tra.hide(); ';
        // clean the action buttons in other tables
        for ($e = 0 ; $e < TABLES_N ; $e++) {
@@ -1858,8 +1860,7 @@ class Room {
         $user_cur = $this->user[$i];
         if ($target != "" && $user_cur->name != $target)
           continue;
-        //     if ($user_cur->sess == '' || $user_cur->stat != 'room')
-        if ($user_cur->sess == '' || $user_cur->stat == 'table' || $user_cur == $user)
+        if ($user_cur->sess == '' || $user_cur->stat == 'table' || $user->idx_get() == $i)
           continue;
         
         if ($is_normchat == TRUE) {
@@ -2197,7 +2198,7 @@ class Room {
       
       if ($user_cur->stat == 'room') {
        $user_cur->comm[$user_cur->step % COMM_N] = "gst.st = ".($user_cur->step+1)."; ".$this->standup_content($user_cur);
-       if ($user_cur == $user) {
+       if ($user->idx_get() == $i) {
           $itin = ($user->flags & USER_FLAG_AUTH ? "<i>" : "");
           $itou = ($user->flags & USER_FLAG_AUTH ? "</i>" : "");
 
@@ -2455,16 +2456,16 @@ class Room {
     
     $content = "[ ";
     for ($i = 0 ; $i < $table->player_n ; $i++) {
-      $user_cur = &$this->user[$table->player[$i]];
-
-      $flags = $user_cur->flags;
-
-      if ($user_cur == $user) 
-        $flags |= 1;
-      
-      log_main($user_cur->name. sprintf(" IN TABLE [%d]", $table_idx));
-      
-      $content .= sprintf('%s[ %d, "%s" ]',($i == 0 ? '' : ', '), $flags, xcape($user_cur->name));
+        $user_cur = &$this->user[$table->player[$i]];
+        
+        $flags = $user_cur->flags;
+        
+        if ($user->idx_get() == $table->player[$i]) 
+            $flags |= 1;
+        
+        log_main($user_cur->name. sprintf(" IN TABLE [%d]", $table_idx));
+        
+        $content .= sprintf('%s[ %d, "%s" ]',($i == 0 ? '' : ', '), $flags, xcape($user_cur->name));
     }
 
     $content .= ' ]';