Changeset 7179 for temp/trunk/data/lib

Timestamp:

2006/11/01 12:02:42 (20 years ago)

Author:

kakinaka

Message:

* empty log message *

Location:

temp/trunk/data/lib

Files:

• gdthumb.php (modified) (1 diff)
• glib.php (modified) (1 diff)
• slib.php (modified) (3 diffs)

temp/trunk/data/lib/gdthumb.php

@@ -40 +40 @@
 list($Ck, $Msg) = $objg->Main($_GET["path"], $_GET["mw"], $_GET["mh"]);
 if(!$Ck) { // ¥¨¥é¡¼¤Î¾ì¹ç
-    header("Content-Type: text/html; charset=euc-jp");
+    header("Content-Type: text/html; charset=CHAR_CODE");
     print $Msg;
 }

temp/trunk/data/lib/glib.php

@@ -23 +23 @@
     
     $return = $header.$contents;
-    if (mb_detect_encoding($return) == 'EUC-JP'){                       //ʸ»ú¥³¡¼¥ÉÊÑ´¹
-        $return = mb_convert_encoding($return,'SJIS','EUC-JP');
+    if (mb_detect_encoding($return) == 'CHAR_CODE'){                        //ʸ»ú¥³¡¼¥ÉÊÑ´¹
+        $return = mb_convert_encoding($return,'SJIS','CHAR_CODE');
         $return = str_replace( array( "\r\n", "\r" ), "\n", $return);   // ²þ¹ÔÊýË¡¤ÎÅý°ì
     }

temp/trunk/data/lib/slib.php

@@ -130 +130 @@
     global $GLOBAL_ERR;
     if($GLOBAL_ERR == "") {
-        $GLOBAL_ERR = "<meta http-equiv='Content-Type' content='text/html; charset=EUC-JP'>\n";
+        $GLOBAL_ERR = "<meta http-equiv='Content-Type' content='text/html; charset=CHAR_CODE'>\n";
     }
     $GLOBAL_ERR.= "<table width='100%' border='0' cellspacing='0' cellpadding='0' summary=' '>\n";
@@ -360 +360 @@
     
     /* i18n¢· ¤À¤ÈÀµ¾ï¤ËÆ°ºî¤·¤Ê¤¤¤¿¤á¡¢mb¢· ¤ËÊѹ¹
-    if (i18n_discover_encoding($data) == 'EUC-JP'){
-        $data = i18n_convert($data,'SJIS','EUC-JP');
+    if (i18n_discover_encoding($data) == 'CHAR_CODE'){
+        $data = i18n_convert($data,'SJIS','CHAR_CODE');
     }
     */
-    if (mb_internal_encoding() == 'EUC-JP'){
-        $data = mb_convert_encoding($data,'SJIS','EUC-JP');
+    if (mb_internal_encoding() == 'CHAR_CODE'){
+        $data = mb_convert_encoding($data,'SJIS','CHAR_CODE');
     }
     
@@ -2150 +2150 @@
 
 // PHP¤Îmb_convert_encoding´Ø¿ô¤òSmarty¤Ç¤â»È¤¨¤ë¤è¤¦¤Ë¤¹¤ë
-function sf_mb_convert_encoding($str, $encode = 'EUC-JP') {
+function sf_mb_convert_encoding($str, $encode = 'CHAR_CODE') {
     return  mb_convert_encoding($str, $encode);
 }