diff options
| author | alecpl <alec@alec.pl> | 2009-09-08 11:51:49 +0000 |
|---|---|---|
| committer | alecpl <alec@alec.pl> | 2009-09-08 11:51:49 +0000 |
| commit | d168b9909acc66510bd24b3e74f6828f47939f75 (patch) | |
| tree | d3e2b5f723b8c19e775ff067860265fbedd6b81d /plugins/managesieve | |
| parent | e8d8b6fd864fd9e3792b8032b1bc40b6ec2b1b7a (diff) | |
- managesieve: Fix handling of "true" as "anyof (true)" test
Diffstat (limited to 'plugins/managesieve')
| -rw-r--r-- | plugins/managesieve/Changelog | 5 | ||||
| -rw-r--r-- | plugins/managesieve/lib/rcube_sieve.php | 4 | ||||
| -rw-r--r-- | plugins/managesieve/managesieve.php | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/plugins/managesieve/Changelog b/plugins/managesieve/Changelog index 45abafa38..e68e9c7e9 100644 --- a/plugins/managesieve/Changelog +++ b/plugins/managesieve/Changelog @@ -1,3 +1,8 @@ +* version 1.6 [2009-09-08] +----------------------------------------------------------- +- Fix warning when importing squirrelmail rules +- Fix handling of "true" as "anyof (true)" test + * version 1.5 [2009-09-04] ----------------------------------------------------------- - Added es_ES, ua_UA localizations diff --git a/plugins/managesieve/lib/rcube_sieve.php b/plugins/managesieve/lib/rcube_sieve.php index 59f7cfcf4..2ab30c54d 100644 --- a/plugins/managesieve/lib/rcube_sieve.php +++ b/plugins/managesieve/lib/rcube_sieve.php @@ -442,7 +442,7 @@ class rcube_sieve_script { $result = NULL; - if (preg_match('/^(if|elsif|else)\s+((allof|anyof|exists|header|not|size)\s+(.*))\s+\{(.*)\}$/sm', trim($content), $matches)) + if (preg_match('/^(if|elsif|else)\s+((true|not\s+true|allof|anyof|exists|header|not|size)(.*))\s+\{(.*)\}$/sm', trim($content), $matches)) { list($tests, $join) = $this->_parse_tests(trim($matches[2])); $actions = $this->_parse_actions(trim($matches[5])); @@ -454,7 +454,7 @@ class rcube_sieve_script 'join' => $join, ); } - + return $result; } diff --git a/plugins/managesieve/managesieve.php b/plugins/managesieve/managesieve.php index b2b52d40f..bfbded94e 100644 --- a/plugins/managesieve/managesieve.php +++ b/plugins/managesieve/managesieve.php @@ -7,7 +7,7 @@ * It's clickable interface which operates on text scripts and communicates * with server using managesieve protocol. Adds Filters tab in Settings. * - * @version 1.5 + * @version 1.6 * @author Aleksander 'A.L.E.C' Machniak <alec@alec.pl> * * Configuration (see config.inc.php.dist): |