aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2016-08-05 14:45:06 +0200
committerMario Vavti <mario@mariovavti.com>2016-08-05 14:45:06 +0200
commitb2298d44a4126ba0b7f0355733bb1125c656bac1 (patch)
tree8f12f84eee380e5e1cfe3003983eaa678a21561a /Zotlabs
parentc029839971bf73d45026920af01d57fc938b8fce (diff)
downloadvolse-hubzilla-b2298d44a4126ba0b7f0355733bb1125c656bac1.tar.gz
volse-hubzilla-b2298d44a4126ba0b7f0355733bb1125c656bac1.tar.bz2
volse-hubzilla-b2298d44a4126ba0b7f0355733bb1125c656bac1.zip
multi acl: port /settings
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Module/Settings.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/Zotlabs/Module/Settings.php b/Zotlabs/Module/Settings.php
index 57a0aa535..12157944f 100644
--- a/Zotlabs/Module/Settings.php
+++ b/Zotlabs/Module/Settings.php
@@ -1220,6 +1220,10 @@ class Settings extends \Zotlabs\Web\Controller {
'$permissions' => t('Default Post and Publish Permissions'),
'$permdesc' => t("\x28click to open/close\x29"),
'$aclselect' => populate_acl($perm_defaults, false, \Zotlabs\Lib\PermissionDescription::fromDescription(t('Use my default audience setting for the type of object published'))),
+ '$allow_cid' => acl2json($perm_defaults['allow_cid']),
+ '$allow_gid' => acl2json($perm_defaults['allow_gid']),
+ '$deny_cid' => acl2json($perm_defaults['deny_cid']),
+ '$deny_gid' => acl2json($perm_defaults['deny_gid']),
'$suggestme' => $suggestme,
'$group_select' => $group_select,
'$role' => array('permissions_role' , t('Channel permissions category:'), $permissions_role, '', get_roles()),
@@ -1282,7 +1286,7 @@ class Settings extends \Zotlabs\Web\Controller {
call_hooks('settings_form',$o);
- $o .= '</form>' . "\r\n";
+ //$o .= '</form>' . "\r\n";
return $o;
}