From: Matteo Nastasi (mop) <nastasi@alternativeoutput.it>
Date: Tue, 12 Feb 2008 21:04:03 +0000 (+0000)
Subject: Log refactoring.
X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=commitdiff_plain;h=8a7ff74c63a4d6836d82c0f583fdc7e519849221;p=brisk.git

Log refactoring.
---

diff --git a/web/briskin5/briskin5.php b/web/briskin5/briskin5.php
index e5834c0..85b1ed7 100644
--- a/web/briskin5/briskin5.php
+++ b/web/briskin5/briskin5.php
@@ -51,7 +51,7 @@ var gst  = new globst();
 gst.st = <?php 
 require_once("../Obj/brisk.phh");
 
-log_load($sess, "LOAD: briskin5.php");
+log_load("bin5/briskin5.php");
 
 if (isset($laststate) == false) {
   $laststate = -1;
diff --git a/web/briskin5/index_rd.php b/web/briskin5/index_rd.php
index 8573a5d..540892e 100644
--- a/web/briskin5/index_rd.php
+++ b/web/briskin5/index_rd.php
@@ -24,7 +24,7 @@
 require_once("../Obj/brisk.phh");
 require_once("Obj/briskin5.phh");
 
-log_load($sess, "LOAD: index_rd.php ".$QUERY_STRING);
+log_load("LOAD: bin5/index_rd.php ".$QUERY_STRING);
 
 $first_loop = TRUE;
 $the_end = FALSE;
@@ -36,7 +36,7 @@ if (DEBUGGING == "local" && $_SERVER['REMOTE_ADDR'] != '127.0.0.1') {
 
 function shutta()
 {
-  log_rd2("bin5 SHUTTA!", connection_status());
+  log_rd2("bin5 SHUTTA!".connection_status());
 }
 
 
@@ -47,7 +47,7 @@ function unrecerror()
   GLOBAL $is_page_streaming;
 
   $is_page_streaming = TRUE;
-  log_rd2("XXX", "UNREC_ERROR");
+  log_rd2("UNREC_ERROR");
   return (sprintf('the_end=true; window.onunload = null; document.location.assign("../index.php");'));
 }
 
@@ -56,7 +56,7 @@ function page_sync($sess, $page)
   GLOBAL $is_page_streaming;
 
   $is_page_streaming = TRUE;
-  log_rd2($sess, "PAGE_SYNC");
+  log_rd2("PAGE_SYNC");
   return (sprintf('the_end=true; window.onunload = null; document.location.assign("%s");', $page));
 }
 
@@ -70,13 +70,13 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
   $ret = FALSE;
   $bri = FALSE;
 
-  // log_rd2($sess, "M");
+  // log_rd2("M");
   /* Sync check (read only without modifications */
   ignore_user_abort(TRUE);
   if (($sem = Briskin5::lock_data($table_idx)) != FALSE) { 
     // Aggiorna l'expire time lato server
     if  ($first_loop == TRUE) {
-      log_only($sess, "F");
+      log_only("F");
 
       // VERIFICARE TUTTE LE LOAD_DATA E PRENDERE CONTROMISURE NEL CASO FALLISCANO //
 
@@ -90,7 +90,7 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
         ignore_user_abort(FALSE);
 	return (unrecerror());
       }
-      log_auth($sess, "update lacc");
+      log_auth($sess, "bin5::update lacc");
       $user->lacc = time();
 
       $bri->garbage_manager(FALSE);
@@ -99,7 +99,7 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
       $first_loop = FALSE;
     }
 
-    log_only($sess, "U");
+    log_only("U");
     Briskin5::unlock_data($sem);
     ignore_user_abort(FALSE);
   }
@@ -108,18 +108,18 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
   }
   
   if (($proxy_step = step_get($sess)) != FALSE) {
-    // log_rd2($sess, "Postget".$proxy_step."zizi");
+    // log_rd2("Postget".$proxy_step."zizi");
     
     if ($cur_step == $proxy_step) {
-      log_only2($sess, "P");
+      log_only2("P");
       return (FALSE);
     }
     else {
-      log_only2($sess, "R");
+      log_only2("R");
     }
   }
   else {
-    log_only2($sess, "R");
+    log_only2("R");
   }
   
   if ($bri == FALSE) {
@@ -128,7 +128,7 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
       if (($sem = Briskin5::lock_data($table_idx)) == FALSE) 
 	break;
       
-      log_only($sess, "P");
+      log_only("P");
       if (($bri = &Briskin5::load_data($table_idx, $table_token)) == FALSE) 
 	break;
     } while (0);
@@ -149,7 +149,7 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
   if ($cur_step == $user->step) 
     return;
 
-  log_rd2($sess, "do other ++".$cur_stat."++".$user->stat."++".$cur_step."++".$user->step);
+  log_rd2("do other ++".$cur_stat."++".$user->stat."++".$cur_step."++".$user->step);
 
   if ($cur_step == -1) {
     // FUNZIONE from_scratch DA QUI 
@@ -166,7 +166,7 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
 
 
     if ($user->trans_step != -1) {
-      log_rd2($sess, "TRANS USATO ".$user->trans_step);
+      log_rd2("TRANS USATO ".$user->trans_step);
       $cur_step = $user->trans_step;
       $user->trans_step = -1;
 
@@ -176,17 +176,17 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
       ignore_user_abort(FALSE);
     }
     else {
-      log_rd2($sess, "TRANS NON ATTIVATO");
+      log_rd2("TRANS NON ATTIVATO");
       Briskin5::unlock_data($sem);
       ignore_user_abort(FALSE);
     }
   }
       
   if ($cur_step == -1) {
-    log_rd2($sess, "PRE-NEWSTAT.");
+    log_rd2("PRE-NEWSTAT.");
 
     if ($user->stat == 'room') {
-      log_rd($sess, "roomma");
+      log_rd("roomma");
       $ret .= show_room(&$bri, &$user);
     }
     /***************
@@ -197,9 +197,9 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
     else if ($user->stat == 'table') {      
       $ret = show_table(&$bri,&$user,$user->step,FALSE,FALSE);
 
-      log_rd2($sess, "SENDED TO THE STREAM: ".$ret);
+      log_rd2("SENDED TO THE STREAM: ".$ret);
     }
-    log_rd2($sess, "NEWSTAT: ".$user->stat);
+    log_rd2("NEWSTAT: ".$user->stat);
 
     $new_stat =  $user->stat;
     $new_subst = $user->subst;
@@ -223,13 +223,13 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
 	    ignore_user_abort(FALSE);
 	    return (page_sync($user->sess, $to_stat == "table" ? "table.php" : "index.php"));
 	  }
-	  log_rd2($sess, "lost history, refresh from scratch");
+	  log_rd2("lost history, refresh from scratch");
 	  $new_step = -1;
 	  break;
 	} 
 	for ($i = $cur_step ; $i < $user->step ; $i++) {
 	  $ii = $i % COMM_N;
-	  log_wr($sess, "TRY RET ".$i."  COMM_N ".COMM_N."  II ".$ii);
+	  log_wr("TRY RET ".$i."  COMM_N ".COMM_N."  II ".$ii);
 	  $ret .= $user->comm[$ii];
 	}
 	$new_stat =  $user->stat;
@@ -238,7 +238,7 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
       } while (0);
       
       if ($user->the_end == TRUE) {
-	log_rd2($sess, "LOGOUT BYE BYE!!");
+	log_rd2("LOGOUT BYE BYE!!");
 	log_auth($user->sess, "Explicit logout.");
 	$tmp_sess = $user->sess;
 	$user->sess = "";
@@ -252,7 +252,7 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
 	else if ($user->subst == 'standup')
 	  $bri->room_outstandup(&$user);
 	else
-	  log_rd2($sess, "LOGOUT FROM WHAT ???");
+	  log_rd2("LOGOUT FROM WHAT ???");
 	  
 	Briskin5::save_data($bri);
       }
@@ -288,7 +288,7 @@ if (!isset($myfrom))
      $myfrom = "";
 if (!isset($subst))
      $subst = "";
-log_rd2($sess, "FROM OUTSIDE - STAT: ".$stat." SUBST: ".$subst." STEP: ".$step." MYFROM: ".$myfrom. "IS_PAGE:" . $is_page_streaming."USER_AGENT:".$HTTP_USER_AGENT);
+log_rd2("FROM OUTSIDE - STAT: ".$stat." SUBST: ".$subst." STEP: ".$step." MYFROM: ".$myfrom. "IS_PAGE:" . $is_page_streaming."USER_AGENT:".$HTTP_USER_AGENT);
 
 
 $endtime = time() + STREAM_TIMEOUT;
@@ -297,13 +297,13 @@ $old_subst = $subst;
 $old_step =  $ext_step = $step;
 
 for ($i = 0 ; time() < $endtime ; $i++) {
-  // log_rd($sess, "PRE MAIN ".$step);;
+  // log_rd("PRE MAIN ".$step);;
   if (($ret = maincheck($sess, $old_stat, $old_subst, $old_step, &$stat, &$subst, &$step, $table_idx, $table_token)) != FALSE) {
     echo '@BEGIN@';
-    // log_rd2($sess, sprintf("\nSESS: [%s]\nOLD_STAT: [%s] OLD_SUBST: [%s] OLD_STEP: [%s] \nSTAT: [%s] SUBST: [%s] STEP: [%s] \nCOMM: [%s]\n", $sess, $old_stat, $old_subst, $old_step, $stat, $subst, $step, $ret));
+    // log_rd2(sprintf("\nSESS: [%s]\nOLD_STAT: [%s] OLD_SUBST: [%s] OLD_STEP: [%s] \nSTAT: [%s] SUBST: [%s] STEP: [%s] \nCOMM: [%s]\n", $sess, $old_stat, $old_subst, $old_step, $stat, $subst, $step, $ret));
     echo "$ret";
     echo ' @END@'; 
-    log_send($sess, "EXT_STEP: ".$ext_step." ENDTIME: [".$endtime."] ".$ret);
+    log_send("EXT_STEP: ".$ext_step." ENDTIME: [".$endtime."] ".$ret);
     flush();
     if ($is_page_streaming)
       break;
@@ -311,10 +311,10 @@ for ($i = 0 ; time() < $endtime ; $i++) {
   $old_stat =  $stat;
   $old_subst = $subst;
   $old_step =  $step;
-  // log_rd($sess, "POST MAIN ".$step);;
+  // log_rd("POST MAIN ".$step);;
   usleep(400000);
   if (($i % 5) == 0) {
-    // log_rd2($sess, "TIME: ".time());
+    // log_rd2("TIME: ".time());
     echo '_';
     flush();
   }
diff --git a/web/briskin5/index_wr.php b/web/briskin5/index_wr.php
index 2fb6da2..3836a56 100644
--- a/web/briskin5/index_wr.php
+++ b/web/briskin5/index_wr.php
@@ -29,12 +29,12 @@ if (DEBUGGING == "local" && $_SERVER['REMOTE_ADDR'] != '127.0.0.1') {
   exit;
 }
 
-log_load($sess, "LOAD: index_wr.php");
+log_load("bin5/index_wr.php");
 
 /*
  *  MAIN
  */
-log_wr($sess, 'COMM: '.$mesg);
+log_wr('COMM: '.$mesg);
 
 if ($table_idx < 0 || $table_idx >= TABLE_N)
      exit;
@@ -43,13 +43,13 @@ $sem = Briskin5::lock_data($table_idx);
 $bri = &Briskin5::load_data($table_idx,$table_token);
 if (($user = &$bri->get_user($sess, &$idx)) == FALSE) {
   echo "Get User Error";
-  log_wr($sess, "Get User Error");
+  log_wr("Get User Error");
   Briskin5::unlock_data($sem);
   exit;
 }
 $argz = explode('|', $mesg);
 
-log_wr($sess, 'POSTSPLIT: '.$argz[0]);
+log_wr('POSTSPLIT: '.$argz[0]);
 
 if ($argz[0] == 'shutdown') {
   log_auth($user_cur->sess, "Shutdown session.");
@@ -59,13 +59,13 @@ if ($argz[0] == 'shutdown') {
   $user->name = "";
   $user->the_end = FALSE;
   
-  log_rd2($user->sess, "AUTO LOGOUT.");
+  log_rd2("AUTO LOGOUT.");
   if ($user->subst == 'sitdown' || $user->stat == 'table')
     $bri->table_wakeup(&$user);
   else if ($user->subst == 'standup')
     $bri->room_outstandup(&$user);
   else
-    log_rd2($sess, "SHUTDOWN FROM WHAT ???");
+    log_rd2("SHUTDOWN FROM WHAT ???");
 }
 /******************
  *                *
@@ -79,7 +79,7 @@ else if ($user->stat == 'room') {
     $user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; ";
     $user->comm[$user->step % COMM_N] .=  show_notify(str_replace("\n", " ", $G_room_help), 0, "torna ai tavoli", 600, 500);
 
-    log_wr($sess, $user->comm[$user->step % COMM_N]);
+    log_wr($user->comm[$user->step % COMM_N]);
     $user->step_inc();
     
   }
@@ -87,7 +87,7 @@ else if ($user->stat == 'room') {
     $user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; ";
     $user->comm[$user->step % COMM_N] .=  show_notify(str_replace("\n", " ", $G_room_about), 0, "torna ai tavoli", 400, 200);
 
-    log_wr($sess, $user->comm[$user->step % COMM_N]);
+    log_wr($user->comm[$user->step % COMM_N]);
     $user->step_inc();
     
   }
@@ -102,10 +102,10 @@ else if ($user->stat == 'room') {
   else if ($user->subst == 'standup') {
    
     if ($argz[0] == 'sitdown') {
-      log_wr($sess, "SITDOWN command");
+      log_wr("SITDOWN command");
 
       if ($user->the_end == TRUE) {
-	log_wr($sess, "INFO:SKIP:argz == sitdown && the_end == TRUE => ignore request.");
+	log_wr("INFO:SKIP:argz == sitdown && the_end == TRUE => ignore request.");
 	Briskin5::unlock_data($sem);
 	exit;
       }
@@ -125,7 +125,7 @@ else if ($user->stat == 'room') {
       $table = &$bri->table[$table_idx];
     
       if ($table->player_n == PLAYERS_N) {
-	log_wr($sess, "WARN:FSM: Sitdown unreachable, table full.");
+	log_wr("WARN:FSM: Sitdown unreachable, table full.");
 	Briskin5::unlock_data($sem);
 	exit;
       } 
@@ -135,13 +135,13 @@ else if ($user->stat == 'room') {
       $user->table = $table_idx;
       $user->table_pos = $table->user_add($idx);
       
-      log_wr($sess, "MOP before");
+      log_wr("MOP before");
 
       if ($table->player_n == PLAYERS_N) {
-	log_wr($sess, "MOP inall");
+	log_wr("MOP inall");
 
 	// Start game for this table.
-	log_wr($sess, "Start game!");
+	log_wr("Start game!");
 	
 	//
 	//  START THE SPAWN HERE!!!!
@@ -154,9 +154,9 @@ else if ($user->stat == 'room') {
 	  for ($i = 0 ; $i < BRISCOLAIN5_PLAYERS_N ; $i++)
 	    $us[$i] = &$bri->user[$table->player[$i]];
 	  if (($bri =& new Briskin5(&$us, &$table, $table_idx)) == FALSE)
-	    log_wr($sess, "bri create: FALSE");
+	    log_wr("bri create: FALSE");
 	  else
-	    log_wr($sess, "bri create: ".serialize($bri));
+	    log_wr("bri create: ".serialize($bri));
 	
 
 	  // Set root table and users
@@ -170,14 +170,14 @@ else if ($user->stat == 'room') {
 	  // init users
 	  for ($i = 0 ; $i < $table->player_n ; $i++) {
 	    $user_cur = &$bri->user[$table->player[$i]];
-	    log_wr($sess, "Pre if!");
+	    log_wr("Pre if!");
 	    
 	    $ret = "";
 	    $ret .= sprintf('gst.st_loc++; gst.st=%d; the_end=true; window.onunload = null ; document.location.assign("table.php");|', $user_cur->step+1);
 	    
 	    $user_cur->comm[$user_cur->step % COMM_N] = $ret;
 	    $user_cur->trans_step = $user_cur->step + 1;
-	    log_wr($sess, "TRANS ATTIVATO");
+	    log_wr("TRANS ATTIVATO");
 	    
 	    
 	    $user_cur->stat_set('table');
@@ -190,13 +190,13 @@ else if ($user->stat == 'room') {
 	  }
 	} // end else {  BEFORE SPAWN
 	
-	log_wr($sess, "MOP after");
+	log_wr("MOP after");
 
       }
       // change room
       $bri->room_sitdown(&$user, $table_idx);
 
-      log_wr($sess, "MOP finish");
+      log_wr("MOP finish");
 
       
     }
@@ -235,10 +235,10 @@ else if ($user->stat == 'table') {
   $table = &$bri->table[$user->table];
 
   if ($argz[0] == 'tableinfo') {
-    log_wr($sess, "PER DI TABLEINFO");
+    log_wr("PER DI TABLEINFO");
     $user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; ";
     $user->comm[$user->step % COMM_N] .= show_table_info(&$bri, &$table, $user->table_pos);
-    log_wr($sess, $user->comm[$user->step % COMM_N]);
+    log_wr($user->comm[$user->step % COMM_N]);
     $user->step_inc();
   }
   else if ($argz[0] == 'chatt') {
@@ -260,7 +260,7 @@ else if ($user->stat == 'table') {
 	$user->comm[$user->step % COMM_N] .= $table->exitlock_show(&$bri->user, $user->table_pos);
 	$user->comm[$user->step % COMM_N] .=  show_notify("<br>I dati presenti sul server non erano allineati con quelli inviati dal tuo browser, adesso lo sono. Riprova ora.", 2000, "Torna alla partita.", 400, 100);
 	
-	log_wr($sess, $user->comm[$user->step % COMM_N]);
+	log_wr($user->comm[$user->step % COMM_N]);
 	$user->step_inc();
 	$logout_cont = FALSE;
       }
@@ -284,7 +284,7 @@ else if ($user->stat == 'table') {
       $ret .= sprintf('exitlock_show(%d, %s);', $ct, 
 		     ($user_cur[$i]->exitislock ? 'true' : 'false'));
       $user_cur[$i]->comm[$user_cur[$i]->step % COMM_N] = $ret;
-      log_wr($sess, $user_cur[$i]->comm[$user_cur[$i]->step % COMM_N]);
+      log_wr($user_cur[$i]->comm[$user_cur[$i]->step % COMM_N]);
       $user_cur[$i]->step_inc();
     }
   }
@@ -292,7 +292,7 @@ else if ($user->stat == 'table') {
     if ($argz[0] == 'lascio' && $user->handpt <= 2) {
       $index_cur = $table->gstart % PLAYERS_N;
     
-      log_wr($sess, sprintf("GIOCO FINITO !!!"));
+      log_wr(sprintf("GIOCO FINITO !!!"));
     
       $table->mult *= 2; 
       $table->old_reason = sprintf("Ha lasciato %s perche` aveva al massimo 2 punti.", $user->name);
@@ -318,11 +318,11 @@ else if ($user->stat == 'table') {
 	$a_card = $argz[1];
 	$a_pnt  = $argz[2];
       
-	log_wr($sess, "CI SIAMO  a_card ".$a_card."  asta_card ".$table->asta_card);
+	log_wr("CI SIAMO  a_card ".$a_card."  asta_card ".$table->asta_card);
       
 	// Abbandono dell'asta
 	if ($a_card <= -1) {
-	  log_wr($sess, "Abbandona l'asta.");
+	  log_wr("Abbandona l'asta.");
 	  $table->asta_pla[$index_cur] = FALSE;
 	  $user->asta_card  = -1;
 	  $table->asta_pla_n--;
@@ -336,7 +336,7 @@ else if ($user->stat == 'table') {
 	  
 
 	  if ($again == FALSE) {
-	    log_wr($sess, "NUOVI ORZI.");
+	    log_wr("NUOVI ORZI.");
 	    $user->asta_card  = $a_card;
 	    $table->asta_card = $a_card;
 	    if ($a_card == 9) {
@@ -354,7 +354,7 @@ else if ($user->stat == 'table') {
 	  $user->comm[$user->step % COMM_N] = $ret;
 	  $user->step_inc();
 
-	  log_wr($sess, "Ripetere.");
+	  log_wr("Ripetere.");
 	}
 	else {
 	  /* next step */
@@ -377,11 +377,11 @@ else if ($user->stat == 'table') {
 
 	  if (($table->asta_pla_n > ($maxcard > -1 ? 1 : 0)) &&
 	      !($table->asta_card == 9 && $table->asta_pnt == 120)) {
-	    log_wr($sess,"ALLOPPA QUI");
+	    log_wr("ALLOPPA QUI");
 	    for ($i = 1 ; $i < PLAYERS_N ; $i++) {
 	      $index_next = ($table->gstart + $i) % PLAYERS_N;
 	      if ($table->asta_pla[$index_next]) {
-		log_wr($sess,"GSTART 1");
+		log_wr("GSTART 1");
 		$table->gstart += $i;
 		break;
 	      }
@@ -402,9 +402,9 @@ else if ($user->stat == 'table') {
 	    }
 	  }
 	  else if ($table->asta_pla_n == 0) {
-	    log_wr($sess, "PASSANO TUTTI!");
+	    log_wr("PASSANO TUTTI!");
 
-	    log_wr($sess, sprintf("GIOCO FINITO !!!"));
+	    log_wr(sprintf("GIOCO FINITO !!!"));
 	  
 	    $table->old_reason = "Hanno passato tutti.";
 	    $table->mult *= 2; 
@@ -422,7 +422,7 @@ else if ($user->stat == 'table') {
 	    }
 	  }
 	  else {
-	    log_wr($sess, "FINITA !");
+	    log_wr("FINITA !");
 	    // if a_pnt == 120 supergame ! else abbandono
 	    if ($a_pnt == 120 || $user->asta_card != -1) {
 	      $chooser = $index_cur;
@@ -461,7 +461,7 @@ else if ($user->stat == 'table') {
 	}
       }
       else {
-	log_wr($sess, "NON CI SIAMO");
+	log_wr("NON CI SIAMO");
       }
     }
     /*  asta::choose */
@@ -472,9 +472,9 @@ else if ($user->stat == 'table') {
 	if ($a_brisco >= 0 && $a_brisco < 40) {
 	  $table->briscola = $a_brisco;
 	  $table->friend   = $table->card[$a_brisco]->owner;
-	  log_wr($sess,"GSTART 2");
+	  log_wr("GSTART 2");
 	  $table->gstart = ($table->mazzo+1) % PLAYERS_N;
-	  log_wr($sess, "Setta la briscola a ".$a_brisco);
+	  log_wr("Setta la briscola a ".$a_brisco);
 
 	  $chooser = $table->asta_win;
 	  $user_chooser = &$bri->user[$table->player[$chooser]];
@@ -506,7 +506,7 @@ else if ($user->stat == 'table') {
     }
   }
   else if ($user->subst == 'game') {
-    log_wr($sess, "state: table::game".$argz[0]);
+    log_wr("state: table::game".$argz[0]);
 
     if ($argz[0] == 'play') {
       $a_play = $argz[1];
@@ -522,14 +522,14 @@ else if ($user->stat == 'table') {
 		       $a_play, $user->table_pos, ($table->gstart % PLAYERS_N),
 		       $table->mazzo, $table->gstart,
 		       $table->card[$a_play]->stat, $table->card[$a_play]->owner);
-      log_wr($sess, "CIC".$loggo);
+      log_wr("CIC".$loggo);
 			  
       /* se era il suo turno e la carta era sua ed era in mano */
       if ($a_play >=0 && $a_play < 40 &&
 	  ($user->table_pos == (($table->gstart + $table->turn) % PLAYERS_N)) &&
 	  $table->card[$a_play]->stat == 'hand' &&
 	  $table->card[$a_play]->owner == $user->table_pos) {
-	log_wr($sess, sprintf("User: %s Play: %d",$user->name, $a_play));
+	log_wr(sprintf("User: %s Play: %d",$user->name, $a_play));
 
 	/* Change the card status. */
 	$table->card[$a_play]->play($a_x, $a_y);
@@ -551,11 +551,11 @@ else if ($user->stat == 'table') {
 	}
 	else if ($table->turn <= (PLAYERS_N * 8)) { /* manche finished */
 	  $winner = calculate_winner($table);
-	  log_wr($sess,"GSTART 3");
+	  log_wr("GSTART 3");
 	  $table->gstart = $winner;
 	  $turn_nex = ($table->gstart + $table->turn) % PLAYERS_N;
 
-	  log_wr($sess, sprintf("The winner is: [%d] [%s]", $winner, $bri->user[$table->player[$winner]]->name));
+	  log_wr(sprintf("The winner is: [%d] [%s]", $winner, $bri->user[$table->player[$winner]]->name));
 	  $card_take = sprintf("sleep(gst,2000);|cards_take(%d);|cards_hidetake($d);",
 			       $winner, $winner);
 	  $player_cur = "remark_off();" . $card_take . "|"; 
@@ -568,7 +568,7 @@ else if ($user->stat == 'table') {
 	  $player_oth = $card_play . $card_take;
 	}
 
-	log_wr($sess, sprintf("Turn Cur %d Turn Nex %d",$turn_cur, $turn_nex));
+	log_wr(sprintf("Turn Cur %d Turn Nex %d",$turn_cur, $turn_nex));
 	for ($i = 0 ; $i < PLAYERS_N ; $i++) {	
 	  $user_cur = &$bri->user[$table->player[$i]];
 
@@ -592,7 +592,7 @@ else if ($user->stat == 'table') {
 
 
 	if ($table->turn == (PLAYERS_N * 8)) { /* game finished */
-	  log_wr($sess, sprintf("GIOCO FINITO !!!"));
+	  log_wr(sprintf("GIOCO FINITO !!!"));
 
 	  /* ************************************************ */
 	  /*    PRIMA LA PARTE PER LO SHOW DI CHI HA VINTO    */
@@ -616,7 +616,7 @@ else if ($user->stat == 'table') {
 	  $user_cur->step_inc();	    
 	}
 
-	log_wr($sess, sprintf("TURN: %d",$table->turn));
+	log_wr(sprintf("TURN: %d",$table->turn));
 	/* Have played all the players ? */
 	/* NO:  switch the focus and enable the next player to play. */
       
@@ -624,10 +624,10 @@ else if ($user->stat == 'table') {
       }
     }
     else
-      log_wr($sess, "NOSENSE");
+      log_wr("NOSENSE");
   }
 }
-log_wr($sess, "before save data");
+log_wr("before save data");
 Briskin5::save_data($bri);
 
 Briskin5::unlock_data($sem);
diff --git a/web/index_wr.php b/web/index_wr.php
index 2d93e22..1a56e98 100644
--- a/web/index_wr.php
+++ b/web/index_wr.php
@@ -29,26 +29,26 @@ if (DEBUGGING == "local" && $_SERVER['REMOTE_ADDR'] != '127.0.0.1') {
   exit;
 }
 
-log_load($sess, "LOAD: index_wr.php");
+log_load("index_wr.php");
 
 /*
  *  MAIN
  */
 $is_spawn = FALSE;
 
-log_wr($sess, 'COMM: '.$mesg);
+log_wr('COMM: '.$mesg);
 
 $sem = Room::lock_data();
 $room = &Room::load_data();
 if (($user = &$room->get_user($sess, &$idx)) == FALSE) {
   echo "Get User Error";
-  log_wr($sess, "Get User Error");
+  log_wr("Get User Error");
   Room::unlock_data($sem);
   exit;
 }
 $argz = explode('|', $mesg);
 
-log_wr($sess, 'POSTSPLIT: '.$argz[0]);
+log_wr('POSTSPLIT: '.$argz[0]);
 
 if ($argz[0] == 'shutdown') {
   log_auth($user_cur->sess, "Shutdown session.");
@@ -58,13 +58,13 @@ if ($argz[0] == 'shutdown') {
   $user->name = "";
   $user->the_end = FALSE;
   
-  log_rd2($user->sess, "AUTO LOGOUT.");
+  log_rd2("AUTO LOGOUT.");
   if ($user->subst == 'sitdown' || $user->stat == 'table')
     $room->room_wakeup(&$user);
   else if ($user->subst == 'standup')
     $room->room_outstandup(&$user);
   else
-    log_rd2($sess, "SHUTDOWN FROM WHAT ???");
+    log_rd2("SHUTDOWN FROM WHAT ???");
 }
 /******************
  *                *
@@ -78,7 +78,7 @@ else if ($user->stat == 'room') {
     $user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; ";
     $user->comm[$user->step % COMM_N] .=  show_notify(str_replace("\n", " ", $G_room_help), 0, "torna ai tavoli", 600, 500);
 
-    log_wr($sess, $user->comm[$user->step % COMM_N]);
+    log_wr($user->comm[$user->step % COMM_N]);
     $user->step_inc();
     
   }
@@ -86,7 +86,7 @@ else if ($user->stat == 'room') {
     $user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; ";
     $user->comm[$user->step % COMM_N] .=  show_notify(str_replace("\n", " ", $G_room_about), 0, "torna ai tavoli", 400, 200);
 
-    log_wr($sess, $user->comm[$user->step % COMM_N]);
+    log_wr($user->comm[$user->step % COMM_N]);
     $user->step_inc();
     
   }
@@ -101,10 +101,10 @@ else if ($user->stat == 'room') {
   else if ($user->subst == 'standup') {
    
     if ($argz[0] == 'sitdown') {
-      log_wr($sess, "SITDOWN command");
+      log_wr("SITDOWN command");
 
       if ($user->the_end == TRUE) {
-	log_wr($sess, "INFO:SKIP:argz == sitdown && the_end == TRUE => ignore request.");
+	log_wr("INFO:SKIP:argz == sitdown && the_end == TRUE => ignore request.");
 	Room::unlock_data($sem);
 	exit;
       }
@@ -124,7 +124,7 @@ else if ($user->stat == 'room') {
       $table = &$room->table[$table_idx];
     
       if ($table->player_n == PLAYERS_N) {
-	log_wr($sess, "WARN:FSM: Sitdown unreachable, table full.");
+	log_wr("WARN:FSM: Sitdown unreachable, table full.");
 	Room::unlock_data($sem);
 	exit;
       } 
@@ -134,13 +134,13 @@ else if ($user->stat == 'room') {
       $user->table = $table_idx;
       $user->table_pos = $table->user_add($idx);
       
-      log_wr($sess, "MOP before");
+      log_wr("MOP before");
 
       if ($table->player_n == PLAYERS_N) {
-	log_wr($sess, "MOP inall");
+	log_wr("MOP inall");
 
 	// Start game for this table.
-	log_wr($sess, "Start game!");
+	log_wr("Start game!");
 	
 	//
 	//  START THE SPAWN HERE!!!!
@@ -152,17 +152,17 @@ else if ($user->stat == 'room') {
 	  $bri_sem = Briskin5::lock_data($table_idx);
 	  $table_token = uniqid("");
 	  $room->table[$table_idx]->table_token = $table_token;
+	  $room->table[$table_idx]->table_start = $curtime;
+	  
 	  if (($bri =& new Briskin5(&$room, $table_idx, $table_token)) == FALSE)
-	    log_wr($sess, "bri create: FALSE");
+	    log_wr("bri create: FALSE");
 	  else
-	    log_wr($sess, "bri create: ".serialize($bri));
+	    log_wr("bri create: ".serialize($bri));
 	
 	  // init table
 	  $bri_table =& $bri->table[0];
 	  $bri_table->init(&$bri->user);
 	  $bri_table->game_init(&$bri->user);
-	  $curtime = time();
-
 	  //
 	  // Init spawned users.
 	  //
@@ -181,16 +181,16 @@ else if ($user->stat == 'room') {
 
 	    $bri_user_cur->step_inc();
 
-	    log_wr($bri_user_cur->sess, "TRY PRESAVE: ".$bri_user_cur->step." TRANS STEP: ".$bri_user_cur->trans_step);
+	    log_wr("TRY PRESAVE: ".$bri_user_cur->step." TRANS STEP: ".$bri_user_cur->trans_step);
 
-	    log_wr($sess, "Pre if!");
+	    log_wr("Pre if!");
 	    
 	    $ret = "";
 	    $ret .= sprintf('gst.st_loc++; gst.st=%d; createCookie("table_idx", %d, 24*365, cookiepath); createCookie("table_token", "%s", 24*365, cookiepath); the_end=true; window.onunload = null ; document.location.assign("briskin5/briskin5.php");|', $user_cur->step+1, $table_idx, $table_token);
 	    
 	    $user_cur->comm[$user_cur->step % COMM_N] = $ret;
 	    $user_cur->trans_step = $user_cur->step + 1;
-	    log_wr($sess, "TRANS ATTIVATO");
+	    log_wr("TRANS ATTIVATO");
 	    
 	    
 	    $user_cur->stat_set('table');
@@ -198,10 +198,10 @@ else if ($user->stat == 'room') {
 	    $user_cur->laccwr = $curtime;
 	    $user_cur->step_inc();
 	  }
-	  log_wr($sess, "presave bri");
+	  log_wr("presave bri");
 	  Briskin5::save_data($bri);
 	  Briskin5::unlock_data($bri_sem);
-	  log_wr($sess, "postsave bri");
+	  log_wr("postsave bri");
 	}
 	else { // BEFORE SPAWN
 	  // init table
@@ -212,14 +212,14 @@ else if ($user->stat == 'room') {
 	  // init users
 	  for ($i = 0 ; $i < $table->player_n ; $i++) {
 	    $user_cur = &$room->user[$table->player[$i]];
-	    log_wr($sess, "Pre if!");
+	    log_wr("Pre if!");
 	    
 	    $ret = "";
 	    $ret .= sprintf('gst.st_loc++; gst.st=%d; the_end=true; window.onunload = null ; document.location.assign("table.php");|', $user_cur->step+1);
 	    
 	    $user_cur->comm[$user_cur->step % COMM_N] = $ret;
 	    $user_cur->trans_step = $user_cur->step + 1;
-	    log_wr($sess, "TRANS ATTIVATO");
+	    log_wr("TRANS ATTIVATO");
 	    
 	    
 	    $user_cur->stat_set('table');
@@ -232,13 +232,13 @@ else if ($user->stat == 'room') {
 	  }
 	} // end else {  BEFORE SPAWN
 	
-	log_wr($sess, "MOP after");
+	log_wr("MOP after");
 
       }
       // change room
       $room->room_sitdown(&$user, $table_idx);
 
-      log_wr($sess, "MOP finish");
+      log_wr("MOP finish");
 
       
     }
@@ -277,10 +277,10 @@ else if ($user->stat == 'table') {
   $table = &$room->table[$user->table];
 
   if ($argz[0] == 'tableinfo') {
-    log_wr($sess, "PER DI TABLEINFO");
+    log_wr("PER DI TABLEINFO");
     $user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; ";
     $user->comm[$user->step % COMM_N] .= show_table_info(&$room, &$table, $user->table_pos);
-    log_wr($sess, $user->comm[$user->step % COMM_N]);
+    log_wr($user->comm[$user->step % COMM_N]);
     $user->step_inc();
   }
   else if ($argz[0] == 'chatt') {
@@ -302,7 +302,7 @@ else if ($user->stat == 'table') {
 	$user->comm[$user->step % COMM_N] .= $table->exitlock_show(&$room->user, $user->table_pos);
 	$user->comm[$user->step % COMM_N] .=  show_notify("<br>I dati presenti sul server non erano allineati con quelli inviati dal tuo browser, adesso lo sono. Riprova ora.", 2000, "Torna alla partita.", 400, 100);
 	
-	log_wr($sess, $user->comm[$user->step % COMM_N]);
+	log_wr($user->comm[$user->step % COMM_N]);
 	$user->step_inc();
 	$logout_cont = FALSE;
       }
@@ -326,7 +326,7 @@ else if ($user->stat == 'table') {
       $ret .= sprintf('exitlock_show(%d, %s);', $ct, 
 		     ($user_cur[$i]->exitislock ? 'true' : 'false'));
       $user_cur[$i]->comm[$user_cur[$i]->step % COMM_N] = $ret;
-      log_wr($sess, $user_cur[$i]->comm[$user_cur[$i]->step % COMM_N]);
+      log_wr($user_cur[$i]->comm[$user_cur[$i]->step % COMM_N]);
       $user_cur[$i]->step_inc();
     }
   }
@@ -334,7 +334,7 @@ else if ($user->stat == 'table') {
     if ($argz[0] == 'lascio' && $user->handpt <= 2) {
       $index_cur = $table->gstart % PLAYERS_N;
     
-      log_wr($sess, sprintf("GIOCO FINITO !!!"));
+      log_wr(sprintf("GIOCO FINITO !!!"));
     
       $table->mult *= 2; 
       $table->old_reason = sprintf("Ha lasciato %s perche` aveva al massimo 2 punti.", $user->name);
@@ -360,11 +360,11 @@ else if ($user->stat == 'table') {
 	$a_card = $argz[1];
 	$a_pnt  = $argz[2];
       
-	log_wr($sess, "CI SIAMO  a_card ".$a_card."  asta_card ".$table->asta_card);
+	log_wr("CI SIAMO  a_card ".$a_card."  asta_card ".$table->asta_card);
       
 	// Abbandono dell'asta
 	if ($a_card <= -1) {
-	  log_wr($sess, "Abbandona l'asta.");
+	  log_wr("Abbandona l'asta.");
 	  $table->asta_pla[$index_cur] = FALSE;
 	  $user->asta_card  = -1;
 	  $table->asta_pla_n--;
@@ -378,7 +378,7 @@ else if ($user->stat == 'table') {
 	  
 
 	  if ($again == FALSE) {
-	    log_wr($sess, "NUOVI ORZI.");
+	    log_wr("NUOVI ORZI.");
 	    $user->asta_card  = $a_card;
 	    $table->asta_card = $a_card;
 	    if ($a_card == 9) {
@@ -396,7 +396,7 @@ else if ($user->stat == 'table') {
 	  $user->comm[$user->step % COMM_N] = $ret;
 	  $user->step_inc();
 
-	  log_wr($sess, "Ripetere.");
+	  log_wr("Ripetere.");
 	}
 	else {
 	  /* next step */
@@ -419,11 +419,11 @@ else if ($user->stat == 'table') {
 
 	  if (($table->asta_pla_n > ($maxcard > -1 ? 1 : 0)) &&
 	      !($table->asta_card == 9 && $table->asta_pnt == 120)) {
-	    log_wr($sess,"ALLOPPA QUI");
+	    log_wr("ALLOPPA QUI");
 	    for ($i = 1 ; $i < PLAYERS_N ; $i++) {
 	      $index_next = ($table->gstart + $i) % PLAYERS_N;
 	      if ($table->asta_pla[$index_next]) {
-		log_wr($sess,"GSTART 1");
+		log_wr("GSTART 1");
 		$table->gstart += $i;
 		break;
 	      }
@@ -444,9 +444,9 @@ else if ($user->stat == 'table') {
 	    }
 	  }
 	  else if ($table->asta_pla_n == 0) {
-	    log_wr($sess, "PASSANO TUTTI!");
+	    log_wr("PASSANO TUTTI!");
 
-	    log_wr($sess, sprintf("GIOCO FINITO !!!"));
+	    log_wr(sprintf("GIOCO FINITO !!!"));
 	  
 	    $table->old_reason = "Hanno passato tutti.";
 	    $table->mult *= 2; 
@@ -464,7 +464,7 @@ else if ($user->stat == 'table') {
 	    }
 	  }
 	  else {
-	    log_wr($sess, "FINITA !");
+	    log_wr("FINITA !");
 	    // if a_pnt == 120 supergame ! else abbandono
 	    if ($a_pnt == 120 || $user->asta_card != -1) {
 	      $chooser = $index_cur;
@@ -503,7 +503,7 @@ else if ($user->stat == 'table') {
 	}
       }
       else {
-	log_wr($sess, "NON CI SIAMO");
+	log_wr("NON CI SIAMO");
       }
     }
     /*  asta::choose */
@@ -514,9 +514,9 @@ else if ($user->stat == 'table') {
 	if ($a_brisco >= 0 && $a_brisco < 40) {
 	  $table->briscola = $a_brisco;
 	  $table->friend   = $table->card[$a_brisco]->owner;
-	  log_wr($sess,"GSTART 2");
+	  log_wr("GSTART 2");
 	  $table->gstart = ($table->mazzo+1) % PLAYERS_N;
-	  log_wr($sess, "Setta la briscola a ".$a_brisco);
+	  log_wr("Setta la briscola a ".$a_brisco);
 
 	  $chooser = $table->asta_win;
 	  $user_chooser = &$room->user[$table->player[$chooser]];
@@ -548,7 +548,7 @@ else if ($user->stat == 'table') {
     }
   }
   else if ($user->subst == 'game') {
-    log_wr($sess, "state: table::game".$argz[0]);
+    log_wr("state: table::game".$argz[0]);
 
     if ($argz[0] == 'play') {
       $a_play = $argz[1];
@@ -564,14 +564,14 @@ else if ($user->stat == 'table') {
 		       $a_play, $user->table_pos, ($table->gstart % PLAYERS_N),
 		       $table->mazzo, $table->gstart,
 		       $table->card[$a_play]->stat, $table->card[$a_play]->owner);
-      log_wr($sess, "CIC".$loggo);
+      log_wr("CIC".$loggo);
 			  
       /* se era il suo turno e la carta era sua ed era in mano */
       if ($a_play >=0 && $a_play < 40 &&
 	  ($user->table_pos == (($table->gstart + $table->turn) % PLAYERS_N)) &&
 	  $table->card[$a_play]->stat == 'hand' &&
 	  $table->card[$a_play]->owner == $user->table_pos) {
-	log_wr($sess, sprintf("User: %s Play: %d",$user->name, $a_play));
+	log_wr(sprintf("User: %s Play: %d",$user->name, $a_play));
 
 	/* Change the card status. */
 	$table->card[$a_play]->play($a_x, $a_y);
@@ -593,11 +593,11 @@ else if ($user->stat == 'table') {
 	}
 	else if ($table->turn <= (PLAYERS_N * 8)) { /* manche finished */
 	  $winner = calculate_winner($table);
-	  log_wr($sess,"GSTART 3");
+	  log_wr("GSTART 3");
 	  $table->gstart = $winner;
 	  $turn_nex = ($table->gstart + $table->turn) % PLAYERS_N;
 
-	  log_wr($sess, sprintf("The winner is: [%d] [%s]", $winner, $room->user[$table->player[$winner]]->name));
+	  log_wr(sprintf("The winner is: [%d] [%s]", $winner, $room->user[$table->player[$winner]]->name));
 	  $card_take = sprintf("sleep(gst,2000);|cards_take(%d);|cards_hidetake($d);",
 			       $winner, $winner);
 	  $player_cur = "remark_off();" . $card_take . "|"; 
@@ -610,7 +610,7 @@ else if ($user->stat == 'table') {
 	  $player_oth = $card_play . $card_take;
 	}
 
-	log_wr($sess, sprintf("Turn Cur %d Turn Nex %d",$turn_cur, $turn_nex));
+	log_wr(sprintf("Turn Cur %d Turn Nex %d",$turn_cur, $turn_nex));
 	for ($i = 0 ; $i < PLAYERS_N ; $i++) {	
 	  $user_cur = &$room->user[$table->player[$i]];
 
@@ -634,7 +634,7 @@ else if ($user->stat == 'table') {
 
 
 	if ($table->turn == (PLAYERS_N * 8)) { /* game finished */
-	  log_wr($sess, sprintf("GIOCO FINITO !!!"));
+	  log_wr(sprintf("GIOCO FINITO !!!"));
 
 	  /* ************************************************ */
 	  /*    PRIMA LA PARTE PER LO SHOW DI CHI HA VINTO    */
@@ -658,7 +658,7 @@ else if ($user->stat == 'table') {
 	  $user_cur->step_inc();	    
 	}
 
-	log_wr($sess, sprintf("TURN: %d",$table->turn));
+	log_wr(sprintf("TURN: %d",$table->turn));
 	/* Have played all the players ? */
 	/* NO:  switch the focus and enable the next player to play. */
       
@@ -666,10 +666,10 @@ else if ($user->stat == 'table') {
       }
     }
     else
-      log_wr($sess, "NOSENSE");
+      log_wr("NOSENSE");
   }
 }
-log_wr($sess, "before save data");
+log_wr("before save data");
 Room::save_data($room);
 
 Room::unlock_data($sem);