Ticket #1484961: roundcubemail-1246-default-charset.patch

program/include/rcube_imap.inc

@@ -1016 +1016 @@
    */
   function &get_structure($uid)
     {
+    global $CONFIG;
+
     $cache_key = $this->mailbox.'.msg';
     $headers = &$this->get_cached_message($cache_key, $uid, true);
 
@@ -1028 +1030 @@
       return FALSE;
 
     $structure_str = iil_C_FetchStructureString($this->conn, $this->mailbox, $msg_id); 
+    if ( preg_match ('/US-ASCII/', $structure_str) ) {
+      if ( $CONFIG['default_charset'] )
+        $structure_str = preg_replace ('/US-ASCII/', $CONFIG['default_charset'], $structure_str);
+    }
     $structure = iml_GetRawStructureArray($structure_str);
     $struct = false;
 
@@ -2334 +2340 @@
    */
   function decode_mime_string($input, $fallback=null)
     {
+    global $CONFIG;
     $out = '';
 
     $pos = strpos($input, '=?');
@@ -2359 +2366 @@
       }
       
     // no encoding information, use fallback
-    return rcube_charset_convert($input, !empty($fallback) ? $fallback : 'ISO-8859-1');
+    $def_charset = $CONFIG['default_charset'] ? $CONFIG['default_charset'] : 'ISO-8859-1';
+    return rcube_charset_convert($input, !empty($fallback) ? $fallback : $def_charset);
     }