summaryrefslogtreecommitdiff
path: root/plugins/acl
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2013-06-17 03:16:53 -0700
committerAleksander Machniak <alec@alec.pl>2013-06-17 03:16:53 -0700
commit38271f246bf4fe982129d69ea492366f7650ab65 (patch)
tree50628a36702a08b028289dfb9f7215c7b9d89235 /plugins/acl
parente11e7e786b01672962a9819c1fd0a65402ce4f30 (diff)
parentf39f3e427e3420b6fcf7fa5c836cce0b3b0053b3 (diff)
Merge pull request #58 from kanarip/master
Add option to prevent mandatory inclusion of 'anyone' and 'anonymous' in ACL configuration
Diffstat (limited to 'plugins/acl')
-rw-r--r--plugins/acl/acl.php1
-rw-r--r--plugins/acl/config.inc.php.dist6
2 files changed, 7 insertions, 0 deletions
diff --git a/plugins/acl/acl.php b/plugins/acl/acl.php
index 28139e92c..59406262e 100644
--- a/plugins/acl/acl.php
+++ b/plugins/acl/acl.php
@@ -148,6 +148,7 @@ class acl extends rcube_plugin
// Load localization and include scripts
$this->load_config();
+ $this->specials = $this->rc->config->get('acl_specials', $this->specials);
$this->add_texts('localization/', array('deleteconfirm', 'norights',
'nouser', 'deleting', 'saving'));
$this->include_script('acl.js');
diff --git a/plugins/acl/config.inc.php.dist b/plugins/acl/config.inc.php.dist
index f957a233a..d0e1a0932 100644
--- a/plugins/acl/config.inc.php.dist
+++ b/plugins/acl/config.inc.php.dist
@@ -16,4 +16,10 @@ $rcmail_config['acl_users_field'] = 'mail';
// The LDAP search filter will be &'d with search queries
$rcmail_config['acl_users_filter'] = '';
+// Include the following 'special' access control subjects in the ACL dialog;
+// Defaults to array('anyone', 'anonymous') (not when set to an empty array)
+// Example: array('anyone') to exclude 'anonymous'.
+// Set to an empty array to exclude all special aci subjects.
+$rcmail_config['acl_specials'] = array('anyone', 'anonymous');
+
?>