Changeset 5598 in subversion

Timestamp:

Dec 13, 2011 6:53:03 AM (18 months ago)

Author:

alec

Message:

• Improve convert_criteria() so string literals will be not used if possible, to workaround issues with some buggy IMAP servers

File:

• trunk/roundcubemail/program/include/rcube_imap.php (modified) (2 diffs)

trunk/roundcubemail/program/include/rcube_imap.php

@@ -1401 +1401 @@
      * @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)
@@ -1521 +1522 @@
                 $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;
             }