X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fbrisk.phh;h=78a7aef8f89da3c505880193208b9649216e52f3;hb=7c225f8f69e49965d43a4af26f5564e4d95ec4cc;hp=8bc7fd0b7924b8ea52b4157ffd1c952ef7702e7e;hpb=0632c5a6e44489f41d3b13b2d81d67c9e916ffd3;p=brisk.git

diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index 8bc7fd0..78a7aef 100644
--- a/web/Obj/brisk.phh
+++ b/web/Obj/brisk.phh
@@ -55,9 +55,9 @@ define(BRISK_DEBUG, 0);
 $G_false = FALSE;
 
 $G_all_points = array( 11,10,4,3,2, 0,0,0,0,0 );
-$G_brisk_version = "spawn-0.0.3";
+$G_brisk_version = "spawn-0.0.6";
 
-$root_wellarr = Array ( 'Benvenuto in brisk (Ver. '.$G_brisk_version.'), <b>NOVITA\'</b>: nuovo layout che permette pi&ugrave; tavoli, pi&ugrave; tavoli.',
+$root_wellarr = Array ( 'Benvenuto in brisk (Ver. '.$G_brisk_version.'), <b>NOVITA\'</b>: riscritta tutta l\'architettura dati del server, tutto pi&egrave; veloce e leggero.',
                         'Se vuoi iscriverti alla <a target="_blank" href="http://www.milug.org/cgi-bin/mailman/listinfo/ml-briscola">Mailing List</a>, cliccala!' );
 $table_wellarr = Array ( 'Benvenuto al tavolo. Se almeno tre giocatori non sbloccano l\'uscita cliccando il lucchetto, chi esce non pu&ograve; risedersi a un qualunque tavolo per '.floor(BAN_TIME/60).' minuti.');
 
@@ -969,6 +969,10 @@ class Room {
 	  if ($user_cur == $user_wup[$wup_idx]) 
 	    break;
 
+	// for users that wakeup the room will be reconstructed by index_rd.php
+	if ($user_cur == $user_wup[$wup_idx]) 
+	  continue;
+
 	log_main("JOIN_WAKEUP wup_idx ".$wup_idx."  wup_n ".$user_wup_n);
 
 	if ($wup_idx < $user_wup_n) {
@@ -1414,10 +1418,8 @@ function log_only2($log) {
     $ssess = "XXXX";
   else
     $ssess = $sess;
-      
 
-  //   if (($fp = @fopen("/tmp/brisk_only2.log", 'a')) != FALSE) {
-  if (($fp = @fopen("/tmp/brisk.log", 'a')) != FALSE) {
+  if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
     fwrite($fp, sprintf("ONL2: [%s] [%s]\n", $ssess, $log));
     fclose($fp);
   }
@@ -1433,10 +1435,8 @@ function log_only($log) {
     $ssess = "XXXX";
   else
     $ssess = $sess;
-      
 
-  //  if (($fp = @fopen("/tmp/brisk_only.log", 'a')) != FALSE) {
-  if (($fp = @fopen("/tmp/brisk.log", 'a')) != FALSE) {
+  if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
     fwrite($fp, sprintf("ONLY: [%s] [%s]\n", $ssess, $log));
     fclose($fp);
   }
@@ -1452,10 +1452,8 @@ function log_main($log) {
     $ssess = "XXXX";
   else
     $ssess = $sess;
-      
 
-  //  if (($fp = @fopen("/tmp/brisk_main.log", 'a')) != FALSE) {
-  if (($fp = @fopen("/tmp/brisk.log", 'a')) != FALSE) {
+  if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
     fwrite($fp, sprintf("MAIN: [%s] [%s]\n", $ssess, $log));
     fclose($fp);
   }
@@ -1472,9 +1470,7 @@ function log_rd($log) {
   else
     $ssess = $sess;
       
-
-  //  if (($fp = @fopen("/tmp/brisk_rd.log", 'a')) != FALSE) {
-  if (($fp = @fopen("/tmp/brisk.log", 'a')) != FALSE) {
+  if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
     fwrite($fp, sprintf("READ: [%s] [%s]\n", $ssess, $log));
     fclose($fp);
   }
@@ -1492,8 +1488,7 @@ function log_rd2($log) {
     $ssess = $sess;
       
 
-  //  if (($fp = @fopen("/tmp/brisk_rd2.log", 'a')) != FALSE) {
-  if (($fp = @fopen("/tmp/brisk.log", 'a')) != FALSE) {
+  if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
     fwrite($fp, sprintf("REA2: [%s] [%s]\n", $ssess, $log));
     fclose($fp);
   }
@@ -1510,9 +1505,7 @@ function log_send($log) {
   else
     $ssess = $sess;
       
-
-  //  if (($fp = @fopen("/tmp/brisk_send.log", 'a')) != FALSE) {
-  if (($fp = @fopen("/tmp/brisk.log", 'a')) != FALSE) {
+  if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
     fwrite($fp, sprintf("SEND: [%s] [%s]\n", $ssess, $log));
     fclose($fp);
   }
@@ -1528,10 +1521,8 @@ function log_lock($log) {
     $ssess = "XXXX";
   else
     $ssess = $sess;
-      
 
-  //  if (($fp = @fopen("/tmp/brisk_lock.log", 'a')) != FALSE) {
-  if (($fp = @fopen("/tmp/brisk.log", 'a')) != FALSE) {
+  if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
     fwrite($fp, sprintf("LOCK: [%s] [%s]\n", $ssess, $log));
     fclose($fp);
   }
@@ -1548,9 +1539,7 @@ function log_wr($log) {
   else
     $ssess = $sess;
       
-
-  //  if (($fp = @fopen("/tmp/brisk_wr.log", 'a')) != FALSE) {
-  if (($fp = @fopen("/tmp/brisk.log", 'a')) != FALSE) {
+  if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
     fwrite($fp, sprintf("WRIT: [%s] [%s]\n", $ssess, $log));
     fclose($fp);
   }
@@ -1567,9 +1556,7 @@ function log_load($log) {
   else
     $ssess = $sess;
       
-
-  //  if (($fp = @fopen("/tmp/brisk_load.log", 'a')) != FALSE) {
-  if (($fp = @fopen("/tmp/brisk.log", 'a')) != FALSE) {
+  if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
     fwrite($fp, sprintf("LOAD: [%s] [%s]\n", $ssess, $log));
     fclose($fp);
   }
@@ -1579,8 +1566,7 @@ function log_auth($sess, $log) {
   if ((BRISK_DEBUG & DBG_AUTH) == 0)
     return;
 
-  //  if (($fp = @fopen("/tmp/brisk_auth.log", 'a')) != FALSE) {
-  if (($fp = @fopen("/tmp/brisk.log", 'a')) != FALSE) {
+  if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
     fwrite($fp, sprintf("AUTH: [%s] [%d] [%s]\n", $sess, time(), $log));
     fclose($fp);
   }
@@ -1591,7 +1577,7 @@ function log_legal($timecur, $sess, $name, $where, $mesg)
 {
   GLOBAL $_SERVER;
 
-  if (($fp = @fopen(LEGAL_PATH, 'a')) != FALSE) {
+  if (($fp = @fopen(LEGAL_PATH."/legal.log", 'a')) != FALSE) {
     /* Unix time | session | nickname | IP | where was | mesg */
     fwrite($fp, sprintf("%ld|%s|%s|%s|%s|%s|\n", $timecur, $sess, $name, $_SERVER['REMOTE_ADDR'], $where , $mesg));
     fclose($fp);