Changeset b1fb698 in github

Timestamp:

Jun 3, 2009 2:45:39 PM (4 years ago)

Author:

alecpl <alec@…>

Branches:

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

Children:

42b25af

Parents:

024130b

Message:

• added more charset aliases

File:

• program/include/main.inc (modified) (4 diffs)

program/include/main.inc

@@ -244 +244 @@
     }
     else if ($from != 'UTF-8' && $conv) {
-      $from = preg_replace(array('/^WINDOWS-*/', '/^CP-/'), array('CP', 'CP'), $from);
+      $from = preg_replace(array('/^WINDOWS-*125([0-8])$/', '/^CP-/'), array('CP125\\1', 'CP'), $from);
       $conv->loadCharset($from);
       $str = $conv->strToUtf8($str);
@@ -265 +265 @@
     }
     else if ($to != 'UTF-8' && $conv) {
-      $to = preg_replace(array('/^WINDOWS-*/', '/^CP-/'), array('CP', 'CP'), $to);
+      $to = preg_replace(array('/^WINDOWS-*125([0-8])$/', '/^CP-/'), array('CP125\\1', 'CP'), $to);
       $conv->loadCharset($to);
       return $conv->utf8ToStr($str);
@@ -306 +306 @@
   $charset = str_replace('UNICODE-1-1-', '', $charset);
 
+  # Aliases: some of them from HTML5 spec.
   $aliases = array(
     'USASCII'       => 'WINDOWS-1252',
@@ -314 +315 @@
     'XUSERDEFINED'  => 'ISO-8859-15',
     'KSC56011987'   => 'EUC-KR',
-    'GB2312'        => 'GB18030',
+    'GB2312'        => 'GBK',
+    'GB231280'      => 'GBK',
     'UNICODE'       => 'UTF-8',
-    'UTF7IMAP'      => 'UTF7-IMAP'
+    'UTF7IMAP'      => 'UTF7-IMAP',
+    'XXBIG5'        => 'BIG5',
+    'TIS620'        => 'WINDOWS-874',
+    'ISO88599'      => 'WINDOWS-1254',
+    'ISO885911'     => 'WINDOWS-874',
   );