MFB: Use preg_quote instead of quotemeta (Bug #8875).

diff --git a/ingo/docs/CHANGES b/ingo/docs/CHANGES
index f8817ff..b90cb59 100644 (file)
--- a/ingo/docs/CHANGES
+++ b/ingo/docs/CHANGES
@@ -10,6 +10,7 @@ v2.0-git
 v1.2.4-cvs
 ----------
 
+[jan] Correctly escape addresses in procmail driver (Bug #8875).
 [jan] Fix procmail scripts when using composite headers (Bug #8804).
 [jan] Support some non-standard Date: headers in Sieve vacation rules
       (Request #8783).

diff --git a/ingo/lib/Script/Procmail/Recipe.php b/ingo/lib/Script/Procmail/Recipe.php
index 50fe06a..e49ecd6 100644 (file)
--- a/ingo/lib/Script/Procmail/Recipe.php
+++ b/ingo/lib/Script/Procmail/Recipe.php
@@ -301,21 +301,21 @@ class Ingo_Script_Procmail_Recipe
             break;
 
         case 'address':
-            $string .= '(.*\<)?' . quotemeta($condition['value']);
+            $string .= '(.*\<)?' . preg_quote($condition['value']);
             break;
 
         case 'not begins with':
             $reverseCondition = true;
             // fall through
         case 'begins with':
-            $string .= $prefix . quotemeta($condition['value']);
+            $string .= $prefix . preg_quote($condition['value']);
             break;
 
         case 'not ends with':
             $reverseCondition = true;
             // fall through
         case 'ends with':
-            $string .= '.*' . quotemeta($condition['value']) . '$';
+            $string .= '.*' . preg_quote($condition['value']) . '$';
             break;
 
         case 'not contain':
@@ -323,7 +323,7 @@ class Ingo_Script_Procmail_Recipe
             // fall through
         case 'contains':
         default:
-            $string .= '.*' . quotemeta($condition['value']);
+            $string .= '.*' . preg_quote($condition['value']);
             break;
         }