From 6174dcc7e002e375dfb65fe8209ff82474ac88c5 Mon Sep 17 00:00:00 2001 From: stekkel Date: Mon, 2 Jun 2003 21:19:53 +0000 Subject: [PATCH] Fixed wrong sqimap_run_command call. The $sid is added inside sqimap_run_command!. git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@4964 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- plugins/filters/filters.php | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/plugins/filters/filters.php b/plugins/filters/filters.php index eea3e1cd..1300394e 100644 --- a/plugins/filters/filters.php +++ b/plugins/filters/filters.php @@ -332,16 +332,15 @@ function spam_filters($imap_stream) { $read = sqimap_run_command($imap_stream, 'FETCH 1:* (FLAGS BODY.PEEK[HEADER.FIELDS ' . '(RECEIVED)])', true, $response, $message, $uid_support); } else { - $read[0] = trim($read[0]); - $i = 0; - $imap_query = $sid.' FETCH '; - $Chunks = explode(' ', $read[0]); - for ($i=2; $i < (count($Chunks)-1) ; $i++) { - $imap_query .= $Chunks[$i].','; + if (isset($read[0])) { + if (preg_match("/^\* SEARCH (.+)$/", $read[0], $regs)) { + $search_array = preg_split("/ /", trim($regs[1])); + } } - $imap_query .= $Chunks[count($Chunks)-1]; + $msgs_str = sqimap_message_list_squisher($search_array); + $imap_query = 'FETCH '.$msgs_str; $imap_query .= ' (FLAGS BODY.PEEK[HEADER.FIELDS '; - $imap_query .= '(RECEIVED)])';//\r\n"; + $imap_query .= '(RECEIVED)])'; $read = sqimap_run_command($imap_stream,$imap_query, true, $response, $message, $uid_support); } } -- 2.25.1