diff options
| author | friendica <info@friendica.com> | 2013-11-29 14:08:37 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-11-29 14:09:21 -0800 |
| commit | 1c5f98440da1b4713d0f5b9f8f6a2d3ca39e23af (patch) | |
| tree | b1d8d2a83e8b0f18a5841f49af09603e9c636b6c /mod/display.php | |
| parent | b707495b5072d6f15e801155b2ce54854224b33c (diff) | |
| download | volse-hubzilla-1c5f98440da1b4713d0f5b9f8f6a2d3ca39e23af.tar.gz volse-hubzilla-1c5f98440da1b4713d0f5b9f8f6a2d3ca39e23af.tar.bz2 volse-hubzilla-1c5f98440da1b4713d0f5b9f8f6a2d3ca39e23af.zip | |
quite a bit of work on default acl permissions and various acl quirks
Diffstat (limited to 'mod/display.php')
| -rw-r--r-- | mod/display.php | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/mod/display.php b/mod/display.php index e95a038ea..9aafec8c3 100644 --- a/mod/display.php +++ b/mod/display.php @@ -40,6 +40,14 @@ function display_content(&$a, $update = 0, $load = false) { $channel = $a->get_channel(); + + $channel_acl = array( + 'allow_cid' => $channel['channel_allow_cid'], + 'allow_gid' => $channel['channel_allow_gid'], + 'deny_cid' => $channel['channel_deny_cid'], + 'deny_gid' => $channel['channel_deny_gid'] + ); + $x = array( 'is_owner' => true, 'allow_location' => ((intval(get_pconfig($channel['channel_id'],'system','use_browser_location'))) ? '1' : ''), @@ -47,7 +55,7 @@ function display_content(&$a, $update = 0, $load = false) { 'nickname' => $channel['channel_address'], 'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), - 'acl' => populate_acl($channel, false), + 'acl' => populate_acl($channel_acl, false), 'bang' => '', 'visitor' => 'block', 'profile_uid' => local_user(), |