X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fi18n.php;h=481d27b02a930b74ba2a31b7bbb035da06b4e356;hp=e1f8a595ae62a7aa3e48e5deb521f37c2158bb94;hb=0300f807ead71c87231d0a931fa0a26cc909abe2;hpb=6fbd125bd6a9b93f4426ded8ec23b4d6986c81bf

diff --git a/functions/i18n.php b/functions/i18n.php
index e1f8a595..481d27b0 100644
--- a/functions/i18n.php
+++ b/functions/i18n.php
@@ -19,7 +19,8 @@
 function charset_decode ($charset, $string) {
     global $languages, $squirrelmail_language;
 
-    if (function_exists($languages[$squirrelmail_language]['XTRA_CODE'])) {
+    if (isset($languages[$squirrelmail_language]['XTRA_CODE']) &&
+        function_exists($languages[$squirrelmail_language]['XTRA_CODE'])) {
         $string = $languages[$squirrelmail_language]['XTRA_CODE']('decode', $string);
     }
 
@@ -33,8 +34,12 @@ function charset_decode ($charset, $string) {
             $ret = charset_decode_iso_8859_1 ($string);
         } else if ($res[1] == '2') {
             $ret = charset_decode_iso_8859_2 ($string);
+        } else if ($res[1] == '4') {
+            $ret = charset_decode_iso_8859_4 ($string);
         } else if ($res[1] == '7') {
             $ret = charset_decode_iso_8859_7 ($string);
+        } else if ($res[1] == '13') {
+            $ret = charset_decode_iso_8859_13 ($string);
         } else if ($res[1] == '15') {
             $ret = charset_decode_iso_8859_15 ($string);
         } else {
@@ -402,6 +407,53 @@ function charset_decode_iso_8859_2 ($string) {
     return $string;
 }
 
+/* 
+   iso-8859-4 is Baltic codeset used in some email clients 
+   instead of iso-8859-13 in Lithuania 
+   only Lithuanian charactes are added.
+*/
+
+function charset_decode_iso_8859_4 ($string) {
+    // latin capital a with ogonek
+    $string = str_replace ("\241", 'Ą', $string);
+    // latin capital c with caron
+    $string = str_replace ("\310", 'Č', $string);
+    // latin capital e with ogonek
+    $string = str_replace ("\312", 'Ę', $string);
+    // latin capital e with dot above
+    $string = str_replace ("\314", 'Ė', $string);
+    // latin capital i with ogonek
+    $string = str_replace ("\307", 'Į', $string);
+    // latin capital s with caron
+    $string = str_replace ("\251", 'Š', $string);
+    // latin capital u with ogonek
+    $string = str_replace ("\331", 'Ų', $string);
+    // latin capital u with macron
+    $string = str_replace ("\336", 'Ū', $string);
+    // latin capital z with caron
+    $string = str_replace ("\256", 'Ž', $string);
+    // latin small a with ogonek
+    $string = str_replace ("\261", 'ą', $string);
+    // latin small c with caron
+    $string = str_replace ("\350", 'č', $string);
+    // latin small e with ogonek
+    $string = str_replace ("\352", 'ę', $string);
+    // latin small e with dot above
+    $string = str_replace ("\354", 'ė', $string);
+    // latin small i with ogonek
+    $string = str_replace ("\347", 'į', $string);
+    // latin small s with caron
+    $string = str_replace ("\271", 'š', $string);
+    // latin small u with ogonek
+    $string = str_replace ("\371", 'ų', $string);
+    // latin small u with macron
+    $string = str_replace ("\376", 'ū', $string);
+    // latin small z with caron
+    $string = str_replace ("\276", 'ž', $string);
+
+    return (charset_decode_iso_8859_1($string));
+}
+
 /* iso-8859-7 is Greek. */
 function charset_decode_iso_8859_7 ($string) {
     global $default_charset;
@@ -440,7 +492,7 @@ function charset_decode_iso_8859_7 ($string) {
      * ISO-8859-7 characters from 11/04 (0xB4) to 11/06 (0xB6)
      * These are Unicode 900-902
      */
-    $string = preg_replace("/([\264-\266])/","'&#' . (ord(\\1)+720)",$string);
+    $string = preg_replace("/([\264-\266])/e",'&#' . (ord("\\1")+720),$string);
     
     /* 11/07 (0xB7) Middle dot is the same in iso-8859-1 */
     $string = str_replace("\267", '·', $string);
@@ -449,7 +501,7 @@ function charset_decode_iso_8859_7 ($string) {
      * ISO-8859-7 characters from 11/08 (0xB8) to 11/10 (0xBA)
      * These are Unicode 900-902
      */
-    $string = preg_replace("/([\270-\272])/","'&#' . (ord(\\1)+720)",$string);
+    $string = preg_replace("/([\270-\272])/e",'&#' . (ord("\\1")+720),$string);
 
     /*
      * 11/11 (0xBB) Right angle quotation mark is the same as in
@@ -458,11 +510,57 @@ function charset_decode_iso_8859_7 ($string) {
     $string = str_replace("\273", '»', $string);
 
     /* And now the rest of the charset */
-    $string = preg_replace("/([\274-\376])/","'&#' . (ord(\\1)+720)",$string);
+    $string = preg_replace("/([\274-\376])/",'&#'.(ord("\\1")+720),$string);
 
     return $string;
 }
 
+/*
+ iso-8859-13 codeset used in Lithuania
+ only Lithuanian charactes are added.
+*/
+
+function charset_decode_iso_8859_13 ($string) {
+    // latin capital a with ogonek
+    $string = str_replace ("\300", 'Ą', $string);
+    // latin capital c with caron
+    $string = str_replace ("\310", 'Č', $string);
+    // latin capital e with ogonek
+    $string = str_replace ("\306", 'Ę', $string);
+    // latin capital e with dot above
+    $string = str_replace ("\313", 'Ė', $string);
+    // latin capital i with ogonek
+    $string = str_replace ("\301", 'Į', $string);
+    // latin capital s with caron
+    $string = str_replace ("\320", 'Š', $string);
+    // latin capital u with ogonek
+    $string = str_replace ("\330", 'Ų', $string);
+    // latin capital u with macron
+    $string = str_replace ("\333", 'Ū', $string);
+    // latin capital z with caron
+    $string = str_replace ("\336", 'Ž', $string);
+    // latin small a with ogonek
+    $string = str_replace ("\340", 'ą', $string);
+    // latin small c with caron
+    $string = str_replace ("\350", 'č', $string);
+    // latin small e with ogonek
+    $string = str_replace ("\346", 'ę', $string);
+    // latin small e with dot above
+    $string = str_replace ("\353", 'ė', $string);
+    // latin small i with ogonek
+    $string = str_replace ("\341", 'į', $string);
+    // latin small s with caron
+    $string = str_replace ("\360", 'š', $string);
+    // latin small u with ogonek
+    $string = str_replace ("\370", 'ų', $string);
+    // latin small u with macron
+    $string = str_replace ("\373", 'ū', $string);
+    // latin small z with caron
+    $string = str_replace ("\376", 'ž', $string);
+
+    return (charset_decode_iso_8859_1($string));
+}
+
 /*
  * iso-8859-15 is Latin 9 and has very much the same use as Latin 1
  * but has the Euro symbol and some characters needed for French.
@@ -679,62 +777,6 @@ function charset_decode_koi8r ($string) {
 }
 
 
-/*
- * Japanese charset extra function
- *
- */
-function japanese_charset_xtra() {
-    $ret = func_get_arg(1);  /* default return value */
-    if (function_exists('mb_detect_encoding')) {
-        switch (func_get_arg(0)) { /* action */
-        case 'decode':
-            $detect_encoding = mb_detect_encoding($ret);
-            if ($detect_encoding == 'JIS' ||
-                $detect_encoding == 'EUC-JP' ||
-                $detect_encoding == 'SJIS') {
-                
-                $ret = mb_convert_encoding($ret, 'EUC-JP', 'AUTO');
-            }
-            break;
-        case 'encode':
-            $detect_encoding = mb_detect_encoding($ret);
-            if ($detect_encoding == 'JIS' ||
-                $detect_encoding == 'EUC-JP' ||
-                $detect_encoding == 'SJIS') {
-                
-                $ret = mb_convert_encoding($ret, 'JIS', 'AUTO');
-            }
-            break;
-        case 'strimwidth':
-            $width = func_get_arg(2);
-            $ret = mb_strimwidth($ret, 0, $width, '...'); 
-            break;
-        case 'encodeheader':
-            $ret = mb_encode_mimeheader($ret);
-            break;
-        case 'decodeheader':
-            $ret = str_replace("\t", "", $ret);
-            if (eregi('=\\?([^?]+)\\?(q|b)\\?([^?]+)\\?=', $ret))
-                $ret = mb_decode_mimeheader($ret);
-            $ret = mb_convert_encoding($ret, 'EUC-JP', 'AUTO');
-            break;
-        case 'downloadfilename':
-            $useragent = func_get_arg(2);
-            if (strstr($useragent, 'Windows') !== false ||
-                strstr($useragent, 'Mac_') !== false) {
-                $ret = mb_convert_encoding($ret, 'SJIS', 'AUTO');
-            } else {
-                $ret = mb_convert_encoding($ret, 'EUC-JP', 'AUTO');
-}
-            break;
-        default:
-            break;
-        }
-    }
-    return $ret;
-}
-
-
 /*
  * Set up the language to be output
  * if $do_search is true, then scan the browser information
@@ -743,7 +785,7 @@ function japanese_charset_xtra() {
 function set_up_language($sm_language, $do_search = false) {
 
     static $SetupAlready = 0;
-    global $HTTP_ACCEPT_LANGUAGE, $use_gettext, $languages,
+    global $use_gettext, $languages,
            $squirrelmail_language, $squirrelmail_default_language,
            $sm_notAlias;
 
@@ -752,8 +794,8 @@ function set_up_language($sm_language, $do_search = false) {
     }
     $SetupAlready = TRUE;
 
-    if ($do_search && ! $sm_language && isset($HTTP_ACCEPT_LANGUAGE)) {
-        $sm_language = substr($HTTP_ACCEPT_LANGUAGE, 0, 2);
+    if ($do_search && ! $sm_language && isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
+        $sm_language = substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2);
     }
     
     if (!$sm_language && isset($squirrelmail_default_language)) {
@@ -898,6 +940,7 @@ $languages['ja']['ALIAS'] = 'ja_JP';
 
 $languages['ko_KR']['NAME']    = 'Korean';
 $languages['ko_KR']['CHARSET'] = 'euc-KR';
+$languages['ko_KR']['XTRA_CODE'] = 'korean_charset_xtra';
 $languages['ko']['ALIAS'] = 'ko_KR';
 
 $languages['nl_NL']['NAME']    = 'Dutch';
@@ -995,7 +1038,7 @@ if ($gettext_flags == 7) {
 /* If we can fake gettext, try that */
 elseif ($gettext_flags == 0) {
     $use_gettext = true;
-    include_once('../functions/gettext.php');
+    include_once(SM_PATH . 'functions/gettext.php');
 } else {
     /* Uh-ho.  A weird install */
     if (! $gettext_flags & 1) {
@@ -1015,4 +1058,112 @@ elseif ($gettext_flags == 0) {
     }
 }
 
+
+/*
+ * Japanese charset extra function
+ *
+ */
+function japanese_charset_xtra() {
+    $ret = func_get_arg(1);  /* default return value */
+    if (function_exists('mb_detect_encoding')) {
+        switch (func_get_arg(0)) { /* action */
+        case 'decode':
+            $detect_encoding = mb_detect_encoding($ret);
+            if ($detect_encoding == 'JIS' ||
+                $detect_encoding == 'EUC-JP' ||
+                $detect_encoding == 'SJIS') {
+                
+                $ret = mb_convert_encoding($ret, 'EUC-JP', 'AUTO');
+            }
+            break;
+        case 'encode':
+            $detect_encoding = mb_detect_encoding($ret);
+            if ($detect_encoding == 'JIS' ||
+                $detect_encoding == 'EUC-JP' ||
+                $detect_encoding == 'SJIS') {
+                
+                $ret = mb_convert_encoding($ret, 'JIS', 'AUTO');
+            }
+            break;
+        case 'strimwidth':
+            $width = func_get_arg(2);
+            $ret = mb_strimwidth($ret, 0, $width, '...'); 
+            break;
+        case 'encodeheader':
+            $result = '';
+            if (strlen($ret) > 0) {
+                $tmpstr = mb_substr($ret, 0, 1);
+                $prevcsize = strlen($tmpstr);
+                for ($i = 1; $i < mb_strlen($ret); $i++) {
+                    $tmp = mb_substr($ret, $i, 1);
+                    if (strlen($tmp) == $prevcsize) {
+                        $tmpstr .= $tmp;
+                    } else {
+                        if ($prevcsize == 1) {
+                            $result .= $tmpstr;
+                        } else {
+                            $result .= mb_encode_mimeheader($tmpstr);
+                        }
+                        $tmpstr = $tmp;
+                        $prevcsize = strlen($tmp);
+                    }
+                }
+                if (strlen($tmpstr)) {
+                    if (strlen(mb_substr($tmpstr, 0, 1)) == 1)
+                        $result .= $tmpstr;
+                    else
+                        $result .= mb_encode_mimeheader($tmpstr);
+                }
+            }
+            $ret = $result;
+            //$ret = mb_encode_mimeheader($ret);
+            break;
+        case 'decodeheader':
+            $ret = str_replace("\t", "", $ret);
+            if (eregi('=\\?([^?]+)\\?(q|b)\\?([^?]+)\\?=', $ret))
+                $ret = mb_decode_mimeheader($ret);
+            $ret = mb_convert_encoding($ret, 'EUC-JP', 'AUTO');
+            break;
+        case 'downloadfilename':
+            $useragent = func_get_arg(2);
+            if (strstr($useragent, 'Windows') !== false ||
+                strstr($useragent, 'Mac_') !== false) {
+                $ret = mb_convert_encoding($ret, 'SJIS', 'AUTO');
+            } else {
+                $ret = mb_convert_encoding($ret, 'EUC-JP', 'AUTO');
+}
+            break;
+        }
+    }
+    return $ret;
+}
+
+
+/*
+ * Korean charset extra function
+ * Hangul(Korean Character) Attached File Name Fix.
+ */
+function korean_charset_xtra() {
+    
+    $ret = func_get_arg(1);  /* default return value */
+    if (func_get_arg(0) == 'downloadfilename') { /* action */
+        $ret = str_replace("\x0D\x0A", '', $ret);  /* Hanmail's CR/LF Clear */
+        for ($i=0;$i<strlen($ret);$i++) {
+            if ($ret[$i] >= "\xA1" && $ret[$i] <= "\xFE") {   /* 0xA1 - 0XFE are Valid */
+                $i++;
+                continue;
+            } else if (($ret[$i] >= 'a' && $ret[$i] <= 'z') || /* From Original ereg_replace in download.php */
+                       ($ret[$i] >= 'A' && $ret[$i] <= 'Z') ||
+                       ($ret[$i] == '.') || ($ret[$i] == '-')) {
+                continue;
+            } else {
+                $ret[$i] = '_';
+            }
+        }
+
+    }
+
+    return $ret;
+}
+
 ?>