X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fbrisk.phh;h=95ec8ab9bab5087c72899d3473aaf29b7e3ffb2d;hb=525cfe7d868bfaefdde9f769f52a50bcb6f1e9e9;hp=6da86a85c0f0c7a62f4ff1757cf2c99507dbdc2c;hpb=2e7430e0fc225c96177e7886071960d093ffd89e;p=brisk.git

diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index 6da86a8..95ec8ab 100644
--- a/web/Obj/brisk.phh
+++ b/web/Obj/brisk.phh
@@ -23,62 +23,62 @@
  */
 
 
-define(BRISK_CONF, "brisk.conf.pho");
-define(FTOK_PATH, "/var/lib/brisk");
-define(LEGAL_PATH, "/tmp/legal_brisk");
-define(PROXY_PATH, "/var/lib/brisk_proxy");
-define(TABLES_N, 36);
-define(TABLES_AUTH_N, 4);
-define(PLAYERS_N, 3);
-define(MAX_POINTS, 5);
-define(MAX_PLAYERS, (20 + (PLAYERS_N * TABLES_N)));
-define(SHM_DIMS_MIN, (50000 + 10000 * TABLES_N + 15000 * MAX_PLAYERS));
-define(SHM_DIMS_MAX, SHM_DIMS_MIN + 1048576);
-define(SHM_DIMS_DLT, 65536);
-
-define(SHM_DIMS_U_MIN, 4096);
-define(SHM_DIMS_U_MAX, 65536);
-define(SHM_DIMS_U_DLT, 4096);
-
-define(COMM_N, 18);
-define(COMM_GEN_N, 50);
-
-define(CHAT_N, 3);
-define(CHAT_ILL_TIME, 6);
-
-define(SESS_LEN, 13);
-define(STREAM_TIMEOUT, 20);
-define(EXPIRE_TIME_RD, 180);
-define(EXPIRE_TIME_SMAMMA, 360); 
-define(EXPIRE_TIME_WAG, 10);
-define(WAKEUP_TIME, 12); 
+define('BRISK_CONF', "brisk.conf.pho");
+define('FTOK_PATH', "/var/lib/brisk");
+define('LEGAL_PATH', "/tmp/legal_brisk");
+define('PROXY_PATH', "/var/lib/brisk_proxy");
+define('TABLES_N', 36);
+define('TABLES_AUTH_N', 4);
+define('PLAYERS_N', 3);
+define('MAX_POINTS', 5);
+define('MAX_PLAYERS', (20 + (PLAYERS_N * TABLES_N)));
+define('SHM_DIMS_MIN', (50000 + 10000 * TABLES_N + 15000 * MAX_PLAYERS));
+define('SHM_DIMS_MAX', SHM_DIMS_MIN + 1048576);
+define('SHM_DIMS_DLT', 65536);
+
+define('SHM_DIMS_U_MIN', 4096);
+define('SHM_DIMS_U_MAX', 65536);
+define('SHM_DIMS_U_DLT', 4096);
+
+define('COMM_N', 18);
+define('COMM_GEN_N', 50);
+
+define('CHAT_N', 3);
+define('CHAT_ILL_TIME', 6);
+
+define('SESS_LEN', 13);
+define('STREAM_TIMEOUT', 60);
+define('EXPIRE_TIME_RD', 180);
+define('EXPIRE_TIME_SMAMMA', 360);
+define('EXPIRE_TIME_WAG', 10);
+define('WAKEUP_TIME', 12);
 // BAN_TIME da allineare anche in commons.js
-define(BAN_TIME, 3600); 
-define(GARBAGE_TIMEOUT, 10);
-define(NICKSERV, "<i>BriskServ</i>");
-
-define(LOCK_SHARE_MAX, 10000);
-
-define(DBG_ONL2, 0x0001);
-define(DBG_ONLY, 0x0002);
-define(DBG_MAIN, 0x0004);
-define(DBG_READ, 0x0008);
-define(DBG_REA2, 0x0010);
-define(DBG_SEND, 0x0020);
-define(DBG_LOCK, 0x0040);
-define(DBG_WRIT, 0x0080);
-define(DBG_LOAD, 0x0100);
-define(DBG_AUTH, 0x0200);
-define(DBG_CRIT, 0x0400);
-define(DBG_LMOP, 0x0800);
-define(DBG_TRAC, 0x1000);
-define(DBG_SHME, 0x2000);
+define('BAN_TIME', 3600);
+define('GARBAGE_TIMEOUT', 10);
+define('NICKSERV', "<i>BriskServ</i>");
+
+define('LOCK_SHARE_MAX', 10000);
+
+define('DBG_ONL2', 0x0001);
+define('DBG_ONLY', 0x0002);
+define('DBG_MAIN', 0x0004);
+define('DBG_READ', 0x0008);
+define('DBG_REA2', 0x0010);
+define('DBG_SEND', 0x0020);
+define('DBG_LOCK', 0x0040);
+define('DBG_WRIT', 0x0080);
+define('DBG_LOAD', 0x0100);
+define('DBG_AUTH', 0x0200);
+define('DBG_CRIT', 0x0400);
+define('DBG_LMOP', 0x0800);
+define('DBG_TRAC', 0x1000);
+define('DBG_SHME', 0x2000);
 // NOTE: BRISK DEBUG must be a numerical constant, not the result of operations on symbols 
-define(BRISK_DEBUG, 0x0800);
+define('BRISK_DEBUG', 0x0800);
 
-define(BRISK_SINGLE_DEBUG,0);
-define(BRISK_SINGLE_SESS, "");
-// define(DEBUGGING, "local");
+define('BRISK_SINGLE_DEBUG',0);
+define('BRISK_SINGLE_SESS', "");
+define('DEBUGGING', "no-debugging");
 
 require_once("$DOCUMENT_ROOT/Etc/".BRISK_CONF);
 
@@ -136,7 +136,7 @@ $mlang_brisk = array( 'btn_backstand'=> array( 'it' => 'torna in piedi',
 $G_lng = langtolng($G_lang);
 
 $G_all_points = array( 11,10,4,3,2, 0,0,0,0,0 );
-$G_brisk_version = "3.6.1";
+$G_brisk_version = "3.6.3";
 
 /* MLANG: ALL THE INFO STRINGS IN brisk.phh */
 $root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), <b>NOVITA\'</b>: nuovo sistema di evidenziazione degli utenti registrati.',
@@ -275,7 +275,7 @@ $G_room_about = array( 'it' => '<br>
   briscola chiamata in salsa ajax
 </div>
 <br><b>version '.$G_brisk_version.'</b><br><br>
-Copyright 2006-2009 <a href=\\"mailto:brisk@alternativeoutput.it\\">Matteo Nastasi</a> (aka mop)<br><br>',
+Copyright 2006-2012 <a href=\\"mailto:brisk@alternativeoutput.it\\">Matteo Nastasi</a> (aka mop)<br><br>',
                       'en' => '<br>
 <div id=\\"header\\" class=\\"header\\">
   <img class=\\"nobo\\" src=\\"img/brisk_logo64.png\\">
@@ -292,7 +292,7 @@ function mop_flush()
 
 function file_lock($fname, $is_exclusive)
 {
-    if (($res = fopen($fname, "r+")) == FALSE) {
+    if (($res = @fopen($fname, "r+")) == FALSE) {
         return (FALSE);
     }
         
@@ -348,6 +348,15 @@ function webservers_check()
     return ($ct);
 }
 
+$escpush_from = array("\\", "\"");
+$escpush_to   = array("\\\\", "\\\"");
+function escpush($s)
+{
+    GLOBAL $escpush_from, $escpush_to;
+
+    return str_replace($escpush_from, $escpush_to, $s);
+}
+
 $escinp_from = array( "\""     );
 $escinp_to = array(   "&quot;" );
 
@@ -649,37 +658,39 @@ class Table {
 
 
 // User flags
-define(USER_FLAG_AUTH,     0x02);
+define('USER_FLAG_AUTH',     0x02);
 
-define(USER_FLAG_MAP_AUTH, 0x0c);
-define(USER_FLAG_LISTAUTH, 0x04);
-define(USER_FLAG_ISOLAUTH, 0x08);
+define('USER_FLAG_MAP_AUTH', 0x0c);
+define('USER_FLAG_LISTAUTH', 0x04);
+define('USER_FLAG_ISOLAUTH', 0x08);
 
-define(USER_FLAG_DBFAILED, 0x10); 
+define('USER_FLAG_DBFAILED', 0x10);
 
 //   user status
-define(USER_FLAG_S_NORM,  0x000); // done
-define(USER_FLAG_S_PAU,   0x100); // done
-define(USER_FLAG_S_OUT,   0x200); // done
-define(USER_FLAG_S_DOG,   0x300); // done
-define(USER_FLAG_S_EAT,   0x400); // done
-define(USER_FLAG_S_WRK,   0x500); // done
-define(USER_FLAG_S_SMK,   0x600); // done
-define(USER_FLAG_S_EYE,   0x700); // done
-define(USER_FLAG_S_RABB,  0x800); // done
-define(USER_FLAG_S_SOCC,  0x900); // done
-define(USER_FLAG_S_BABY,  0xa00); // done
-define(USER_FLAG_S_MOP,   0xb00); // done
-
-define(USER_FLAG_S_ALL,   0xf00); // done
+define('USER_FLAG_S_NORM',  0x000); // done
+define('USER_FLAG_S_PAU',   0x100); // done
+define('USER_FLAG_S_OUT',   0x200); // done
+define('USER_FLAG_S_DOG',   0x300); // done
+define('USER_FLAG_S_EAT',   0x400); // done
+define('USER_FLAG_S_WRK',   0x500); // done
+define('USER_FLAG_S_SMK',   0x600); // done
+define('USER_FLAG_S_EYE',   0x700); // done
+define('USER_FLAG_S_RABB',  0x800); // done
+define('USER_FLAG_S_SOCC',  0x900); // done
+define('USER_FLAG_S_BABY',  0xa00); // done
+define('USER_FLAG_S_MOP',   0xb00); // done
+
+define('USER_FLAG_S_ALL',   0xf00); // done
 
 /* type of user normal, supporter etc ... */
-define(USER_FLAG_TY_ALL,     0xff0000); // done
-define(USER_FLAG_TY_NORM,    0x010000); // done
-define(USER_FLAG_TY_SUPER,   0x020000); // done
+define('USER_FLAG_TY_ALL',     0xff0000); // done
+define('USER_FLAG_TY_NORM',    0x010000); // done
+define('USER_FLAG_TY_SUPER',   0x020000); // done
 //  ... other usefull status ...
-define(USER_FLAG_TY_SUSPEND, 0x400000); // done
-define(USER_FLAG_TY_DISABLE, 0x800000); // done
+define('USER_FLAG_TY_SUSPEND', 0x400000); // done
+define('USER_FLAG_TY_DISABLE', 0x800000); // done
+
+define('RD_STREAM_TIMEOUT', 4);
 
 class User {
   var $idx;        // index in the users array when you are in game
@@ -695,6 +706,16 @@ class User {
   var $subst;      // substatus for each status   
   var $step;       // step of the current status
   var $trans_step; // step to enable transition between pages (disable == -1)
+
+  var $rd_socket;  // socket handle of push stream
+  var $rd_endtime; // end time for push stream
+  var $rd_stat;    // actual status of push stream
+  var $rd_subst;   // actual substatus of push stream
+  var $rd_step;    // actual step of push stream
+  var $rd_from;    // referer
+  var $rd_scristp; // current script step (for each session) 
+  var $rd_tout;    // if no message are sent after RD_STREAM_TIMEOUT secs we send a keepalive from server
+
   var $comm;       // commands array
   // var $asta_card;  // 
   // var $asta_pnt;   //
@@ -738,6 +759,16 @@ class User {
     $thiz->step       = 1;
     $thiz->trans_step = -1;
     $thiz->comm       = array();
+
+    $thiz->rd_socket  = NULL;
+    $thiz->rd_endtime = -1;
+    $thiz->rd_stat    = -1;
+    $thiz->rd_subst   = "";
+    $thiz->rd_step    = -1;
+    $thiz->rd_from    = "";
+    $thiz->rd_scristp = -1;
+    $thiz->rd_tout    = -1;
+
     $thiz->asta_card  = -2;
     $thiz->asta_pnt   = -1;
     $thiz->handpt     = -1;
@@ -870,6 +901,52 @@ class User {
     return ($thiz);
   }
 
+  function rd_data_set($curtime, $stat, $subst, $step, $from)
+  {
+      $this->rd_endtime = $curtime + STREAM_TIMEOUT;
+      $this->rd_stat    = $stat;
+      $this->rd_subst   = $subst;
+      $this->rd_step    = $step;
+      $this->rd_from    = $from;
+      $this->rd_scristp = 0;
+      $this->rd_tout    = $curtime + RD_STREAM_TIMEOUT;
+  }
+
+  function rd_socket_get() {
+      return ($this->rd_socket);
+  }
+
+  function rd_socket_set($sock) {
+      $this->rd_socket = $sock;
+  }
+
+  function rd_tout_get()
+  {
+      return ($this->rd_tout);
+  }
+
+  function rd_tout_set($tm)
+  {
+      $this->rd_tout = $tm;
+  }
+
+  function rd_tout_is_expired($tm)
+  {
+      // printf("rd_tout %d tm %d\n", $this->rd_tout, $tm);
+      return ($this->rd_tout < $tm);
+  }
+
+  function rd_endtime_is_expired($tm)
+  {
+      // printf("rd_endtime %d tm %d\n", $this->rd_tout, $tm);
+      return ($this->rd_endtime < $tm);
+  }
+
+  function rd_tout_reset($tm)
+  {
+      $this->rd_tout = $tm + RD_STREAM_TIMEOUT;
+  }
+
   function idx_get() {
       return ($this->idx);
   }
@@ -886,7 +963,7 @@ class User {
     if (validate_sess($this->sess)) {
       if (file_exists(PROXY_PATH) == FALSE)
         mkdir(PROXY_PATH, 0775, TRUE);
-      $fp = fopen(PROXY_PATH."/".$this->sess.".stat", 'w');
+      $fp = @fopen(PROXY_PATH."/".$this->sess.".stat", 'w');
       fwrite($fp, sprintf("%s\n",$this->stat));
       fclose($fp);
     }
@@ -908,6 +985,7 @@ class User {
       return TRUE;
   }
 
+
   function save_step() 
   {
       do {
@@ -1416,7 +1494,7 @@ class Room {
 
       $ret = "gst.st = ".($user_cur->step+1)."; ".($remove_wagon ? sprintf("tra.rem(%d);",$table_idx) : "");
       if ($from_table && ($user_cur->table == $table_idx || $user->idx_get() == $i)) {
-	$ret .= 'gst.st_loc++; the_end=true; window.onunload = null; window.onbeforeunload = null; document.location.assign("index.php");|';
+	$ret .= 'gst.st_loc++; hstm.stop(); window.onunload = null; window.onbeforeunload = null; document.location.assign("index.php");|';
 	// $ret .= 'gst.st_loc++; document.location.assign("index.php");|';
 	log_main("DOCUMENT.index.php: from table");
       }