X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fdecode%2Ftis_620.php;h=8b55bbec9c64161b881e570718a195f988b23c5b;hp=c817e9ffd5823878a37dc99e877962a8679b9df2;hb=5e5daa47f6270e55903f95fb3deff491fde2d6f5;hpb=df8c4d6d0d3ecbfd0bb64f52ab6db6708debbdba

diff --git a/functions/decode/tis_620.php b/functions/decode/tis_620.php
index c817e9ff..8b55bbec 100644
--- a/functions/decode/tis_620.php
+++ b/functions/decode/tis_620.php
@@ -1,21 +1,18 @@
 <?php
+
 /**
  * decode/tis620.php
- * $Id$
- *
- * Copyright (c) 2003 The SquirrelMail Project Team
- * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
  * This file contains tis620 decoding function that is needed to read
  * tis620 encoded mails in non-tis620 locale.
- * 
+ *
  * Original data taken from:
  *  http://www.inet.co.th/cyberclub/trin/thairef/tis620-iso10646.html
  *
  * Original copyright:
  *  Note: The information contained herein is provided as-is. It was
  *  complied from various references given at the end of the page.
- *  The author (trin@mozart.inet.co.th) believes all information 
+ *  The author (trin@mozart.inet.co.th) believes all information
  *  presented here is accurate.
  *
  *     References
@@ -34,6 +31,9 @@
  *  5. http://charts.unicode.org/Unicode.charts/normal/U0E00.html
  *  6. http://www.unicode.org/
  *
+ * @copyright 2003-2015 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$
  * @package squirrelmail
  * @subpackage decode
  */
@@ -44,118 +44,110 @@
  * @return string Decoded string
  */
 function charset_decode_tis_620 ($string) {
-    global $default_charset;
-
-    if (strtolower($default_charset) == 'tis-620')
-        return $string;
-
-    /* Only do the slow convert if there are 8-bit characters */
-    /* there is no 0x80-0x9F letters in TIS620 */
-    if ( ! ereg("[\241-\377]", $string) )
+    // don't do decoding when there are no 8bit symbols
+    if (! sq_is8bit($string,'tis-620'))
         return $string;
 
     $tis620 = array(
-		"\xA0" => '&#65535;',
-		"\xA1" => '&#3585;',
-		"\xA2" => '&#3586;',
-		"\xA3" => '&#3587;',
-		"\xA4" => '&#3588;',
-		"\xA5" => '&#3589;',
-		"\xA6" => '&#3590;',
-		"\xA7" => '&#3591;',
-		"\xA8" => '&#3592;',
-		"\xA9" => '&#3593;',
-		"\xAA" => '&#3594;',
-		"\xAB" => '&#3595;',
-		"\xAC" => '&#3596;',
-		"\xAD" => '&#3597;',
-		"\xAE" => '&#3598;',
-		"\xAF" => '&#3599;',
-		"\xB0" => '&#3600;',
-		"\xB1" => '&#3601;',
-		"\xB2" => '&#3602;',
-		"\xB3" => '&#3603;',
-		"\xB4" => '&#3604;',
-		"\xB5" => '&#3605;',
-		"\xB6" => '&#3606;',
-		"\xB7" => '&#3607;',
-		"\xB8" => '&#3608;',
-		"\xB9" => '&#3609;',
-		"\xBA" => '&#3610;',
-		"\xBB" => '&#3611;',
-		"\xBC" => '&#3612;',
-		"\xBD" => '&#3613;',
-		"\xBE" => '&#3614;',
-		"\xBF" => '&#3615;',
-		"\xC0" => '&#3616;',
-		"\xC1" => '&#3617;',
-		"\xC2" => '&#3618;',
-		"\xC3" => '&#3619;',
-		"\xC4" => '&#3620;',
-		"\xC5" => '&#3621;',
-		"\xC6" => '&#3622;',
-		"\xC7" => '&#3623;',
-		"\xC8" => '&#3624;',
-		"\xC9" => '&#3625;',
-		"\xCA" => '&#3626;',
-		"\xCB" => '&#3627;',
-		"\xCC" => '&#3628;',
-		"\xCD" => '&#3629;',
-		"\xCE" => '&#3630;',
-		"\xCF" => '&#3631;',
-		"\xD0" => '&#3632;',
-		"\xD1" => '&#3633;',
-		"\xD2" => '&#3634;',
-		"\xD3" => '&#3635;',
-		"\xD4" => '&#3636;',
-		"\xD5" => '&#3637;',
-		"\xD6" => '&#3638;',
-		"\xD7" => '&#3639;',
-		"\xD8" => '&#3640;',
-		"\xD9" => '&#3641;',
-		"\xDA" => '&#3642;',
-		"\xDB" => '&#65535;',
-		"\xDC" => '&#65535;',
-		"\xDD" => '&#65535;',
-		"\xDE" => '&#65535;',
-		"\xDF" => '&#3647;',
-		"\xE0" => '&#3648;',
-		"\xE1" => '&#3649;',
-		"\xE2" => '&#3650;',
-		"\xE3" => '&#3651;',
-		"\xE4" => '&#3652;',
-		"\xE5" => '&#3653;',
-		"\xE6" => '&#3654;',
-		"\xE7" => '&#3655;',
-		"\xE8" => '&#3656;',
-		"\xE9" => '&#3657;',
-		"\xEA" => '&#3658;',
-		"\xEB" => '&#3659;',
-		"\xEC" => '&#3660;',
-		"\xED" => '&#3661;',
-		"\xEE" => '&#3662;',
-		"\xEF" => '&#3663;',
-		"\xF0" => '&#3664;',
-		"\xF1" => '&#3665;',
-		"\xF2" => '&#3666;',
-		"\xF3" => '&#3667;',
-		"\xF4" => '&#3668;',
-		"\xF5" => '&#3669;',
-		"\xF6" => '&#3670;',
-		"\xF7" => '&#3671;',
-		"\xF8" => '&#3672;',
-		"\xF9" => '&#3673;',
-		"\xFA" => '&#3674;',
-		"\xFB" => '&#3675;',
-		"\xFC" => '&#65535;',
-		"\xFD" => '&#65535;',
-		"\xFE" => '&#65535;',
-		"\xFF" => '&#65535;'
-		);
+        "\xA0" => '&#65535;',
+        "\xA1" => '&#3585;',
+        "\xA2" => '&#3586;',
+        "\xA3" => '&#3587;',
+        "\xA4" => '&#3588;',
+        "\xA5" => '&#3589;',
+        "\xA6" => '&#3590;',
+        "\xA7" => '&#3591;',
+        "\xA8" => '&#3592;',
+        "\xA9" => '&#3593;',
+        "\xAA" => '&#3594;',
+        "\xAB" => '&#3595;',
+        "\xAC" => '&#3596;',
+        "\xAD" => '&#3597;',
+        "\xAE" => '&#3598;',
+        "\xAF" => '&#3599;',
+        "\xB0" => '&#3600;',
+        "\xB1" => '&#3601;',
+        "\xB2" => '&#3602;',
+        "\xB3" => '&#3603;',
+        "\xB4" => '&#3604;',
+        "\xB5" => '&#3605;',
+        "\xB6" => '&#3606;',
+        "\xB7" => '&#3607;',
+        "\xB8" => '&#3608;',
+        "\xB9" => '&#3609;',
+        "\xBA" => '&#3610;',
+        "\xBB" => '&#3611;',
+        "\xBC" => '&#3612;',
+        "\xBD" => '&#3613;',
+        "\xBE" => '&#3614;',
+        "\xBF" => '&#3615;',
+        "\xC0" => '&#3616;',
+        "\xC1" => '&#3617;',
+        "\xC2" => '&#3618;',
+        "\xC3" => '&#3619;',
+        "\xC4" => '&#3620;',
+        "\xC5" => '&#3621;',
+        "\xC6" => '&#3622;',
+        "\xC7" => '&#3623;',
+        "\xC8" => '&#3624;',
+        "\xC9" => '&#3625;',
+        "\xCA" => '&#3626;',
+        "\xCB" => '&#3627;',
+        "\xCC" => '&#3628;',
+        "\xCD" => '&#3629;',
+        "\xCE" => '&#3630;',
+        "\xCF" => '&#3631;',
+        "\xD0" => '&#3632;',
+        "\xD1" => '&#3633;',
+        "\xD2" => '&#3634;',
+        "\xD3" => '&#3635;',
+        "\xD4" => '&#3636;',
+        "\xD5" => '&#3637;',
+        "\xD6" => '&#3638;',
+        "\xD7" => '&#3639;',
+        "\xD8" => '&#3640;',
+        "\xD9" => '&#3641;',
+        "\xDA" => '&#3642;',
+        "\xDB" => '&#65535;',
+        "\xDC" => '&#65535;',
+        "\xDD" => '&#65535;',
+        "\xDE" => '&#65535;',
+        "\xDF" => '&#3647;',
+        "\xE0" => '&#3648;',
+        "\xE1" => '&#3649;',
+        "\xE2" => '&#3650;',
+        "\xE3" => '&#3651;',
+        "\xE4" => '&#3652;',
+        "\xE5" => '&#3653;',
+        "\xE6" => '&#3654;',
+        "\xE7" => '&#3655;',
+        "\xE8" => '&#3656;',
+        "\xE9" => '&#3657;',
+        "\xEA" => '&#3658;',
+        "\xEB" => '&#3659;',
+        "\xEC" => '&#3660;',
+        "\xED" => '&#3661;',
+        "\xEE" => '&#3662;',
+        "\xEF" => '&#3663;',
+        "\xF0" => '&#3664;',
+        "\xF1" => '&#3665;',
+        "\xF2" => '&#3666;',
+        "\xF3" => '&#3667;',
+        "\xF4" => '&#3668;',
+        "\xF5" => '&#3669;',
+        "\xF6" => '&#3670;',
+        "\xF7" => '&#3671;',
+        "\xF8" => '&#3672;',
+        "\xF9" => '&#3673;',
+        "\xFA" => '&#3674;',
+        "\xFB" => '&#3675;',
+        "\xFC" => '&#65535;',
+        "\xFD" => '&#65535;',
+        "\xFE" => '&#65535;',
+        "\xFF" => '&#65535;'
+        );
 
     $string = str_replace(array_keys($tis620), array_values($tis620), $string);
 
     return $string;
 }
-
-?>