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

diff --git a/ChangeLog b/ChangeLog
index 39089bcd9017564fdf0723345f344b1d9903fc70..805a4d53793f551b375bf5f8ebcab622f417e531 100644 (file)
--- 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 b41302fa60a1bec498143aff96c119006f748933..aa9f8b3ce141b68acdfe46598aeb4b4c2af7c9ad 100644 (file)
--- 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 */