Changeset 2334 in subversion

Timestamp:

Mar 6, 2009 3:52:21 PM (4 years ago)

Author:

alec

Message:

• Use US-ASCII as failover when Unicode searching fails (#1485762) only US-ASCII is a must-have charset from IMAP's RFC

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• program/include/rcube_imap.php (modified) (3 diffs)

trunk/roundcubemail/CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Use US-ASCII as failover when Unicode searching fails (#1485762)
 - Fix errors handling in IMAP command continuations (#1485762)
 - Fix FETCH result parsing for servers returning flags at the end of result (#1485763)

trunk/roundcubemail/program/include/rcube_imap.php

@@ -956 +956 @@
     $results = $this->_search_index($mailbox, $str, $charset, $sort_field);
 
-    // try search with ISO charset (should be supported by server)
+    // try search with US-ASCII charset (should be supported by server)
     // only if UTF-8 search is not supported
-    if (empty($results) && !is_array($results) && !empty($charset) && $charset!='ISO-8859-1')
-      {
-        // convert strings to ISO-8859-1
+    if (empty($results) && !is_array($results) && !empty($charset) && $charset!='US-ASCII')
+      {
+        // convert strings to US_ASCII
         if(preg_match_all('/\{([0-9]+)\}\r\n/', $str, $matches, PREG_OFFSET_CAPTURE))
           {
@@ -968 +968 @@
             $string_offset = $m[1] + strlen($m[0]) + 4; // {}\r\n
             $string = substr($str, $string_offset - 1, $m[0]);
-            $string = rcube_charset_convert($string, $charset, 'ISO-8859-1');
+            $string = rcube_charset_convert($string, $charset, 'US-ASCII');
+            if (!$string) continue;
             $res .= sprintf("%s{%d}\r\n%s", substr($str, $last, $m[1] - $last - 1), strlen($string), $string);
             $last = $m[0] + $string_offset - 1;
@@ -978 +979 @@
           $res = $str;
           
-        $results = $this->search($mbox_name, $res, 'ISO-8859-1', $sort_field);
+        $results = $this->search($mbox_name, $res, '', $sort_field);
       }