Ticket #1484730: roundcube-r955-charset.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

@@ -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';
+
   if (empty($conf['log_dir']))
     $conf['log_dir'] = $INSTALL_PATH.'logs';
   else

program/include/rcube_imap.inc

@@ -65 +65 @@
   var $search_string = '';
   var $search_charset = '';
   var $debug_level = 1;
+  var $charset = '';  
   var $error_code = 0;
 
 
@@ -78 +79 @@
     $this->db = $db_conn;
     }
 
+  function setCharset($charset) {
+    $this->charset = $charset;
+    }
 
   /**
    * PHP 4 object constructor
@@ -889 +893 @@
       $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!=$GLOBALS['CONFIG']['locale_charset'])
+        $results = $this->search($mbox_name, $criteria, rcube_charset_convert($str, $charset, $GLOBALS['CONFIG']['locale_charset']), $GLOBALS['CONFIG']['locale_charset']);
       
       $this->set_search_set($criteria, $str, $results, $charset);
       return $results;
@@ -1229 +1233 @@
         {
         // assume ISO-8859-1 if no charset specified
         if (empty($o_part->charset))
-          $o_part->charset = 'ISO-8859-1';
+          $o_part->charset = $GLOBALS['CONFIG']['locale_charset'];
 
         $body = rcube_charset_convert($body, $o_part->charset);
         }
@@ -2279 +2283 @@
    */
   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 +2322 @@
       }
       
     // no encoding information, use fallback
-    return rcube_charset_convert($input, !empty($fallback) ? $fallback : 'ISO-8859-1');
+    return rcube_charset_convert($input, !empty($fallback) ? $fallback : $GLOBALS['CONFIG']['locale_charset'] );
     }
 
 
@@ -2396 +2400 @@
       return rcube_charset_convert($body, $ctype_param['charset']);
 
     // defaults to what is specified in the class header
-    return rcube_charset_convert($body,  'ISO-8859-1');
+    return rcube_charset_convert($body,  $GLOBALS['CONFIG']['locale_charset'] );
     }
 
 

program/lib/Mail/mime.php

@@ -182 +182 @@
                                      'text_encoding' => '7bit',
                                      'html_encoding' => 'quoted-printable',
                                      '7bit_wrap'     => 998,
-                                     'html_charset'  => 'ISO-8859-1',
-                                     'text_charset'  => 'ISO-8859-1',
-                                     'head_charset'  => 'ISO-8859-1'
+                                     'html_charset'  => $GLOBALS['CONFIG']['locale_charset'],
+                                     'text_charset'  => $GLOBALS['CONFIG']['locale_charset'],
+                                     'head_charset'  => $GLOBALS['CONFIG']['locale_charset']
                                     );
     }
 
@@ -527 +527 @@
         $params['encoding']     = $value['encoding'];
         if ($value['disposition'] != "inline") {
             $fname = array("fname" => $value['name']);
-            $fname_enc = $this->_encodeHeaders($fname, array('head_charset' => $value['charset'] ? $value['charset'] : 'iso-8859-1'));
+            $fname_enc = $this->_encodeHeaders($fname, array('head_charset' => $value['charset'] ? $value['charset'] : $GLOBALS['CONFIG']['locale_charset']));
             $params['dfilename'] = $fname_enc['fname'];
         }
         if ($value['charset']) {

program/lib/utf8.class.php

@@ -38 +38 @@
 // Adapted to fit RoundCube
 define("UTF8_MAP_DIR", "program/lib/encoding");
 $utf8_maps = array(
+  "KOI8-R" => UTF8_MAP_DIR . "/KOI8R.map",
+  "KOI8_R" => UTF8_MAP_DIR . "/KOI8R.map",
+  "KOI8R"  => UTF8_MAP_DIR . "/KOI8R.map",
   "CP1250" => UTF8_MAP_DIR . "/CP1250.map",
   "CP1251" => UTF8_MAP_DIR . "/CP1251.map",
   "CP1252" => UTF8_MAP_DIR . "/CP1252.map",
@@ -64 +67 @@
 //Class definition
 Class utf8{
 
-  var $charset = "ISO-8859-1";
+  var $charset = "";
   var $ascMap = array();
   var $utfMap = array();
 
   // made PHP5 capable by RoundCube
-  function __construct($charset="ISO-8859-1"){
-    $this->loadCharset($charset);
+  function __construct($charset=""){
+     $this->charset = $GLOBALS['CONFIG']['locale_charset'];
+     if(empty($charset)) $charset = $this->charset;
+     $this->loadCharset($charset);
   }
   
   //Constructor
-  function utf8($charset="ISO-8859-1"){
+  function utf8($charset=""){
     $this->__construct($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";