From fc55bc5148f58bdbdcf3addb1a1383e994bf9c00 Mon Sep 17 00:00:00 2001 From: "Jeroen van Meeuwen (Kolab Systems)" Date: Thu, 21 Feb 2013 14:27:20 -0500 Subject: Add configuration option 'specials' to hide specials 'anyone' and 'anonymous' from the ACL configuration dialog --- plugins/acl/acl.php | 1 + plugins/acl/config.inc.php.dist | 2 ++ 2 files changed, 3 insertions(+) (limited to 'plugins') diff --git a/plugins/acl/acl.php b/plugins/acl/acl.php index 5ae9e4e0a..ffaa51b6d 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..6a9c3a57e 100644 --- a/plugins/acl/config.inc.php.dist +++ b/plugins/acl/config.inc.php.dist @@ -16,4 +16,6 @@ $rcmail_config['acl_users_field'] = 'mail'; // The LDAP search filter will be &'d with search queries $rcmail_config['acl_users_filter'] = ''; +$rcmail_config['acl_specials'] = array(); + ?> -- cgit v1.2.3 From f39f3e427e3420b6fcf7fa5c836cce0b3b0053b3 Mon Sep 17 00:00:00 2001 From: "Jeroen van Meeuwen (Kolab Systems)" Date: Mon, 11 Mar 2013 09:54:59 +0000 Subject: Add some verbiage on the usage of 'acl_specials' in the default config.inc.php.dist. --- plugins/acl/config.inc.php.dist | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'plugins') diff --git a/plugins/acl/config.inc.php.dist b/plugins/acl/config.inc.php.dist index 6a9c3a57e..d0e1a0932 100644 --- a/plugins/acl/config.inc.php.dist +++ b/plugins/acl/config.inc.php.dist @@ -16,6 +16,10 @@ $rcmail_config['acl_users_field'] = 'mail'; // The LDAP search filter will be &'d with search queries $rcmail_config['acl_users_filter'] = ''; -$rcmail_config['acl_specials'] = array(); +// 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'); ?> -- cgit v1.2.3 From 4e12fd5c82b9e299a9eb91bb6e0bb09c47090a16 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Wed, 19 Jun 2013 08:54:59 +0200 Subject: Fix so attachment_reminder=false really disables the reminder action --- plugins/attachment_reminder/attachment_reminder.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'plugins') 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') { -- cgit v1.2.3