[mms] Fix sieve driver correctly identifying mailing list when determ…

…ining whether to send vacation messages (Bug #12938; skhorde@smail.inf.fg-bonn-rhein-sieg.de). Conflicts: ingo/docs/CHANGES ingo/package.xml
horde · Jan 30, 2014 · d9a2b4b · d9a2b4b
1 parent 3c713dd
commit d9a2b4b
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 2 deletions.
diff --git a/ingo/docs/CHANGES b/ingo/docs/CHANGES
@@ -8,6 +8,15 @@ v3.2.0-git
 [mms] Add 'newEmailFilter' API link.
 
 
+------
+v3.1.4
+------
+
+[mms] Fix sieve driver correctly identifying mailing lists when determining
+      whether to send vacation messages (Bug #12938;
+      skhorde@smail.inf.fg-bonn-rhein-sieg.de).
+
+
 ------
 v3.1.3
 ------

diff --git a/ingo/lib/Script/Sieve.php b/ingo/lib/Script/Sieve.php
@@ -335,8 +335,11 @@ protected function _addVacationBlocks()
             $mime_headers = new Horde_Mime_Headers();
             $headers = $mime_headers->listHeaders();
             $headers['Mailing-List'] = null;
-            $tmp = new Ingo_Script_Sieve_Test_Exists(array('headers' => implode("\n", array_keys($headers))));
-            $tests[] = new Ingo_Script_Sieve_Test_Not($tmp);
+            foreach (array_keys($headers) as $h) {
+                $tests[] = new Ingo_Script_Sieve_Test_Not(
+                    new Ingo_Script_Sieve_Test_Exists(array('headers' => $h))
+                );
+            }
             $vals = array('headers' => 'Precedence',
                           'match-type' => ':is',
                           'strings' => "list\nbulk\njunk",

diff --git a/ingo/package.xml b/ingo/package.xml
@@ -1336,5 +1336,18 @@
 * [mms] SECURITY: Protect against CSRF attacks by using tokens on destructive actions (Bug #12796; CVE-2013-6275; found by Marcela Benetrix &lt;m.benetrix@e-secure.com.au&gt;).
    </notes>
   </release>
+  <release>
+   <version>
+    <release>3.1.4</release>
+    <api>3.0.0</api></version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api></stability>
+   <date>2013-10-29</date>
+   <license uri="http://www.horde.org/licenses/apache">ASL</license>
+   <notes>
+* [mms] Fix sieve driver correctly identifying mailing lists when determining whether to send vacation messages (Bug #12938; skhorde@smail.inf.fg-bonn-rhein-sieg.de).
+   </notes>
+  </release>
  </changelog>
 </package>