projects
/
brisk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
raddoppiato numero di tabelle
[brisk.git]
/
web
/
brisk.phh
diff --git
a/web/brisk.phh
b/web/brisk.phh
index
7985a10
..
df0c631
100644
(file)
--- a/
web/brisk.phh
+++ b/
web/brisk.phh
@@
-20,7
+20,7
@@
*/
define( FTOK_PATH, "/var/lib/brisk");
*/
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));
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(SESS_LEN, 13);
define(STREAM_TIMEOUT, 20);
define(EXPIRE_TIME, 180);
-define(GARBAGE_TIMEOUT,
3
0);
+define(GARBAGE_TIMEOUT,
1
0);
define(NICKSERV, "<i>SERVER</i>");
define(BRISK_DEBUG, FALSE);
// define(DEBUGGING, "local");
function xcape($s)
{
define(NICKSERV, "<i>SERVER</i>");
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 = ".($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");
}
// $ret .= 'gst.st_loc++; document.location.assign("index.php");|';
log_main("DOCUMENT.index.php", "from table");
}
@@
-541,8
+541,6
@@
class brisco {
}
}
else {
}
}
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];
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");',
$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++;
}
}
$user_cur->step++;
}
}
@@
-824,8
+822,10
@@
function table_content($bri, $user, $table_idx)
$content .= sprintf("%s%s%s<br>",$hilion, xcape($user_cur->name), $hilioff);
}
$content .= sprintf("%s%s%s<br>",$hilion, xcape($user_cur->name), $hilioff);
}
+ /*
for ( ; $i < PLAYERS_N ; $i++)
$content .= "<br>";
for ( ; $i < PLAYERS_N ; $i++)
$content .= "<br>";
+ */
$ret .= sprintf('$("table%d").innerHTML = "%s";', $table_idx, $content);
$ret .= sprintf('$("table%d").innerHTML = "%s";', $table_idx, $content);
@@
-840,7
+840,7
@@
function standup_content(&$bri, $user)
if ($user->stat != 'room')
return;
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;
for ($e = 0 , $ct = 0 ; $e < MAX_PLAYERS ; $e++) {
if ($bri->user[$e]->sess == "" || $bri->user[$e]->stat != "room" || $bri->user[$e]->name == "")
continue;
@@
-864,9
+864,9
@@
function standup_content(&$bri, $user)
}
$content .= '</table>';
}
$content .= '</table>';
- $content
.= '<div class=\\"esco\\"><input name=\\"logout\\" value=\\"Esco.\\" onclick=\\"act_logout();\\" type=\\"button\\"></div
>';
-
-
$ret .= sprintf('$("standup").innerHTML = "%s";', $content
);
+ $content
2 = '<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);
}
return ($ret);
}