Ticket #1484730: roundcube-charset-new.diff

config/main.inc.php.dist

@@ -120 +120 @@
 // the default locale setting
 $rcmail_config['locale_string'] = 'en';
 
+// the default locale charset
+$rcmail_config['locale_charset'] = 'ISO-8859-1';
+
 // use this format for short date display
 $rcmail_config['date_short'] = 'D H:i';
 

program/include/main.inc

@@ -126 +126 @@
  */
 function rcmail_load_config()
   {
-  global $INSTALL_PATH;
+  global $INSTALL_PATH, $utf8_maps;
 
   // load config file
   include_once('config/main.inc.php');
@@ -141 +141 @@
   include_once('config/db.inc.php');
   $conf = array_merge($conf, $rcmail_config);
 
+  if (empty($conf['locale_charset']))
+    $conf['locale_charset'] = 'ISO-8859-1';
+
+  $utf8_maps['KOI8-R'] = UTF8_MAP_DIR . "/KOI8R.map";
+  $utf8_maps['KOI8_R'] = UTF8_MAP_DIR . "/KOI8R.map";
+  $utf8_maps['KOI8R'] = UTF8_MAP_DIR . "/KOI8R.map";
+
   if (empty($conf['log_dir']))
     $conf['log_dir'] = $INSTALL_PATH.'logs';
   else
@@ -255 +262 @@
   $IMAP = new rcube_imap($DB);
   $IMAP->debug_level = $CONFIG['debug_level'];
   $IMAP->skip_deleted = $CONFIG['skip_deleted'];
+  $IMAP->setDefaultCharset($CONFIG['locale_charset']);
 
 
   // connect with stored session data
@@ -901 +909 @@
  */
 function rcube_charset_convert($str, $from, $to=NULL)
   {
-  global $MBSTRING;
+  global $MBSTRING, $CONFIG;
 
   $from = strtoupper($from);
   $to = $to==NULL ? strtoupper(RCMAIL_CHARSET) : strtoupper($to);
@@ -926 +934 @@
       return $out;
     }
 
-  $conv = new utf8();
+  $conv = new utf8($CONFIG['locale_charset']);
 
   // convert string to UTF-8
   if ($from=='UTF-7')

program/include/rcube_imap.inc

@@ -66 +66 @@
   var $search_charset = '';
   var $debug_level = 1;
   var $error_code = 0;
+  var $charset = '';
+  static $default_charset = 'ISO-8859-1';
 
 
   /**
@@ -78 +80 @@
     $this->db = $db_conn;
     }
 
+  function setCharset($charset) {
+    if(!empty($charset)) $this->charset = $charset;
+    else $this->charset = rcube_imap::$default_charset;
+    }
+
+  function setDefaultCharset($charset) {
+    rcube_imap::$default_charset = $charset;
+    $this->setCharset($charset);
+    }
 
   /**
    * PHP 4 object constructor
@@ -889 +900 @@
       $results = $this->_search_index($mailbox, $search);
 
       // try search with ISO charset (should be supported by server)
-      if (empty($results) && !empty($charset) && $charset!='ISO-8859-1')
-        $results = $this->search($mbox_name, $criteria, rcube_charset_convert($str, $charset, 'ISO-8859-1'), 'ISO-8859-1');
+      if (empty($results) && !empty($charset) && $charset!=$this->charset)
+        $results = $this->search($mbox_name, $criteria, rcube_charset_convert($str, $charset, $this->charset), $this->charset);
       
       $this->set_search_set($criteria, $str, $results, $charset);
       return $results;
@@ -1227 +1238 @@
       // convert charset (if text or message part)
       if ($o_part->ctype_primary=='text' || $o_part->ctype_primary=='message')
         {
-        // assume ISO-8859-1 if no charset specified
+        // assume default locale charset if no charset specified
         if (empty($o_part->charset))
-          $o_part->charset = 'ISO-8859-1';
+          $o_part->charset = $this->charset;
 
         $body = rcube_charset_convert($body, $o_part->charset);
         }
@@ -2279 +2290 @@
    */
   function decode_header($input, $remove_quotes=FALSE)
     {
-    $str = $this->decode_mime_string((string)$input);
+    $str = $this->decode_mime_string((string)$input, !empty($this->charset) ? $this->charset : null );
     if ($str{0}=='"' && $remove_quotes)
       $str = str_replace('"', '', $str);
     
@@ -2318 +2329 @@
       }
       
     // no encoding information, use fallback
-    return rcube_charset_convert($input, !empty($fallback) ? $fallback : 'ISO-8859-1');
+    return rcube_charset_convert($input, !empty($fallback) ? $fallback : rcube_imap::$default_charset );
     }
 
 

program/steps/mail/func.inc

@@ -229 +229 @@
     
     $out .= sprintf("<td class=\"icon\">%s</td>\n", $message_icon ? sprintf($image_tag, $skin_path, $message_icon, '') : '');
     
+    $IMAP->setCharset($header->charset);
+    
     // format each col
     foreach ($a_show_cols as $col)
       {
@@ -317 +319 @@
     if (empty($header))
       continue;
 
+    $IMAP->setCharset($header->charset);
+
     // format each col; similar as in rcmail_message_list()
     foreach ($a_show_cols as $col)
       {
@@ -815 +819 @@
   
   $header_count = 0;
   
+  $IMAP->setCharset($headers['charset']);
+
   // allow the following attributes to be added to the <table> tag
   $attrib_str = create_attrib_string($attrib, array('style', 'class', 'id', 'cellpadding', 'cellspacing', 'border', 'summary'));
   $out = '<table' . $attrib_str . ">\n";