projects
/
brisk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
enhanced prefs management
[brisk.git]
/
web
/
Obj
/
brisk.phh
diff --git
a/web/Obj/brisk.phh
b/web/Obj/brisk.phh
index
09ea77f
..
36060d8
100644
(file)
--- a/
web/Obj/brisk.phh
+++ b/
web/Obj/brisk.phh
@@
-928,7
+928,7
@@
class Room
// for test: $prefs = new Client_prefs(USER_FLAG_LISTAUTH >> 2);
$prefs = new Client_prefs(($user->flags & USER_FLAG_MAP_AUTH) >> 2);
// 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\');', json_encode($prefs));
+ $ret .= sprintf('prefs_load(\'%s\'
, false, false
);', json_encode($prefs));
if(false) {
if ($user->flags & USER_FLAG_ISOLAUTH) {
if(false) {
if ($user->flags & USER_FLAG_ISOLAUTH) {
@@
-2215,7
+2215,7
@@
class Room
$content = ob_get_contents();
ob_end_clean();
$content = ob_get_contents();
ob_end_clean();
- $s_a_p->p
gflush_try_add
($enc, $new_socket, 20, $header_out, $content);
+ $s_a_p->p
endpage_try_addflush
($enc, $new_socket, 20, $header_out, $content);
return TRUE;
break;
return TRUE;
break;
@@
-2225,7
+2225,7
@@
class Room
$content = ob_get_contents();
ob_end_clean();
$content = ob_get_contents();
ob_end_clean();
- $s_a_p->p
gflush_try_add
($enc, $new_socket, 20, $header_out, $content);
+ $s_a_p->p
endpage_try_addflush
($enc, $new_socket, 20, $header_out, $content);
return TRUE;
break;
return TRUE;
break;
@@
-2238,7
+2238,7
@@
class Room
$content = User::stream_fini($transp, $s_a_p->rndstr, TRUE);
$content = User::stream_fini($transp, $s_a_p->rndstr, TRUE);
- $s_a_p->p
gflush_try_add
($enc, $new_socket, 20, $header_out, $content);
+ $s_a_p->p
endpage_try_addflush
($enc, $new_socket, 20, $header_out, $content);
return TRUE;
break;
return TRUE;
break;