source IP address stored into log

[brisk.git] / web / index_wr.php

diff --git a/web/index_wr.php b/web/index_wr.php
index ea74d07..14c7f79 100644 (file)
--- a/web/index_wr.php
+++ b/web/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
@@ -81,7 +81,7 @@ $mlang_indwr = array( 'btn_backtotab' => array( 'it' => 'Torna ai tavoli.',
 
 function index_wr_main(&$room, $remote_addr, $get, $post, $cookie)
 {
-    GLOBAL $G_black_list, $G_lang, $G_room_help, $G_room_about, $mlang_indwr;
+    GLOBAL $G_shutdown, $G_black_list, $G_lang, $G_room_help, $G_room_about, $G_room_passwdhowto, $mlang_indwr;
 
     log_load("index_wr.php");
 
@@ -197,9 +197,13 @@ function index_wr_main(&$room, $remote_addr, $get, $post, $cookie)
 
     log_wr('POSTSPLIT: '.$argz[0]);
 
-    log_wr($user->step, 'index_wr.php: after get_user()');
+    // LACC UPDATED
+    $user->lacc = $curtime;
 
-    if ($argz[0] == 'shutdown') {
+    if ($argz[0] == 'ping') {
+        log_wr("PING RECEIVED");
+    }
+    else if ($argz[0] == 'shutdown') {
         log_auth($user->sess, "Shutdown session.");
 
         $user->reset();
@@ -346,7 +350,7 @@ function index_wr_main(&$room, $remote_addr, $get, $post, $cookie)
 
         $dobreak = FALSE;
         do {
-            log_wr("INFO:SKIP:argz == poll name: [".$cli_name."] AUTH: ".($user->flags & USER_FLAG_AUTH));
+            log_wr("INFO:SKIP:argz == poll name: [".$cli_poll_name."] AUTH: ".($user->flags & USER_FLAG_AUTH));
             if (($user->flags & USER_FLAG_AUTH) != USER_FLAG_AUTH) {
                 // MLANG: <b>Per partecipare al sondaggio devi essere autenticato.</b>
                 $mesg_to_user = sprintf('chatt_sub("%s", [2, "%s"],"%s");', $dt, NICKSERV, $mlang_indwr['pollmust'][$G_lang]);
@@ -458,12 +462,6 @@ function index_wr_main(&$room, $remote_addr, $get, $post, $cookie)
         else if ($argz[0] == 'splash') {
             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; */
-            /* if (($$CO_splashdate = gpcs_var("$CO_splashdate", $get, $post, $cookie)) === FALSE)  */
-            /*     $$CO_splashdate = ""; */
-
-            /* GLOBAL $$CO_splashdate; */
-
             $user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; ";
 
             $user->comm[$user->step % COMM_N] .=  show_notify_ex(str_replace("\n", " ", $G_splash_content[$G_lang]), 0, $mlang_indwr['btn_backtotab'][$G_lang], $G_splash_w, $G_splash_h, true, 0);
@@ -572,8 +570,6 @@ function index_wr_main(&$room, $remote_addr, $get, $post, $cookie)
                 if ($table->player_n == PLAYERS_N) {
                     log_wr("WARN:FSM: Sitdown unreachable, table full.");
                     return FALSE;
-                    Room::unlock_data($sem);
-                    exit;
                 }
       
                 // set new status
@@ -595,7 +591,7 @@ function index_wr_main(&$room, $remote_addr, $get, $post, $cookie)
                     //
                     
                     // Create new spawned table
-                    $bri_sem = Bin5::lock_data(TRUE, $table_idx);
+                    // $bri_sem = Bin5::lock_data(TRUE, $table_idx);
                     $table_token = uniqid("");
                     $room->table[$table_idx]->table_token = $table_token;
                     $room->table[$table_idx]->table_start = $curtime;
@@ -604,10 +600,10 @@ function index_wr_main(&$room, $remote_addr, $get, $post, $cookie)
                     for ($i = 0 ; $i < $table->player_n ; $i++) {
                         $plist .= '|'.$room->user[$table->player[$i]]->sess;
                     }
-                    log_legal($curtime, 'xxx', $user, "STAT:CREATE_GAME", $plist);
+                    log_legal($curtime, $user->ip, $user, "STAT:CREATE_GAME", $plist);
                     
                     log_wr("pre new Bin5");
-                    if (($bri = new Bin5($room, $table_idx, $table_token)) == FALSE)
+                    if (($bri = new Bin5($room, $table_idx, $table_token, $get, $post, $cookie)) == FALSE)
                         log_wr("bri create: FALSE");
                     else
                         log_wr("bri create: ".serialize($bri));
@@ -646,7 +642,7 @@ function index_wr_main(&$room, $remote_addr, $get, $post, $cookie)
                         while (array_pop($user_cur->comm) != NULL);
           
                         $ret = "";
-                        $ret .= sprintf('gst.st_loc++; gst.st=%d; createCookie("table_idx", %d, 24*365, cookiepath); createCookie("table_token", "%s", 24*365, cookiepath); createCookie("lang", "%s", 24*365, cookiepath); hstm.stop(); window.onunload = null ; window.onbeforeunload = null ; document.location.assign("briskin5/index.php");|', $user_cur->step+1, $table_idx, $table_token, $G_lang);
+                        $ret .= sprintf('gst.st_loc++; gst.st=%d; createCookie("table_idx", %d, 24*365, cookiepath); createCookie("table_token", "%s", 24*365, cookiepath); createCookie("lang", "%s", 24*365, cookiepath); xstm.stop(); window.onunload = null ; window.onbeforeunload = null ; document.location.assign("briskin5/index.php");|', $user_cur->step+1, $table_idx, $table_token, $G_lang);
                         
                         $user_cur->comm[$user_cur->step % COMM_N] = $ret;
                         $user_cur->trans_step = $user_cur->step + 1;
@@ -658,6 +654,7 @@ function index_wr_main(&$room, $remote_addr, $get, $post, $cookie)
                         $user_cur->step_inc();
                     }
                     log_wr("presave bri");
+                    $room->match_add($table_idx, $bri);
                     log_wr("postsave bri");
                 }
                 // change room