X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Fbrisk.phh;h=1fe3f1295eabb20243aebc1c589c5f5cee9a7530;hb=ae4baf0b0142cc538df4370430f4971440b33ee6;hp=111660fe153d95eedd5bb0db04ba60299eb670a0;hpb=5918d37b0c8f041c7cb5f4d469bf5820f39902d7;p=brisk.git

diff --git a/web/brisk.phh b/web/brisk.phh
index 111660f..1fe3f12 100644
--- a/web/brisk.phh
+++ b/web/brisk.phh
@@ -22,10 +22,12 @@
 define(FTOK_PATH, "/var/lib/brisk");
 define(LEGAL_PATH, "/tmp/legal_brisk");
 define(PROXY_PATH, "/var/lib/brisk_proxy");
-define(TABLES_N, 8);
+define(TABLES_N, 12);
 define(PLAYERS_N, 3);
 define(MAX_POINTS, 5);
-define(MAX_PLAYERS, (PLAYERS_N * TABLES_N));
+define(MAX_PLAYERS, (20 + (PLAYERS_N * TABLES_N)));
+define(SHM_DIMS, (50000 * MAX_PLAYERS));
+// define(COMM_N, 6);
 define(COMM_N, 12);
 define(COMM_GEN_N, 50);
 define(SESS_LEN, 13);
@@ -39,10 +41,12 @@ define(NICKSERV, "<i>SERVER</i>");
 define(BRISK_DEBUG, FALSE);
 // define(DEBUGGING, "local");
 
+$G_false = FALSE;
+
 $G_all_points = array( 11,10,4,3,2, 0,0,0,0,0 );
-$G_brisk_version = "0.7.1";
+$G_brisk_version = "0.8.2";
 
-$root_wellarr = Array ( 'Benvenuto in brisk (Ver. '.$G_brisk_version.'), <b>NOVITA\'</b>: ottimizzazione della CPU e chiuso il bug di mancato cambio pagina.',
+$root_wellarr = Array ( 'Benvenuto in brisk (Ver. '.$G_brisk_version.'), <b>NOVITA\'</b>: nuovo layout che permette pi&ugrave; tavoli, pi&ugrave; tavoli.',
                         '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.');
 
@@ -54,8 +58,6 @@ Questa &egrave; un\'implementazione della briscola in cinque, cos&igrave; come &
 <a target=\\"_blank\\" href=\\"http://it.wikipedia.org/wiki/Briscola#Gioco_a_5\\">Wikipedia</a>; in breve &egrave; la variante con l\'asta prima sulla carta e poi sui punti.<br><br>
 <b>Configurazione del browser.</b><br>
 Occorre abilitare i cookies.<br>
-Se usate <b>Internet Explorer 6</b> dovete settare: strumenti -> opzioni internet -> file temporanei:impostazioni->\\"verifica per nuove versioni della pagina scaricata\\" ad: \\"ogni volta che si visita la pagina\\".<br>
-Se usate <b>Internet Explorer 7</b> dovete settare: strumenti -> opzioni internet -> etichetta \\"Generale\\" -> cronologia esplorazioni -> impostazioni ad \\"apertura alla pagina web\\".<br>
 <br>
 <b>Uso del sito</b><br>
 Potete sedervi a un tavolo o rimanere in piedi.<br>
@@ -210,7 +212,7 @@ class Table {
 
     for ($i = 39 ; $i >= 0 ; $i--) {
       $rn = rand(0, $i);
-
+      
       if ($rn == 0)
 	log_main("RND ZERO", "");
       
@@ -220,7 +222,7 @@ class Table {
       $this->card[$id]->assign('hand', $owner);
 
       $rest[$rn] = $rest[$i];
-      $pubbpos[$rn2] = $pubbpos[$i];
+      // $pubbpos[$rn2] = $pubbpos[$i];
     }
   }
 
@@ -242,7 +244,7 @@ class Table {
 
   function game_init(&$userarr)
   {
-    log_rd2($sess,"GSTART 4");
+    log_rd2("XXX", "GSTART 4");
 
     $this->gstart = ($this->mazzo+1) % PLAYERS_N;
     $this->bunch_make();
@@ -367,6 +369,7 @@ class User {
   var $exitislock; // Player can exit from the table ?
   var $table;      // id of the current table (if in table state)
   var $table_pos;  // idx on the table
+  var $the_end;    // Flag to change the end of the session
 
   function User($name, $sess, $stat = "", $subst = "", $table = -1, $ip="0.0.0.0") {
     $this->name  = $name;
@@ -410,7 +413,11 @@ class User {
 	break;
       fwrite($fp, pack("l",$this->step), 4);
       fclose($fp);
+
+      return (TRUE);
     } while (0);
+
+    return (FALSE);
   }
 
   function step_inc() {
@@ -420,7 +427,11 @@ class User {
       $fp = fopen(PROXY_PATH."/".$this->sess.".step", 'w');
       fwrite($fp, pack("l",$this->step), 4);
       fclose($fp);
+
+      return (TRUE);
     }
+    
+    return (FALSE);
   }
 }
 
@@ -588,7 +599,7 @@ class brisco {
 	$ret .= table_content($this, $user_cur, $table_idx);
 	$ret .= standup_content($this, $user_cur);
 	
-	$act_content = table_act_content(FALSE, 0, $e, $user->table);
+	$act_content = table_act_content(FALSE, 0, $table_idx, $user->table);
 	$ret .= sprintf('$("table_act%d").innerHTML = "%s";', $table_idx, $act_content);
 	
 	
@@ -753,7 +764,7 @@ class brisco {
 	    $table = &$this->table[$user->table];
 	    
 	    $user_cur->comm[$user_cur->step % COMM_N] = "gst.st = ".($user_cur->step+1)."; ";
-	    $user_cur->comm[$user_cur->step % COMM_N] = sprintf('set_names(" %s", " %s", " %s", " %s", " %s"); ',
+	    $user_cur->comm[$user_cur->step % COMM_N] .= sprintf('set_names(" %s", " %s", " %s", " %s", " %s"); ',
 	        xcape($this->user[$table->player[($user_cur->table_pos)%PLAYERS_N]]->name),
 	        xcape($this->user[$table->player[($user_cur->table_pos+1)%PLAYERS_N]]->name),
 	        xcape($this->user[$table->player[($user_cur->table_pos+2)%PLAYERS_N]]->name),
@@ -790,7 +801,7 @@ class brisco {
 
   function &get_user($sess, &$idx)
   {
-    GLOBAL $PHP_SELF;
+    GLOBAL $PHP_SELF, $G_false;
 
     if (validate_sess($sess)) {
       for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
@@ -808,7 +819,8 @@ class brisco {
     else {
       log_main($sess, sprintf("get_user: Wrong strlen [%s]",$sess));
     }
-    return (FALSE);
+
+    return ($G_false);
   }
 
   /*
@@ -822,12 +834,14 @@ class brisco {
    */
   function &add_user(&$sess, &$idx, $name, $ip)
   {
+    GLOBAL $G_false;
+
     $idx = -1;
     $idfree = -1;
     
     if (($name_new = validate_name($name)) == FALSE) {
       $idx = -2;
-      return (FALSE);
+      return ($G_false);
     }
 
     log_auth("XXX", sprintf("ARRIVA: [%s]", $sess));
@@ -866,6 +880,7 @@ class brisco {
       }
       $this->user[$idx]->name = $name_new;
       $this->user[$idx]->stat_set("room");
+      // MOP $this->user[$idx]->step_set(0);
       $this->user[$idx]->subst = "standup";
       $this->user[$idx]->lacc =   $curtime;
       $this->user[$idx]->laccwr = $curtime;
@@ -876,7 +891,7 @@ class brisco {
       return ($this->user[$idx]);
     }
 
-    return (FALSE);
+    return ($G_false);
   }
   
   function standup_update(&$user)
@@ -909,6 +924,28 @@ function make_seed()
   return (float) $sec + ((float) $usec * 100000);
 }
 
+function log_only2($sess, $log) {
+  if (BRISK_DEBUG != TRUE)
+    return;
+  
+
+  if (($fp = @fopen("/tmp/brisk_only2.log", 'a')) != FALSE) {
+    fwrite($fp, sprintf("SESS: [%s] [%s]\n", $sess, $log));
+    fclose($fp);
+  }
+}
+
+function log_only($sess, $log) {
+  if (BRISK_DEBUG != TRUE)
+    return;
+  
+
+  if (($fp = @fopen("/tmp/brisk_only.log", 'a')) != FALSE) {
+    fwrite($fp, sprintf("SESS: [%s] [%s]\n", $sess, $log));
+    fclose($fp);
+  }
+}
+
 function log_main($sess, $log) {
   if (BRISK_DEBUG != TRUE)
     return;
@@ -1011,6 +1048,8 @@ function init_data()
 
 function lock_data()
 {
+  GLOBAL $sess; 
+
 	//  echo "LOCK: ".FTOK_PATH."/main";
 	//  exit;
   if (($tok = ftok(FTOK_PATH."/main", "B")) == -1) {
@@ -1022,17 +1061,19 @@ function lock_data()
     echo "SEM_GET FAILED";
     exit;
   }
-  if (sem_acquire($res)) {
-    log_lock($sess, "LOCK");
+  if (sem_acquire($res)) {   
+    log_only($sess, "LOCK");
     return ($res);
   }
   else
-    return (false);
+    return (FALSE);
 }
 
 function unlock_data($res)
 {
-  log_lock($sess, "UNLOCK");
+  GLOBAL $sess; 
+
+  log_only($sess, "UNLOCK");
   return (sem_release($res));
 }
 
@@ -1050,7 +1091,7 @@ function lock_banlist()
   if (sem_acquire($res)) 
     return ($res);
   else
-    return (false);
+    return (FALSE);
 }
 
 function unlock_banlist($res)
@@ -1061,17 +1102,28 @@ function unlock_banlist($res)
 
 function &load_data() 
 {
+  GLOBAL $G_false, $sess;
+
   if (($tok = ftok(FTOK_PATH."/main", "B")) == -1) {
     echo "FTOK FAILED";
     exit;
   }
 
-  if ($shm = shm_attach($tok,200000 * TABLES_N)) {
-    if(($bri = @shm_get_var($shm, $tok)) == false) {
-      log_main("XXX", "INIT MAIN DATA");
-
+  if ($shm = shm_attach($tok, SHM_DIMS)) {
+    $bri = @shm_get_var($shm, $tok);
+    
+    log_only($sess, "bri ==  ".($bri == FALSE ?   "FALSE" : "TRUE")."  bri ===  ".($bri === FALSE ? "FALSE" : "TRUE")."  bri isset ".(isset($bri) ?   "TRUE" : "FALSE"));
+    if (isset($bri)) 
+      log_only($sess, "bri count ".count($bri));
+    
+    if ($bri == FALSE) {
+      log_only($sess, "INIT MAIN DATA");
+      
       $bri = init_data();
-      shm_put_var($shm, $tok, $bri);
+      if (shm_put_var($shm, $tok, $bri) == FALSE) {
+	log_only($sess, "PUT_VAR FALLITA ".strlen(serialize($bri)));
+	log_only($sess, serialize($bri));
+      }
     }
     
     shm_detach($shm);
@@ -1080,12 +1132,14 @@ function &load_data()
     return ($ret);
   }
 
-  return (NULL);
+  return ($G_false);
 }
 
 
 function save_data(&$bri) 
 {
+  GLOBAL $sess;
+
   $ret =   FALSE;
   $shm =   FALSE;
   $isacq = FALSE;
@@ -1098,11 +1152,13 @@ function save_data(&$bri)
   do {
     $isacq = TRUE;
     
-    if (($shm = shm_attach($tok,200000 * TABLES_N)) == FALSE)
+    if (($shm = shm_attach($tok, SHM_DIMS)) == FALSE)
       break;
     
+    // log_only($sess, "PUT_VAR DI ".strlen(serialize($bri)));
     if (shm_put_var($shm, $tok, $bri) == FALSE) {
-      echo "DANNO: ".strlen(serialize($bri));
+      log_only($sess, "PUT_VAR FALLITA ".strlen(serialize($bri)));
+      log_only($sess, serialize($bri));
       break;
     }
     // log_main("XXX", "QUI CI ARRIVA [".$bri->user[0]->name."]");
@@ -1136,7 +1192,7 @@ function table_act_content($isstanding, $sitted, $table, $cur_table)
 function table_content($bri, $user, $table_idx)
 {
   $content = "";
-
+  $ret = "";
   // TODO
   //
   //   Si possono usare i dati nella classe table
@@ -1156,7 +1212,7 @@ function table_content($bri, $user, $table_idx)
       else
 	{ $hilion = ""; $hilioff = ""; }
 
-    log_main($bri->user[$e]->name, sprintf("IN TABLE [%d]", $table_idx));
+    log_main($user_cur->name, sprintf("IN TABLE [%d]", $table_idx));
     
     $content .= sprintf("%s%s%s<br>",$hilion, xcape($user_cur->name), $hilioff);
   }
@@ -1281,6 +1337,7 @@ function multoval($mult)
 
 function show_table_info(&$bri, &$table, $table_pos)
 {
+  $ret = "";
   $user = &$bri->user[$table->player[$table_pos]];
 
   $pnt_min = $table->points_n - MAX_POINTS < 0 ? 0 : $table->points_n - MAX_POINTS;
@@ -1384,6 +1441,7 @@ function show_table_info(&$bri, &$table, $table_pos)
 function root_wellcome($user)
 {
   GLOBAL $root_wellarr;
+  $ret = "";
 
   for ($i = 0 ; $i < count($root_wellarr) ; $i++)
     $ret .= sprintf('chatt_sub("ChanServ: ","%s");', str_replace('"', '\"', $root_wellarr[$i]));
@@ -1394,6 +1452,7 @@ function root_wellcome($user)
 function table_wellcome($user)
 {
   GLOBAL $table_wellarr;
+  $ret = "";
 
   for ($i = 0 ; $i < count($table_wellarr) ; $i++)
     $ret .= sprintf('chatt_sub("ChanServ: ","%s");', str_replace('"', '\"', $table_wellarr[$i]));
@@ -1403,7 +1462,7 @@ function table_wellcome($user)
 
 function show_room(&$bri, &$user)
 {
-  $ret .= sprintf('gst.st = %d;',  $user->step);
+  $ret = sprintf('gst.st = %d;',  $user->step);
   $ret .= sprintf('stat = "%s";',  $user->stat);
 
   $ret .= root_wellcome($user);
@@ -1482,7 +1541,7 @@ function show_table(&$bri, &$user, $sendstep, $is_transition, $is_again)
 	      break;
 	  }
 	}
-	log_rd($sess, "O ".$o." VAL ".$table->card[$o]->value." Owner: ".$table->card[$o]->owner);
+	log_rd($user->sess, "O ".$o." VAL ".$table->card[$o]->value." Owner: ".$table->card[$o]->owner);
 	
 	$ret .= sprintf( ' card_send(%d,%d,%d,%8.2f,%d);|', ($table->gstart + $e) % PLAYERS_N, 
 			 $i, ((($e + PLAYERS_N - $table_pos + $table->gstart) % PLAYERS_N) == 0 ?