summaryrefslogtreecommitdiff
path: root/plugins/managesieve
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2013-09-20 12:17:30 +0200
committerAleksander Machniak <alec@alec.pl>2013-09-20 12:17:30 +0200
commit439fd773e3783145c31e728ae6b6876f1efa9973 (patch)
treea65de8c3ee1a33a352a72ec116fa51214a496b95 /plugins/managesieve
parent889c76cbdc05992b060ded9984690285588e285b (diff)
Fix typo in last commit and some managesieve tests (where we changed
:comparator position)
Diffstat (limited to 'plugins/managesieve')
-rw-r--r--plugins/managesieve/lib/Roundcube/rcube_sieve_script.php2
-rw-r--r--plugins/managesieve/tests/src/parser4
-rw-r--r--plugins/managesieve/tests/src/parser.out2
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 f6a2f7dd5..6fbc3f89d 100644
--- a/plugins/managesieve/lib/Roundcube/rcube_sieve_script.php
+++ b/plugins/managesieve/lib/Roundcube/rcube_sieve_script.php
@@ -943,7 +943,7 @@ class rcube_sieve_script
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 9c4717be4..c99b49814 100644
--- a/plugins/managesieve/tests/src/parser
+++ b/plugins/managesieve/tests/src/parser
@@ -6,13 +6,13 @@ if anyof (header :contains "X-DSPAM-Result" "Spam")
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 cb0bad5e7..796343d4a 100644
--- a/plugins/managesieve/tests/src/parser.out
+++ b/plugins/managesieve/tests/src/parser.out
@@ -12,7 +12,7 @@ if header :contains ["From","To"] "test@domain.tld"
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;