From 7e411517e5f8ef9d5e0b2f2b075e9ee1c243ee73 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Wed, 30 Jan 2013 16:26:19 +0900
Subject: [PATCH] =?UTF-8?q?g4[charset]=20=EC=A0=9C=EA=B1=B0=EC=97=90=20?=
 =?UTF-8?q?=EB=94=B0=EB=A5=B8=20iconv=20=EA=B4=80=EB=A0=A8=20=EC=BD=94?=
 =?UTF-8?q?=EB=93=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shop/kcp/pp_ax_hub.php   |  5 +----
 shop/orderformupdate.php | 14 ++++----------
 shop/settle_kcp.inc.php  |  4 ++--
 3 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/shop/kcp/pp_ax_hub.php b/shop/kcp/pp_ax_hub.php
index d88aa454e..f3bdc7940 100644
--- a/shop/kcp/pp_ax_hub.php
+++ b/shop/kcp/pp_ax_hub.php
@@ -233,10 +233,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
 
     if ($res_cd != '0000')
     {
-        if (strtolower($g4[charset]) == "utf-8")
-        {
-            $res_msg = iconv("euc-kr", "utf-8", $res_msg);
-        }
+        $res_msg = iconv("euc-kr", "utf-8", $res_msg);
 
         echo "<script>
         var openwin = window.open( './kcp/proc_win.php', 'proc_win', '' );
diff --git a/shop/orderformupdate.php b/shop/orderformupdate.php
index 425f78ba9..a3982ea3d 100644
--- a/shop/orderformupdate.php
+++ b/shop/orderformupdate.php
@@ -491,9 +491,7 @@ else if ($od_settle_case == "계좌이체")
     $od_receipt_time    = preg_replace("/([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})/", "\\1-\\2-\\3 \\4:\\5:\\6", $app_time);
     $tno                = $tno;
     $od_receipt_point   = $i_temp_point;
-    if (strtolower($g4['charset']) == "utf-8") {
-        $bank_name = iconv("cp949", "utf8", $bank_name);
-    }
+    $bank_name          = iconv("cp949", "utf8", $bank_name);
     $od_bank_account    = $bank_name;
     $od_deposit_name    = $od_name;
     $same_amount_check  = true;
@@ -504,10 +502,8 @@ else if($od_settle_case == "가상계좌")
 
     $od_receipt_amount  = 0;
     $od_receipt_point   = $i_temp_point;
-    if (strtolower($g4['charset']) == "utf-8") {
-        $bankname = iconv("cp949", "utf8", $bankname);
-        $depositor = iconv("cp949", "utf8", $depositor);
-    }
+    $bankname           = iconv("cp949", "utf8", $bankname);
+    $depositor          = iconv("cp949", "utf8", $depositor);
     $od_bank_account    = $bankname.' '.$account;
     $od_deposit_name    = $depositor;
 }
@@ -530,9 +526,7 @@ else if ($od_settle_case == "신용카드")
     $od_receipt_time    = preg_replace("/([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})/", "\\1-\\2-\\3 \\4:\\5:\\6", $app_time);
     $tno                = $tno;
     $od_receipt_point   = $i_temp_point;
-    if (strtolower($g4['charset']) == "utf-8") {
-        $card_name = iconv("cp949", "utf8", $card_name);
-    }
+    $card_name          = iconv("cp949", "utf8", $card_name);
     $od_bank_account    = $card_name;
     $same_amount_check  = true;
 }
diff --git a/shop/settle_kcp.inc.php b/shop/settle_kcp.inc.php
index 08f899da2..35b943381 100644
--- a/shop/settle_kcp.inc.php
+++ b/shop/settle_kcp.inc.php
@@ -4,12 +4,12 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
 $test = "";
 if ($default['de_card_test']) {
     if ($default['de_escrow_use'] == 1) {
-        // 일반결제 테스트
+        // 에스크로결제 테스트
         $default['de_kcp_mid'] = "T0007";
         $default['de_kcp_site_key'] = '2.mDT7R4lUIfHlHq4byhYjf__';
     }
     else {
-        // 에스크로결제 테스트
+        // 일반결제 테스트
         $default['de_kcp_mid'] = "T0000";
         $default['de_kcp_site_key'] = '3grptw1.zW0GSo4PQdaGvsF__';
     }