From 82f4820fae85ede4f961c3ea71292ee7322128f6 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Tue, 13 Dec 2011 06:53:03 -0500
Subject: [PATCH] - Improve convert_criteria() so string literals will be not used if possible, to workaround issues with some buggy IMAP servers
---
program/include/rcube_imap.php | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index 3552010..60cc415 100644
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@@ -1400,6 +1400,7 @@
* @param string $charset Search charset
* @param string $sort_field Header field to sort by
* @access public
+ * @todo: Search criteria should be provided in non-IMAP format, eg. array
*/
function search($mailbox='', $str='ALL', $charset=NULL, $sort_field=NULL)
{
@@ -1520,9 +1521,9 @@
$string_offset = $m[1] + strlen($m[0]) + 4; // {}\r\n
$string = substr($str, $string_offset - 1, $m[0]);
$string = rcube_charset_convert($string, $charset, $dest_charset);
- if (!$string)
+ if ($string === false)
continue;
- $res .= sprintf("%s{%d}\r\n%s", substr($str, $last, $m[1] - $last - 1), strlen($string), $string);
+ $res .= substr($str, $last, $m[1] - $last - 1) . rcube_imap_generic::escape($string);
$last = $m[0] + $string_offset - 1;
}
if ($last < strlen($str))
--
Gitblit v1.9.1