From 439fd773e3783145c31e728ae6b6876f1efa9973 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 20 Sep 2013 06:17:30 -0400
Subject: [PATCH] Fix typo in last commit and some managesieve tests (where we changed :comparator position)
---
plugins/managesieve/tests/src/parser | 4 ++--
plugins/managesieve/tests/src/parser.out | 2 +-
plugins/managesieve/lib/Roundcube/rcube_sieve_script.php | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/plugins/managesieve/lib/Roundcube/rcube_sieve_script.php b/plugins/managesieve/lib/Roundcube/rcube_sieve_script.php
index f6a2f7d..6fbc3f8 100644
--- a/plugins/managesieve/lib/Roundcube/rcube_sieve_script.php
+++ b/plugins/managesieve/lib/Roundcube/rcube_sieve_script.php
@@ -943,7 +943,7 @@
if (preg_match('/^(value|count)-([gteqnl]{2})/', $test['type'], $m)) {
array_push($exts, 'relational');
- $out .= ' :' . $m[1] . ' "' . $m[2];
+ $out .= ' :' . $m[1] . ' "' . $m[2] . '"';
}
else {
if ($test['type'] == 'regex') {
diff --git a/plugins/managesieve/tests/src/parser b/plugins/managesieve/tests/src/parser
index 9c4717b..c99b498 100644
--- a/plugins/managesieve/tests/src/parser
+++ b/plugins/managesieve/tests/src/parser
@@ -6,13 +6,13 @@
stop;
}
# rule:[test1]
-if anyof (header :comparator "i;ascii-casemap" :contains ["From","To"] "test@domain.tld")
+if anyof (header :contains :comparator "i;ascii-casemap" ["From","To"] "test@domain.tld")
{
discard;
stop;
}
# rule:[test2]
-if anyof (not header :comparator "i;octet" :contains ["Subject"] "[test]", header :contains "Subject" "[test2]")
+if anyof (not header :contains :comparator "i;octet" ["Subject"] "[test]", header :contains "Subject" "[test2]")
{
fileinto "test";
stop;
diff --git a/plugins/managesieve/tests/src/parser.out b/plugins/managesieve/tests/src/parser.out
index cb0bad5..796343d 100644
--- a/plugins/managesieve/tests/src/parser.out
+++ b/plugins/managesieve/tests/src/parser.out
@@ -12,7 +12,7 @@
stop;
}
# rule:[test2]
-if anyof (not header :comparator "i;octet" :contains "Subject" "[test]", header :contains "Subject" "[test2]")
+if anyof (not header :contains :comparator "i;octet" "Subject" "[test]", header :contains "Subject" "[test2]")
{
fileinto "test";
stop;
--
Gitblit v1.9.1