From 38271f246bf4fe982129d69ea492366f7650ab65 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 17 Jun 2013 06:16:53 -0400
Subject: [PATCH] Merge pull request #58 from kanarip/master

---
 plugins/acl/config.inc.php.dist |    6 ++++++
 plugins/acl/acl.php             |    1 +
 2 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/plugins/acl/acl.php b/plugins/acl/acl.php
index 28139e9..5940626 100644
--- a/plugins/acl/acl.php
+++ b/plugins/acl/acl.php
@@ -148,6 +148,7 @@
 
         // 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 f957a23..d0e1a09 100644
--- a/plugins/acl/config.inc.php.dist
+++ b/plugins/acl/config.inc.php.dist
@@ -16,4 +16,10 @@
 // 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');
+
 ?>

--
Gitblit v1.9.1