From 1c01a2b6f417042cdabbad000835d8a1c16ae85f Mon Sep 17 00:00:00 2001 From: chicpro Date: Wed, 16 Apr 2014 10:56:43 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9D=BC=EB=B6=80=20=EC=84=9C=EB=B2=84?= =?UTF-8?q?=EC=97=90=EC=84=9C=EC=9D=98=20setlocale=20=EA=B2=B0=EA=B3=BC?= =?UTF-8?q?=EA=B0=92=20=EC=98=A4=EB=A5=98=EB=A1=9C=20=EC=9D=B8=ED=95=9C=20?= =?UTF-8?q?kcp=20=EC=97=B0=EB=8F=99=20=EC=98=A4=EB=A5=98=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/orderescrow.inc.php | 32 ++++------------------ adm/shop_admin/orderpartcancelupdate.php | 34 ++++-------------------- mobile/shop/kcp/pp_ax_hub_cancel.php | 13 +++------ shop/kcp/pp_ax_hub_cancel.php | 13 +++------ shop/orderinquirycancel.php | 13 +++------ 5 files changed, 22 insertions(+), 83 deletions(-) diff --git a/adm/shop_admin/orderescrow.inc.php b/adm/shop_admin/orderescrow.inc.php index fd7bf45d0..46ba69400 100644 --- a/adm/shop_admin/orderescrow.inc.php +++ b/adm/shop_admin/orderescrow.inc.php @@ -1,28 +1,9 @@ m_res_msg; // 결과 메시지 } -if($locale_change) - setlocale(LC_CTYPE, $def_locale); +// locale 설정 초기화 +setlocale(LC_CTYPE, ''); ?> \ No newline at end of file diff --git a/adm/shop_admin/orderpartcancelupdate.php b/adm/shop_admin/orderpartcancelupdate.php index 5db65cfeb..3516f47c7 100644 --- a/adm/shop_admin/orderpartcancelupdate.php +++ b/adm/shop_admin/orderpartcancelupdate.php @@ -1,6 +1,7 @@ $sum['tax_mny']) if($free_mny && $free_mny > $sum['free_mny']) alert('비과세 취소금액을 '.number_format($sum['free_mny']).'원 이하로 입력해 주십시오.'); -// 취소사유의 한글깨짐 방지처리 -$def_locale = setlocale(LC_CTYPE, 0); -$cancel_memo = iconv("utf-8", "euc-kr", $mod_memo); -$locale_change = false; -if(preg_match("/utf[\-]?8/i", $def_locale)) { - setlocale(LC_CTYPE, 'ko_KR.euc-kr'); - $locale_change = true; -} +// locale ko_KR.euc-kr 로 설정 +setlocale(LC_CTYPE, 'ko_KR.euc-kr'); // 부분취소 실행 -if ($default['de_card_test']) { - if ($default['de_escrow_use'] == 1) { - // 에스크로결제 테스트 - $default['de_kcp_mid'] = "T0007"; - $default['de_kcp_site_key'] = '4Ho4YsuOZlLXUZUdOxM1Q7X__'; - } - else { - // 일반결제 테스트 - $default['de_kcp_mid'] = "T0000"; - $default['de_kcp_site_key'] = '3grptw1.zW0GSo4PQdaGvsF__'; - } -} -else { - $default['de_kcp_mid'] = "SR".$default['de_kcp_mid']; -} - $g_conf_site_cd = $default['de_kcp_mid']; $g_conf_site_key = $default['de_kcp_site_key']; $g_conf_home_dir = G5_SHOP_PATH.'/kcp'; @@ -85,9 +64,6 @@ else { } } -$g_conf_log_level = "3"; -$g_conf_gw_port = "8090"; - include G5_SHOP_PATH.'/kcp/pp_cli_hub_lib.php'; $tno = $od['od_tno']; @@ -196,8 +172,8 @@ if ( $req_tx == "mod" ) } } -if($locale_change) - setlocale(LC_CTYPE, $def_locale); +// locale 설정 초기화 +setlocale(LC_CTYPE, ''); include_once(G5_PATH.'/head.sub.php'); ?> diff --git a/mobile/shop/kcp/pp_ax_hub_cancel.php b/mobile/shop/kcp/pp_ax_hub_cancel.php index 6f66a5f30..5d1442e2d 100644 --- a/mobile/shop/kcp/pp_ax_hub_cancel.php +++ b/mobile/shop/kcp/pp_ax_hub_cancel.php @@ -1,13 +1,8 @@ \ No newline at end of file diff --git a/shop/kcp/pp_ax_hub_cancel.php b/shop/kcp/pp_ax_hub_cancel.php index 8b1cc52e4..ce1eef5aa 100644 --- a/shop/kcp/pp_ax_hub_cancel.php +++ b/shop/kcp/pp_ax_hub_cancel.php @@ -1,13 +1,8 @@ \ No newline at end of file diff --git a/shop/orderinquirycancel.php b/shop/orderinquirycancel.php index 309ebd7b6..d0b8e20f8 100644 --- a/shop/orderinquirycancel.php +++ b/shop/orderinquirycancel.php @@ -44,18 +44,13 @@ if($od['od_tno']) { $_POST['mod_desc'] = iconv("utf-8", "euc-kr", '주문자 본인 취소-'.$cancel_memo); $_POST['site_cd'] = $default['de_kcp_mid']; - // 취소내역 한글깨짐방지 - $def_locale = setlocale(LC_CTYPE, 0); - $locale_change = false; - if(preg_match("/utf[\-]?8/i", $def_locale)) { - setlocale(LC_CTYPE, 'ko_KR.euc-kr'); - $locale_change = true; - } + // locale ko_KR.euc-kr 로 설정 + setlocale(LC_CTYPE, 'ko_KR.euc-kr'); include G5_SHOP_PATH.'/kcp/pp_ax_hub.php'; - if($locale_change) - setlocale(LC_CTYPE, $def_locale); + // locale 설정 초기화 + setlocale(LC_CTYPE, ''); } // 장바구니 자료 취소