X-Git-Url: http://mop.ddnsfree.com/gitweb/?p=brisk.git;a=blobdiff_plain;f=web%2Fbriskin5%2FObj%2Fbriskin5.phh;h=f5db998feaa38ad120a7a757b31f8900cad13442;hp=fc1b2a805eb55361270aa078908b0ef7ada3dd5c;hb=d0accc6cc623168616438ad06f0611a3dbb8f5a4;hpb=8b9c2b3ec59baef7c9f64f9663347bc5b9cf69fe

diff --git a/web/briskin5/Obj/briskin5.phh b/web/briskin5/Obj/briskin5.phh
index fc1b2a8..f5db998 100644
--- a/web/briskin5/Obj/briskin5.phh
+++ b/web/briskin5/Obj/briskin5.phh
@@ -656,9 +656,9 @@ class Bin5_table extends Table {
                 unset($bdb);
             }
             else {
-                log_points($remote_addr, $curtime, $user, "STAT:BRISKIN5:FINISH_GAME", "DATABASE CONNECTION FAILED");
+                log_points($user->ip, $curtime, $user, "STAT:BRISKIN5:FINISH_GAME", "DATABASE CONNECTION FAILED");
             }
-            log_points($remote_addr, $curtime, $user, "STAT:BRISKIN5:FINISH_GAME", $plist);
+            log_points($user->ip, $curtime, $user, "STAT:BRISKIN5:FINISH_GAME", $plist);
         }
 
         $this->game_init(&$bri->user);
@@ -791,8 +791,7 @@ class Bin5_table extends Table {
                 continue;
             $user_cur = &$bri->user[$this->player[$i]];
             $user_cur->comm[$user_cur->step % COMM_N] = "gst.st = ".($user_cur->step+1)."; ";
-            $user_cur->comm[$user_cur->step % COMM_N] .= sprintf('chatt_sub("%s", [2, "%s"],"%s");',
-                                                                 $dt, NICKSERV, $msg);
+            $user_cur->comm[$user_cur->step % COMM_N] .= nickserv_msg($dt, $msg);
             $user_cur->step_inc();
         }
     }
@@ -1113,27 +1112,9 @@ class Bin5_user extends User {
 
               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 ($this->the_end == TRUE) { management is moved
+              // in the spush scope
           } /* if ($this->rd_step < $this->step) { */
-
       }  /* else of if ($this->rd_step == -1) { */
 
 
@@ -1211,6 +1192,8 @@ class Bin5 {
 
         if (validate_sess($sess)) {
             for ($i = 0 ; $i < BIN5_MAX_PLAYERS ; $i++) {
+                if ($this->user[$i]->is_empty())
+                    continue;
                 if (strcmp($sess, $this->user[$i]->sess) == 0) {
                     // find it
                     $idx = $i;
@@ -1268,7 +1251,7 @@ class Bin5 {
         if ($force || $this->garbage_timeout < $curtime) {
             for ($i = 0 ; $i < BIN5_MAX_PLAYERS ; $i++) {
                 $user_cur = $this->user[$i];
-                if ($user_cur->sess == "" ||
+                if ($user_cur->is_active() == FALSE || // is not active user or
                     ($user_cur->stat == 'table' && ($user_cur->subst == 'shutdowned' || $user_cur->subst == 'shutdowner')))
                     continue;
 
@@ -1278,15 +1261,8 @@ class Bin5 {
                     if ($user_cur->stat == 'table') {
                         log_auth($user_cur->sess," bin5 Autologout session.");
 
-                        /* SI DELEGA AL garbage_manager principale LA RIMOZIONE DELL'UTENTE
-
-                           $tmp_sess = $user_cur->sess;
-                           $user_cur->sess = "";
-                           Bin5_user::step_unproxy($tmp_sess);
-                           $user_cur->name = "";
-                           $user_cur->the_end = FALSE;
-
-                        */
+                        /* main garbage_manager is delegate as autologout management */
+                        $user_cur->the_end = TRUE;
 
                         /* se gli altri utenti non erano d'accordo questo utente viene bannato */
                         $remcalc = $this->table[0]->exitlock_calc(&$this->user, $user_cur->table_pos);
@@ -1377,7 +1353,7 @@ class Bin5 {
     }
 
 
-    function chatt_send($user, $mesg)
+    function chatt_send($user, $mesg, $mlang_indwr = NULL)
     {
         GLOBAL $mlang_brisk, $G_lang;
 
@@ -1403,7 +1379,7 @@ class Bin5 {
             for ($i = 0 ; $i < ($user->stat == 'room' ? BIN5_MAX_PLAYERS : BIN5_PLAYERS_N) ; $i++) {
                 if ($user->stat == 'room') {
                     $user_cur = &$this->user[$i];
-                    if ($user_cur->sess == '' || $user_cur->stat != 'room')
+                    if ($user_cur->is_active() == FALSE || $user_cur->stat != 'room') // is not active user or stat isn't 'room'
                         continue;
                 }
                 else {