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/channel.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/channel.php')
| -rw-r--r-- | mod/channel.php | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/mod/channel.php b/mod/channel.php index e5af91b53..f36636023 100644 --- a/mod/channel.php +++ b/mod/channel.php @@ -131,6 +131,13 @@ function channel_content(&$a, $update = 0, $load = false) { $o .= common_friends_visitor_widget($a->profile['profile_uid']); + $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'] + ); + if($perms['post_wall']) { @@ -140,7 +147,7 @@ function channel_content(&$a, $update = 0, $load = false) { 'default_location' => (($is_owner) ? $a->profile['channel_location'] : ''), 'nickname' => $a->profile['channel_address'], 'lockstate' => (((strlen($a->profile['channel_allow_cid'])) || (strlen($a->profile['channel_allow_gid'])) || (strlen($a->profile['channel_deny_cid'])) || (strlen($a->profile['channel_deny_gid']))) ? 'lock' : 'unlock'), - 'acl' => (($is_owner) ? populate_acl($channel, false) : ''), + 'acl' => (($is_owner) ? populate_acl($channel_acl) : ''), 'showacl' => (($is_owner) ? 'yes' : ''), 'bang' => '', 'visitor' => (($is_owner || $observer) ? 'block' : 'none'), |