X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fbrisk.phh;h=36060d87c181c19815cabd3964a6c014c63f981f;hb=2dafd9b1a8edbf64595bee1e669be6c95921bf61;hp=32168a84c63d00be948f187b9801cc5116b84766;hpb=39660404f585a8541f4568ff2e37f9d4bfd7fc08;p=brisk.git diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh index 32168a8..36060d8 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 = "4.5.4"; +$G_brisk_version = "4.6.0"; /* MLANG: ALL THE INFO STRINGS IN brisk.phh */ -$root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NOVITA\': nuova visualizzazione dello stato della connessione dati, ... , migliorata la gestione dei tavoli in caso di piccoli blocchi del server.', +$root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NOVITA\': aggiunti script di avvio automatico, gestione dei segnali e logging dell\' ultima connessione.', '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!' ) ); @@ -695,6 +695,16 @@ class Delay_Manager } } +class Client_prefs { + var $listen; + + function Client_prefs($listen) + { + $this->listen = $listen; + } +} + + class Room { static $delta_t; @@ -916,14 +926,20 @@ class Room $ret = sprintf('gst.st = %d; ', $user_step); - if ($user->flags & USER_FLAG_ISOLAUTH) { - $ret .= 'list_set(\'isolation\', false, \''.$mlang_brisk['tit_onisol'][$G_lang].'\' ); '; - } - else if ($user->flags & USER_FLAG_LISTAUTH) { - $ret .= 'list_set(\'auth\', false, \''.$mlang_brisk['tit_onauth'][$G_lang].'\' ); '; - } - else { - $ret .= 'list_set(\'all\', false, \'\' ); '; + // for test: $prefs = new Client_prefs(USER_FLAG_LISTAUTH >> 2); + $prefs = new Client_prefs(($user->flags & USER_FLAG_MAP_AUTH) >> 2); + $ret .= sprintf('prefs_load(\'%s\', false, false);', json_encode($prefs)); + + if(false) { + if ($user->flags & USER_FLAG_ISOLAUTH) { + $ret .= 'list_set(\'isolation\', false, \''.$mlang_brisk['tit_onisol'][$G_lang].'\' ); '; + } + else if ($user->flags & USER_FLAG_LISTAUTH) { + $ret .= 'list_set(\'auth\', false, \''.$mlang_brisk['tit_onauth'][$G_lang].'\' ); '; + } + else { + $ret .= 'list_set(\'all\', false, \'\' ); '; + } } if ($user->subst == 'standup') @@ -2199,7 +2215,7 @@ class Room $content = ob_get_contents(); ob_end_clean(); - $s_a_p->pgflush_try_add($enc, $new_socket, 20, $header_out, $content); + $s_a_p->pendpage_try_addflush($enc, $new_socket, 20, $header_out, $content); return TRUE; break; @@ -2209,7 +2225,7 @@ class Room $content = ob_get_contents(); ob_end_clean(); - $s_a_p->pgflush_try_add($enc, $new_socket, 20, $header_out, $content); + $s_a_p->pendpage_try_addflush($enc, $new_socket, 20, $header_out, $content); return TRUE; break; @@ -2222,7 +2238,7 @@ class Room $content = User::stream_fini($transp, $s_a_p->rndstr, TRUE); - $s_a_p->pgflush_try_add($enc, $new_socket, 20, $header_out, $content); + $s_a_p->pendpage_try_addflush($enc, $new_socket, 20, $header_out, $content); return TRUE; break;