summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2013-06-19 19:52:33 +0200
committerAleksander Machniak <alec@alec.pl>2013-06-19 19:52:33 +0200
commit3bbe4e7424f12b4f870fb775b8230714a2862380 (patch)
tree925ee90ecc269ed5fad0426efed4e741ca3f3cd7 /plugins
parentcd9e4154060ff38226e77eea82123519322b2327 (diff)
parentb200258d5af08ff24065d58c96d8ccf834d1ffad (diff)
Merge branch 'master' of github.com:roundcube/roundcubemail
Diffstat (limited to 'plugins')
-rw-r--r--plugins/acl/acl.php1
-rw-r--r--plugins/acl/config.inc.php.dist6
-rwxr-xr-xplugins/attachment_reminder/attachment_reminder.php8
3 files changed, 12 insertions, 3 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');
+
?>
diff --git a/plugins/attachment_reminder/attachment_reminder.php b/plugins/attachment_reminder/attachment_reminder.php
index a215ff57c..82ad7a60e 100755
--- a/plugins/attachment_reminder/attachment_reminder.php
+++ b/plugins/attachment_reminder/attachment_reminder.php
@@ -36,9 +36,11 @@ class attachment_reminder extends rcube_plugin
$rcmail = rcube::get_instance();
if ($rcmail->task == 'mail' && $rcmail->action == 'compose') {
- $this->include_script('attachment_reminder.js');
- $this->add_texts('localization/', array('keywords', 'forgotattachment'));
- $rcmail->output->add_label('addattachment', 'send');
+ if ($rcmail->config->get('attachment_reminder')) {
+ $this->include_script('attachment_reminder.js');
+ $this->add_texts('localization/', array('keywords', 'forgotattachment'));
+ $rcmail->output->add_label('addattachment', 'send');
+ }
}
if ($rcmail->task == 'settings') {