X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Fbrisk.phh;h=df0c63166f6b0f07881fae598e61fbbb6b544074;hb=6c6e0102902abe5576863ed829141ad940500e8a;hp=32168dc1801af1168a7f7f89ad8bf4493c0609d4;hpb=5b42d77cdb09b136c0243184e46a43db453ef8ab;p=brisk.git

diff --git a/web/brisk.phh b/web/brisk.phh
index 32168dc..df0c631 100644
--- a/web/brisk.phh
+++ b/web/brisk.phh
@@ -20,7 +20,7 @@
  */
 
 define( FTOK_PATH, "/var/lib/brisk");
-define(TABLES_N, 4);
+define(TABLES_N, 8);
 define(PLAYERS_N, 3);
 define(MAX_POINTS, 5);
 define(MAX_PLAYERS, (PLAYERS_N * TABLES_N));
@@ -29,7 +29,7 @@ define(COMM_GEN_N, 50);
 define(SESS_LEN, 13);
 define(STREAM_TIMEOUT, 20);
 define(EXPIRE_TIME, 180);
-define(GARBAGE_TIMEOUT, 30);
+define(GARBAGE_TIMEOUT, 10);
 define(NICKSERV, "<i>SERVER</i>");
 define(BRISK_DEBUG, FALSE);
 // define(DEBUGGING, "local");
@@ -362,7 +362,7 @@ class brisco {
 
       $ret = "gst.st = ".($user_cur->step+1)."; ";
       if ($from_table && ($user_cur->table == $table_idx || $user_cur == $user)) {
-	$ret .= 'gst.st_loc++; the_end=true; document.location.assign("index.php");|';
+	$ret .= 'gst.st_loc++; the_end=true; window.onunload = null; document.location.assign("index.php");|';
 	// $ret .= 'gst.st_loc++; document.location.assign("index.php");|';
 	log_main("DOCUMENT.index.php", "from table");
       }
@@ -552,7 +552,7 @@ class brisco {
 	}
 	
 	$user_cur->comm[$user_cur->step % COMM_N] = "gst.st = ".($user_cur->step+1)."; ";
-	$user_cur->comm[$user_cur->step % COMM_N] .= sprintf('chatt_sub("%s",\'%s\');',
+	$user_cur->comm[$user_cur->step % COMM_N] .= sprintf('chatt_sub("%s","%s");',
 							     $dt.xcape($user->name), xcape($user_mesg));
 	$user_cur->step++;
       }
@@ -822,8 +822,10 @@ function table_content($bri, $user, $table_idx)
     
     $content .= sprintf("%s%s%s<br>",$hilion, xcape($user_cur->name), $hilioff);
   }
+  /*
   for ( ; $i < PLAYERS_N ; $i++)
     $content .= "<br>";
+  */
 
   $ret .= sprintf('$("table%d").innerHTML = "%s";', $table_idx, $content);
   
@@ -838,7 +840,7 @@ function standup_content(&$bri, $user)
   if ($user->stat != 'room')
     return;
 
-  $content .= '<table width=\\"100%\\">';
+  $content .= '<table class=\\"table_standup\\">';
   for ($e = 0 , $ct = 0 ; $e < MAX_PLAYERS ; $e++) {
     if ($bri->user[$e]->sess == "" || $bri->user[$e]->stat != "room" || $bri->user[$e]->name == "")
       continue;
@@ -862,9 +864,9 @@ function standup_content(&$bri, $user)
   }
   $content .= '</table>';
 	
-  $content .= '<div class=\\"esco\\"><input name=\\"logout\\" value=\\"Esco.\\" onclick=\\"act_logout();\\" type=\\"button\\"></div>';
-
-  $ret .= sprintf('$("standup").innerHTML = "%s";', $content);
+  $content2 = '<input name=\\"logout\\" value=\\"Esco.\\" onclick=\\"window.onunload = null; act_logout();\\" type=\\"button\\">';
+  $ret .= sprintf('$("standup").innerHTML = "%s";  $("esco").innerHTML = "%s";', 
+		  $content, $content2);
 
   return ($ret);
 }