X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=web%2FObj%2Fbrisk.phh;h=5bf51e1e8e47132ed7ae805be14f4e0f4b8a8ebe;hb=999dbffae178a3d4d58635ed0e5f8532400f578d;hp=684a672b200572acef84c06737abba98ab17b103;hpb=4cd4c8c8a4897524e418346766d17a4e0a10d558;p=brisk.git
diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index 684a672..5bf51e1 100644
--- a/web/Obj/brisk.phh
+++ b/web/Obj/brisk.phh
@@ -153,10 +153,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 = "5.4.0";
+$G_brisk_version = "5.4.2";
/* MLANG: ALL THE INFO STRINGS IN brisk.phh */
-$root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NOVITA\': potete scegliere che regole usare per giocare dal menu "Prefs" al tavolo.',
+$root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NOVITA\': uscita più veloce dal sito.',
'Se vuoi iscriverti alla Mailing List, cliccala!' ),
'en' => array ( 'EN Brisk (Ver. '.$G_brisk_version.'), NOVITA\': puoi creare la tua rete di amicizie con /info,',
'vedere cosa pensano i tuoi amici degli altri utenti e tavoli riservati per registrati e apprendisti.',
@@ -1226,10 +1226,15 @@ class Brisk
function users_cleanup()
{
+ $curtime = time();
for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
$user_cur = $this->user[$i];
- if ($user_cur->the_end) {
+ if ($user_cur->the_end
+ && (($user_cur->rd_toflush == FALSE
+ && $user_cur->rd_step == $user_cur->step)
+ || $user_cur->rd_endtime_is_expired($curtime))
+ ) {
$user_cur->reset(); // users_cleanup, OK
}
}
@@ -2803,9 +2808,10 @@ class Brisk
break;
case "index_rd.php":
+ case "index_rd_wss.php":
if (($transp = gpcs_var('transp', $get, $post, $cookie)) === FALSE)
$transp = "iframe";
- if ($transp == 'websocket')
+ if ($transp == 'websocket' || $transp == 'websocketsec')
$enc = 'plain';
do {
@@ -2871,7 +2877,7 @@ class Brisk
$subs = "briskin5/";
$subs_l = strlen($subs);
if (!strncmp($path, $subs, $subs_l)) {
- $ret = Bin5::request_mgr(&$s_a_p, $header, &$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;
@@ -3435,9 +3441,9 @@ function validate_name($name)
return (FALSE);
}
-function playsound($filename)
+function playsound($name)
{
- return (sprintf('playsound("flasou", "%s");', $filename));
+ return (sprintf('g_jukebox.play("%s");', $name));
}
function secstoword($secs)