From 91b5aa0208aaafb7b35551ee1486280262d510d0 Mon Sep 17 00:00:00 2001
From: tokul <tokul@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Sat, 24 Sep 2005 17:22:32 +0000
Subject: [PATCH] fix imap command. \r\n is added by sqimap_run_command. If
 second \r\n is present, it breaks next issued imap command
 (sqimap_mailbox_exists() always returns true).

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@10119 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 ChangeLog                   | 2 ++
 plugins/filters/filters.php | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 39089bcd..805a4d53 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -446,6 +446,8 @@ Version 1.5.1 -- CVS
     in src/configtest.php.
   - Added field size controls to database preference backend (#1233721).
   - Added bincimap preset (#1285099).
+  - Fixed IMAP search command in filters plugin. Command was breaking 
+    sqimap_mailbox_exists() check. Reported by Daniel Watts.
 
 Version 1.5.0 - 2 February 2004
 -------------------------------
diff --git a/plugins/filters/filters.php b/plugins/filters/filters.php
index b41302fa..aa9f8b3c 100644
--- a/plugins/filters/filters.php
+++ b/plugins/filters/filters.php
@@ -315,7 +315,7 @@ function filter_search_and_delete($imap_stream, $where, $what, $where_to, $user_
         $search_str .= ' ' . $where . ' ' . $what;
     } else {
         $search_str .= ' ' . $where . ' {' . strlen($what) . "}\r\n"
-                    . $what . "\r\n";
+                    . $what;
     }
 
     /* read data back from IMAP */
-- 
2.25.1