Index: /temp/trunk/data/lib/slib.php
===================================================================
--- /temp/trunk/data/lib/slib.php	(revision 7179)
+++ /temp/trunk/data/lib/slib.php	(revision 7180)
@@ -130,5 +130,5 @@
 	global $GLOBAL_ERR;
 	if($GLOBAL_ERR == "") {
-		$GLOBAL_ERR = "<meta http-equiv='Content-Type' content='text/html; charset=CHAR_CODE'>\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,10 +360,10 @@
 	
 	/* i18n¢· ¤À¤ÈÀµ¾ï¤ËÆ°ºî¤·¤Ê¤¤¤¿¤á¡¢mb¢· ¤ËÊÑ¹¹
-	if (i18n_discover_encoding($data) == 'CHAR_CODE'){
-		$data = i18n_convert($data,'SJIS','CHAR_CODE');
+	if (i18n_discover_encoding($data) == CHAR_CODE){
+		$data = i18n_convert($data,'SJIS',CHAR_CODE);
 	}
 	*/
-	if (mb_internal_encoding() == 'CHAR_CODE'){
-		$data = mb_convert_encoding($data,'SJIS','CHAR_CODE');
+	if (mb_internal_encoding() == CHAR_CODE){
+		$data = mb_convert_encoding($data,'SJIS',CHAR_CODE);
 	}
 	
Index: /temp/trunk/data/lib/gdthumb.php
===================================================================
--- /temp/trunk/data/lib/gdthumb.php	(revision 7179)
+++ /temp/trunk/data/lib/gdthumb.php	(revision 7180)
@@ -40,5 +40,5 @@
 list($Ck, $Msg) = $objg->Main($_GET["path"], $_GET["mw"], $_GET["mh"]);
 if(!$Ck) { // ¥¨¥é¡¼¤Î¾ì¹ç
-	header("Content-Type: text/html; charset=CHAR_CODE");
+	header("Content-Type: text/html; charset=" . CHAR_CODE);
 	print $Msg;
 }
Index: /temp/trunk/data/lib/glib.php
===================================================================
--- /temp/trunk/data/lib/glib.php	(revision 7179)
+++ /temp/trunk/data/lib/glib.php	(revision 7180)
@@ -23,6 +23,6 @@
 	
 	$return = $header.$contents;
-	if (mb_detect_encoding($return) == 'CHAR_CODE'){						//Ê¸»ú¥³¡¼¥ÉÊÑ´¹
-		$return = mb_convert_encoding($return,'SJIS','CHAR_CODE');
+	if (mb_detect_encoding($return) == CHAR_CODE){						//Ê¸»ú¥³¡¼¥ÉÊÑ´¹
+		$return = mb_convert_encoding($return,'SJIS',CHAR_CODE);
 		$return = str_replace( array( "\r\n", "\r" ), "\n", $return);	// ²þ¹ÔÊýË¡¤ÎÅý°ì
 	}
Index: /temp/trunk/data/class/SC_Pdf.php
===================================================================
--- /temp/trunk/data/class/SC_Pdf.php	(revision 7179)
+++ /temp/trunk/data/class/SC_Pdf.php	(revision 7180)
@@ -28,5 +28,5 @@
 	function SC_Pdf($width = 595, $height = 842, $fontsize = 10) {
 		$this->license_key = "B600602-010400-714251-5851C1";
-		$this->src_code = "CHAR_CODE";
+		$this->src_code = CHAR_CODE;
 		// UTF-8¤Ç¤Ê¤¤¤È¥Ö¥í¥Ã¥¯Æâ¤Ç²þ¹Ô¤Ç¤­¤Ê¤¤¡£
 		$this->dst_code = "UTF-8";
@@ -410,5 +410,5 @@
 			$end_y = 0;
 		}
-		$enc_table = mb_convert_encoding($line, "utf-8", "CHAR_CODE");
+		$enc_table = mb_convert_encoding($line, "utf-8", CHAR_CODE);
 				
 		$tf = PDF_create_textflow($this->pdf, $enc_table, $option);
Index: /temp/trunk/data/class/GC_SendMail.php
===================================================================
--- /temp/trunk/data/class/GC_SendMail.php	(revision 7179)
+++ /temp/trunk/data/class/GC_SendMail.php	(revision 7180)
@@ -64,5 +64,5 @@
 		$this->to			 = $to;
 		$this->subject		 = Mb_encode_mimeheader($subject);
-		$this->body			 = mb_convert_encoding( $body, "iso-2022-jp", "CHAR_CODE");
+		$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";
Index: /temp/trunk/html/admin/develop/upload_csv.php
===================================================================
--- /temp/trunk/html/admin/develop/upload_csv.php	(revision 7179)
+++ /temp/trunk/html/admin/develop/upload_csv.php	(revision 7180)
@@ -56,5 +56,5 @@
 		$filepath = $objUpFile->getTempFilePath('csv_file');
 		// ¥¨¥ó¥³¡¼¥É
-		$enc_filepath = sfEncodeFile($filepath, "CHAR_CODE", CSV_TEMP_DIR);
+		$enc_filepath = sfEncodeFile($filepath, CHAR_CODE, CSV_TEMP_DIR);
 		$fp = fopen($enc_filepath, "r");
 		
Index: /temp/trunk/html/admin/develop/csv.php
===================================================================
--- /temp/trunk/html/admin/develop/csv.php	(revision 7179)
+++ /temp/trunk/html/admin/develop/csv.php	(revision 7180)
@@ -26,5 +26,5 @@
 
 // ¥¨¥ó¥³¡¼¥É
-$enc_filepath = sfEncodeFile($filepath, "CHAR_CODE", CSV_TEMP_DIR);
+$enc_filepath = sfEncodeFile($filepath, CHAR_CODE, CSV_TEMP_DIR);
 
 $total = 0;
Index: /temp/trunk/html/admin/products/bak_upload_csv.php
===================================================================
--- /temp/trunk/html/admin/products/bak_upload_csv.php	(revision 7179)
+++ /temp/trunk/html/admin/products/bak_upload_csv.php	(revision 7180)
@@ -54,5 +54,5 @@
 		$filepath = $objUpFile->getTempFilePath('csv_file');
 		// ¥¨¥ó¥³¡¼¥É
-		$enc_filepath = sfEncodeFile($filepath, "CHAR_CODE", CSV_TEMP_DIR);
+		$enc_filepath = sfEncodeFile($filepath, CHAR_CODE, CSV_TEMP_DIR);
 		$fp = fopen($enc_filepath, "r");
 		$line = 0;		// ¹Ô¿ô
Index: /temp/trunk/html/admin/products/upload_rakuten.php
===================================================================
--- /temp/trunk/html/admin/products/upload_rakuten.php	(revision 7179)
+++ /temp/trunk/html/admin/products/upload_rakuten.php	(revision 7180)
@@ -56,5 +56,5 @@
 		$filepath = $objUpFile->getTempFilePath('csv_file');
 		// ¥¨¥ó¥³¡¼¥É
-		$enc_filepath = sfEncodeFile($filepath, "CHAR_CODE", CSV_TEMP_DIR);
+		$enc_filepath = sfEncodeFile($filepath, CHAR_CODE, CSV_TEMP_DIR);
 		$fp = fopen($enc_filepath, "r");
 		$line = 0;		// ¹Ô¿ô
Index: /temp/trunk/html/admin/products/edit.php
===================================================================
--- /temp/trunk/html/admin/products/edit.php	(revision 7179)
+++ /temp/trunk/html/admin/products/edit.php	(revision 7180)
@@ -7,5 +7,5 @@
  *}-->
 <head>
-<meta http-equiv="content-type" content="application/xhtml+xml; charset=CHAR_CODE" />
+<meta http-equiv="content-type" content="application/xhtml+xml; charset=<!--{$smarty.const.CHAR_CODE}-->" />
 <meta http-equiv="content-script-type" content="text/javascript" />
 <meta http-equiv="content-style-type" content="text/css" />
Index: /temp/trunk/html/admin/products/upload_csv.php
===================================================================
--- /temp/trunk/html/admin/products/upload_csv.php	(revision 7179)
+++ /temp/trunk/html/admin/products/upload_csv.php	(revision 7180)
@@ -56,5 +56,5 @@
 		$filepath = $objUpFile->getTempFilePath('csv_file');
 		// ¥¨¥ó¥³¡¼¥É
-		$enc_filepath = sfEncodeFile($filepath, "CHAR_CODE", CSV_TEMP_DIR);
+		$enc_filepath = sfEncodeFile($filepath, CHAR_CODE, CSV_TEMP_DIR);
 		$fp = fopen($enc_filepath, "r");
 		$line = 0;		// ¹Ô¿ô
Index: /temp/trunk/html/admin/products/review_show.php
===================================================================
--- /temp/trunk/html/admin/products/review_show.php	(revision 7179)
+++ /temp/trunk/html/admin/products/review_show.php	(revision 7180)
@@ -8,5 +8,5 @@
  *}-->
 <head>
-<meta http-equiv="content-type" content="application/xhtml+xml; charset=CHAR_CODE" />
+<meta http-equiv="content-type" content="application/xhtml+xml; charset=<!--{$smarty.const.CHAR_CODE}-->" />
 <meta http-equiv="content-script-type" content="text/javascript" />
 <meta http-equiv="content-style-type" content="text/css" />
Index: /temp/trunk/html/admin/login_error.php
===================================================================
--- /temp/trunk/html/admin/login_error.php	(revision 7179)
+++ /temp/trunk/html/admin/login_error.php	(revision 7180)
@@ -8,5 +8,5 @@
  *}-->
 <head>
-<meta http-equiv="content-type" content="application/xhtml+xml; charset=CHAR_CODE" />
+<meta http-equiv="content-type" content="application/xhtml+xml; charset=<!--{$smarty.const.CHAR_CODE}-->" />
 <meta http-equiv="content-script-type" content="text/javascript" />
 <meta http-equiv="content-style-type" content="text/css" />
Index: /temp/trunk/html/admin/error.php
===================================================================
--- /temp/trunk/html/admin/error.php	(revision 7179)
+++ /temp/trunk/html/admin/error.php	(revision 7180)
@@ -8,5 +8,5 @@
  *}-->
 <head>
-<meta http-equiv="content-type" content="application/xhtml+xml; charset=CHAR_CODE" />
+<meta http-equiv="content-type" content="application/xhtml+xml; charset=<!--{$smarty.const.CHAR_CODE}-->" />
 <meta http-equiv="content-script-type" content="text/javascript" />
 <meta http-equiv="content-style-type" content="text/css" />
Index: /temp/trunk/html/admin/total/class/lib.php
===================================================================
--- /temp/trunk/html/admin/total/class/lib.php	(revision 7179)
+++ /temp/trunk/html/admin/total/class/lib.php	(revision 7180)
@@ -27,5 +27,5 @@
 function lfImageText($dst_image, $text, $font_size, $left, $top, $font, $arrRGB) {
 	$color = ImageColorAllocate($dst_image, $arrRGB[0], $arrRGB[1], $arrRGB[2]);
-	$text = mb_convert_encoding($text, "UTF-8", "CHAR_CODE");
+	$text = mb_convert_encoding($text, "UTF-8", CHAR_CODE);
 	// É½¼¨³ÑÅÙ	
 	$angle = 0;
Index: /temp/trunk/html/admin/total/class/SC_GraphBase.php
===================================================================
--- /temp/trunk/html/admin/total/class/SC_GraphBase.php	(revision 7179)
+++ /temp/trunk/html/admin/total/class/SC_GraphBase.php	(revision 7180)
@@ -128,5 +128,5 @@
 			imagefilledrectangle($this->image, $left - 2, $top - 2, $left + $text_width + 2, $top + $font_size + 2, $this->labelbg_color);
 		}
-		//$text = mb_convert_encoding($text, "UTF-8", "CHAR_CODE");
+		//$text = mb_convert_encoding($text, "UTF-8", CHAR_CODE);
 		$text = mb_convert_encoding($text, "SHIFT-JIS");
 		if($color != NULL) {
@@ -148,5 +148,5 @@
 	// ¥í¥°¤ò½ÐÎÏ¤¹¤ë
 	function debugPrint($text) {
-		$text = mb_convert_encoding($text, "UTF-8", "CHAR_CODE");
+		$text = mb_convert_encoding($text, "UTF-8", CHAR_CODE);
 		if(!isset($this->text_top)) {
 			$this->text_top = FONT_SIZE + LINE_PAD;
Index: /temp/trunk/html/admin/system/bkup.php
===================================================================
--- /temp/trunk/html/admin/system/bkup.php	(revision 7179)
+++ /temp/trunk/html/admin/system/bkup.php	(revision 7180)
@@ -196,5 +196,5 @@
 	$csv_file = $bkup_dir . "bkup_data.csv";
 	$csv_autoinc_file = $bkup_dir . "autoinc_data.csv";
-	mb_internal_encoding('CHAR_CODE');
+	mb_internal_encoding(CHAR_CODE);
 	// CSV½ÐÎÏ
 	// ¥Ç¥£¥ì¥¯¥È¥ê¤¬Â¸ºß¤·¤Æ¤¤¤Ê¤±¤ì¤ÐºîÀ®¤¹¤ë		
