X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Fbrisk.phh;h=03ec212463f1b4dd39a06b60008f74a8a6b93a1e;hb=c16e845881b89f8f84524367a3b4bcf30f895bf8;hp=7985a10e27b7ae3f28dded718f35a1f509c2d394;hpb=df5eead2cf1da99652042a299afef80b86ccc4d7;p=brisk.git
diff --git a/web/brisk.phh b/web/brisk.phh
index 7985a10..03ec212 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,11 +553,93 @@ 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++;
}
}
}
+
+ function &get_user($sess, &$idx)
+ {
+ GLOBAL $PHP_SELF;
+
+ if (strlen($sess) == SESS_LEN) {
+ for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
+ if (strcmp($sess, $this->user[$i]->sess) == 0) {
+ // find it
+ $idx = $i;
+ return ($this->user[$i]);
+ }
+ }
+ log_main($sess, sprintf("get_user: Wrong sess from page [%s]",$PHP_SELF));
+ // for ($i = 0 ; $i < MAX_PLAYERS ; $i++)
+ // log_main($sess, sprintf("get_user: Wrong sess compared with [%s]",$this->user[$i]->sess));
+ }
+ else {
+ log_main($sess, sprintf("get_user: Wrong strlen [%s]",$sess));
+ }
+ return (FALSE);
+ }
+
+ /*
+ * function &add_user(&$bri, &$sess, &$idx, $name)
+ *
+ * RETURN VALUE:
+ * if ($idx != -1 && ret == FALSE) => duplicated nick
+ * if ($idx == -1 && ret == FALSE) => no space left
+ * if (ret == TRUE) => SUCCESS
+ */
+ function &add_user(&$sess, &$idx, $name)
+ {
+ $idx = -1;
+ $idfree = -1;
+
+ log_auth("XXX", sprintf("ARRIVA: [%s]", $sess));
+ if (validate_sess($sess) == FALSE)
+ $sess = "";
+
+ for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
+ /* free user ? */
+ if (strcmp($sess, $this->user[$i]->sess) == 0) {
+ if ($idx == -1)
+ $idx = $i;
+ }
+ if ($idfree == -1 && strcmp("", $this->user[$i]->sess) == 0) {
+ $idfree = $i;
+ }
+ if (strcmp($this->user[$i]->name, $name) == 0) {
+ $idx = $i;
+ break;
+ }
+ }
+ if ($idx == -1)
+ $idx = $idfree;
+
+ log_auth("XXX", sprintf("TROVATO A QUESTO PUNTO [%d] sess [%s] name [%s]", $idx, $sess, $name));
+
+ if ($idx != -1 && $i == MAX_PLAYERS) {
+ /* SUCCESS */
+ if ($sess == "") {
+ $this->user[$idx]->sess = uniqid("");
+ $sess = $this->user[$idx]->sess;
+
+ }
+ else {
+ $this->user[$idx]->sess = $sess;
+ }
+ $this->user[$idx]->name = $name;
+ $this->user[$idx]->stat = "room";
+ $this->user[$idx]->subst = "standup";
+
+ log_main("XXX", sprintf("TROVATO LIBERO A [%d] sess [%s] name [%s]", $idx, $sess, $name));
+
+ return ($this->user[$idx]);
+ }
+
+ return (FALSE);
+ }
+
+
} // end class brisco
@@ -717,80 +797,18 @@ function save_data(&$bri)
return ($ret);
}
-function &get_user(&$bri, $sess, &$idx)
-{
- GLOBAL $PHP_SELF;
-
- if (strlen($sess) == SESS_LEN) {
- for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
- if (strcmp($sess, $bri->user[$i]->sess) == 0) {
- // find it
- $idx = $i;
- return ($bri->user[$i]);
- }
- }
- log_main($sess, sprintf("get_user: Wrong sess from page [%s]",$PHP_SELF));
- // for ($i = 0 ; $i < MAX_PLAYERS ; $i++)
- // log_main($sess, sprintf("get_user: Wrong sess compared with [%s]",$bri->user[$i]->sess));
- }
- else {
- log_main($sess, sprintf("get_user: Wrong strlen [%s]",$sess));
- }
- return (FALSE);
-}
-
-/*
- * function &add_user(&$bri, &$sess, &$idx, $name)
- *
- * RETURN VALUE:
- * if ($idx != -1 && ret == FALSE) => duplicated nick
- * if ($idx == -1 && ret == FALSE) => no space left
- * if (ret == TRUE) => SUCCESS
- */
-function &add_user(&$bri, &$sess, &$idx, $name)
-{
- $idx = -1;
-
- for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
- /* free user ? */
- if (strcmp($sess, $bri->user[$i]->sess) == 0) {
- if ($idx == -1)
- $idx = $i;
- }
- if (strcmp($bri->user[$i]->name, $name) == 0) {
- $idx = $i;
- break;
- }
- }
- if ($idx != -1 && $i == MAX_PLAYERS) {
- /* SUCCESS */
- $bri->user[$idx]->sess = uniqid("");
- $sess = $bri->user[$idx]->sess;
- $bri->user[$idx]->name = $name;
- $bri->user[$idx]->stat = "room";
- $bri->user[$idx]->subst = "standup";
-
- log_main("XXX", sprintf("TROVATO LIBERO A [%d] sess [%s] name [%s]", $idx, $sess, $name));
-
- return ($bri->user[$idx]);
- }
- else {
- return (FALSE);
- }
-}
-
function table_act_content($isstanding, $sitted, $table, $cur_table)
{
$ret = "";
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 = "";
}
@@ -824,8 +842,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 +860,7 @@ function standup_content(&$bri, $user)
if ($user->stat != 'room')
return;
- $content .= '