diff options
| author | Thomas Bruederli <thomas@roundcube.net> | 2012-10-03 14:17:05 +0200 |
|---|---|---|
| committer | Thomas Bruederli <thomas@roundcube.net> | 2012-10-03 14:17:05 +0200 |
| commit | 05c4edf34bcff89fcae80389e890fa07271f5275 (patch) | |
| tree | 21c9f740ad1c71cc9242c5d56a2defaf07d7af33 /plugins/managesieve | |
| parent | 7bcd291517e9aca620e8938e965347a73b620a7a (diff) | |
| parent | d68c9088c3731ca84a0312e0648fe3c63e8d4a1d (diff) | |
Merge branch 'master' of github.com:roundcube/roundcubemail
Diffstat (limited to 'plugins/managesieve')
| -rw-r--r-- | plugins/managesieve/Changelog | 3 | ||||
| -rw-r--r-- | plugins/managesieve/managesieve.php | 8 | ||||
| -rw-r--r-- | plugins/managesieve/package.xml | 15 |
3 files changed, 22 insertions, 4 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; diff --git a/plugins/managesieve/package.xml b/plugins/managesieve/package.xml index 20fec7895..e8e8102b0 100644 --- a/plugins/managesieve/package.xml +++ b/plugins/managesieve/package.xml @@ -17,10 +17,10 @@ <email>alec@alec.pl</email> <active>yes</active> </lead> - <date>2012-07-24</date> + <date>2012-10-03</date> <version> - <release>5.2</release> - <api>5.0</api> + <release>6.0</release> + <api>6.0</api> </version> <stability> <release>stable</release> @@ -95,6 +95,15 @@ <file name="skins/classic/images/down_small.gif" role="data"></file> <file name="skins/classic/images/filter.png" role="data"></file> <file name="skins/classic/images/up_small.gif" role="data"></file> + <file name="skins/larry/managesieve.css" role="data"></file> + <file name="skins/larry/managesieve_mail.css" role="data"></file> + <file name="skins/larry/templates/filteredit.html" role="data"></file> + <file name="skins/larry/templates/managesieve.html" role="data"></file> + <file name="skins/larry/templates/setedit.html" role="data"></file> + <file name="skins/larry/images/add.png" role="data"></file> + <file name="skins/larry/images/del.png" role="data"></file> + <file name="skins/larry/images/down_small.gif" role="data"></file> + <file name="skins/larry/images/up_small.gif" role="data"></file> <file name="managesieve.php" role="php"></file> <file name="lib/rcube_sieve.php" role="php"></file> <file name="lib/rcube_sieve_script.php" role="php"></file> |