Changeset b8e65ce3 in github

Timestamp:

Aug 10, 2007 12:38:29 PM (6 years ago)

Author:

thomascube <thomas@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

8810b6db

Parents:

e715986

Message:

Fix charset converting issues with iconv and mbstring

Files:

• CHANGELOG (modified) (1 diff)
• program/include/main.inc (modified) (3 diffs)

CHANGELOG

@@ -10 +10 @@
 - Make autocomplete for loginform configurable by the skin template
 - Fix compose function from address book (closes #1484426)
+- Added //IGNORE to iconv call (patch #1484420, closes #1484023)
+- Check if mbstring supports charset (#1484290 and #1484292)
+- Prefer iconv over mbstring (as suggested in #1484292)
 - Updated Simplified Chinese localization
 - Added Ukrainian translation

program/include/main.inc

@@ -473 +473 @@
   
   // settings for mbstring module (by Tadashi Jokagi)
-  if (is_null($s_mbstring_loaded))
-    $MBSTRING = $s_mbstring_loaded = extension_loaded("mbstring");
-  else
+  if (is_null($s_mbstring_loaded) && ($s_mbstring_loaded = extension_loaded("mbstring")))
+  {
+    $MBSTRING = array();
+    foreach (mb_list_encodings() as $charset)
+      $MBSTRING[strtoupper($charset)] = strtoupper($charset);
+    
+    // add some alias charsets
+    $MBSTRING['UTF-7'] = "UTF7-IMAP";
+    $MBSTRING['WINDOWS-1257'] = "ISO-8859-13";
+  }
+  else if (is_null($s_mbstring_loaded))
     $MBSTRING = $s_mbstring_loaded = FALSE;
     
@@ -1050 +1058 @@
   {
   global $MBSTRING;
+  static $mb_encodings;
 
   $from = strtoupper($from);
@@ -1057 +1066 @@
     return $str;
 
+  // convert charset using iconv module  
+  if (function_exists('iconv') && $from != 'UTF-7' && $to != 'UTF-7')
+    return iconv($from, $to . "//IGNORE", $str);
+
   // convert charset using mbstring module  
-  if ($MBSTRING)
-    {
-    $to = $to=="UTF-7" ? "UTF7-IMAP" : $to;
-    $from = $from=="UTF-7" ? "UTF7-IMAP": $from;
-
+  if ($MBSTRING && ($mbfrom = $MBSTRING[$from]) && ($mbto = $MBSTRING[$to]))
+    {
     // return if convert succeeded
-    if (($out = mb_convert_encoding($str, $to, $from)) != '')
+    if (($out = mb_convert_encoding($str, $mbto, $mbfrom)) != '')
       return $out;
     }
-
-  // convert charset using iconv module  
-  if (function_exists('iconv') && $from!='UTF-7' && $to!='UTF-7')
-    return iconv($from, $to, $str);
 
   $conv = new utf8();