X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;ds=inline;f=web%2FObj%2Fbrisk.phh;h=bb51cb6e06d8a7dcaad2c4cce2fb30a026587e08;hb=95fab8a421e10d8ed1174a76971bb585e81cc8a0;hp=65e2aba566f297d4de32d1ee6b3695e8bebf86d9;hpb=24ed800c2ca5855886af42f6f8ac4681a0089ee6;p=brisk.git
diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index 65e2aba..bb51cb6 100644
--- a/web/Obj/brisk.phh
+++ b/web/Obj/brisk.phh
@@ -140,10 +140,10 @@ $mlang_brisk = array( 'btn_backstand'=> array( 'it' => 'torna in piedi',
$G_lng = langtolng($G_lang);
$G_all_points = array( 11,10,4,3,2, 0,0,0,0,0 );
-$G_brisk_version = "3.6.3";
+$G_brisk_version = "4.0.0";
/* MLANG: ALL THE INFO STRINGS IN brisk.phh */
-$root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NOVITA\': nuovo sistema di evidenziazione degli utenti registrati.',
+$root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NOVITA\': adottato sac-a-push come motore per l\'invio dei dati in tempo reale.',
'Se vuoi iscriverti alla Mailing List, cliccala!' ),
'en' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NEWS: usage of reader/writer locking instead of generic exclusive locking.',
'If you want to subscribe our Mailing List, click it!' ) );
@@ -984,7 +984,7 @@ class Room {
$ret = "gst.st = ".($user_cur->step+1)."; ".($remove_wagon ? sprintf("tra.rem(%d);",$table_idx) : "");
if ($from_table && ($user_cur->table == $table_idx || $user->idx_get() == $i)) {
- $ret .= 'gst.st_loc++; hstm.stop(); window.onunload = null; window.onbeforeunload = null; document.location.assign("index.php");|';
+ $ret .= 'gst.st_loc++; xstm.stop(); window.onunload = null; window.onbeforeunload = null; document.location.assign("index.php");|';
// $ret .= 'gst.st_loc++; document.location.assign("index.php");|';
log_main("DOCUMENT.index.php: from table");
}
@@ -1219,7 +1219,7 @@ class Room {
$only_you = FALSE;
// common settings
- $msg = substr($mesg, 6, 128);
+ $msg = mb_substr($mesg, 6, 128, "UTF-8");
$curtime = time();
$dt = date("H:i ", $curtime);
$target = "";
@@ -2133,31 +2133,33 @@ class Room {
return ($ret);
}
- function request_mgr(&$s_a_p, &$header_out, &$new_socket, $path, $addr, $get, $post, $cookie)
+ function request_mgr(&$s_a_p, $header, &$header_out, &$new_socket, $path, $addr, $get, $post, $cookie)
{
printf("NEW_SOCKET (root): %d\n", intval($new_socket));
+ $enc = get_encoding($header);
+
force_no_cache($header_out);
switch ($path) {
case "":
case "index.php":
ob_start();
- index_main($this, $header_out, $addr, $get, $post, $cookie);
- $content = ob_get_contents();
- ob_end_clean();
+ index_main($this, $header_out, $addr, $get, $post, $cookie);
+ $content = ob_get_contents();
+ ob_end_clean();
- $s_a_p->pgflush_try_add($new_socket, 20, $header_out, $content);
- return TRUE;
+ $s_a_p->pgflush_try_add($enc, $new_socket, 20, $header_out, $content);
+ return TRUE;
- break;
+ break;
case "index_wr.php":
ob_start();
index_wr_main($this, $addr, $get, $post, $cookie);
$content = ob_get_contents();
ob_end_clean();
-
- $s_a_p->pgflush_try_add($new_socket, 20, $header_out, $content);
+
+ $s_a_p->pgflush_try_add($enc, $new_socket, 20, $header_out, $content);
return TRUE;
break;
@@ -2165,9 +2167,9 @@ class Room {
do {
if (!isset($cookie['sess'])
|| (($user = $this->get_user($cookie['sess'], $idx)) == FALSE)) {
- $content = User::stream_fini(TRUE);
+ $content = User::stream_fini($s_a_p->rndstr, TRUE);
- $s_a_p->pgflush_try_add($new_socket, 20, $header_out, $content);
+ $s_a_p->pgflush_try_add($enc, $new_socket, 20, $header_out, $content);
return TRUE;
break;
@@ -2179,11 +2181,11 @@ class Room {
printf("CLOSE AND OPEN AGAIN ON IFRA2\n");
$user->rd_socket_set(NULL);
}
-
+
$content = "";
- $user->stream_init($header_out, $content, $get, $post, $cookie);
+ $user->stream_init($s_a_p->rndstr, $enc, $header_out, $content, $get, $post, $cookie);
- $response = headers_render($header_out, -1).chunked_content($content);
+ $response = headers_render($header_out, -1).chunked_content($user->rd_zls_get(), $content);
$response_l = mb_strlen($response, "ASCII");
$wret = @fwrite($new_socket, $response, $response_l);
@@ -2211,7 +2213,7 @@ class Room {
$subs = "briskin5/";
$subs_l = strlen($subs);
if (!strncmp($path, $subs, $subs_l)) {
- $ret = Bin5::request_mgr(&$s_a_p, &$header_out, &$new_socket, substr($path, $subs_l) , $addr, $get, $post, $cookie);
+ $ret = Bin5::request_mgr(&$s_a_p, $header, &$header_out, &$new_socket, substr($path, $subs_l) , $addr, $get, $post, $cookie);
return ($ret);
}
break;
@@ -2677,7 +2679,7 @@ function validate_sess($sess)
function validate_name($name)
{
- $name_new = str_replace(' ', '_', substr(trim($name),0,12));
+ $name_new = str_replace(' ', '_', mb_substr(trim($name),0,12, "UTF-8"));
for ($i = 0 ; $i < strlen($name_new) ; $i++) {
$c = $name_new[$i];