Ticket #1484961: rcube_imap.patch

rcube_imap.php

@@ -1337 +1336 @@
       if ($o_part->ctype_primary=='text' || $o_part->ctype_primary=='message')
         {
         // assume default if no charset specified
-        if (empty($o_part->charset))
-          $o_part->charset = $this->default_charset;
+        if (empty($o_part->charset) || preg_match('/us-ascii|x-unknown/i', $o_part->charset))
+          $o_part->charset = rc_detect_encoding(substr($body, 0, 10000), $this->default_charset);
 
         $body = rcube_charset_convert($body, $o_part->charset);
         }
@@ -1364 +1363 @@
   function &get_body($uid, $part=1)
     {
     $headers = $this->get_headers($uid);
-    return rcube_charset_convert(
-      $this->mime_decode($this->get_message_part($uid, $part), 'quoted-printable'),
-      $headers->charset ? $headers->charset : $this->default_charset);
+    $body = $this->mime_decode($this->get_message_part($uid, $part), 'quoted-printable');
+    return rcube_charset_convert($body, $headers->charset ? $headers->charset
+        : rc_detect_encoding(substr($body, 0, 10000), $this->default_charset));
     }
 
 
@@ -2434 +2433 @@
    */
   function decode_header($input, $remove_quotes=FALSE)
     {
-    $str = rcube_imap::decode_mime_string((string)$input, $this->default_charset);
+    $str = rcube_imap::decode_mime_string((string)$input, rc_detect_encoding($input));
     if ($str{0}=='"' && $remove_quotes)
       $str = str_replace('"', '', $str);
     
@@ -2571 +2570 @@
       return rcube_charset_convert($body, $ctype_param['charset']);
 
     // defaults to what is specified in the class header
-    return rcube_charset_convert($body,  $this->default_charset);
+    return rcube_charset_convert($body,  rc_detect_encoding(substr($body, 0, 10000), $this->default_charset));
     }