X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Fbriskin5%2FObj%2Fbriskin5.phh;h=94a8940b6043d36e741b99ed8ec8cdeb010e8a56;hb=879ef1677b59eb159d0b9982a8fb5b056f13bff7;hp=6985443323167feca54fda78607c400892a1df98;hpb=9e17931c28667a4d2eb8967725101480b95c193c;p=brisk.git

diff --git a/web/briskin5/Obj/briskin5.phh b/web/briskin5/Obj/briskin5.phh
index 6985443..94a8940 100644
--- a/web/briskin5/Obj/briskin5.phh
+++ b/web/briskin5/Obj/briskin5.phh
@@ -2,7 +2,7 @@
 /*
  *  brisk - briskin5.phh
  *
- *  Copyright (C) 2006-2011 Matteo Nastasi
+ *  Copyright (C) 2006-2012 Matteo Nastasi
  *                          mailto: nastasi@alternativeoutput.it 
  *                                  matteo.nastasi@milug.org
  *                          web: http://www.alternativeoutput.it
@@ -428,6 +428,8 @@ class Bin5_user extends User {
     var $handpt;     // Total card points at the beginning of the current hand.
     var $exitislock; // Player can exit from the table ?
     var $privflags;  // Flags for briskin5 only 
+
+    const BASE = "../";
     
     function User() {
     }
@@ -475,17 +477,20 @@ class Bin5_user extends User {
        } 
     */
     
-    function spawn($from, $table, $table_pos)
+    function spawn($from, &$bri, $table, $table_pos, $get, $post, $cookie)
     {
-        GLOBAL $CO_bin5_pref_ring_endauct;
-        
         if (($thiz = new Bin5_user()) == FALSE)
             return (FALSE);
-        
+
+        if (($CO_bin5_pref_ring_endauct = gpcs_var("CO_bin5_pref_ring_endauct", $get, $post, $cookie)) === FALSE) {
+            $CO_bin5_pref_ring_endauct = "";
+        }
+
         $thiz->parentcopy($from);
         
         /* NOTE: at this moment idx and table_pos fields have the same value 
            but diffentent functions, we keep them separated for a while */
+        $thiz->room       = $bri;
         $thiz->idx        = $table_pos;
         $thiz->asta_card  = -2;
         $thiz->asta_pnt   = -1;
@@ -495,7 +500,7 @@ class Bin5_user extends User {
         log_wr("Bin5 constructor");
         
         $this->privflags  = ($CO_bin5_pref_ring_endauct == "true" ? BIN5_USER_FLAG_RING_ENDAUCT : 0) | 0;
-        
+
         $thiz->table_orig = $table;
         $thiz->table      = 0;
         $thiz->table_pos  = $table_pos;
@@ -715,6 +720,147 @@ class Bin5_user extends User {
         return ($ret);
     }
 
+    protected function blocking_error($is_unrecoverable)
+    {
+        log_crit("BLOCKING_ERROR UNREC: ".($is_unrecoverable ? "TRUE" : "FALSE"));
+        return (sprintf(($is_unrecoverable ? 'xstm.stop(); ' : '').'window.onbeforeunload = null; window.onunload = null; document.location.assign("../index.php");'));
+    }
+    
+    protected function page_sync($sess, $page)
+    {
+        log_rd2("PAGE_SYNC");
+        printf("xXx BIN5_USER::PAGE_SYNC\n");
+        return (sprintf('xstm.stop(); window.onbeforeunload = null; window.onunload = null; document.location.assign("%s");', $page));
+    }
+
+    protected function maincheck($cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_subst, &$new_step, $splashdate, $table_idx, $table_token)
+    {
+        GLOBAL $G_lang, $mlang_indrd;
+        GLOBAL $G_with_splash, $G_splash_content, $G_splash_interval, $G_splash_idx;
+        GLOBAL $G_splash_w, $G_splash_h, $G_splash_timeout;
+        $CO_splashdate = "CO_splashdate".$G_splash_idx;
+        $$CO_splashdate = $splashdate;
+        
+        GLOBAL $S_load_stat;
+        
+        log_rd("maincheck begin");
+        
+        $ret = FALSE;
+        $curtime = time();
+        
+      /* Nothing changed, return. */
+      if ($cur_step == $this->step) 
+          return (FALSE);
+      
+      log_rd2("do other cur_stat[".$cur_stat."] user->stat[".$this->stat."] cur_step[".$cur_step."] user_step[".$this->step."]");
+      
+      if ($cur_step == -1) {
+          /*
+           *  if $cur_step == -1 load the current state from the main struct
+           */
+          
+          $S_load_stat['wR_minusone']++;
+          
+          // if ($this->the_end == TRUE) {
+          // log_rd2("main_check: the end".var_export(debug_backtrace()));
+          // }
+          
+          if ($this->trans_step != -1) {
+              log_rd2("TRANS USATO ".$this->trans_step);
+              $cur_step = $this->trans_step;
+              $this->trans_step = -1;
+          }
+          else {
+              log_rd2("TRANS NON ATTIVATO");
+          }
+      }
+      
+      
+      /* this part I suppose is read only on $this->room structure */
+      if ($cur_step == -1) {
+          log_rd2("PRE-NEWSTAT");
+              
+          /***************
+           *             *
+           *    TABLE    *
+           *             *
+           ***************/
+          if ($this->stat == 'table') {
+              log_load("RESYNC");
+              /* NOTE: $this->room is associated with the current $bri object */
+              printf("xXx CLASS NAME [%s]\n", get_class($this->room));
+              $ret = show_table(&$this->room, $this, $this->step, FALSE, FALSE);
+          }
+          log_rd2("NEWSTAT: ".$this->stat);
+
+          $new_stat =  $this->stat;
+          $new_subst = $this->subst;
+          $new_step =  $this->step;
+      } /* if ($cur_step == -1) { */
+      else {
+          /* $sem = Room::lock_data(FALSE); */
+          $S_load_stat['rU_heavy']++;
+          
+          if ($cur_step < $this->step) {
+              do {
+                  if ($cur_step + COMM_N < $this->step) {
+                      if (($cur_stat != $this->stat)) {
+                          $to_stat = $this->stat;
+                          /* Room::unlock_data($sem); */
+                          log_load("RESYNC");
+                          printf("xXx BIN5_USER::MAINCHECK\n");
+                          return ($this->page_sync($this->sess, ($to_stat == "table" ? "index.php" : "../index.php"), $this->table, $this->table_token));
+                      }
+                      log_rd2("lost history, refresh from scratch");
+                      printf("xXx LOST HISTORY!\n");
+                      $new_step = -1;
+                      break;
+                  } 
+                  for ($i = $cur_step ; $i < $this->step ; $i++) {
+                      $ii = $i % COMM_N;
+                      log_rd2("ADDED TO THE STREAM: ".$this->comm[$ii]);
+                      $ret .= $this->comm[$ii];
+                  }
+                  $new_stat =  $this->stat;
+                  $new_subst = $this->subst;
+                  $new_step =  $this->step;
+              } while (0);
+              
+              log_rd2($this->step, 'index_rd.php: after ret set');
+              
+              if ($this->the_end == TRUE) {
+                  log_rd2("LOGOUT BYE BYE!!");
+                  log_auth($this->sess, "Explicit logout.");
+                  
+                  if ($this->the_end == TRUE) {
+                      $this->reset();
+                      
+                      // FIXME !!! 
+                      /* if ($this->subst == 'sitdown') { */
+                      /*     log_load("ROOM WAKEUP"); */
+                      /*     $this->room->room_wakeup($this); */
+                      /* } */
+                      /* else if ($this->subst == 'standup') */
+                      /*     $this->room->room_outstandup($this); */
+                      /* else */
+                      /*     log_rd2("LOGOUT FROM WHAT ???"); */
+                      
+                  } /* if ($this->the_end == TRUE) { ... */
+              } /* if ($this->the_end == TRUE) { ... */
+          } /* if ($cur_step < $this->step) { */
+          
+          /* Room::unlock_data($sem); */
+      }  /* else of if ($cur_step == -1) { */
+      
+    
+      return ($ret);
+  }  //   function maincheck (...
+
+
+
+
+
+
 } // end class Bin5_user
 
 
@@ -726,7 +872,7 @@ class Bin5 {
     var $table;
     var $comm; // commands for many people
     var $step; // current step of the comm array
-    // externalized var $garbage_timeout;
+    var $garbage_timeout;
     var $shm_sz;
     
     var $table_idx;
@@ -735,7 +881,30 @@ class Bin5 {
     var $the_end;
     var $tok;
 
-    function Bin5 ($room, $table_idx, $table_token) {
+    static function page_manager($room, $header_out, $path, $method, $addr, $get, $post, $cookie) 
+    {
+        switch ($path) {
+        case "":
+        case "index.php":
+            ob_start();
+            bin5_index_main($room, $header_out, $addr, $get, $post, $cookie);
+            $content = ob_get_contents();
+            ob_end_clean();
+            
+            force_no_cache($header_out);
+
+            $pgflush = new PageFlush($new_socket, $curtime, 20, $header_out, $content);
+            
+            if ($pgflush->try_flush($curtime) == FALSE) {
+                // Add $pgflush to the pgflush array
+                array_push($pages_flush, $pgflush);
+            }
+            break;
+        }
+        return TRUE;
+    }
+
+    function Bin5 ($room, $table_idx, $table_token, $get, $post, $cookie) {
         $this->user = array();
         $this->table = array();
         
@@ -753,7 +922,7 @@ class Bin5 {
         
         for ($i = 0 ; $i < $table->player_n ; $i++) {
             $user[$table->player[$i]]->table_token = $table_token;
-            $this->user[$i] = Bin5_user::spawn($user[$table->player[$i]], $table_idx, $i);
+            $this->user[$i] = Bin5_user::spawn($user[$table->player[$i]], $this, $table_idx, $i, $get, $post, $cookie);
         }
         $this->table[0] = Bin5_table::spawn(&$table);
         
@@ -761,7 +930,7 @@ class Bin5 {
         
         $this->table_idx = $table_idx;
         $this->table_token = $table_token;
-        Bin5::garbage_time_expire_set($table_idx, 0);
+        $this->garbage_timeout = 0;
         
         log_wr("Bin5 constructor end");
     }
@@ -799,8 +968,7 @@ class Bin5 {
         /* Garbage collector degli utenti in timeout */
         $ismod = FALSE;
         $curtime = time();
-        // externalized if ($force || $this->garbage_timeout < $curtime) {
-        if ($force || Bin5::garbage_time_is_expired($this->table_idx, $curtime)) {
+        if ($force || $this->garbage_timeout < $curtime) {
             for ($i = 0 ; $i < BIN5_MAX_PLAYERS ; $i++) {
                 $user_cur = $this->user[$i];
                 if ($user_cur->sess == "" || 
@@ -838,8 +1006,7 @@ class Bin5 {
             }
             log_rd2($user_cur->sess." GARBAGE UPDATED!");
             
-            // externalized $this->garbage_timeout = $curtime + GARBAGE_TIMEOUT;
-            Bin5::garbage_time_expire_set($this->table_idx, $curtime + GARBAGE_TIMEOUT);
+            $this->garbage_timeout = $curtime + GARBAGE_TIMEOUT;
             
             $ismod = TRUE;
         }
@@ -1153,7 +1320,7 @@ class Bin5 {
             $user_cur->laccwr = $curtime;
 
             $ret = "gst.st = ".($user_cur->step+1)."; ";
-            $ret .= 'gst.st_loc++; hstm.stop(); window.onbeforeunload = null; window.onunload = null; document.location.assign("../index.php");|';
+            $ret .= 'gst.st_loc++; xstm.stop(); window.onbeforeunload = null; window.onunload = null; document.location.assign("../index.php");|';
 
             log_wr($user_cur->sess." BIN5_WAKEUP: ".$ret);
             $user_cur->comm[$user_cur->step % COMM_N] = $ret;
@@ -1185,48 +1352,108 @@ class Bin5 {
         return ($is_ab);
     }
 
-
-    static function garbage_time_is_expired($tab_id, $tm) 
+    static function request_mgr(&$s_a_p, $header, &$header_out, &$new_socket, $path, $addr, $get, $post, $cookie)
     {
-        $ret = TRUE;
-        $fp = FALSE;
-        do {
-            if (file_exists(BIN5_PROXY_PATH."/table".$tab_id) == FALSE)
-                mkdir(BIN5_PROXY_PATH."/table".$tab_id, 0775, TRUE);
-            if (($fp = @fopen(BIN5_PROXY_PATH."/table".$tab_id."/garbage_time.expired", 'rb')) == FALSE)
-                break;
-            if (($s = fread($fp, 4)) == FALSE)
-                break;
-            if (mb_strlen($s, "ASCII") != 4)
-                break;
-            $arr = unpack('Le', $s);
-            if ($arr['e'] > $tm)
-                $ret = FALSE;
-        } while (0);
-      
-        if ($fp != FALSE)
-            fclose($fp);
-      
-        log_rd2("END: return ".($ret ? "TRUE" : "FALSE"));
-      
-        return ($ret);
-    }
+        printf("NEW_SOCKET (root): %d\n", intval($new_socket));
+        
+        $enc = get_encoding($header);
+        if (isset($header['User-Agent']) && strstr($header['User-Agent'], "MSIE")) {
+            $transp_type = "htmlfile";
+        }
+        else {
+            $transp_type = "iframe";
+        }
+        force_no_cache($header_out);
+
+        if (($table_idx = gpcs_var('table_idx', $get, $post, $cookie)) === FALSE) 
+            unset($table_idx);
+        
+        if (($table_token = gpcs_var('table_token', $get, $post, $cookie)) === FALSE) 
+            unset($table_token);
+
+
+        switch ($path) {
+        case "":
+        case "index.php":
+            ob_start();
+            bin5_index_main($transp_type, $header_out, $addr, $get, $post, $cookie);
+            $content = ob_get_contents();
+            ob_end_clean();
+        
+            $s_a_p->pgflush_try_add($enc, $new_socket, 20, $header_out, $content);
+            return TRUE;
+        
+        break;
+        case "index_wr.php":
+            // FIXME $content can be unset
+            if (isset($table_idx) && isset($table_token)) {
+                if (($bri = $s_a_p->app->match_get($table_idx, $table_token)) != FALSE) {
+                    ob_start();
+                    bin5_index_wr_main($bri, $addr, $get, $post, $cookie);
+                    $content = ob_get_contents();
+                    ob_end_clean();
+                }
+            }
+            $s_a_p->pgflush_try_add($enc, $new_socket, 20, $header_out, $content);
+            return TRUE;
+            
+            break;
+        case "index_rd_ifra.php":
+            do {
+                if (!isset($table_idx)
+                    || !isset($table_token)
+                    || !isset($cookie['sess'])
+                    || ($bri = $s_a_p->app->match_get($table_idx, $table_token)) == NULL
+                    || (($user = $bri->get_user($cookie['sess'], $idx)) == FALSE)) {
+
+                    $content = Bin5_user::stream_fini($s_a_p->rndstr, TRUE);
+                    $s_a_p->pgflush_try_add($enc, $new_socket, 20, $header_out, $content);
+
+                    return TRUE;
+                    break;
+                }
+                // close a previous opened index_read_ifra socket, if exists
+                if (($prev = $user->rd_socket_get()) != NULL) {
+                    $s_a_p->socks_unset($user->rd_socket_get());
+                    fclose($user->rd_socket_get());
+                    printf("CLOSE AND OPEN AGAIN ON IFRA2\n");
+                    $user->rd_socket_set(NULL);
+                }
+                
+                $content = "";
+                $user->stream_init($s_a_p->rndstr, $enc, $header_out, $content, $get, $post, $cookie);
+                $response = headers_render($header_out, -1).chunked_content($user->rd_zls_get(), $content);
+                $response_l = mb_strlen($response, "ASCII");
+                
+                $wret = @fwrite($new_socket, $response, $response_l);
+                if ($wret < $response_l) {
+                    printf("TROUBLES WITH FWRITE: %d\n", $wret);
+                    $user->rd_cache_set(mb_substr($content, $wret, $response_l - $wret, "ASCII"));
+                }
+                else {
+                    $user->rd_cache_set("");
+                }
+                fflush($new_socket);
+                
+                
+                $s_a_p->socks_set($new_socket, $user);
+                $user->rd_socket_set($new_socket);
+                printf(" - qui ci siamo - ");
+                return TRUE;
+            } while (FALSE);
+            
+            return FALSE;
+            break;
+            
+        default:
+            return FALSE;
+            break;
+      }
+
+      return (FALSE);
+  }
+
 
-    static function garbage_time_expire_set($tab_id, $tm) 
-    {
-        do {
-            if (file_exists(BIN5_PROXY_PATH."/table".$tab_id) == FALSE)
-                mkdir(BIN5_PROXY_PATH."/table".$tab_id, 0775, TRUE);
-            if (($fp = @fopen(BIN5_PROXY_PATH."/table".$tab_id."/garbage_time.expired", 'wb')) == FALSE)
-                break;
-            fwrite($fp, pack("L",$tm));
-            fclose($fp);
-          
-            return (TRUE);
-        } while (0);
-      
-        return (FALSE);
-    }
 
 } // end class Bin5
 
@@ -1350,14 +1577,14 @@ function calculate_points(&$table)
    from table: asta cmd e tutti passano:  TRUE, TRUE
    from table: fine partita:              TRUE, TRUE
 */
-function show_table(&$room, &$user, $sendstep, $is_transition, $is_again)
+function show_table(&$bri, &$user, $sendstep, $is_transition, $is_again)
 {
     $table_idx = $user->table;
-    $table     = $room->table[$table_idx];
+    $table     = $bri->table[$table_idx];
     $table_pos = $user->table_pos;
 
     $ret = "table_init();";
-    $ret .= $table->exitlock_show(&$room->user, $table_pos);
+    $ret .= $table->exitlock_show(&$bri->user, $table_pos);
     if (!$is_again) {
         /* GENERAL STATUS */
         $ret .= sprintf( 'gst.st = %d; stat = "%s"; subst = "%s"; table_pos = %d;',
@@ -1371,24 +1598,25 @@ function show_table(&$room, &$user, $sendstep, $is_transition, $is_again)
         /* USERS INFO */
         $ret .= $user->myname_innerHTML();
         $ret .= sprintf('set_names([%d, "%s"], [%d, "%s"], [%d, "%s"], [%d, "%s"], [%d, "%s"]); ',
-                        $room->user[$table->player[($table_pos) % BIN5_PLAYERS_N]]->flags,
-                        xcape($room->user[$table->player[($table_pos) % BIN5_PLAYERS_N]]->name),
+                        $bri->user[$table->player[($table_pos) % BIN5_PLAYERS_N]]->flags,
+                        xcape($bri->user[$table->player[($table_pos) % BIN5_PLAYERS_N]]->name),
 
-                        $room->user[$table->player[($table_pos+1) % BIN5_PLAYERS_N]]->flags,
-                        xcape($room->user[$table->player[($table_pos+1) % BIN5_PLAYERS_N]]->name),
+                        $bri->user[$table->player[($table_pos+1) % BIN5_PLAYERS_N]]->flags,
+                        xcape($bri->user[$table->player[($table_pos+1) % BIN5_PLAYERS_N]]->name),
 
-                        $room->user[$table->player[($table_pos+2) % BIN5_PLAYERS_N]]->flags,
-                        xcape($room->user[$table->player[($table_pos+2) % BIN5_PLAYERS_N]]->name),
+                        $bri->user[$table->player[($table_pos+2) % BIN5_PLAYERS_N]]->flags,
+                        xcape($bri->user[$table->player[($table_pos+2) % BIN5_PLAYERS_N]]->name),
 
-                        (BIN5_PLAYERS_N == 3 ? 0 : $room->user[$table->player[($table_pos+3) % BIN5_PLAYERS_N]]->flags),
-                        (BIN5_PLAYERS_N == 3 ? "" :  xcape($room->user[$table->player[($table_pos+3) % BIN5_PLAYERS_N]]->name)),
+                        (BIN5_PLAYERS_N == 3 ? 0 : $bri->user[$table->player[($table_pos+3) % BIN5_PLAYERS_N]]->flags),
+                        (BIN5_PLAYERS_N == 3 ? "" :  xcape($bri->user[$table->player[($table_pos+3) % BIN5_PLAYERS_N]]->name)),
 
-                        (BIN5_PLAYERS_N == 3 ? 0 : $room->user[$table->player[($table_pos+4) % BIN5_PLAYERS_N]]->flags),
-                        (BIN5_PLAYERS_N == 3 ? "" :  xcape($room->user[$table->player[($table_pos+4) % BIN5_PLAYERS_N]]->name)));
+                        (BIN5_PLAYERS_N == 3 ? 0 : $bri->user[$table->player[($table_pos+4) % BIN5_PLAYERS_N]]->flags),
+                        (BIN5_PLAYERS_N == 3 ? "" :  xcape($bri->user[$table->player[($table_pos+4) % BIN5_PLAYERS_N]]->name)));
     }
     /* NOTIFY FOR THE CARD MAKER */
     if ($is_transition) { //  && $user->subst ==  "asta" superfluo
-        $ret .= show_table_info(&$room, &$table, $table_pos);
+        $ret .= show_table_info(&$bri, &$table, $table_pos);
+        $ret .= "setTimeout(preload_images, 500, g_preload_img_arr, g_imgct);";
     }
     if (!$is_again) 
         $ret .= table_wellcome($user);
@@ -1478,7 +1706,7 @@ function show_table(&$room, &$user, $sendstep, $is_transition, $is_again)
         /* show users auction status */
         $showst = "";
         for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) {
-            $user_cur = &$room->user[$table->player[$i]];
+            $user_cur = &$bri->user[$table->player[$i]];
             $showst .= sprintf("%s%d", ($i == 0 ? "" : ", "), 
                                ($user_cur->asta_card < 9 ? $user_cur->asta_card : $user_cur->asta_pnt));
         }
@@ -1525,7 +1753,7 @@ function show_table(&$room, &$user, $sendstep, $is_transition, $is_again)
             $ret .= "remark_off();";
     
         /* WHO CALL AND WHAT */
-        $ret .= briscola_show($room, $table, $user);
+        $ret .= briscola_show($bri, $table, $user);
     
     }
     return ($ret);
@@ -1577,19 +1805,19 @@ function calculate_winner(&$table)
     return ($cur_win);
 }
 
-function show_table_info(&$room, &$table, $table_pos)
+function show_table_info(&$bri, &$table, $table_pos)
 {
     GLOBAL $G_lang, $mlang_bin5_bin5;
 
     $ret = "";
-    $user = $room->user[$table->player[$table_pos]];
+    $user = $bri->user[$table->player[$table_pos]];
 
     $pnt_min = $table->points_n - MAX_POINTS < 0 ? 0 : $table->points_n - MAX_POINTS;
     $noty = sprintf('<table class=\"points\"><tr><th></th>');
   
     // Names.
     for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) 
-        $noty .= sprintf('<th class=\"td_points\">%s</th>', xcape($room->user[$table->player[$i]]->name));
+        $noty .= sprintf('<th class=\"td_points\">%s</th>', xcape($bri->user[$table->player[$i]]->name));
     $noty .= sprintf("</tr>");
 
     // Points.
@@ -1624,8 +1852,8 @@ function show_table_info(&$room, &$table, $table_pos)
             /* MLANG: "<hr>Nell'ultima mano ha chiamato <b>%s</b>, il socio era <b>%s</b>,<br>", "hanno fatto <b>cappotto</b> EBBRAVI!.<hr>", "dovevano fare <b>%s</b> punti e ne hanno fatti <b>%d</b>: hanno <b>%s</b>.<hr>", "<hr>Nell'ultima mano <b>%s</b> si &egrave; chiamato in mano,<br>", "ha fatto <b>cappotto</b> EBBRAVO!.<hr>", "doveva fare <b>%s</b> punti e ne ha fatti <b>%d</b>: ha <b>%s</b>.<hr>", ($table->old_asta_pnt > 61 ? "almeno ".$table->old_asta_pnt : 'pi&ugrave; di 60'), $table->old_pnt, ($wol == 1 ? "vinto" : ($wol == 0 ? "pareggiato" : "perso" */
       
             $noty .= sprintf($mlang_bin5_bin5['info_part'][$G_lang], 
-                             xcape($room->user[$win]->name),
-                             xcape($room->user[$fri]->name));
+                             xcape($bri->user[$win]->name),
+                             xcape($bri->user[$fri]->name));
             if ($table->old_pnt == 120) {
                 $noty .= sprintf($mlang_bin5_bin5['info_capp'][$G_lang]);
             }
@@ -1638,7 +1866,7 @@ function show_table_info(&$room, &$table, $table_pos)
         }
         else {
             $noty .= sprintf($mlang_bin5_bin5['info_alon'][$G_lang],
-                             xcape($room->user[$win]->name));
+                             xcape($bri->user[$win]->name));
             if ($table->old_pnt == 120) {
                 $noty .= sprintf($mlang_bin5_bin5['info_acap'][$G_lang]);
             }
@@ -1660,7 +1888,7 @@ function show_table_info(&$room, &$table, $table_pos)
     if ($table->mazzo == $table_pos) 
         $noty .= $mlang_bin5_bin5['info_yshuf'][$G_lang];
     else {
-        $unam = xcape($room->user[$table->player[$table->mazzo]]->name);
+        $unam = xcape($bri->user[$table->player[$table->mazzo]]->name);
         $noty .= sprintf($mlang_bin5_bin5['info_shuf'][$G_lang], $unam);
     }
 
@@ -1679,7 +1907,7 @@ function show_table_info(&$room, &$table, $table_pos)
         $noty .= $mlang_bin5_bin5['info_yturn'][$G_lang];
     }
     else {
-        $unam = xcape($room->user[$table->player[$curplayer]]->name);
+        $unam = xcape($bri->user[$table->player[$curplayer]]->name);
         $noty .= sprintf($mlang_bin5_bin5['info_turn'][$G_lang], $unam);
     }
   
@@ -1710,7 +1938,7 @@ function table_wellcome($user)
 }
 
 
-function briscola_show($room, $table, $user)
+function briscola_show($bri, $table, $user)
 {
     GLOBAL $G_lang, $mlang_bin5_bin5;
     $ptnadd = "";
@@ -1727,7 +1955,7 @@ function briscola_show($room, $table, $user)
     else {
         $prestr = sprintf('$("callerinfo").innerHTML = "%s";', $mlang_bin5_bin5['call_call'][$G_lang]);
         $ret .= sprintf($prestr, 
-                        xcape($room->user[$table->player[$table->asta_win]]->name), $ptnadd);
+                        xcape($bri->user[$table->player[$table->asta_win]]->name), $ptnadd);
     }
     $ret .= sprintf('set_iscalling(%d);', ($table->asta_win - $user->table_pos + BIN5_PLAYERS_N) % BIN5_PLAYERS_N);
 
@@ -1762,15 +1990,13 @@ function game_result($asta_pnt, $pnt)
     }
 }
 
-function log_points($curtime, $user, $where, $mesg) 
+function log_points($remote_addr, $curtime, $user, $where, $mesg) 
 {
-    GLOBAL $_SERVER;
-
     if (($fp = @fopen(LEGAL_PATH."/points.log", 'a')) != FALSE) {
         /* Unix time | session | nickname | IP | where was | mesg */
         fwrite($fp, sprintf("%ld|%s|%s|%s|%s|%s|%s|\n", $curtime, $user->sess,
                             ($user->flags & USER_FLAG_AUTH ? 'A' : 'N'),
-                            $user->name, $_SERVER['REMOTE_ADDR'], $where , $mesg));
+                            $user->name, $remote_addr, $where , $mesg));
         fclose($fp);
     }
 }