css per la room

[brisk.git] / web / brisk.phh

diff --git a/web/brisk.phh b/web/brisk.phh
index 7985a10..39fd17e 100644 (file)
--- a/web/brisk.phh
+++ b/web/brisk.phh
@@ -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, "<i>SERVER</i>");
 define(BRISK_DEBUG, FALSE);
 // define(DEBUGGING, "local");
 
 function xcape($s)
 {
-  return (str_replace('@', '&#64;', str_replace('|', '&brvbar;', htmlentities($s,ENT_COMPAT,"UTF-8"))));
+  return (str_replace('\\', '\\\\', str_replace('@', '&#64;', str_replace('|', '&brvbar;', 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++;
       }
     }
@@ -864,7 +862,7 @@ function standup_content(&$bri, $user)
   }
   $content .= '</table>';
        
-  $content .= '<div class=\\"esco\\"><input name=\\"logout\\" value=\\"Esco.\\" onclick=\\"act_logout();\\" type=\\"button\\"></div>';
+  $content .= '<div class=\\"esco\\"><input name=\\"logout\\" value=\\"Esco.\\" onclick=\\"window.onunload = null; act_logout();\\" type=\\"button\\"></div>';
 
   $ret .= sprintf('$("standup").innerHTML = "%s";', $content);