From 1d33e35ed41c36c4e3639a9cbecbd9aee7ae40fd Mon Sep 17 00:00:00 2001
From: philippe_mingo <philippe_mingo@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Wed, 28 Aug 2002 11:36:08 +0000
Subject: [PATCH] "J.I Kim" <aporie@iskra.sarang.net>

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@3491 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 functions/i18n.php                       | 141 ++++++++++++++---------
 locale/es_ES/LC_MESSAGES/squirrelmail.mo | Bin 74867 -> 74865 bytes
 locale/ko_KR/LC_MESSAGES/squirrelmail.mo | Bin 69443 -> 69443 bytes
 3 files changed, 84 insertions(+), 57 deletions(-)

diff --git a/functions/i18n.php b/functions/i18n.php
index f7ad4658..3a916eff 100644
--- a/functions/i18n.php
+++ b/functions/i18n.php
@@ -680,62 +680,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
@@ -899,6 +843,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';
@@ -1016,4 +961,86 @@ 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':
+            $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;
+}
+
+?>
\ No newline at end of file
diff --git a/locale/es_ES/LC_MESSAGES/squirrelmail.mo b/locale/es_ES/LC_MESSAGES/squirrelmail.mo
index 3670d89c020f300a3ad546bbf9adb26e36f4ae7b..db913af98de22d274562417e0e804493d0180eb3 100644
GIT binary patch
delta 2658
zcmXZcdra0<9LMqVd$<TF0?I`Z9v(!YxIOqNh)_y~Gz@R#C{t&GHp`Sn&ZZ{6%*~dS
z*%)hX%&iMJ^VWRKrp(gDk}htowo(erZp$t+r!6$p-XG47KY0Dl?>WD7zUO<s=UnTJ
zyxJT2-t}TP%NSEUXiNsq$0%HjBk^fW!>t&N?KlcMJon>R+Q&UV!z9`R=*Pb?6BBM2
z6N^Qdg3~?c-7xO(izctbCe#4iaU8aL9!3Rp7B$e<7?1rp2LC_>cpEiw)J<bX;3QOl
zg{a@FFcKfY30Qa2wG*x3g)*@XFXEf1NVolGKYRl<;9g9|E=<I39FJdMI{u2I(HXMe
zC88FRhH+TpwJR}(_F|WZJ|32%R$hL~PB0f!X|KQn$C!<nK>MxRcEF>k{-0wn_Tzf&
zx??9!G0t#?GSJWaeAI$!Q5jo-W$3o>ph)(kB0P#p)hSf!dT;`s#|*rV*_h-w!?iIL
z7t($ZwKW~6K)WyxkK=qCz=>GobB1edA<}kD0}o35CJf*n%*B(KgO^Y#j*74=$wKY@
zOjNPfp;lCnkKt<6N<TrR{(IDd{z1(%gj#S$q+{-7elwW|b!b8r*^{WM--uIi7i#ZM
zqXy_jt>iZ>$B|La@K#l$zFX?~3@TGEqcV61_1&jf<TK_^Ok;kN9%EM&LZ!S4HPK>J
zU>i^YZ1LLLQAM^B74ROf-HBT9F)YS&s3ILgWh6e<_Rm2b;~=^k_#PgV%4*aK=3)dk
zq5^sxwWpiC_D<9m>_si$AU=eJagKQwpT`y)#HT3UwIdy~jQ06aj;X=Yc*o4d=i(iA
z_&j#=LKB=u?d6xKfPTVKyo?JlYqVq5VKdIceq4i@365EeJ5W{q9ZtnDiPjoCOnWoF
zj&~<HW(RgBxi*!v$2jIuUMxbT{2(fTFe;@dy!T(BQh5QDxhtp(<zH0w523z`9&1xP
z3N_w%)RqNMH4sD<VZF<Pifk$ByuXSX=pC=aVblO0pw97!Ub`PB)BYK?MRCdY^!Txe
z_AFGO>rnT^cCX!zO8o&WK=*g=htw21Kp`r!d6<U{r~z70H{Wj5-glykD~y_`2Nh@^
zYAY|H`d`JnFgn%t528**71GZ&jrPH`V2B@HK&9$^Jc&K13EVV$5458KID#7J6e^_`
zQGxo#*?S`y8)%oKiuyIwxcg9nAIDUc?^*AM0n|nF7wX~}G2Rwa0jdTXQ7hVl>bDzJ
zGw-5q&Zu;|@<dcSfZECeR85q6?<-NqwgzK#eCm0q!lkGbcA&1>w=ok>qb43eT_o2~
zdzUc5PE?89C#D8hV=ZdjBRC&}8ICE$R#e6gpvF6gu3r4eLl7e~t<!Ke?NykL`*16M
zjK5%&-@ebyvMat1wc<tCh|6##euT<ocEB-Pa1OqRXRs4%vpN5Y>`J!nm@(0&x(YSm
z5>zp+LS<wf>J;om?dg70ZJfaXev8WBAS&f|P+Jg{W8WvBj%_OHcYls+Q#Xkhx)SqH
z15fih)OpsUZp24W8C!-b!d6r*yn>pz%kvQGUO0vd`~+&^Z%_*xKpor5E)VK>%j@8q
zWCw~v?NJiy!(8uuF)Gkf&)KNGU*P>-j|y}NYK6;Dfi|Io)Af(PWIobqY5Sr4pszKe
zZP$!lzD2&UzalP{U&8tK_s#J=(HxF`DIz~56bO}+gn}jI!BAPCq^zQ}tfFLEn?D>H
fL32jMl+y6S;S1HVMNQ4?S2t}~*%GcCEHC^Y?z1#u

delta 2660
zcmXZddra0<9LMqV0~Am$auE>l;Q{iJ3Oo;iTsF+mh=zeCGpDJMVAfQYQMsZ1EThXt
zmhuN{Zp^Jr9E!R}jWTCxbJ)$T)s}RDX111HW_D33?EQJp&p&*fbDr}%m+$$W!?nSv
z>w{58|0r~GjWLBcjLF8uI1V@BM0^6%(Z%uDjd9rH*@r3A2RuK<B<dsR!{2c#Cfzh9
z7K?B)R(LktG;X+|#p}?H8lVF+u-o$}YC#uJ1AT$<IE=~o3u=L8)J`0Y(Nw3S7FdY-
zy&9wNUd+P!QP)oN7!5fz?8ISw9ktS(|JV;-Lk+kOQ?VB(;c1+LpJFEdhzS_^ul+6=
zwUH?}0gJtQ6~<6s=294<um-jB%Kz*Hi!hCP6V7&w*@B7G-x#w49!K^61P5^#H(~EB
zJ8`;k!V&VJkM=pJ4b`C{)`WA>ZKI%-^r2RG92KfFsL-9qEF8jY{0o&cDUK7)jZ$1p
z{XW#u^q>~ni!*Ql>v070uqeU_=h*#7-8IW8DD>^<$Gtcm-^F~qj0$mdq}@p_>g?yE
zlC>VSqegrPA3^PO5Ec4wQ5*UjHP0Ao!@elTR58DqK|vi_P)W7{mGxUNh_9l~{w!*M
z4^cb$3Cl5loD)8(8q{~IJfB2G>Sa^}kD$K$2n!;N`4!Wd-(<(w9hIO$UX7Y)8ERoq
zp%$>st9PK1tP{21y<YtQYR4zB5HF&VbPN@d#8}&Z8tNJc(bd57C@7RQs2wcANNh$e
zXg%sow|ezX)Di4MZJ-~QV&MeGJdMxdW*o&0B=5$Fj(L#!P@H3Guq@s&^Kg5-<A(3!
zX&N-aS=3p6hFZ`SEXAwXfVl~d*@%zhoj8o^F(=V6jrbxetG~fJFm;l(7W=7h#oahN
z$uZC4=_J>Na$&M#R?x5%74m-60#2Ypddh4692Ls1P?5WadQfhnvVRQqT}+A%aRO?*
zEYy+Zp>iOIO2S5$f|6_%>b}2%8t6^0!%@@#Z=>$<dtQAQr&0d_bwqKg_V)O(fcjmi
zg|?#Ji4L#cjSBr?oQ>|!-VYg*?Er<Sl{MfDT#g!G2kPb9gF5>IsN_0<n&>=gp<knp
z@-nLbb)1PYX|{h5bt|foey(Y@1=EJb{O}wqRBz!scpf#uGwJpn=teEz7;2z1sE~e#
zT4+>;eK*o@8TCq3Qtw8Mdl0qo0Zdc+UhsYxK|M6Tp&p*tDK?o3P&v?y+R-*tzdfj&
zIfQySqciQ!lTr0N)KM0oa-z&@uR>khT8z>4X{0b8SD`}KgL-QB<5WD0ns@~Dko<`{
zyQC~TQ5Eu@m|ASXI@GwwupWci4(~rlh>F-@)OZ&${P+KR3Pm)GpK6_p)zsHvCLY9X
z_yJzQYM*VNnPYdn0JY<#_%N=<CVU?i$$Y<K+VLKI0ng!ntjp#8Yh~ARZAV|84RtkY
zz?G<ET!)HCE9w?>qRzArl^f^KkC#vp97ToP$+t%kjcQLqUE2)Q@BVz(hHg3ydJ=C(
z4LsNDQ197@dJ$KkLbw{0gga2VunRRoujdieyKoY<@KdOXzeH_p1a)n%x)jv$me(Qb
zHak!p>WorQAI|jJ1E__Tc`ihq{Sxo@M$|%AqIS3jwa^xHuuT8)FO`pUTe?Qd4^iye
zRk15#dt}I0IUzP;NknMYf}y)3S|1IKe<^a-<e<Me5GXDRlou73`U4e}r6rZYiY{NM
kIJ(3iD61?9gdPZ8S~ziS>!y~qZB3i~%`Ksd8|8EU2bwxHlmGw#

diff --git a/locale/ko_KR/LC_MESSAGES/squirrelmail.mo b/locale/ko_KR/LC_MESSAGES/squirrelmail.mo
index 50705cceb122fd21905123ba62410ee6346bdbe1..d0b48d1a9a2fdd875e50a60cc7e1a93c385cafc7 100644
GIT binary patch
delta 36
scmX>+kLB<@mJK(yh#D&x85kJp8<^@F8Ymc8SQ%MZnObaqyCp0N0PC*|E&u=k

delta 36
qcmX>+kLB<@mJK(yh#Dyv85kJp8yM;v87deWS{VV6(dM^X!lD4`tqc_a

-- 
2.25.1