user ip address management and check fixed

[brisk.git] / web / briskin5 / index_wr.php

diff --git a/web/briskin5/index_wr.php b/web/briskin5/index_wr.php
index fbc37c5..9f9764f 100644 (file)
--- a/web/briskin5/index_wr.php
+++ b/web/briskin5/index_wr.php
@@ -2,7 +2,7 @@
 /*
  *  brisk - index_wr.php
  *
- *  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
@@ -38,10 +38,12 @@ require_once("Obj/briskin5.phh");
 /*
  *  MAIN
  */
-function bin5_index_wr_main(&$bri, $remote_addr, $get, $post, $cookie)
+function bin5_index_wr_main(&$bri, $remote_addr_full, $get, $post, $cookie)
 {
     GLOBAL $G_base, $G_dbasetype;
 
+    $remote_addr = addrtoipv4($remote_addr_full);
+
     $curtime = time();
     if ($bri == NULL) {
         return FALSE;
@@ -73,9 +75,11 @@ function bin5_index_wr_main(&$bri, $remote_addr, $get, $post, $cookie)
     
     log_wr('POSTSPLIT: '.$argz[0].'  user->stat: ['.$user->stat.']');
     log_wr($user->step, 'bin::index_wr.php: after get_user()');
+
+    $user->lacc = $curtime;
     
     if ($argz[0] == 'ping') {
-        $user->lacc = $curtime;
+        log_wr("PING RECEIVED");
     }
     else if (false && $argz[0] == 'shutdown') {
         log_auth($user_cur->sess, "Shutdown session. delegate to room gc the autologout");
@@ -109,8 +113,6 @@ function bin5_index_wr_main(&$bri, $remote_addr, $get, $post, $cookie)
             $bri->chatt_send(&$user,$mesg);
         }
         else if ($argz[0] == 'preferences_update') {
-            GLOBAL $CO_bin5_pref_ring_endauct;
-            
             log_wr("PER DI PREFERENCES_UPDATE");
             
             if ($CO_bin5_pref_ring_endauct == "true")
@@ -177,7 +179,8 @@ function bin5_index_wr_main(&$bri, $remote_addr, $get, $post, $cookie)
                 $table->mult += 1; 
                 $table->old_reason = sprintf("Ha lasciato %s perché aveva al massimo 2 punti.", xcape($user->name));
                 
-                $table->game_next();
+                // Non si cambia mazzo se si abbandona la partita
+                // $table->game_next();
                 $table->game_init(&$bri->user);
                 
                 for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) {    
@@ -494,7 +497,7 @@ function bin5_index_wr_main(&$bri, $remote_addr, $get, $post, $cookie)
                         for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) {
                             $plist .= '|'.xcapelt($ucodes[$i]);
                         }
-                        log_legal($curtime, 'xxx', $user, "STAT:BRISKIN5:FINISH_GAME", $plist);
+                        log_legal($curtime, $user->ip, $user, "STAT:BRISKIN5:FINISH_GAME", $plist);
                         if ($user->table_orig < TABLES_AUTH_N) {
                             require_once("../Obj/dbase_".$G_dbasetype.".phh");