firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

g4[charset] 제거에 따른 iconv 관련 코드 수정

Browse Source
This commit is contained in:
chicpro
2013-01-30 16:26:19 +09:00
parent 35427edd3b
commit 7e411517e5
3 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
shop/kcp/pp_ax_hub.php
View File

@ -233,10 +233,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
if ($res_cd != '0000') 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> echo "<script>
var openwin = window.open( './kcp/proc_win.php', 'proc_win', '' ); var openwin = window.open( './kcp/proc_win.php', 'proc_win', '' );

14
shop/orderformupdate.php
View File

@ -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); $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; $tno = $tno;
$od_receipt_point = $i_temp_point; $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_bank_account = $bank_name;
$od_deposit_name = $od_name; $od_deposit_name = $od_name;
$same_amount_check = true; $same_amount_check = true;
@ -504,10 +502,8 @@ else if($od_settle_case == "가상계좌")
$od_receipt_amount = 0; $od_receipt_amount = 0;
$od_receipt_point = $i_temp_point; $od_receipt_point = $i_temp_point;
if (strtolower($g4['charset']) == "utf-8") { $bankname = iconv("cp949", "utf8", $bankname);
$bankname = iconv("cp949", "utf8", $bankname); $depositor = iconv("cp949", "utf8", $depositor);
$depositor = iconv("cp949", "utf8", $depositor);
}
$od_bank_account = $bankname.' '.$account; $od_bank_account = $bankname.' '.$account;
$od_deposit_name = $depositor; $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); $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; $tno = $tno;
$od_receipt_point = $i_temp_point; $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; $od_bank_account = $card_name;
$same_amount_check = true; $same_amount_check = true;
} }

4
shop/settle_kcp.inc.php
View File

@ -4,12 +4,12 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
$test = ""; $test = "";
if ($default['de_card_test']) { if ($default['de_card_test']) {
if ($default['de_escrow_use'] == 1) { if ($default['de_escrow_use'] == 1) {
// 일반결제 테스트 // 에스크로결제 테스트
$default['de_kcp_mid'] = "T0007"; $default['de_kcp_mid'] = "T0007";
$default['de_kcp_site_key'] = '2.mDT7R4lUIfHlHq4byhYjf__'; $default['de_kcp_site_key'] = '2.mDT7R4lUIfHlHq4byhYjf__';
} }
else { else {
// 에스크로결제 테스트 // 일반결제 테스트
$default['de_kcp_mid'] = "T0000"; $default['de_kcp_mid'] = "T0000";
$default['de_kcp_site_key'] = '3grptw1.zW0GSo4PQdaGvsF__'; $default['de_kcp_site_key'] = '3grptw1.zW0GSo4PQdaGvsF__';
} }