Changeset 7179 for temp/trunk/data

Timestamp:

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

Author:

kakinaka

Message:

* empty log message *

Location:

temp/trunk/data

Files:

• class/GC_SendMail.php (modified) (1 diff)
• class/SC_Pdf.php (modified) (2 diffs)
• conf/conf.php (modified) (1 diff)
• lib/gdthumb.php (modified) (1 diff)
• lib/glib.php (modified) (1 diff)
• lib/slib.php (modified) (3 diffs)

temp/trunk/data/class/GC_SendMail.php

@@ -64 +64 @@
         $this->to            = $to;
         $this->subject       = Mb_encode_mimeheader($subject);
-        $this->body          = mb_convert_encoding( $body, "iso-2022-jp", "EUC-JP");
+        $this->body          = mb_convert_encoding( $body, "iso-2022-jp", "CHAR_CODE");
         $this->header        = "Mime-Version: 1.0\n";
         $this->header       .= "Content-Type: text/html; charset=iso-2022-jp\n";

temp/trunk/data/class/SC_Pdf.php

@@ -28 +28 @@
     function SC_Pdf($width = 595, $height = 842, $fontsize = 10) {
         $this->license_key = "B600602-010400-714251-5851C1";
-        $this->src_code = "EUC-JP";
+        $this->src_code = "CHAR_CODE";
         // UTF-8¤Ç¤Ê¤¤¤È¥Ö¥í¥Ã¥¯Æâ¤Ç²þ¹Ô¤Ç¤­¤Ê¤¤¡£
         $this->dst_code = "UTF-8";
@@ -410 +410 @@
             $end_y = 0;
         }
-        $enc_table = mb_convert_encoding($line, "utf-8", "euc-jp");
+        $enc_table = mb_convert_encoding($line, "utf-8", "CHAR_CODE");
                 
         $tf = PDF_create_textflow($this->pdf, $enc_table, $option);

temp/trunk/data/conf/conf.php

@@ -64 +64 @@
 define("AFF_ENTRY_COMPLETE", 2);
 //--------------------------------------------------------------------------------------------------------
+
+// ʸ»ú¥³¡¼¥É
+define("CHAR_CODE", "EUC-JP");
 
 // EC-CUBE¥Ð¡¼¥¸¥ç¥ó¾ðÊó

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);
 }