X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fbrisk.phh;h=bbd62b8d4a51069eb5cab16b4a17f6d1b00a8053;hb=a8c6e814800a78f4325d49f8a08a0332d45a3842;hp=29dbc6790c3f620d53084bb0614bfd207136996d;hpb=1da3c486582c30adbc3d3055d5bd046427ac7ab3;p=brisk.git

diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index 29dbc67..bbd62b8 100644
--- a/web/Obj/brisk.phh
+++ b/web/Obj/brisk.phh
@@ -22,7 +22,7 @@
 define(FTOK_PATH, "/var/lib/brisk");
 define(LEGAL_PATH, "/tmp/legal_brisk");
 define(PROXY_PATH, "/var/lib/brisk_proxy");
-define(TABLES_N, 12);
+define(TABLES_N, 20);
 define(PLAYERS_N, 3);
 define(MAX_POINTS, 5);
 define(MAX_PLAYERS, (20 + (PLAYERS_N * TABLES_N)));
@@ -50,14 +50,17 @@ define(DBG_LOAD, 0x0100);
 define(DBG_AUTH, 0x0200);
 
 define(BRISK_DEBUG, 0);
+
+define(BRISK_SINGLE_DEBUG,0);
+define(BRISK_SINGLE_SESS, "");
 // define(DEBUGGING, "local");
 
 $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.9.2";
 
-$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>: chiuso il <b>bug</b> dei <b>tavoli bianchi</b>, versione beta.',
                         '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.');
 
@@ -715,10 +718,12 @@ class Room {
 	  if (($sem = Briskin5::lock_data($table_idx)) != FALSE) { 
 	    log_main("bin5 lock data success");
 	    
+	    $no_recovery = FALSE;
 	    if (($bri = &Briskin5::load_data($table_idx)) != FALSE) {
 	      if ($table_cur->table_token != $bri->table_token) {
 		log_main("ERROR: not matching table_token. Room: ".$table_cur->table_token."  Table: ".$bri->table_token);
 		log_main("ERROR: not matching table_start. Room: ".$table_cur->table_start."  Table: ".$bri->table_start);
+		$no_recovery = TRUE;
 		$bri = FALSE;
 	      }
 	    }
@@ -737,20 +742,21 @@ class Room {
 		/*
 		 *  DESTROY OF FINISHED TABLE && MOVE PLAYER TO ROOM AGAIN
 		 */
+		log_main("garbage_manager: INSIDE THE END.");
+
 		for ($i = 0 ; $i < $bri_table->player_n ; $i++) {
 		  // stat must be "table" by definition
 		  $user_cur =& $this->user[$table_cur->player[$i]];
 		  $bri_user =& $bri->user[$i];
-
+		  
 		  $user_cur->subst      = $bri_user->subst;
 		  $user_cur->step       = $bri_user->step;
-		  $user_cur->trans_step = $bri_user->step;
 		  $user_cur->lacc       = $bri_user->lacc;
 		  $user_cur->laccwr     = $bri_user->lacc;
 		  $user_cur->bantime    = $bri_user->bantime;
 		}
 	      
-		$this->room_join_wakeup(&$user_cur); 
+		$this->room_join_wakeup(&$user_cur, FALSE, 0); 
 		$table_cur->table_token = "";
 
 		Briskin5::destroy_data($table_idx);
@@ -765,9 +771,26 @@ class Room {
 		Briskin5::save_data(&$bri);
 	      }
 	    } // else if (($bri = &Briskin5::load_data($table_idx)) != FALSE) {
-	    else {
+	    else if ($no_recovery == FALSE) {
 	      log_main("ERROR: table ".$table_idx." unrecoverable join");
+
+	      for ($i = 0 ; $i < $table_cur->player_n ; $i++) {
+		$user_cur = &$this->user[$table_cur->player[$i]];
+		$user_cur->subst = "shutdowner";
+		$user_cur->step_inc();
+		
+		$ret = sprintf('stat = "%s"; subst = "%s";',  $cur_user->stat, $cur_user->subst);
+		$ret .= "gst.st = ".($user_cur->step+1)."; ";
+		$ret .= show_notify("<br>I dati del tavolo n&deg; ".$user_cur->table." sono inconsistenti, verranno resettati.<br><br>Torni in piedi.<br><br>", 2000, "Chiudi.", 400, 110);
+		$user_cur->comm[$user_cur->step % COMM_N] = $ret;
+		$user_cur->step_inc();
+	      }
+
+	      $this->room_join_wakeup(&$user_cur, TRUE, -2); 
+	      $table_cur->table_token = "";
 	    }
+
+	    Briskin5::unlock_data($sem);
 	  } // bri::lock_data
 	} //  if ($table_cur->player_n == PLAYERS_N) {
       } //  for ($table_idx = 0 ; $table_idx < TABLES_N ; $table_idx++) {
@@ -906,7 +929,7 @@ class Room {
     }
   }
 
-  function room_join_wakeup(&$user, $update_lacc = FALSE)
+  function room_join_wakeup(&$user, $update_lacc = FALSE, $trans_delta)
   {
     $table_idx = $user->table;
     $table = &$this->table[$table_idx];
@@ -916,6 +939,8 @@ class Room {
     $curtime = time();
     $user_wup = array();
     $user_wup_n = 0;
+    $user_tab = array();
+    $user_tab_n = 0;
     log_main("JOIN WAKEUP: from table [".$user->table."] nplayers_n: ".$this->table[$user->table]->player_n);
     
     for ($i = 0 ; $i < $table->player_n ; $i++) {
@@ -936,6 +961,7 @@ class Room {
 	  $user_cur->table = -1;
 	  $user_wup[$user_wup_n++] = &$user_cur;
 	}
+	$user_tab[$user_tab_n++] = &$user_cur;
       }
     }
 
@@ -965,29 +991,28 @@ class Room {
 	$act_content = table_act_content(FALSE, 0, $table_idx, $user_cur->table);
 	$ret .= sprintf('$("table_act%d").innerHTML = "%s";', $table_idx, $act_content);
 	
-	for ($wup_idx = 0 ; $wup_idx < $user_wup_n  ; $wup_idx++)
-	  if ($user_cur == $user_wup[$wup_idx]) 
+	for ($tab_idx = 0 ; $tab_idx < $user_tab_n  ; $tab_idx++)
+	  if ($user_cur == $user_tab[$tab_idx]) 
 	    break;
 
-	log_main("JOIN_WAKEUP wup_idx ".$wup_idx."  wup_n ".$user_wup_n);
+	// for users that wakeup the room will be reconstructed by index_rd.php
+	if ($tab_idx < $user_tab_n) {
+	  log_main("PRE show_room username: ".$user_cur->name."  STEP: ".$user_cur->step);
+	  $user_cur->trans_step = $user_cur->step + 1 + $trans_delta;
+	  $user_cur->comm[$user_cur->step % COMM_N] = "";
+	  $user_cur->step_inc();
+	  $user_cur->comm[$user_cur->step % COMM_N] = show_room(&$this, ($user_cur->step + 1), &$user_cur);
+	  $user_cur->step_inc();
+	  log_main("POST show_room username: ".$user_cur->name."  STEP: ".$user_cur->step);
 
-	if ($wup_idx < $user_wup_n) {
-	  log_main("JOIN_WAKEUP less");
-	  // set the new status 
-	  $ret .=  'stat = "room"; subst = "standup"; ';
-	  // clean the action buttons in other tables
-	  for ($e = 0 ; $e < TABLES_N ; $e++) {
-	    if ($this->table[$e]->player_n < PLAYERS_N)
-	      $ret .= sprintf('$("table_act%d").innerHTML = "%s";', $e, table_act_content(TRUE, 0, $e, $user_cur->table));
-	  }
-	  log_main("JOIN_WAKEUP end less");
-	}
-	else {
-	  log_main("JOIN_WAKEUP more");
-	  $act_content = table_act_content(($user_cur->subst == 'standup'), $table->player_n, $table_idx, $user_cur->table);
-	  $ret .= sprintf('$("table_act%d").innerHTML = "%s";', $table_idx, $act_content);
-	  log_main("JOIN_WAKEUP end more");
+	  continue;
 	}
+	log_main("JOIN_WAKEUP wup_idx ".$wup_idx."  wup_n ".$user_wup_n);
+
+	log_main("JOIN_WAKEUP more");
+	$act_content = table_act_content(($user_cur->subst == 'standup'), $table->player_n, $table_idx, $user_cur->table);
+	$ret .= sprintf('$("table_act%d").innerHTML = "%s";', $table_idx, $act_content);
+	log_main("JOIN_WAKEUP end more");
       }
       log_wr("ROOM_JOIN_WAKEUP: ".$ret);
       $user_cur->comm[$user_cur->step % COMM_N] = $ret;
@@ -1249,7 +1274,8 @@ class Room {
       }
       $this->user[$idx]->name = $name_new;
       $this->user[$idx]->stat_set("room");
-      // MOP $this->user[$idx]->step_set(0);
+      $this->user[$idx]->step_set(0);
+      while (array_pop($this->user[$idx]->comm) != NULL);
       $this->user[$idx]->subst = "standup";
       $this->user[$idx]->lacc =   $curtime;
       $this->user[$idx]->laccwr = $curtime;
@@ -1297,7 +1323,7 @@ class Room {
   {
     GLOBAL $G_false, $sess;
     
-    if (($tok = ftok(FTOK_PATH."/main", "B")) == -1) {
+    if (($tok = @ftok(FTOK_PATH."/main", "B")) == -1) {
       echo "FTOK FAILED";
       exit;
     }
@@ -1339,7 +1365,7 @@ class Room {
     
     // var_dump($room);
     
-    if (($tok = ftok(FTOK_PATH."/main", "B")) == -1) 
+    if (($tok = @ftok(FTOK_PATH."/main", "B")) == -1) 
       return (FALSE);
     
     do {
@@ -1370,7 +1396,7 @@ class Room {
     
     //  echo "LOCK: ".FTOK_PATH."/main";
     //  exit;
-    if (($tok = ftok(FTOK_PATH."/main", "B")) == -1) {
+    if (($tok = @ftok(FTOK_PATH."/main", "B")) == -1) {
       echo "FTOK FAILED";
       exit;
     }
@@ -1405,16 +1431,19 @@ function make_seed()
 
 
 function log_only2($log) {
-  if ((BRISK_DEBUG & DBG_ONL2) == 0)
-    return;
-  
   GLOBAL $sess;
 
+  if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_ONL2) == 0)
+    return;
+
   if (isset($sess) == FALSE)
     $ssess = "XXXX";
   else
     $ssess = $sess;
 
+  if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_ONL2) == 0)
+    return;
+
   if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
     fwrite($fp, sprintf("ONL2: [%s] [%s]\n", $ssess, $log));
     fclose($fp);
@@ -1422,16 +1451,19 @@ function log_only2($log) {
 }
 
 function log_only($log) {
-  if ((BRISK_DEBUG & DBG_ONLY) == 0)
-    return;
-  
   GLOBAL $sess;
 
+  if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_ONLY) == 0)
+    return;
+
   if (isset($sess) == FALSE)
     $ssess = "XXXX";
   else
     $ssess = $sess;
 
+  if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_ONLY) == 0)
+    return;
+
   if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
     fwrite($fp, sprintf("ONLY: [%s] [%s]\n", $ssess, $log));
     fclose($fp);
@@ -1439,16 +1471,19 @@ function log_only($log) {
 }
 
 function log_main($log) {
-  if ((BRISK_DEBUG & DBG_MAIN) == 0)
-    return;
-  
   GLOBAL $sess;
 
+  if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_MAIN) == 0)
+    return;
+
   if (isset($sess) == FALSE)
     $ssess = "XXXX";
   else
     $ssess = $sess;
 
+  if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_MAIN) == 0)
+    return;
+
   if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
     fwrite($fp, sprintf("MAIN: [%s] [%s]\n", $ssess, $log));
     fclose($fp);
@@ -1456,16 +1491,19 @@ function log_main($log) {
 }
 
 function log_rd($log) {
-  if ((BRISK_DEBUG & DBG_READ) == 0)
-    return;
-  
   GLOBAL $sess;
 
+  if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_READ) == 0)
+    return;
+
   if (isset($sess) == FALSE)
     $ssess = "XXXX";
   else
     $ssess = $sess;
-      
+
+  if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_READ) == 0)
+    return;
+
   if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
     fwrite($fp, sprintf("READ: [%s] [%s]\n", $ssess, $log));
     fclose($fp);
@@ -1473,16 +1511,18 @@ function log_rd($log) {
 }
 
 function log_rd2($log) {
-  if ((BRISK_DEBUG & DBG_REA2) == 0)
-    return;
-  
   GLOBAL $sess;
 
+  if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_REA2) == 0)
+    return;
+
   if (isset($sess) == FALSE)
     $ssess = "XXXX";
   else
     $ssess = $sess;
       
+  if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_REA2) == 0)
+    return;
 
   if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
     fwrite($fp, sprintf("REA2: [%s] [%s]\n", $ssess, $log));
@@ -1491,16 +1531,19 @@ function log_rd2($log) {
 }
 
 function log_send($log) {
-  if ((BRISK_DEBUG & DBG_SEND) == 0)
-    return;
-  
   GLOBAL $sess;
 
+  if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_SEND) == 0)
+    return;
+
   if (isset($sess) == FALSE)
     $ssess = "XXXX";
   else
     $ssess = $sess;
       
+  if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_SEND) == 0)
+    return;
+
   if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
     fwrite($fp, sprintf("SEND: [%s] [%s]\n", $ssess, $log));
     fclose($fp);
@@ -1508,16 +1551,19 @@ function log_send($log) {
 }
 
 function log_lock($log) {
-  if ((BRISK_DEBUG & DBG_LOCK) == 0)
-    return;
-  
   GLOBAL $sess;
 
+  if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_LOCK) == 0)
+    return;
+
   if (isset($sess) == FALSE)
     $ssess = "XXXX";
   else
     $ssess = $sess;
 
+  if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_LOCK) == 0)
+    return;
+
   if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
     fwrite($fp, sprintf("LOCK: [%s] [%s]\n", $ssess, $log));
     fclose($fp);
@@ -1525,16 +1571,19 @@ function log_lock($log) {
 }
 
 function log_wr($log) {
-  if ((BRISK_DEBUG & DBG_WRIT) == 0)
-    return;
-  
   GLOBAL $sess;
 
+  if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_WRIT) == 0)
+    return;
+
   if (isset($sess) == FALSE)
     $ssess = "XXXX";
   else
     $ssess = $sess;
       
+  if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_WRIT) == 0)
+    return;
+
   if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
     fwrite($fp, sprintf("WRIT: [%s] [%s]\n", $ssess, $log));
     fclose($fp);
@@ -1542,15 +1591,18 @@ function log_wr($log) {
 }
 
 function log_load($log) {
-  if ((BRISK_DEBUG & DBG_LOAD) == 0)
-    return;
-  
   GLOBAL $sess;
 
+  if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_LOAD) == 0)
+    return;
+
   if (isset($sess) == FALSE)
     $ssess = "XXXX";
   else
     $ssess = $sess;
+
+  if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_LOAD) == 0)
+    return;
       
   if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
     fwrite($fp, sprintf("LOAD: [%s] [%s]\n", $ssess, $log));
@@ -1559,7 +1611,10 @@ function log_load($log) {
 }
 
 function log_auth($sess, $log) {
-  if ((BRISK_DEBUG & DBG_AUTH) == 0)
+  if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_AUTH) == 0)
+    return;
+
+  if (( (BRISK_DEBUG | ($sess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_AUTH) == 0)
     return;
 
   if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
@@ -1585,7 +1640,7 @@ function log_legal($timecur, $sess, $name, $where, $mesg)
 
 function lock_banlist()
 {
-  if (($tok = ftok(FTOK_PATH."/main", "L")) == -1) {
+  if (($tok = @ftok(FTOK_PATH."/main", "L")) == -1) {
     echo "FTOK FAILED";
     exit;
   }
@@ -1893,9 +1948,12 @@ function table_wellcome($user)
   return ($ret);
 }
 
-function show_room(&$room, &$user)
+function show_room(&$room, $user_step, &$user)
 {
-  $ret = sprintf('gst.st = %d;',  $user->step);
+  log_main("show_room: username: ".$user->name);
+
+
+  $ret = sprintf('gst.st = %d;',  $user_step);
   $ret .= sprintf('stat = "%s";',  $user->stat);
 
   $ret .= root_wellcome($user);