summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2011-05-24 08:32:01 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2011-05-24 08:32:01 +0000
commit915b33f61a1c3c929105d1ace843a90c5a1c0c37 (patch)
treeb072c1e6c2fb015e78f13fbd5f8439aaf18ffcc9 /plugins
parent4386498aa7ae1d45dbdfd0ac659939dc0d163458 (diff)
- Fixed regex extension (error: regex require missing)
git-svn-id: https://svn.roundcube.net/trunk@4806 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'plugins')
-rw-r--r--plugins/managesieve/Changelog3
-rw-r--r--plugins/managesieve/lib/rcube_sieve_script.php5
-rw-r--r--plugins/managesieve/managesieve.php2
3 files changed, 9 insertions, 1 deletions
diff --git a/plugins/managesieve/Changelog b/plugins/managesieve/Changelog
index a1b7f872b..ca7967092 100644
--- a/plugins/managesieve/Changelog
+++ b/plugins/managesieve/Changelog
@@ -1,5 +1,8 @@
+* version 4.2 [2011-05-24]
+-----------------------------------------------------------
- Moved elsif replacement code to handle only imports from other formats
- Fixed mod_mailbox() usage for newer Roundcube versions
+- Fixed regex extension (error: regex require missing)
* version 4.1 [2011-03-07]
-----------------------------------------------------------
diff --git a/plugins/managesieve/lib/rcube_sieve_script.php b/plugins/managesieve/lib/rcube_sieve_script.php
index 48122525c..ee2780266 100644
--- a/plugins/managesieve/lib/rcube_sieve_script.php
+++ b/plugins/managesieve/lib/rcube_sieve_script.php
@@ -153,9 +153,14 @@ class rcube_sieve_script
if (preg_match('/^(value|count)-([gteqnl]{2})/', $test['type'], $m)) {
array_push($exts, 'relational');
array_push($exts, 'comparator-i;ascii-numeric');
+
$tests[$i] .= 'header :' . $m[1] . ' "' . $m[2] . '" :comparator "i;ascii-numeric"';
}
else {
+ if ($test['type'] == 'regex') {
+ array_push($exts, 'regex');
+ }
+
$tests[$i] .= 'header :' . $test['type'];
}
diff --git a/plugins/managesieve/managesieve.php b/plugins/managesieve/managesieve.php
index 27009bf39..7cd210ecf 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 4.1
+ * @version 4.2
* @author Aleksander 'A.L.E.C' Machniak <alec@alec.pl>
*
* Configuration (see config.inc.php.dist)