updates to make javascript actually behave correctly for real.

[squirrelmail.git] / plugins / filters / filters.php

diff --git a/plugins/filters/filters.php b/plugins/filters/filters.php
index 3cd6c35b98896eb5a9845b946570862e4492bbdc..a70aa712b8c479ff7a5c39a5563a09a1fef78979 100644 (file)
--- a/plugins/filters/filters.php
+++ b/plugins/filters/filters.php
@@ -3,7 +3,7 @@
 /**
  * Message and Spam Filter Plugin
  *
- * Copyright (c) 1999-2003 The SquirrelMail Project Team
+ * Copyright (c) 1999-2004 The SquirrelMail Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
  * This plugin filters your inbox into different folders based upon given
@@ -191,8 +191,8 @@ function user_filters($imap_stream) {
 
 function filter_search_and_delete($imap_stream, $where, $what, $where_to, $user_scan, 
                                   $should_expunge) {
-    global $languages, $squirrelmail_language, $allow_charset_search, 
-           $uid_support, $imap_server_type;
+    global $languages, $squirrelmail_language, $allow_charset_search, $imap_server_type;
+
     if ($user_scan == 'new') {
         $category = 'UNSEEN';
     } else {
@@ -222,7 +222,7 @@ function filter_search_and_delete($imap_stream, $where, $what, $where_to, $user_
     }
 
     /* read data back from IMAP */
-    $read = sqimap_run_command($imap_stream, $search_str, true, $response, $message, $uid_support);
+    $read = sqimap_run_command($imap_stream, $search_str, true, $response, $message, TRUE);
 
     // This may have problems with EIMS due to it being goofy
 
@@ -251,7 +251,7 @@ function filter_search_and_delete($imap_stream, $where, $what, $where_to, $user_
 
 // These are the spam filters
 function spam_filters($imap_stream) {
-    global $data_dir, $username, $uid_support;
+    global $data_dir, $username;
     global $SpamFilters_YourHop;
     global $SpamFilters_DNScache;
     global $SpamFilters_SharedCache;
@@ -289,7 +289,7 @@ function spam_filters($imap_stream) {
     if ($filters_spam_scan != 'new') {
         $query = 'FETCH 1:* (BODY.PEEK[HEADER.FIELDS (Received)])';
     } else {
-        $read = sqimap_run_command($imap_stream, 'SEARCH UNSEEN', true, $response, $message, $uid_support);
+        $read = sqimap_run_command($imap_stream, 'SEARCH UNSEEN', true, $response, $message, TRUE);
         if ($response != 'OK' || trim($read[0]) == '* SEARCH') {
            $query = 'FETCH 1:* (BODY.PEEK[HEADER.FIELDS (RECEIVED)])';
         } else {
@@ -751,10 +751,9 @@ function update_for_folder ($args) {
  * The unused FETCH arguments and HEADERS are disabled.
  */
 function filter_get_headers ($imap_stream, $query) {
-    global $uid_support;
     /* Get the small headers for each message in $msg_list */
 
-    $read_list = sqimap_run_command_list ($imap_stream, $query, false, $response, $message, $uid_support);
+    $read_list = sqimap_run_command_list ($imap_stream, $query, false, $response, $message, TRUE);
 
     if (isset($response) && $response != 'OK') {
         return false;
@@ -867,4 +866,4 @@ function filter_get_headers ($imap_stream, $query) {
     return $msgs;
 }
 
-?>
\ No newline at end of file
+?>