X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fbrisk.phh;h=36060d87c181c19815cabd3964a6c014c63f981f;hb=2dafd9b1a8edbf64595bee1e669be6c95921bf61;hp=804c6ee8362da94045fe3c20fe9b2346bcf40e6f;hpb=4134ca0a411ba95acb7e5bda7632df30cd91eafc;p=brisk.git diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh index 804c6ee..36060d8 100644 --- a/web/Obj/brisk.phh +++ b/web/Obj/brisk.phh @@ -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;