X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;ds=inline;f=web%2Fbrisk.phh;h=df0c63166f6b0f07881fae598e61fbbb6b544074;hb=f55c2d16a38119d63ee03304ea38e7e647ad1f5a;hp=7985a10e27b7ae3f28dded718f35a1f509c2d394;hpb=df5eead2cf1da99652042a299afef80b86ccc4d7;p=brisk.git
diff --git a/web/brisk.phh b/web/brisk.phh
index 7985a10..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,14 +29,14 @@ 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, "SERVER");
define(BRISK_DEBUG, FALSE);
// define(DEBUGGING, "local");
function xcape($s)
{
- return (str_replace('@', '@', str_replace('|', '¦', htmlentities($s,ENT_COMPAT,"UTF-8"))));
+ return (str_replace('\\', '\\\\', str_replace('@', '@', str_replace('|', '¦', htmlentities($s,ENT_COMPAT,"UTF-8")))));
}
@@ -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");
}
@@ -541,8 +541,6 @@ class brisco {
}
}
else {
- $user_mesg = xcape($user_mesg);
-
for ($i = 0 ; $i < ($user->stat == 'room' ? MAX_PLAYERS : PLAYERS_N) ; $i++) {
if ($user->stat == 'room') {
$user_cur = &$this->user[$i];
@@ -555,7 +553,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");',
- $dt.xcape($user->name), $user_mesg);
+ $dt.xcape($user->name), xcape($user_mesg));
$user_cur->step++;
}
}
@@ -824,8 +822,10 @@ function table_content($bri, $user, $table_idx)
$content .= sprintf("%s%s%s
",$hilion, xcape($user_cur->name), $hilioff);
}
+ /*
for ( ; $i < PLAYERS_N ; $i++)
$content .= "
";
+ */
$ret .= sprintf('$("table%d").innerHTML = "%s";', $table_idx, $content);
@@ -840,7 +840,7 @@ function standup_content(&$bri, $user)
if ($user->stat != 'room')
return;
- $content .= '