summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2012-10-03 09:05:37 +0200
committerAleksander Machniak <alec@alec.pl>2012-10-03 09:05:37 +0200
commit7b274b8871767a9a28e18cb182d8e49f26a61cd7 (patch)
treef19e810263c47f8aa83e24998ed0c1360d1f2e5a
parentccdd61e6c05cfe34dc9450631f4c20a98ab885d4 (diff)
Fix so scripts listed in managesieve_filename_exceptions aren't displayed on the list (#1488724)
-rw-r--r--plugins/managesieve/Changelog3
-rw-r--r--plugins/managesieve/managesieve.php8
2 files changed, 10 insertions, 1 deletions
diff --git a/plugins/managesieve/Changelog b/plugins/managesieve/Changelog
index c0428c4fc..ce9386154 100644
--- a/plugins/managesieve/Changelog
+++ b/plugins/managesieve/Changelog
@@ -1,7 +1,10 @@
+* version 6.0 [2012-10-03]
+-----------------------------------------------------------
- Fixed issue with DBMail bug [http://pear.php.net/bugs/bug.php?id=19077] (#1488594)
- Added support for enotify/notify (RFC5435, RFC5436, draft-ietf-sieve-notify-00)
- Change default port to 4190 (IANA-allocated), add port auto-detection (#1488713)
- Added request size limits detection and script corruption prevention (#1488648)
+- Fix so scripts listed in managesieve_filename_exceptions aren't displayed on the list (#1488724)
* version 5.2 [2012-07-24]
-----------------------------------------------------------
diff --git a/plugins/managesieve/managesieve.php b/plugins/managesieve/managesieve.php
index 7282ff2e0..7f4624ec9 100644
--- a/plugins/managesieve/managesieve.php
+++ b/plugins/managesieve/managesieve.php
@@ -62,7 +62,7 @@ class managesieve extends rcube_plugin
"x-beenthere",
);
- const VERSION = '5.2';
+ const VERSION = '6.0';
const PROGNAME = 'Roundcube (Managesieve)';
const PORT = 4190;
@@ -1839,6 +1839,12 @@ class managesieve extends rcube_plugin
if ($active = $this->sieve->get_active()) {
$this->active = array($active);
}
+
+ // Hide scripts from config
+ $exceptions = $this->rc->config->get('managesieve_filename_exceptions');
+ if (!empty($exceptions)) {
+ $this->list = array_diff($this->list, (array)$exceptions);
+ }
}
return $this->list;