aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2016-08-04 12:09:06 +0200
committerMario Vavti <mario@mariovavti.com>2016-08-04 12:09:06 +0200
commit036b72757c0dd24cb468e5d02f717de9dffe67cb (patch)
tree60c4a4dfe7ce3aafa0b03ec475cf2c88bcd9c68c /Zotlabs
parent120e9a1e4c816eb629bc00dcf2324a26825479e0 (diff)
downloadvolse-hubzilla-036b72757c0dd24cb468e5d02f717de9dffe67cb.tar.gz
volse-hubzilla-036b72757c0dd24cb468e5d02f717de9dffe67cb.tar.bz2
volse-hubzilla-036b72757c0dd24cb468e5d02f717de9dffe67cb.zip
multi acl: port /wiki
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Module/Wiki.php17
1 files changed, 13 insertions, 4 deletions
diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php
index 55a52ea6d..011cd4366 100644
--- a/Zotlabs/Module/Wiki.php
+++ b/Zotlabs/Module/Wiki.php
@@ -74,11 +74,16 @@ class Wiki extends \Zotlabs\Web\Controller {
// Initialize the ACL to the channel default permissions
$x = array(
'lockstate' => (( $local_observer['channel_allow_cid'] ||
- $local_observer['channel_allow_gid'] ||
- $local_observer['channel_deny_cid'] ||
- $local_observer['channel_deny_gid'])
- ? 'lock' : 'unlock'),
+ $local_observer['channel_allow_gid'] ||
+ $local_observer['channel_deny_cid'] ||
+ $local_observer['channel_deny_gid'])
+ ? 'lock' : 'unlock'
+ ),
'acl' => populate_acl($channel_acl),
+ 'allow_cid' => acl2json($channel_acl['allow_cid']),
+ 'allow_gid' => acl2json($channel_acl['allow_gid']),
+ 'deny_cid' => acl2json($channel_acl['deny_cid']),
+ 'deny_gid' => acl2json($channel_acl['deny_gid']),
'bang' => ''
);
} else {
@@ -186,6 +191,10 @@ class Wiki extends \Zotlabs\Web\Controller {
'$page' => $pageUrlName,
'$lockstate' => $x['lockstate'],
'$acl' => $x['acl'],
+ '$allow_cid' => $x['allow_cid'],
+ '$allow_gid' => $x['allow_gid'],
+ '$deny_cid' => $x['deny_cid'],
+ '$deny_gid' => $x['deny_gid'],
'$bang' => $x['bang'],
'$content' => $content,
'$renderedContent' => $renderedContent,