X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fbrisk.phh;h=ca9a14086c7ac413a847098bd2eed895966212ae;hb=e469882b494df00aab18f2e38d18c5faa214c740;hp=c5bc2de83802155bffedb7514780b26a6e7f7772;hpb=29a83e580080f589142bc8639d8a757503fd3175;p=brisk.git

diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index c5bc2de..ca9a140 100644
--- a/web/Obj/brisk.phh
+++ b/web/Obj/brisk.phh
@@ -131,16 +131,15 @@ $mlang_brisk = array( 'btn_backstand'=> array( 'it' => 'torna in piedi',
 
 );
 
-$G_false = FALSE;
 $G_lng = langtolng($G_lang);
 
 $G_all_points = array( 11,10,4,3,2, 0,0,0,0,0 );
-$G_brisk_version = "3.2.0";
+$G_brisk_version = "3.5.0";
 
 /* MLANG: ALL THE INFO STRINGS IN brisk.phh */
-$root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), <b>NOVITA\'</b>: informazioni al tavolo sul chiamante, nuovo stato di supporter del sito.',
+$root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), <b>NOVITA\'</b>: seconda versione di test per la nuova gestione dei dati volatili, rivista gestione del ticker.',
                                        'Se vuoi iscriverti alla <a target="_blank" href="mailto:ml-briscola+subscribe@milug.org">Mailing List</a>, cliccala!' ),
-                       'en' => array ( 'Brisk (Ver. '.$G_brisk_version.'), <b>NEWS</b>: caller information on the table, new supporter status.',
+                       'en' => array ( 'Brisk (Ver. '.$G_brisk_version.'), <b>NEWS</b>: second test version for the new volatile data management, ticker management refactored.',
                                        'If you want to subscribe our <a target="_blank" href="ml-briscola+subscribe@milug.org">Mailing List</a>, click it!' ) );
 
 $G_room_help = array( 'it' => '
@@ -384,19 +383,17 @@ class Table {
   {
   }
   
-  function &create($idx) 
+  function create($idx) 
   {
-    GLOBAL $G_false;
-
-    if (($thiz =& new Table()) == FALSE)
-      return ($G_false);
+    if (($thiz = new Table()) == FALSE)
+      return (FALSE);
 
     $thiz->idx       =   $idx;
     $thiz->player    =   array();
     $thiz->player_n  =   0;
     $thiz->auth_only =   FALSE;
 
-    $thiz->wag_own   =  NULL;
+    $thiz->wag_own   =  -1;
     $thiz->wag_com   =  "";
     $thiz->wag_tout   =  0;
 
@@ -408,10 +405,8 @@ class Table {
     return ($thiz);
   }
 
-  function copy(&$from)
+  function copy($from)
   {
-    GLOBAL $G_false;
-    
     $this->idx = $from->idx;
     $this->player = array();
     for ($i = 0 ; $i < $from->player_n ; $i++)
@@ -432,24 +427,20 @@ class Table {
     $this->wakeup_time = $from->wakeup_time;
   }
 
-  function &myclone(&$from)
+  function myclone($from)
   {
-    GLOBAL $G_false;
-    
-    if (($thiz =& new Table()) == FALSE)
-      return ($G_false);
+    if (($thiz = new Table()) == FALSE)
+      return (FALSE);
 
     $this->copy($from);
 
     return ($thiz);
   }
   
-  function &spawn(&$from)
+  function spawn($from)
   {
-    GLOBAL $G_false;
-    
-    if (($thiz =& new Table()) == FALSE)
-      return ($G_false);
+    if (($thiz = new Table()) == FALSE)
+      return (FALSE);
     
     $thiz->idx = $from->idx;
     $thiz->player = array();
@@ -471,11 +462,11 @@ class Table {
     return ($thiz);
   }
 
-  function wag_set(&$user, $mesg)
+  function wag_set($user_idx, $mesg)
   {
     log_main("WAG_SET");
 
-    $this->wag_own  = &$user;
+    $this->wag_own  =  $user_idx;
     $this->wag_com  =  $mesg;
     $this->wag_tout =  0;
   }
@@ -485,17 +476,17 @@ class Table {
     log_main("WAG_RESET");
 
     unset($this->wag_own);
-    $this->wag_own = NULL;
+    $this->wag_own  = -1;
     $this->wag_com  = "";
     $this->wag_tout = $timeout;
   }
 
-  function getPlayer($idx)
+  function player_get($idx)
   {
     return ($this->player[$idx]);
   }
 
-  function setPlayer($idx, $player)
+  function player_set($idx, $player)
   {
     $this->player[$idx] = $player;
   }
@@ -508,7 +499,7 @@ class Table {
     return ($this->player_n - 1);
   }
   
-  function user_rem(&$room, &$user)
+  function user_rem($room, $user)
   {
     $tabpos = $user->table_pos;
     
@@ -518,7 +509,7 @@ class Table {
       /* aggiorna l'array dei giocatori al tavolo. */
       for ($i = $tabpos ; $i < $this->player_n-1 ; $i++) {
 	$this->player[$i] = $this->player[$i+1];
-	$user_cur = &$room->user[$this->player[$i]];
+	$user_cur = $room->user[$this->player[$i]];
 	$user_cur->table_pos = $i;
       }
       $this->player_n--;
@@ -534,7 +525,7 @@ class Table {
   //                              ($this->table[$i]->auth_only == FALSE ? TRUE : $user->flags & USER_FLAG_AUTH));
 
   // function act_content($isstanding, $sitted, $table, $cur_table, $allowed)
-  function act_content(&$user)
+  function act_content($user)
   {
     $ret = "";
     $isstanding = ($user->subst == 'standup');
@@ -608,7 +599,8 @@ define(USER_FLAG_TY_SUSPEND, 0x400000); // done
 define(USER_FLAG_TY_DISABLE, 0x800000); // done
 
 class User {
-  var $idx;        // index in the users array
+  var $idx;        // index in the users array when you are in game
+  var $idx_orig;   // index in the users array when you aren't in game
   var $code;       // authentication code
   var $name;       // name of the user
   var $sess;       // session of the user
@@ -628,8 +620,8 @@ class User {
 
   // FIXME: the table_orig field must be removed after table field verify of index management (in spawned table
   //        it is allways ZERO
-  var $table_orig; // id of the current table (if in table state)
-  var $table;      // id of the current table (if in table state)
+  var $table;      // id of the current table when you are in game
+  var $table_orig; // id of the current table when you aren't in game
   var $table_pos;  // idx on the table
   var $table_token;// token that identify a game on a table
   var $flags;      // Bitfield with: AUTHENTICATE: 0x02 
@@ -645,53 +637,49 @@ class User {
   function User() {
   }
 
-  function &create($idx, $name, $sess, $stat = "", $subst = "", $table = -1, $ip="0.0.0.0") {
-    GLOBAL $G_false;
-
-    // error_log("User::create BEGIN", 0);
-
-    if (($thiz =& new User()) == FALSE)
-      return ($G_false);
-
-    $thiz->idx   = $idx;
-    $thiz->code  = -1;
-    $thiz->name  = $name;
-    $thiz->sess  = $sess;
-    $thiz->ip    = $ip;
-    $thiz->lacc   = time();
-    $thiz->laccwr = time();
-    $thiz->bantime = 0;
-    $thiz->stat  = $stat;
-    $thiz->subst  = $subst;
-    $thiz->step  = 1;
-    $thiz->trans_step  = -1;
-    $thiz->comm  = array();
-    $thiz->asta_card = -2;
-    $thiz->asta_pnt  = -1;
-    $thiz->handpt = -1;
+  function create($idx, $name, $sess, $stat = "", $subst = "", $table = -1, $ip="0.0.0.0") {
+    if (($thiz = new User()) == FALSE)
+      return (FALSE);
+
+    $thiz->idx        = $idx;
+    $thiz->idx_orig   = $idx;
+    $thiz->code       = -1;
+    $thiz->name       = $name;
+    $thiz->sess       = $sess;
+    $thiz->ip         = $ip;
+    $thiz->lacc       = time();
+    $thiz->laccwr     = time();
+    $thiz->bantime    = 0;
+    $thiz->stat       = $stat;
+    $thiz->subst      = $subst;
+    $thiz->step       = 1;
+    $thiz->trans_step = -1;
+    $thiz->comm       = array();
+    $thiz->asta_card  = -2;
+    $thiz->asta_pnt   = -1;
+    $thiz->handpt     = -1;
     $thiz->exitislock = TRUE;
 
-    $thiz->flags = 0x00;
+    $thiz->flags      = 0x00;
     
-    $thiz->chattime = array_fill(0, CHAT_N, 0);
-    $thiz->chat_cur = 0;
-    $thiz->chat_lst = "";
-    $thiz->chat_ban = 0;
-    $thiz->chat_dlt = 0;
+    $thiz->chattime   = array_fill(0, CHAT_N, 0);
+    $thiz->chat_cur   = 0;
+    $thiz->chat_lst   = "";
+    $thiz->chat_ban   = 0;
+    $thiz->chat_dlt   = 0;
 
     $thiz->table_orig = $table;
     $thiz->table      = $table;
-    $thiz->table_pos = -1;
-    $thiz->table_token = "";
+    $thiz->table_pos  = -1;
+    $thiz->table_token= "";
     $thiz->shm_sz = SHM_DIMS_U_MIN;
     return ($thiz);
   }
 
-  function copy(&$from)
+  function copy($from)
   {
-    GLOBAL $G_false;
-    
     $this->idx        = $from->idx;
+    $this->idx_orig   = $from->idx;
     $this->code       = $from->code;
     $this->name       = $from->name;
     $this->sess       = $from->sess;
@@ -707,23 +695,25 @@ 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;
     $this->handpt     = $from->handpt;
     $this->exitislock = $from->exitislock;
 
-    $this->flags = $from->flags;
+    $this->flags      = $from->flags;
 
-    $this->chattime = array();
+    $this->chattime   = array();
     for ($i = 0 ; $i < CHAT_N ; $i++)
       $this->chattime[$i] = $from->chattime[$i];
-    $this->chat_cur = $from->chat_cur;
-    $this->chat_lst = $from->chat_lst;
-    $this->chat_ban = $from->chat_ban;
-    $this->chat_dlt = $from->chat_dlt;
+    $this->chat_cur   = $from->chat_cur;
+    $this->chat_lst   = $from->chat_lst;
+    $this->chat_ban   = $from->chat_ban;
+    $this->chat_dlt   = $from->chat_dlt;
 
     $this->table_orig = $from->table_orig;
     $this->table      = $from->table;
@@ -735,26 +725,23 @@ class User {
   }
 
 
-  function &myclone(&$from)
+  function myclone($from)
   {
-    GLOBAL $G_false;
-    
-    if (($thiz =& new User()) == FALSE)
-      return ($G_false);
+    if (($thiz = new User()) == FALSE)
+      return (FALSE);
     
     $thiz->copy($from);
 
     return ($thiz);
   }
   
-  function &spawn(&$from, $table, $table_pos)
+  function spawn($from, $table, $table_pos)
   {
-    GLOBAL $G_false;
-    
-    if (($thiz =& new User()) == FALSE)
-      return ($G_false);
+    if (($thiz = new User()) == FALSE)
+      return (FALSE);
     
     $thiz->idx        = $from->idx;
+    $thiz->idx_orig   = $from->idx;
     $thiz->code       = $from->code;
     $thiz->name       = $from->name;
     $thiz->sess       = $from->sess;
@@ -823,39 +810,76 @@ class User {
     */
   }
 
-  function step_set($step) {
-    $this->step = $step;
-    
-    do {
-      if (validate_sess($this->sess) == FALSE)
-	break;
-      if (file_exists(PROXY_PATH) == FALSE)
-        mkdir(PROXY_PATH);
-      if (($fp = @fopen(PROXY_PATH."/".$this->sess.".step", 'w')) == FALSE)
-	break;
-      fwrite($fp, pack("LL",$this->step, $this->idx));
-      fclose($fp);
-
-      return (TRUE);
-    } while (0);
+  function step_set($step) 
+  {
+      $this->step = $step & 0x7fffffff;
+      
+      do {
+          if (validate_sess($this->sess) == FALSE)
+              break;
+          if (file_exists(PROXY_PATH) == FALSE)
+              mkdir(PROXY_PATH);
+          if (($fp = @fopen(PROXY_PATH."/".$this->sess.".step", 'w')) == FALSE)
+              break;
+          fwrite($fp, pack("LL",$this->step, $this->idx));
+          fclose($fp);
 
-    return (FALSE);
+          log_main("step_set [".$this->sess. "] [".$this->step."]"); 
+          
+          return (TRUE);
+      } while (0);
+      
+      return (FALSE);
   }
-
+  
   function step_inc($delta = 1) {
-    $this->step += $delta;
-    
-    if (validate_sess($this->sess)) {
-      if (file_exists(PROXY_PATH) == FALSE)
-        mkdir(PROXY_PATH);
-      $fp = fopen(PROXY_PATH."/".$this->sess.".step", 'w');
-      fwrite($fp, pack("LL", $this->step, $this->idx));
-      fclose($fp);
+      $this->step += $delta;
+      /* modularization because unpack() not manage unsigned 32bit int correctly */
+      $this->step &= 0x7fffffff;
+      
+      if (validate_sess($this->sess)) {
+          if (file_exists(PROXY_PATH) == FALSE)
+              mkdir(PROXY_PATH);
+          $fp = fopen(PROXY_PATH."/".$this->sess.".step", 'w');
+          fwrite($fp, pack("LL", $this->step, $this->idx));
+          fclose($fp);
+
+          log_main("step_inc [".$this->sess. "] [".$this->step."]"); 
+          
+          return (TRUE);
+      }
+      
+      return (FALSE);
+  }
 
-      return (TRUE);
-    }
-    
-    return (FALSE);
+  static function step_get($sess)
+  {
+      $fp = FALSE;
+      do {
+          if (validate_sess($sess) == FALSE)
+              break;
+          
+          if (file_exists(PROXY_PATH) == FALSE)
+              mkdir(PROXY_PATH);
+          if (($fp = @fopen(PROXY_PATH."/".$sess.".step", 'rb')) == FALSE)
+              break;
+          if (($s = fread($fp, 8)) == FALSE)
+              break;
+          if (strlen($s) != 8)
+              break;
+          $arr = unpack('Ls/Li', $s);
+          fclose($fp);
+          
+          // log_rd2("A0: ".$arr[0]."  A1: ".$arr[1]);
+          return ($arr);
+      } while (0);
+      
+      if ($fp != FALSE)
+          fclose($fp);
+      
+      log_rd2("STEP_GET [".$sess."]: return false ");
+      
+      return (FALSE);
   }
 
   function reset() {
@@ -876,136 +900,100 @@ class User {
     $this->the_end = FALSE;
   }
 
-
-
-  // SHSPLIT save and load function for the User class.
-  function &load_data($id) 
+  static function load_data($id, $sess) 
   {
-    GLOBAL $G_false, $sess;
-
-    // error_log("User::load_data BEGIN", 0);
-
-    $doexit = FALSE;
-    do {
-      if (($tok = @ftok(FTOK_PATH."/user".$id, "B")) == -1) {
-	log_main("ftok failed");
-	$doexit = TRUE;
-	break;
-      }
-    
-      if (($shm_sz = sharedmem_sz($tok)) == -1) {
-	log_main("shmop_open failed");
-      }
-	
-      if ($shm_sz == -1)
-	$shm_sz = SHM_DIMS_U_MIN;
-
-      if ($shm = shm_attach($tok, $shm_sz)) {
-	$user = @shm_get_var($shm, $tok);
-	
-	log_only("bri ==  ".($user == FALSE ?   "FALSE" : "TRUE")."  bri ===  ".($user === FALSE ? "FALSE" : "TRUE")."  bri isset ".(isset($user) ?   "TRUE" : "FALSE"));
-	if (isset($user)) 
-	  log_only("bri count ".count($user));
-	
-	if ($user == FALSE) {
-	  log_only("INIT MAIN DATA");
-	  
-          // SHSPLIT FIXME: init_data for User class ??
-	  $user =& User::create($id, "", "");
-	  if (@shm_put_var($shm, $tok, $user) == FALSE) {
-              log_only("PUT_VAR FALLITA ".strlen(serialize($user)));
-              log_only(serialize($user));
-	  }
-	}
-
-	$user->shm_sz = $shm_sz;
-	
-	shm_detach($shm);
-      }
+      log_main("load_data: id [".$id."] sess [".($sess == FALSE ? "FALSE" : $sess)."] ");
       
-      //  
-      // SHSPLIT: load users from the shared memory
-      //
-      $ret = &$user;
-      return ($ret);
-    } while (0);
-    
-    if ($doexit)
-      exit();
-    
-    return ($G_false);
+      $doexit = FALSE;
+      do {
+          if (($tok = @ftok(FTOK_PATH."/user".$id, "B")) == -1) {
+              log_main("ftok failed");
+              $doexit = TRUE;
+              break;
+          }
+          
+          if (($shm_sz = sharedmem_sz($tok)) == -1) {
+              log_main("shmop_open failed");
+          }
+          
+          if ($shm_sz == -1)
+              $shm_sz = SHM_DIMS_U_MIN;
+          
+          if ($shm = shm_attach($tok, $shm_sz)) {
+              $user = @shm_get_var($shm, $tok);
+              
+              if ($sess != FALSE && $user->sess != $sess) {
+                  $doexit = TRUE;
+                  break;
+              }
+              log_only("user ==  ".($user == FALSE ?   "FALSE" : "TRUE")."  user ===  ".($user === FALSE ? "FALSE" : "TRUE")."  user isset ".(isset($user) ?   "TRUE" : "FALSE"));
+              
+              if ($user == FALSE) {
+                  log_only("INIT MAIN DATA");
+                  
+                  // SHSPLIT FIXME: init_data for User class ??
+                  $user = User::create($id, "", "");
+                  if (@shm_put_var($shm, $tok, $user) == FALSE) {
+                      log_only("PUT_VAR FALLITA ".strlen(serialize($user)));
+                      log_only(serialize($user));
+                  }
+              }
+              
+              $user->shm_sz = $shm_sz;
+              
+              shm_detach($shm);
+          }
+          
+          //  
+          // SHSPLIT: load users from the shared memory
+          //
+          return ($user);
+      } while (0);
+      
+      if ($doexit)
+          exit();
+      
+      return (FALSE);
   }
   
 
-  function save_data(&$user, $id) 
+  static function save_data($user, $id) 
   {
-    GLOBAL $sess;
-    
-    $shm =   FALSE;
-    
-    // var_dump($user);
-    // error_log("User::save_data BEGIN", 0);
-
-    if (($tok = @ftok(FTOK_PATH."/user".$id, "B")) == -1) {
-      return (FALSE);
-    }
-    while ($user->shm_sz < SHM_DIMS_U_MAX) {
-      if (($shm = shm_attach($tok, $user->shm_sz)) == FALSE)
-	break;
+      GLOBAL $sess;
       
-      // log_only("PUT_VAR DI ".strlen(serialize($user)));
-      if (shm_put_var($shm, $tok, $user) != FALSE) {
-	shm_detach($shm);
-	return (TRUE);
-      }
-      if (shm_remove($shm) === FALSE) {
-	log_only("REMOVE FALLITA");
-	break;
+      $shm =   FALSE;
+      
+      if (($tok = @ftok(FTOK_PATH."/user".$id, "B")) == -1) {
+          return (FALSE);
       }
-      shm_detach($shm);
-      $user->shm_sz += SHM_DIMS_U_DLT;
-    } 
-
-    if ($shm)
-      shm_detach($shm);
-    
-    return (FALSE);
+      while ($user->shm_sz < SHM_DIMS_U_MAX) {
+          if (($shm = shm_attach($tok, $user->shm_sz)) == FALSE)
+              break;
+          
+          // log_only("PUT_VAR DI ".strlen(serialize($user)));
+          if (shm_put_var($shm, $tok, $user) != FALSE) {
+              shm_detach($shm);
+              log_main("User[".$id."] saved.");
+              return (TRUE);
+          }
+          if (shm_remove($shm) === FALSE) {
+              log_only("REMOVE FALLITA");
+              break;
+          }
+          shm_detach($shm);
+          $user->shm_sz += SHM_DIMS_U_DLT;
+      } 
+      
+      if ($shm)
+          shm_detach($shm);
+      
+      return (FALSE);
   }
 
 
-
 } // end class User
 
 
-function step_get($sess) {
-  $fp = FALSE;
-  do {
-    if (validate_sess($sess) == FALSE)
-      break;
-
-    if (file_exists(PROXY_PATH) == FALSE)
-      mkdir(PROXY_PATH);
-    if (($fp = @fopen(PROXY_PATH."/".$sess.".step", 'rb')) == FALSE)
-      break;
-    if (($s = fread($fp, 8)) == FALSE)
-      break;
-    if (strlen($s) != 8)
-      break;
-    $arr = unpack('Ls/Li', $s);
-    fclose($fp);
-
-    // log_rd2("A0: ".$arr[0]."  A1: ".$arr[1]);
-    return ($arr);
-  } while (0);
-
-  if ($fp != FALSE)
-    fclose($fp);
-
-  log_rd2("STEP_GET: return false ");
-
-  return (FALSE);
-}
-
 function step_unproxy($sess) {
   log_rd2("UNPROXY: ".PROXY_PATH."/".$sess.".step");
   if (file_exists(PROXY_PATH) == FALSE)
@@ -1019,7 +1007,7 @@ class Room {
   var $table;
   var $comm; // commands for many people
   var $step; // current step of the comm array
-  var $garbage_timeout;
+  // externalized var $garbage_timeout;
   var $shm_sz;
 
   function Room () {
@@ -1027,11 +1015,11 @@ class Room {
     $this->table = array();
 
     for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
-        $this->user[$i] =& User::create($i, "", "");
+        $this->user[$i] = User::create($i, "", "");
     }
 
     for ($i = 0 ; $i < TABLES_N ; $i++) {
-      $this->table[$i] =& Table::create($i);
+      $this->table[$i] = Table::create($i);
       /* OLD METHOD
       if ($i < 12) {
         $row = ( (((int)($i / 4)) % 2) == 0 );
@@ -1047,7 +1035,8 @@ class Room {
       else
         $this->table[$i]->auth_only = FALSE;
     }
-    $this->garbage_timeout = 0;
+    // externalized $this->garbage_timeout = 0;
+    Room::garbage_time_expire_set(0);
     $this->shm_sz = SHM_DIMS_MIN;
   }
 
@@ -1061,24 +1050,26 @@ class Room {
 
     /* Garbage collector degli utenti in timeout */
     $curtime = time();
-    if ($force || $this->garbage_timeout < $curtime) {
+
+    // externalized if ($force || $this->garbage_timeout < $curtime) {
+    if ($force || Room::garbage_time_is_expired($curtime)) {
       
       // FIXME BRISK4: include for each kind of table
       require_once("${G_base}briskin5/Obj/briskin5.phh");
 
       // Before all align times with table timeout
       for ($table_idx = 0 ; $table_idx < TABLES_N ; $table_idx++) {
-	$table_cur =& $this->table[$table_idx];
+	$table_cur = $this->table[$table_idx];
 	// if the table is complete and exists its shared mem we get the info about users lacc
 
 	if ($table_cur->player_n == PLAYERS_N) {
 	  log_main("PLAYERS == N TABLE ".$table_idx);
 	  
-	  if (($sem = Briskin5::lock_data($table_idx)) != FALSE) { 
+	  if (($sem = Bin5::lock_data($table_idx)) != FALSE) { 
 	    log_main("bin5 lock data success");
 	    
 	    $no_recovery = FALSE;
-	    if (($bri = &Briskin5::load_data($table_idx)) != FALSE) {
+	    if (($bri = Bin5::load_data($table_idx)) != FALSE) {
 	      if ($table_cur->table_token != $bri->table_token) {
 		log_main("ERROR: not matching table_token. Room: ".$table_cur->table_token."  Table: ".$bri->table_token);
 		log_main("ERROR: not matching table_start. Room: ".$table_cur->table_start."  Table: ".$bri->table_start);
@@ -1094,7 +1085,7 @@ class Room {
 	      log_main("garbage_manager: bri loaded successfully.");
 	      $bri->garbage_manager(TRUE);
 	      
-	      $bri_table = &$bri->table[0];
+	      $bri_table = $bri->table[0];
 
 	      // is the end of the table
 	      if ($bri->the_end == TRUE) {
@@ -1110,8 +1101,8 @@ class Room {
 
 		for ($i = 0 ; $i < $bri_table->player_n ; $i++) {
 		  // stat must be "table" by definition
-		  $user_cur =& $this->user[$table_cur->player[$i]];
-		  $bri_user =& $bri->user[$i];
+		  $user_cur = $this->user[$table_cur->player[$i]];
+		  $bri_user = $bri->user[$i];
 		  
 		  $user_cur->subst      = $bri_user->subst;
 		  $user_cur->step       = $bri_user->step;
@@ -1122,10 +1113,10 @@ class Room {
 
                 log_legal($curtime, $user_cur, "STAT:DESTROY_GAME", $plist);
 
-		$this->room_join_wakeup(&$user_cur, FALSE, 0); 
+		$this->room_join_wakeup($user_cur, FALSE, 0); 
 		$table_cur->table_token = "";
                 $table_cur->wakeup_time = $curtime + WAKEUP_TIME;
-		Briskin5::destroy_data($table_idx);
+		Bin5::destroy_data($table_idx);
 	      }
 	      else {
 		log_main("gm:: save_data");
@@ -1134,14 +1125,14 @@ class Room {
 		  $this->user[$table_cur->player[$i]]->lacc = $bri->user[$i]->lacc;
 		}
 	      
-		Briskin5::save_data(&$bri);
+		Bin5::save_data($bri);
 	      }
-	    } // else if (($bri = &Briskin5::load_data($table_idx)) != FALSE) {
+	    } // else if (($bri = Bin5::load_data($table_idx)) != FALSE) {
 	    else if ($no_recovery == FALSE) {
 	      log_crit("ERROR: table ".$table_idx." unrecoverable join");
 
 	      for ($i = 0 ; $i < $table_cur->player_n ; $i++) {
-		$user_cur = &$this->user[$table_cur->player[$i]];
+		$user_cur = $this->user[$table_cur->player[$i]];
 		$user_cur->subst = "shutdowner";
 		$user_cur->step_inc();
 		
@@ -1160,11 +1151,11 @@ class Room {
               }
               log_legal($curtime, $user_cur, "STAT:DESTROY_GAME(RECOVERY)", $plist);
               
-	      $this->room_join_wakeup(&$user_cur, TRUE, -2); 
+	      $this->room_join_wakeup($user_cur, TRUE, -2); 
 	      $table_cur->table_token = "";
 	    }
 
-	    Briskin5::unlock_data($sem);
+	    Bin5::unlock_data($sem);
 	  } // bri::lock_data
 	} //  if ($table_cur->player_n == PLAYERS_N) {
       } //  for ($table_idx = 0 ; $table_idx < TABLES_N ; $table_idx++) {
@@ -1172,7 +1163,7 @@ class Room {
       log_rd2("out new loop.");
 		
       for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
-	$user_cur = &$this->user[$i];
+	$user_cur = $this->user[$i];
 	
 	log_rd2("User: ".$user_cur->name."  stat: ".$user_cur->stat."  subst: ".$user_cur->subst);
 	  
@@ -1190,9 +1181,9 @@ class Room {
 	    
 	    log_rd2("AUTO LOGOUT.");
 	    if ($user_cur->subst == 'sitdown' || $user_cur->stat == 'table')
-	      $this->room_wakeup(&$user_cur);
+	      $this->room_wakeup($user_cur);
 	    else if ($user_cur->subst == 'standup')
-	      $this->room_outstandup(&$user_cur);
+	      $this->room_outstandup($user_cur);
 	    else
 	      log_rd2("LOGOUT FROM WHAT ???");
 	  }
@@ -1200,7 +1191,7 @@ class Room {
 
 	if ($user_cur->laccwr + EXPIRE_TIME_SMAMMA < $curtime) { // lo rimettiamo in piedi
 	  if ($user_cur->stat == 'room' && $user_cur->subst == 'sitdown') {
-	    $this->room_wakeup(&$user_cur);
+	    $this->room_wakeup($user_cur);
 	    $user_cur->comm[$user_cur->step % COMM_N] = "gst.st = ".($user_cur->step+1)."; ";
             /* MLANG: <br>Sei stato inattivo per ".(EXPIRE_TIME_SMAMMA/60.0)." minuti. <br><br>Quindi ritorni tra i <b>Giocatori in piedi</b>.", "torna ai tavoli" */
 	    $user_cur->comm[$user_cur->step % COMM_N] .=  show_notify($mlang_brisk['tabtout_a'][$G_lang].(EXPIRE_TIME_SMAMMA/60.0).$mlang_brisk['tabtout_b'][$G_lang], 0, $mlang_brisk['btn_backstand'][$G_lang], 400, 100);
@@ -1210,14 +1201,15 @@ class Room {
       }
       log_rd2("GARBAGE UPDATED!");
       
-      $this->garbage_timeout = time() + GARBAGE_TIMEOUT;
+      // externalized $this->garbage_timeout = time() + GARBAGE_TIMEOUT;
+      Room::garbage_time_expire_set($curtime + GARBAGE_TIMEOUT);
       $ismod = TRUE;
     }
 
     return ($ismod);
   }
 
-  function show_room($user_step, &$user)
+  function show_room($user_step, $user)
   {
     GLOBAL $G_lang, $mlang_brisk;
     log_main("show_room: username: ".$user->name);
@@ -1257,8 +1249,8 @@ class Room {
       // $ret .= table_act_content(($user->subst == 'standup'), $this->table[$i]->player_n, $i, $user->table, 
       //                          ($this->table[$i]->auth_only == FALSE ? TRUE : $user->flags & USER_FLAG_AUTH));
       $ret .=  $this->table[$i]->act_content($user);
-      if ($this->table[$i]->wag_own != NULL) 
-        $ret .= sprintf('tra.add(%d, "%s: %s"); ', $i,  $this->table[$i]->wag_own->name, $this->table[$i]->wag_com);
+      if ($this->table[$i]->wag_own != -1) 
+        $ret .= sprintf('tra.add(%d, "%s: %s"); ', $i,  $this->user[$this->table[$i]->wag_own]->name, $this->table[$i]->wag_com);
       else 
         $ret .= sprintf('tra.rem(%d); ', $i);
     }
@@ -1268,10 +1260,10 @@ class Room {
   }
   
 
-  function room_wakeup(&$user)
+  function room_wakeup($user)
   {
     $table_idx = $user->table;
-    $table = &$this->table[$table_idx];
+    $table = $this->table[$table_idx];
 
     log_main("WAKEUP: begin function table:".$table_idx."  stat: ".$user->stat."  subst: ".$user->subst);
 
@@ -1282,10 +1274,10 @@ class Room {
       log_main("WAKEUP: from table [".$user->table."] nplayers_n: ".$this->table[$user->table]->player_n);
 
       for ($i = 0 ; $i < $table->player_n ; $i++) {
-	$user_cur = &$this->user[$table->player[$i]];
+	$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,26 +1296,25 @@ class Room {
       $user->laccwr = $curtime;
     }
     
-    $remove_wagon = false;
-    if($table->wag_own == $user) {
-      $remove_wagon = true;
+    $remove_wagon = FALSE;
+    if($table->wag_own == $user->idx_get()) {
       $table->wag_reset($curtime);
-      
+      $remove_wagon = TRUE;
     }
     
 
     /* aggiorna l'array dei giocatori al tavolo. */
-    $table->user_rem(&$this, &$user);
+    $table->user_rem($this, $user);
 
     for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
-      $user_cur = &$this->user[$i];
+      $user_cur = $this->user[$i];
       if ($user_cur->sess == '' || $user_cur->stat != 'room')
 	continue;
       
       // 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");
@@ -1337,7 +1328,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
@@ -1361,10 +1352,10 @@ class Room {
     }
   }
 
-  function room_join_wakeup(&$user, $update_lacc = FALSE, $trans_delta)
+  function room_join_wakeup($user, $update_lacc = FALSE, $trans_delta)
   {
     $table_idx = $user->table;
-    $table = &$this->table[$table_idx];
+    $table = $this->table[$table_idx];
     
     log_main("JOIN_WAKEUP: begin function table:".$table_idx."  stat: ".$user->stat."  subst: ".$user->subst);
 
@@ -1376,7 +1367,7 @@ class Room {
     log_main("JOIN WAKEUP: from table [".$user->table."] nplayers_n: ".$this->table[$user->table]->player_n);
     
     for ($i = 0 ; $i < $table->player_n ; $i++) {
-      $user_cur = &$this->user[$table->player[$i]];
+      $user_cur = $this->user[$table->player[$i]];
       log_main("PREIMPOST INLOOP name: ".$user_cur->name);
       if ($user_cur->sess != "") {
 	if ($update_lacc == TRUE) {
@@ -1391,26 +1382,26 @@ class Room {
 	  $user_cur->stat_set("room");
 	  $user_cur->subst = "standup";
 	  $user_cur->table = -1;
-	  $user_wup[$user_wup_n++] = &$user_cur;
+	  $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];
       }
     }
 
     for ($wup_idx = 0 ; $wup_idx < $user_wup_n  ; $wup_idx++)
-      $table->user_rem(&$this, &$user_wup[$wup_idx]);
+      $table->user_rem($this, $user_wup[$wup_idx]);
 
     /* aggiorna l'array dei giocatori al tavolo. */
 
     for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
       log_main("START LOOP");
-      $user_cur = &$this->user[$i];
+      $user_cur = $this->user[$i];
       if ($user_cur->sess == '' || $user_cur->stat != 'room') {
 	log_main("name: ".$user_cur->name."skip   subst: ".$user_cur->subst);
 	continue;
@@ -1432,8 +1423,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) {
@@ -1446,7 +1437,7 @@ class Room {
 	  $user_cur->trans_step = $user_cur->step + 1 + $trans_delta;
 	  $user_cur->comm[$user_cur->step % COMM_N] = "";
 	  $user_cur->step_inc();
-	  $user_cur->comm[$user_cur->step % COMM_N] = $this->show_room(($user_cur->step + 1), &$user_cur);
+	  $user_cur->comm[$user_cur->step % COMM_N] = $this->show_room(($user_cur->step + 1), $user_cur);
 	  $user_cur->step_inc();
 	  log_main("POST show_room username: ".$user_cur->name."  STEP: ".$user_cur->step);
 
@@ -1467,23 +1458,23 @@ class Room {
     }
   }
 
-  function room_outstandup(&$user)
+  function room_outstandup($user)
   {
-    $this->room_sitdown(&$user, -1);
+    $this->room_sitdown($user, -1);
   }
   
-  function table_update(&$user)
+  function table_update($user)
   {
     log_main("table_update: pre - USER: ".$user->name);
 
     $table_idx = $user->table;
 
     if ($table_idx > -1) 
-      $table = &$this->table[$table_idx];
+      $table = $this->table[$table_idx];
     
     for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
       $ret = "";
-      $user_cur = &$this->user[$i];
+      $user_cur = $this->user[$i];
       if ($user_cur->sess == '' || $user_cur->stat != 'room')
       continue;
       
@@ -1491,7 +1482,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);
@@ -1503,31 +1494,30 @@ class Room {
     log_main("table_update: post");
   }
 
-  function room_sitdown(&$user, $table_idx)
+  function room_sitdown($user, $table_idx)
   {
     log_main("room_sitdown ".($user == FALSE ? "USER: FALSE" : "USER: ".$user->name));
 
     $train_app = "";
 
     if ($table_idx > -1 && $table_idx < TABLES_N) { 
-      $table = &$this->table[$table_idx];
+      $table = $this->table[$table_idx];
 
       // wagon shutdown 
-      if ($table->wag_own != NULL && $table->player_n == PLAYERS_N) {        
+      if ($table->wag_own != -1 && $table->player_n == PLAYERS_N) {        
         for ($i = 0 ; $i < TABLES_N ; $i++) {
-          $user_cur =& $this->user[$table->player[$i]];
-          if ($user_cur == $table->wag_own) {
-            $train_app = sprintf("tra.rem(%d); ", $table_idx); 
-            $table->wag_reset(time());
-            break;
-          }
+            if ($table->wag_own == $table->player[$i]) {
+                $train_app = sprintf("tra.rem(%d); ", $table_idx); 
+                $table->wag_reset(time());
+                break;
+            }
 	}
       }
     }
 
     for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
       $ret = "";
-      $user_cur = &$this->user[$i];
+      $user_cur = $this->user[$i];
       if ($user_cur->sess == '' || $user_cur->stat != 'room')
       continue;
       
@@ -1536,7 +1526,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++) {
@@ -1556,7 +1546,7 @@ class Room {
     }
   }
 
-  function chatt_send(&$user, $mesg)
+  function chatt_send($user, $mesg)
   {
     GLOBAL $G_base, $G_alarm_passwd, $mlang_brisk, $G_lang;
     $only_you = FALSE;
@@ -1590,9 +1580,9 @@ class Room {
           break;
         }
 
-        $table = &$this->table[$user->table];
+        $table = $this->table[$user->table];
         
-        if ($table->wag_own != NULL) {
+        if ($table->wag_own != -1) {
           // MLANG <br>Il messaggio di segnalazione del tavolo &egrave; gi&agrave; attivato.<br><br> 
           $msg = $mlang_brisk['tickjust'][$G_lang];
           $to_user = show_notify($msg, 0, "chiudi", 400, 100);
@@ -1612,7 +1602,7 @@ class Room {
         
         $msg = substr($msg, 5);
         
-        $table->wag_set($user, $msg);
+        $table->wag_set($user->idx_get(), $msg);
         $to_user = sprintf('tra.add(%d, "%s");', $user->table, xcape(sprintf("%s: %s", $user->name, $msg)));
         $to_room = $to_user;
         /* for old isolation management $is_ticker = TRUE; */
@@ -1713,7 +1703,7 @@ class Room {
 
         $msg = "COMMAND ".$msg;
         for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
-          $user_cur = &$this->user[$i];
+          $user_cur = $this->user[$i];
 
           if ($user_cur->sess == '')
             continue;
@@ -1875,11 +1865,10 @@ class Room {
 
     if ($to_room != FALSE) {
       for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
-        $user_cur = &$this->user[$i];
+        $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) {
@@ -1909,17 +1898,17 @@ class Room {
       require_once("${G_base}briskin5/Obj/briskin5.phh");
       // Before all align times with table timeout
       for ($table_idx = 0 ; $table_idx < TABLES_N ; $table_idx++) {
-        $table_cur =& $this->table[$table_idx];
+        $table_cur = $this->table[$table_idx];
         // if the table is complete and exists its shared mem we get the info about users lacc
         
         if ($table_cur->player_n == PLAYERS_N) {
           log_main("PLAYERS == N TABLE ".$table_idx);
         
-          if (($sem = Briskin5::lock_data($table_idx)) != FALSE) { 
+          if (($sem = Bin5::lock_data($table_idx)) != FALSE) { 
             log_main("bin5 lock data success");
             
             $no_recovery = FALSE;
-            if (($bri = &Briskin5::load_data($table_idx)) != FALSE) {
+            if (($bri = Bin5::load_data($table_idx)) != FALSE) {
               if ($table_cur->table_token != $bri->table_token) {
                 log_main("ERROR: not matching table_token. Room: ".$table_cur->table_token."  Table: ".$bri->table_token);
                 $bri = FALSE;
@@ -1927,10 +1916,10 @@ class Room {
             }
             
             if ($bri != FALSE) {
-              $bri_table = &$bri->table[0];
+              $bri_table = $bri->table[0];
               for ($i = 0 ; $i < $bri_table->player_n ; $i++) {
                 // stat must be "table" by definition
-                $bri_user =& $bri->user[$i];
+                $bri_user = $bri->user[$i];
               
                 if ($target != "" && $bri_user->name != $target)
                   continue;
@@ -1939,9 +1928,9 @@ class Room {
                 $bri_user->comm[$bri_user->step % COMM_N] .= $to_tabl;
                 $bri_user->step_inc();
               }
-              Briskin5::save_data(&$bri);
+              Bin5::save_data($bri);
             }
-            Briskin5::unlock_data($sem);
+            Bin5::unlock_data($sem);
           } // bri::lock_data
         } //  if ($table_cur->player_n == PLAYERS_N) {
       } //  for ($table_idx = 0 ; $table_idx < TABLES_N ; $table_idx++) {
@@ -1949,11 +1938,11 @@ class Room {
 
     if ($update_room) {
       if ($user->stat == 'room' && $user->subst == 'standup') {
-        $this->standup_update(&$user);
+        $this->standup_update($user);
       }
       else if ($user->stat == 'room' && $user->subst == 'sitdown') {
         log_main("chatt_send pre table update");
-        $this->table_update(&$user);
+        $this->table_update($user);
         log_main("chatt_send post table update");
       }
     } // if ($update_room ...
@@ -1961,16 +1950,16 @@ class Room {
     return;
   } // function chatt_send( ...
 
-  function &get_user($sess, &$idx)
+  function get_user($sess, &$idx)
   {
-    GLOBAL $PHP_SELF, $G_false;
+    GLOBAL $PHP_SELF;
 
     if (validate_sess($sess)) {
       for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
 	if (strcmp($sess, $this->user[$i]->sess) == 0) {
 	  // find it
 	  $idx = $i;
-	  $ret = &$this->user[$i];
+	  $ret = $this->user[$i];
 	  return ($ret);
 	}
       }
@@ -1982,11 +1971,11 @@ class Room {
       log_main(sprintf("get_user: Wrong strlen [%s]",$sess));
     }
 
-    return ($G_false);
+    return (FALSE);
   }
 
   /*
-   * function &add_user(&$room, &$sess, &$idx, $name, $pass, $ip)
+   * function add_user(&$room, &$sess, &$idx, $name, $pass, $ip)
    *
    * RETURN VALUE:
    *   if ($idx >  -1    && ret == FALSE)  =>  duplicated nick
@@ -1997,14 +1986,12 @@ class Room {
    *   if ($idx == -$idx && ret == user)   =>  SUCCESS (but the login exists in the auth db)
    */
 
-  function &add_user(&$sess, &$idx, $name, $pass, $ip)
+  function add_user(&$sess, &$idx, $name, $pass, $ip)
   {
-    GLOBAL $G_base, $G_false, $CO_list;
+    GLOBAL $G_base, $CO_list;
 
     $idx = 0;
 
-    error_log("add_user: G_false: [".$G_false."]", 0);
-
     $authenticate = FALSE;
     $user_type    = 0;
     $login_exists = FALSE;
@@ -2016,7 +2003,7 @@ class Room {
 
     if (($name_new = validate_name($name)) == FALSE) {
       $idx = -2;
-      return ($G_false);
+      return (FALSE);
     }
 
     log_auth("XXX", sprintf("ARRIVA: [%s] pass:[%s]", $sess, ($pass == FALSE ? "FALSE" : $pass)));
@@ -2034,12 +2021,11 @@ class Room {
             log_auth("XXX", "authenticate: ".($authenticate != FALSE ? "TRUE" : "FALSE"));
             
             if ($authenticate != FALSE) {
-                error_log(print_r(&$authenticate, TRUE),0);
                 $user_type = $authenticate->type_get();
             }
             else {
                 $idx = -3;
-                return ($G_false);
+                return (FALSE);
             }
         }
         else {
@@ -2081,7 +2067,7 @@ class Room {
     if ($ghost > -1 && $ghost_auth && ($authenticate != FALSE)) {
       /* swap session */
 
-      $ghost_user =& $this->user[$ghost];
+      $ghost_user = $this->user[$ghost];
       $curtime = time();
       $ghost_user->step_inc();
       if ($sess == "") {
@@ -2097,15 +2083,15 @@ class Room {
       if ($ghost_user->stat == "table" && $this->table[$table_idx]->player_n == PLAYERS_N) {
         // FIXME BRISK4: include for each kind of table
         require_once("${G_base}briskin5/Obj/briskin5.phh");
-        if (($brisem = Briskin5::lock_data($table_idx)) != FALSE) { 
-          if (($bri = &Briskin5::load_data($table_idx)) != FALSE) {
+        if (($brisem = Bin5::lock_data($table_idx)) != FALSE) { 
+          if (($bri = Bin5::load_data($table_idx)) != FALSE) {
             if ($bri->the_end != TRUE) {
               $bri->user[$ghost_user->table_pos]->step_inc();
               $bri->user[$ghost_user->table_pos]->sess = $sess;
-              Briskin5::save_data(&$bri);
+              Bin5::save_data($bri);
             }
           }
-          Briskin5::unlock_data($brisem);
+          Bin5::unlock_data($brisem);
         }
       }
 
@@ -2159,7 +2145,7 @@ class Room {
       
       if ($ghost > -1) {
         log_main("ghost: rename!");
-        $ghost_user =& $this->user[$ghost];
+        $ghost_user = $this->user[$ghost];
 
         if ($ghost_auth == FALSE) {
           for ($sfx = 1 ; $sfx <= MAX_PLAYERS ; $sfx++) {
@@ -2180,11 +2166,11 @@ class Room {
           $ghost_user->name = $ghostname;
           
           if ($ghost_user->stat == 'room' && $ghost_user->subst == 'standup') {
-            $this->standup_update(&$ghost_user);
+            $this->standup_update($ghost_user);
           }
           else {
             log_main("chatt_send pre table update");
-            $this->table_update(&$ghost_user);
+            $this->table_update($ghost_user);
           log_main("chatt_send post table update");
           }
         } // if ($ghost_auth == FALSE
@@ -2205,13 +2191,13 @@ class Room {
       return ($ret);
     }
 
-    return ($G_false);
+    return (FALSE);
   }
   
-  function standup_update(&$user)
+  function standup_update($user)
   {
     for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
-      $user_cur = &$this->user[$i];
+      $user_cur = $this->user[$i];
       if ($user_cur->sess == '')
 	continue;
 
@@ -2219,7 +2205,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>" : "");
 
@@ -2234,21 +2220,19 @@ class Room {
   }
 
   // Static functions
-  static function &create()
+  static function create()
   {
-    $room =& new Room();
+    $room = new Room();
     
     return $room;
   }
   
   
-  function &load_data() 
+  function load_data() 
   {
-    GLOBAL $G_false, $sess;
+    GLOBAL $sess;
     $doexit = FALSE;
 
-    // error_log("Room::load_data BEGIN", 0);
-
     do {
       if (($tok = @ftok(FTOK_PATH."/main", "B")) == -1) {
 	log_main("ftok failed");
@@ -2274,12 +2258,10 @@ class Room {
               log_only("INIT MAIN DATA");
               shm_detach($shm);
               
-              // error_log("DE CHE", 0);
-
-              $room =& Room::create();
+              $room = Room::create();
               
               if (Room::save_data($room) == FALSE)
-                  return $G_false;
+                  return FALSE;
 
               return $room;
           }
@@ -2288,25 +2270,24 @@ class Room {
           shm_detach($shm);
 
           for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
-              $room->user[$i] = User::load_data($i);
+              $room->user[$i] = User::load_data($i, FALSE);
           }
       }
       
       //  
       // SHSPLIT: load users from the shared memory
       //
-      $ret = &$room;
-      return ($ret);
+      return ($room);
     } while (0);
     
     if ($doexit)
       exit();
     
-    return ($G_false);
+    return (FALSE);
   }
   
 
-  function save_data_orig(&$room) 
+  function save_data_orig($room) 
   {
     GLOBAL $sess;
     
@@ -2341,16 +2322,13 @@ class Room {
   }
 
 
-  function save_data(&$room) 
+  function save_data($room) 
   {
       GLOBAL $sess;
     
       $ret =   FALSE;
       $shm =   FALSE;
     
-      // var_dump($room);
-      // error_log("Room::save_data BEGIN", 0);
-    
       if (($tok = @ftok(FTOK_PATH."/main", "B")) == -1) 
           return (FALSE);
     
@@ -2387,32 +2365,33 @@ class Room {
           User::save_data($user_park[$i], $i);
           $room->user[$i] = $user_park[$i];
       }
+      log_load("FINISH: ".($ret == TRUE ? "TRUE" : "FALSE"));
 
       return ($ret);
   }
 
-  function lock_data()
+  static function lock_data()
   {
-    GLOBAL $sess; 
-    
-    //  echo "LOCK: ".FTOK_PATH."/main";
-    //  exit;
-    if (($tok = @ftok(FTOK_PATH."/main", "B")) == -1) {
-      return (FALSE);
-    }
-    // echo "FTOK ".$tok."<br>";
-    if (($res = sem_get($tok)) == FALSE) {
-      return (FALSE);
-    }
-    if (sem_acquire($res)) {   
-      log_lock("LOCK room");
-      return ($res);
-    }
-    else
-      return (FALSE);
+      GLOBAL $sess; 
+      
+      //  echo "LOCK: ".FTOK_PATH."/main";
+      //  exit;
+      if (($tok = @ftok(FTOK_PATH."/main", "B")) == -1) {
+          return (FALSE);
+      }
+      // echo "FTOK ".$tok."<br>";
+      if (($res = sem_get($tok)) == FALSE) {
+          return (FALSE);
+      }
+      if (sem_acquire($res)) {   
+          log_lock("LOCK room");
+          return ($res);
+      }
+      else
+          return (FALSE);
   }
   
-  function unlock_data($res)
+  static function unlock_data($res)
   {
     GLOBAL $sess; 
     
@@ -2430,8 +2409,8 @@ class Room {
     if ($user->stat != 'room')
       return;
     
-    for ($e = 0 , $ct = 0 ; $ct < 4 && $e < MAX_PLAYERS ; $e++) {
-      if ($this->user[$e]->sess == "" || $this->user[$e]->stat != "room" || $this->user[$e]->name == "")
+    for ($i = 0 , $ct = 0 ; $ct < 4 && $i < MAX_PLAYERS ; $i++) {
+      if ($this->user[$i]->sess == "" || $this->user[$i]->stat != "room" || $this->user[$i]->name == "")
         continue;
       $ct++;
     }
@@ -2440,20 +2419,19 @@ class Room {
     
     $content = ' j_stand_cont( [ ';
 
-    for ($e = 0 , $ct = 0 ; $e < MAX_PLAYERS ; $e++) {
-      if ($this->user[$e]->sess == "" || $this->user[$e]->stat != "room" || $this->user[$e]->name == "")
+    for ($i = 0 , $ct = 0 ; $i < MAX_PLAYERS ; $i++) {
+      if ($this->user[$i]->sess == "" || $this->user[$i]->stat != "room" || $this->user[$i]->name == "")
         continue;
       
-      $flags = $this->user[$e]->flags;
+      $flags = $this->user[$i]->flags;
       
-      if ($this->user[$e]->subst == "standup") {
-        if ($this->user[$e] == $user) 
-          { 
-            $flags |= 1;
+      if ($this->user[$i]->subst == "standup") {
+          if ($user->idx_get() == $i) { 
+              $flags |= 1;
           }
-        
-        $content .= sprintf('%s[ %d, "%s" ]',($ct > 0 ? ', ' : ''), $flags, xcape($this->user[$e]->name));
-        $ct++;
+          
+          $content .= sprintf('%s[ %d, "%s" ]',($ct > 0 ? ', ' : ''), $flags, xcape($this->user[$i]->name));
+          $ct++;
       }
     }
     $content .= ' ]);';
@@ -2471,23 +2449,23 @@ class Room {
     //
     
     $sess = $user->sess;
-    $table = &$this->table[$table_idx];
+    $table = $this->table[$table_idx];
     
     if ($user->stat != 'room')
       return;
     
     $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 .= ' ]';
@@ -2497,6 +2475,49 @@ class Room {
     return ($ret);
   }
 
+  static function garbage_time_is_expired($tm) 
+  {
+      $ret = TRUE;
+      $fp = FALSE;
+      do {
+          if (file_exists(PROXY_PATH) == FALSE)
+              mkdir(PROXY_PATH);
+          if (($fp = @fopen(PROXY_PATH."/garbage_time.expired", 'rb')) == FALSE)
+              break;
+          if (($s = fread($fp, 4)) == FALSE)
+              break;
+          if (strlen($s) != 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);
+  }
+
+  static function garbage_time_expire_set($tm) 
+  {
+      do {
+          if (file_exists(PROXY_PATH) == FALSE)
+              mkdir(PROXY_PATH);
+          if (($fp = @fopen(PROXY_PATH."/garbage_time.expired", 'wb')) == FALSE)
+              break;
+          fwrite($fp, pack("L",$tm));
+          fclose($fp);
+          
+          return (TRUE);
+      } while (0);
+      
+      return (FALSE);
+  }
+
+
 } // end class Room
 
 function make_seed()
@@ -2505,245 +2526,287 @@ function make_seed()
   return (float) $sec + ((float) $usec * 100000);
 }
 
+function btrace_line($ar)
+{
+    GLOBAL $G_btrace_pref_sub;
 
-function log_mop($step, $log) {
-  GLOBAL $sess, $PHP_SELF;
-
-  if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_LMOP) == 0)
-    return;
-
-  if (isset($sess) == FALSE)
-    $ssess = "XXXX";
-  else
-    $ssess = $sess;
-
-  if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_LMOP) == 0)
-    return;
-
-  if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
-    fwrite($fp, sprintf("LMOP: [%f] [%05d] [%s] [%s]\n", gettimeofday(TRUE), $step, $PHP_SELF, $log));
-    fclose($fp);
-  }
+    $ret = "";
+    for ($i = 0 ; $i < count($ar) ; $i++) {
+        $with_class = isset($ar[$i]['class']);
+        $with_file  = isset($ar[$i]['file']);
+        $ret .= sprintf("%s%s%s (%s:%d)", ($i == 0 ? "" : ", "), 
+                        ($with_class ?  $ar[$i]['class'].$ar[$i]['type'] : ""), 
+                        $ar[$i]['function'], ($with_file ? str_replace($G_btrace_pref_sub, "", $ar[$i]['file']) : ""), 
+                        ($with_file ? $ar[$i]['line'] : ""));
+    }
+    
+    return ($ret);
 }
 
-
-function log_only2($log) {
-  GLOBAL $sess, $PHP_SELF;
-
-  if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_ONL2) == 0)
-    return;
-
-  if (isset($sess) == FALSE)
-    $ssess = "XXXX";
-  else
-    $ssess = $sess;
-
-  if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_ONL2) == 0)
-    return;
-
-  if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
-    fwrite($fp, sprintf("ONL2: [%s] [%s] [%s]\n", $ssess, $PHP_SELF, $log));
-    fclose($fp);
-  }
+function log_mop($step, $log)
+{
+    GLOBAL $sess, $PHP_SELF;
+    
+    if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_LMOP) == 0)
+        return;
+    
+    if (isset($sess) == FALSE)
+        $ssess = "XXXX";
+    else
+        $ssess = $sess;
+    
+    if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_LMOP) == 0)
+        return;
+    
+    $btrace = btrace_line(debug_backtrace());
+    if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
+        fwrite($fp, sprintf("LMOP: [%f] [%05d] [%s] [%s]\n", gettimeofday(TRUE), $step, $log, $btrace));
+        fclose($fp);
+    }
 }
 
-function log_crit($log) {
-  GLOBAL $sess, $PHP_SELF;
 
-  if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_CRIT) == 0)
-    return;
-
-  if (isset($sess) == FALSE)
-    $ssess = "XXXX";
-  else
-    $ssess = $sess;
-
-  if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_CRIT) == 0)
-    return;
-
-  if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
-    fwrite($fp, sprintf("CRIT: [%s] [%s] [%s]\n", $ssess, $PHP_SELF, $log));
-    fclose($fp);
-  }
+function log_only2($log)
+{
+    GLOBAL $sess, $PHP_SELF;
+    
+    if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_ONL2) == 0)
+        return;
+    
+    if (isset($sess) == FALSE)
+        $ssess = "XXXX";
+    else
+        $ssess = $sess;
+    
+    if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_ONL2) == 0)
+        return;
+    
+    $btrace = btrace_line(debug_backtrace());
+    if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
+        fwrite($fp, sprintf("ONL2: [%s] [%s] [%s]\n", $ssess, $log, $btrace));
+        fclose($fp);
+    }
 }
 
-function log_only($log) {
-  GLOBAL $sess, $PHP_SELF;
-
-  if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_ONLY) == 0)
-    return;
-
-  if (isset($sess) == FALSE)
-    $ssess = "XXXX";
-  else
-    $ssess = $sess;
-
-  if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_ONLY) == 0)
-    return;
-
-  if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
-    fwrite($fp, sprintf("ONLY: [%s] [%s] [%s]\n", $ssess, $PHP_SELF, $log));
-    fclose($fp);
-  }
+function log_crit($log)
+{
+    GLOBAL $sess, $PHP_SELF;
+    
+    if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_CRIT) == 0)
+        return;
+    
+    if (isset($sess) == FALSE)
+        $ssess = "XXXX";
+    else
+        $ssess = $sess;
+    
+    if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_CRIT) == 0)
+        return;
+    
+    $btrace = btrace_line(debug_backtrace());
+    if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
+        fwrite($fp, sprintf("CRIT: [%s] [%s] [%s]\n", $ssess, $log, $btrace));
+        fclose($fp);
+    }
 }
 
-function log_main($log) {
+function log_only($log)
+{
     GLOBAL $sess, $PHP_SELF;
-
-  if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_MAIN) == 0)
-    return;
-
-  if (isset($sess) == FALSE)
-    $ssess = "XXXX";
-  else
-    $ssess = $sess;
-
-  if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_MAIN) == 0)
-    return;
-
-  if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
-    fwrite($fp, sprintf("MAIN: [%s] [%s] [%s]\n", $ssess, $PHP_SELF, $log));
-    fclose($fp);
-  }
+    
+    if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_ONLY) == 0)
+        return;
+    
+    if (isset($sess) == FALSE)
+        $ssess = "XXXX";
+    else
+        $ssess = $sess;
+    
+    if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_ONLY) == 0)
+        return;
+    
+    $btrace = btrace_line(debug_backtrace());
+    if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
+        fwrite($fp, sprintf("ONLY: [%s] [%s] [%s]\n", $ssess, $log, $btrace));
+        fclose($fp);
+    }
 }
 
-function log_rd($log) {
-  GLOBAL $sess, $PHP_SELF;
-
-  if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_READ) == 0)
-    return;
-
-  if (isset($sess) == FALSE)
-    $ssess = "XXXX";
-  else
-    $ssess = $sess;
-
-  if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_READ) == 0)
-    return;
-
-  if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
-    fwrite($fp, sprintf("READ: [%s] [%s] [%s]\n", $ssess, $PHP_SELF, $log));
-    fclose($fp);
-  }
+function log_main($log)
+{
+    GLOBAL $sess, $PHP_SELF;
+    
+    if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_MAIN) == 0)
+        return;
+    
+    if (isset($sess) == FALSE)
+        $ssess = "XXXX";
+    else
+        $ssess = $sess;
+    
+    if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_MAIN) == 0)
+        return;
+    
+    $btrace = btrace_line(debug_backtrace());
+    if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
+        fwrite($fp, sprintf("MAIN: [%s] [%s] [%s]\n", $ssess, $log, $btrace));
+        fclose($fp);
+    }
 }
 
-function log_rd2($log) {
-  GLOBAL $sess, $PHP_SELF;
-
-  if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_REA2) == 0)
-    return;
-
-  if (isset($sess) == FALSE)
-    $ssess = "XXXX";
-  else
-    $ssess = $sess;
-      
-  if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_REA2) == 0)
-    return;
-
-  if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
-    fwrite($fp, sprintf("REA2: [%s] [%s] [%s]\n", $ssess, $PHP_SELF, $log));
-    fclose($fp);
-  }
+function log_rd($log)
+{
+    GLOBAL $sess, $PHP_SELF;
+    
+    if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_READ) == 0)
+        return;
+    
+    if (isset($sess) == FALSE)
+        $ssess = "XXXX";
+    else
+        $ssess = $sess;
+    
+    if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_READ) == 0)
+        return;
+    
+    $btrace = btrace_line(debug_backtrace());
+    if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
+        fwrite($fp, sprintf("READ: [%s] [%s] [%s]\n", $ssess, $log, $btrace));
+        fclose($fp);
+    }
 }
 
-function log_send($log) {
-  GLOBAL $sess, $PHP_SELF;
-
-  if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_SEND) == 0)
-    return;
-
-  if (isset($sess) == FALSE)
-    $ssess = "XXXX";
-  else
-    $ssess = $sess;
-      
-  if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_SEND) == 0)
-    return;
-
-  if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
-    fwrite($fp, sprintf("SEND: [%s] [%s] [%s]\n", $ssess, $PHP_SELF, $log));
-    fclose($fp);
-  }
+function log_rd2($log)
+{
+    GLOBAL $sess, $PHP_SELF;
+    
+    if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_REA2) == 0)
+        return;
+    
+    if (isset($sess) == FALSE)
+        $ssess = "XXXX";
+    else
+        $ssess = $sess;
+    
+    if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_REA2) == 0)
+        return;
+    
+    $btrace = btrace_line(debug_backtrace());
+    
+    if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
+        fwrite($fp, sprintf("REA2: [%s] [%s] [%s]\n", $ssess, $log, $btrace));
+        fclose($fp);
+    }
 }
 
-function log_lock($log) {
-  GLOBAL $sess, $PHP_SELF;
-
-  if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_LOCK) == 0)
-    return;
-
-  if (isset($sess) == FALSE)
-    $ssess = "XXXX";
-  else
-    $ssess = $sess;
-
-  if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_LOCK) == 0)
-    return;
-
-  if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
-    fwrite($fp, sprintf("LOCK: [%s] [%s] [%s]\n", $ssess, $PHP_SELF, $log));
-    fclose($fp);
-  }
+function log_send($log)
+{
+    GLOBAL $sess, $PHP_SELF;
+    
+    if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_SEND) == 0)
+        return;
+    
+    if (isset($sess) == FALSE)
+        $ssess = "XXXX";
+    else
+        $ssess = $sess;
+    
+    if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_SEND) == 0)
+        return;
+    
+    $btrace = btrace_line(debug_backtrace());
+    if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
+        fwrite($fp, sprintf("SEND: [%s] [%s] [%s]\n", $ssess, $log, $btrace));
+        fclose($fp);
+    }
 }
 
-function log_wr($log) {
-  GLOBAL $sess, $PHP_SELF;
-
-  if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_WRIT) == 0)
-    return;
-
-  if (isset($sess) == FALSE)
-    $ssess = "XXXX";
-  else
-    $ssess = $sess;
-      
-  if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_WRIT) == 0)
-    return;
-
-  if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
-    fwrite($fp, sprintf("WRIT: [%s] [%s] [%s]\n", $ssess, $PHP_SELF, $log));
-    fclose($fp);
-  }
+function log_lock($log)
+{
+    GLOBAL $sess, $PHP_SELF;
+    
+    if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_LOCK) == 0)
+        return;
+    
+    if (isset($sess) == FALSE)
+        $ssess = "XXXX";
+    else
+        $ssess = $sess;
+    
+    if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_LOCK) == 0)
+        return;
+    
+    $btrace = btrace_line(debug_backtrace());
+    if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
+        fwrite($fp, sprintf("LOCK: [%s] [%s] [%s]\n", $ssess, $log, $btrace));
+        fclose($fp);
+    }
 }
 
-function log_load($log) {
-  GLOBAL $sess, $PHP_SELF;
-
-  if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_LOAD) == 0)
-    return;
-
-  if (isset($sess) == FALSE)
-    $ssess = "XXXX";
-  else
-    $ssess = $sess;
+function log_wr($log)
+{
+    GLOBAL $sess, $PHP_SELF;
+    
+    if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_WRIT) == 0)
+        return;
+    
+    if (isset($sess) == FALSE)
+        $ssess = "XXXX";
+    else
+        $ssess = $sess;
+    
+    if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_WRIT) == 0)
+        return;
+    
+    $btrace = btrace_line(debug_backtrace());
+    if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
+        fwrite($fp, sprintf("WRIT: [%s] [%s] [%s]\n", $ssess, $log, $btrace));
+        fclose($fp);
+    }
+}
 
-  if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_LOAD) == 0)
-    return;
-      
-  if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
-    fwrite($fp, sprintf("LOAD: [%s] [%s] [%s]\n", $ssess, $PHP_SELF, $log));
-    fclose($fp);
-  }
+function log_load($log)
+{
+    GLOBAL $sess, $PHP_SELF;
+    
+    if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_LOAD) == 0)
+        return;
+    
+    if (isset($sess) == FALSE)
+        $ssess = "XXXX";
+    else
+        $ssess = $sess;
+    
+    if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_LOAD) == 0)
+        return;
+    
+    $btrace = btrace_line(debug_backtrace());
+    if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
+        fwrite($fp, sprintf("LOAD: [%s] [%s] [%s]\n", $ssess, $log, $btrace));
+        fclose($fp);
+    }
 }
 
-function log_auth($sess, $log) {
+function log_auth($sess, $log)
+{
     GLOBAL $PHP_SELF;
-  if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_AUTH) == 0)
-    return;
-
-  if (( (BRISK_DEBUG | ($sess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_AUTH) == 0)
-    return;
 
-  if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
-    fwrite($fp, sprintf("AUTH: [%s] [%d] [%s] [%s]\n", $sess, time(), $PHP_SELF, $log));
-    fclose($fp);
-  }
+    if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_AUTH) == 0)
+        return;
+    
+    if (( (BRISK_DEBUG | ($sess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_AUTH) == 0)
+        return;
+    
+    $btrace = btrace_line(debug_backtrace());
+    if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
+        fwrite($fp, sprintf("LOAD: [%s] [%d] [%s] [%s]\n", $sess, time(), $log, $btrace));
+        fclose($fp);
+    }
 }
 
 
 // function log_legal($curtime, $sess, $name, $where, $mesg) 
-function log_legal($curtime, &$user, $where, $mesg) 
+function log_legal($curtime, $user, $where, $mesg) 
 {
   GLOBAL $_SERVER;
 
@@ -2862,6 +2925,8 @@ function secstoword($secs)
 {
   GLOBAL $G_lang;
 
+  $ret = "";
+
   $mins = floor($secs / 60);
   $secs = $secs % 60;
   if ($G_lang == 'en') {