Added a search by header option to filters -- needs error checking on the searchstring

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@2685 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/plugins/filters/filters.php b/plugins/filters/filters.php
index 887d2c87d1995b98dc2bdff2d9d9863c5c1a786c..a144822c08721bd1f839c4df5b339eb0521cab36 100644 (file)
--- a/plugins/filters/filters.php
+++ b/plugins/filters/filters.php
@@ -333,6 +333,11 @@ function filter_search_and_delete($imap, $where, $what, $where_to) {
     } else {
         $search_str = "SEARCH CHARSET US-ASCII ALL ";
     }
+    if ($where == "Header") {
+       $what = explode(':', $what);
+       $where = trim($where . ' ' . $what[0]);
+       $what = addslashes(trim($what[1]));
+    }
     $search_str .= $where . ' {' . strlen($what) . "}\r\n" . $what . "\r\n";
     
     fputs ($imap, "a001 $search_str");

diff --git a/plugins/filters/options.php b/plugins/filters/options.php
index 0fde042ad636b77ef8e60fec887ea512fa7b6c87..cbf2c152a0a05bc446744554be9cdddd123f2bc7 100644 (file)
--- a/plugins/filters/options.php
+++ b/plugins/filters/options.php
@@ -96,6 +96,9 @@
         $sel = (($L && $filters[$theid]['where'] == 'Subject')?'selected':'');
         echo "<option value=\"Subject\" $sel>" . _ ("Subject") . '</option>';
 
+        $sel = (($L && $filters[$theid]['where'] == 'Header')?'selected':'');
+        echo "<option value=\"Header\" $sel>" . _ ("Header") . '</option>';
+
         echo         '</select>'.
                 '</td>'.
             '</tr>'.