From 9c34f21f399f1eac2488a69448d23c4827e12459 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Wed, 30 Jan 2013 16:18:36 +0900 Subject: [PATCH 1/8] =?UTF-8?q?=ED=9A=8C=EC=9B=90=EC=A0=95=EB=B3=B4?= =?UTF-8?q?=EC=88=98=EC=A0=95=EC=8B=9C=20=EA=B2=BD=EB=A1=9C=20=EC=98=A4?= =?UTF-8?q?=EB=A5=98=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/register_form.php | 7 ++++--- bbs/register_form_update.php | 10 +++++----- lib/common.lib.php | 14 +++----------- skin/member/neo/register_form.skin.php | 2 +- 4 files changed, 13 insertions(+), 20 deletions(-) diff --git a/bbs/register_form.php b/bbs/register_form.php index 5f9e3301f..1552caf81 100644 --- a/bbs/register_form.php +++ b/bbs/register_form.php @@ -1,6 +1,6 @@ alert(\''.$msg.'\');'; if ($w == "") { - goto_url($g4['bbs_url'].'/register_result.php'); + goto_url(G4_BBS_URL.'/register_result.php'); } else if ($w == 'u') { $row = sql_fetch(" select mb_password from {$g4['member_table']} where mb_id = '{$member[mb_id]}' "); $tmp_password = $row['mb_password']; if ($old_email != $mb_email && $config['cf_use_email_certify']) { set_session("ss_mb_id", ""); - alert('회원 정보가 수정 되었습니다.\n\nE-mail 주소가 변경되었으므로 다시 인증하셔야 합니다.', G4_PATH); + alert('회원 정보가 수정 되었습니다.\n\nE-mail 주소가 변경되었으므로 다시 인증하셔야 합니다.', G4_URL); } else { - alert('회원 정보가 수정 되었습니다.', $g4['url']); + alert('회원 정보가 수정 되었습니다.', G4_URL); /* echo ' 회원정보수정 diff --git a/lib/common.lib.php b/lib/common.lib.php index defe2e2f6..70ba129a4 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -1429,18 +1429,10 @@ function check_string($str, $options) // 한글 if ($oc >= 0xA0 && $oc <= 0xFF) { - if (strtoupper($g4['charset']) == 'UTF-8') { - if ($options & G4_HANGUL) { - $s .= $c . $str[$i+1] . $str[$i+2]; - } - $i+=2; - } else { - // 한글은 2바이트 이므로 문자하나를 건너뜀 - $i++; - if ($options & G4_HANGUL) { - $s .= $c . $str[$i]; - } + if ($options & G4_HANGUL) { + $s .= $c . $str[$i+1] . $str[$i+2]; } + $i+=2; } // 숫자 else if ($oc >= 0x30 && $oc <= 0x39) { diff --git a/skin/member/neo/register_form.skin.php b/skin/member/neo/register_form.skin.php index ffa780f06..495b88815 100644 --- a/skin/member/neo/register_form.skin.php +++ b/skin/member/neo/register_form.skin.php @@ -206,7 +206,7 @@ var member_skin_path = "";
- + 취소
From a3967b6fbc1b595d00b51f668d4072339b145429 Mon Sep 17 00:00:00 2001 From: chicpro Date: Wed, 30 Jan 2013 16:24:44 +0900 Subject: [PATCH 2/8] =?UTF-8?q?=EA=B3=B5=ED=86=B5=20URL=20=EA=B2=BD?= =?UTF-8?q?=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/configform.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adm/shop_admin/configform.php b/adm/shop_admin/configform.php index 83f5121ad..429b67d6d 100644 --- a/adm/shop_admin/configform.php +++ b/adm/shop_admin/configform.php @@ -407,7 +407,7 @@ include_once (G4_ADMIN_PATH."/admin.head.php"); 공통 URL - /settle_kcp_common.php + /settle_kcp_common.php 상점정보관리 > 정보변경 > 공통URL 정보 > 공통URL 변경후\"에 넣으셔야 상점에 자동으로 입금 통보됩니다.")?> From 35427edd3b270dbee476c0432bc59e72ef8d37d2 Mon Sep 17 00:00:00 2001 From: chicpro Date: Wed, 30 Jan 2013 16:25:45 +0900 Subject: [PATCH 3/8] =?UTF-8?q?=EA=B0=80=EC=83=81=EA=B3=84=EC=A2=8C=20?= =?UTF-8?q?=EC=9E=85=EA=B8=88=20=EC=A0=95=EB=B3=B4=20=EA=B8=B0=EB=A1=9D=20?= =?UTF-8?q?=EC=BD=94=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/settle_kcp_common.php | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/shop/settle_kcp_common.php b/shop/settle_kcp_common.php index c80209db4..1e8af15e5 100644 --- a/shop/settle_kcp_common.php +++ b/shop/settle_kcp_common.php @@ -1,7 +1,15 @@ $value) { + fwrite($fp, $key." = ".$value." / "); +} +fclose($fp); +*/ /*------------------------------------------------------------------------------ ※ KCP 에서 가맹점의 결과처리 페이지로 데이터를 전송할 때에, 아래와 같은 @@ -46,7 +54,7 @@ switch ($_SERVER['REMOTE_ADDR']) { /* = 주시기 바랍니다. 등록 방법은 연동 매뉴얼을 참고하시기 바랍니다. = */ /* ============================================================================== */ - //write_log("$g4[path]/data/log/kcp_common.log", print_r($_POST)); + //write_log(G4_DATA_PATH."/log/kcp_common.log", print_r($_POST)); /* ============================================================================== */ /* = 02. 공통 통보 데이터 받기 = */ @@ -138,15 +146,19 @@ switch ($_SERVER['REMOTE_ADDR']) { /* = -------------------------------------------------------------------------- = */ /* = 03-1. 가상계좌 입금 통보 데이터 DB 처리 작업 부분 = */ /* = -------------------------------------------------------------------------- = */ + if ( $tx_cd == "TX00" ) { // 주문서 UPDATE + $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", $tx_tm); + $sql = " update {$g4['yc4_order_table']} set od_receipt_amount = '$ipgm_mnyx', - od_receipt_time = '$tx_tm', - od_cash_authno = '$cash_a_no + od_receipt_time = '$od_receipt_time', + od_cash_authno = '$cash_a_no' where od_id = '$order_no' and tno = '$tno' "; + sql_query($sql, FALSE); } From 7e411517e5f8ef9d5e0b2f2b075e9ee1c243ee73 Mon Sep 17 00:00:00 2001 From: chicpro Date: Wed, 30 Jan 2013 16:26:19 +0900 Subject: [PATCH 4/8] =?UTF-8?q?g4[charset]=20=EC=A0=9C=EA=B1=B0=EC=97=90?= =?UTF-8?q?=20=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 "