X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Fbrisk.phh;h=467680ac75990ea32d8e6986eba19dc0f7801ec6;hb=667be56a8497bbfc4f887da9c3aa0abe35f0b12c;hp=c3b810b6fc1f4fa56f660932fe26d4579554c52f;hpb=f18bac8374119fa1f3c826e82cfc74ce2ce52dd7;p=brisk.git
diff --git a/web/brisk.phh b/web/brisk.phh
index c3b810b..467680a 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,13 +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")))));
}
@@ -361,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");
}
@@ -540,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];
@@ -554,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++;
}
}
@@ -569,43 +568,63 @@ function make_seed()
}
function log_main($sess, $log) {
+ if (BRISK_DEBUG != TRUE)
+ return;
+
$fp = fopen("/tmp/brisk_main.log", 'a');
fwrite($fp, sprintf("SESS: [%s] [%s]\n", $sess, $log));
fclose($fp);
}
function log_rd($sess, $log) {
- // $fp = fopen("/tmp/brisk_rd.log", 'a');
- // fwrite($fp, sprintf("SESS: [%s] [%s]\n", $sess, $log));
- // fclose($fp);
- ;
+ if (BRISK_DEBUG != TRUE)
+ return;
+
+ $fp = fopen("/tmp/brisk_rd.log", 'a');
+ fwrite($fp, sprintf("SESS: [%s] [%s]\n", $sess, $log));
+ fclose($fp);
}
function log_rd2($sess, $log) {
+ if (BRISK_DEBUG != TRUE)
+ return;
+
$fp = fopen("/tmp/brisk_rd2.log", 'a');
fwrite($fp, sprintf("SESS: [%s] [%s]\n", $sess, $log));
fclose($fp);
}
function log_send($sess, $log) {
+ if (BRISK_DEBUG != TRUE)
+ return;
+
$fp = fopen("/tmp/brisk_send.log", 'a');
fwrite($fp, sprintf("SESS: [%s] [%s]\n", $sess, $log));
fclose($fp);
}
function log_auth($sess, $log) {
+ if (BRISK_DEBUG != TRUE)
+ return;
+
$fp = fopen("/tmp/brisk_auth.log", 'a');
fwrite($fp, sprintf("SESS: [%d] [%s] [%s]\n", time(), $sess, $log));
fclose($fp);
}
function log_wr($sess, $log) {
+ if (BRISK_DEBUG != TRUE)
+ return;
+
$fp = fopen("/tmp/brisk_wr.log", 'a');
fwrite($fp, sprintf("SESS: [%s] [%s]\n", $sess, $log));
fclose($fp);
}
function log_load($sess, $log) {
+ if (BRISK_DEBUG != TRUE)
+ return;
+
$fp = fopen("/tmp/brisk_load.log", 'a');
fwrite($fp, sprintf("SESS: [%s] [%s]\n", $sess, $log));
fclose($fp);
@@ -764,12 +783,12 @@ function table_act_content($isstanding, $sitted, $table, $cur_table)
if ($isstanding) {
if ($sitted < PLAYERS_N) {
- $ret = sprintf('', $table, $table);
+ $ret = sprintf('', $table, $table);
}
}
else {
if ($table == $cur_table)
- $ret = sprintf('');
+ $ret = sprintf('');
else
$ret = "";
}
@@ -803,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);
@@ -819,7 +840,7 @@ function standup_content(&$bri, $user)
if ($user->stat != 'room')
return;
- $content .= '