From a92760c983dce7bb9d4a6c9f614f71db06f7be2a Mon Sep 17 00:00:00 2001
From: alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Tue, 8 Sep 2009 11:51:49 +0000
Subject: - managesieve: Fix handling of "true" as "anyof (true)" test

git-svn-id: https://svn.roundcube.net/trunk@2935 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 roundcubemail/plugins/managesieve/Changelog           | 5 +++++
 roundcubemail/plugins/managesieve/lib/rcube_sieve.php | 4 ++--
 roundcubemail/plugins/managesieve/managesieve.php     | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/roundcubemail/plugins/managesieve/Changelog b/roundcubemail/plugins/managesieve/Changelog
index 45abafa38..e68e9c7e9 100644
--- a/roundcubemail/plugins/managesieve/Changelog
+++ b/roundcubemail/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/roundcubemail/plugins/managesieve/lib/rcube_sieve.php b/roundcubemail/plugins/managesieve/lib/rcube_sieve.php
index 59f7cfcf4..2ab30c54d 100644
--- a/roundcubemail/plugins/managesieve/lib/rcube_sieve.php
+++ b/roundcubemail/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/roundcubemail/plugins/managesieve/managesieve.php b/roundcubemail/plugins/managesieve/managesieve.php
index b2b52d40f..bfbded94e 100644
--- a/roundcubemail/plugins/managesieve/managesieve.php
+++ b/roundcubemail/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):
-- 
cgit v1.2.3