alecpl
2009-09-08 d168b9909acc66510bd24b3e74f6828f47939f75
- managesieve: Fix handling of "true" as "anyof (true)" test


3 files modified
11 ■■■■ changed files
plugins/managesieve/Changelog 5 ●●●●● patch | view | raw | blame | history
plugins/managesieve/lib/rcube_sieve.php 4 ●●●● patch | view | raw | blame | history
plugins/managesieve/managesieve.php 2 ●●● patch | view | raw | blame | history
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
plugins/managesieve/lib/rcube_sieve.php
@@ -442,7 +442,7 @@
    {
      $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 @@
            'join' => $join,
        );
    }
      return $result;
    }    
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):