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

샵관리자: merge

Browse Source
This commit is contained in:
whitedot
2013-01-30 18:16:22 +09:00
parent ea47fef67a 41e2746562
commit 968f949434
10 changed files with 47 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
adm/shop_admin/configform.php
View File

@ -405,7 +405,7 @@ include_once (G4_ADMIN_PATH."/admin.head.php");
<th scope="row">공통 URL</th>
<td colspan="4">
<?=help("가상계좌 사용시 이 주소를 \"KCP 관리자 > 상점정보관리 > 정보변경 > 공통URL 정보 > 공통URL 변경후\"에 넣으셔야 상점에 자동으로 입금 통보됩니다.")?>
<?=$g4[shop_url]?>/settle_kcp_common.php
<?=G4_SHOP_URL?>/settle_kcp_common.php
</td>
</tr>
<tr>
@ -442,8 +442,6 @@ include_once (G4_ADMIN_PATH."/admin.head.php");
</tr>
</table>
<table>
<caption>배송정보</caption>
<tr>

7
bbs/register_form.php
View File

@ -1,6 +1,6 @@
<?
define('G4_CAPTCHA', 1);
include_once('./_common.php');
include_once(G4_GCAPTCHA_PATH.'/gcaptcha.lib.php');
include_once(G4_PATH.'/lib/register.lib.php');
// 불법접근을 막도록 토큰생성
@ -108,9 +108,10 @@ $mb_icon = G4_PATH.'/data/member/'.substr($member['mb_id'],0,2).'/'.$member['mb_
include_once('./_head.php');
if ($g4['https_url'])
$register_action_url = "{$g4['https_url']}/{$g4['bbs']}/register_form_update.php";
//$register_action_url = "{$g4['https_url']}/{$g4['bbs']}/register_form_update.php";
$register_action_url = G4_BBS_URL.'/register_form_update.php';
else
$register_action_url = "{$g4['url']}/{$g4['bbs']}/register_form_update.php";
$register_action_url = G4_BBS_URL.'/register_form_update.php';
$req_nick = !isset($member['mb_nick_date']) || (isset($member['mb_nick_date']) && $member['mb_nick_date'] <= date("Y-m-d", $g4['server_time'] - ($config['cf_nick_modify'] * 86400)));

10
bbs/register_form_update.php
View File

@ -1,6 +1,6 @@
<?
define('G4_CAPTCHA', 1);
include_once('./_common.php');
include_once(G4_GCAPTCHA_PATH.'/gcaptcha.lib.php');
include_once(G4_PATH.'/lib/register.lib.php');
include_once(G4_PATH.'/lib/mailer.lib.php');
@ -307,23 +307,23 @@ if ($w == '') {
// 사용자 코드 실행
@include_once (G4_PATH.'/skin/member/'.$config['cf_member_skin'].'/register_update.skin.php');
@include_once ($member_skin_path.'/register_update.skin.php');
if ($msg)
echo '<script>alert(\''.$msg.'\');</script>';
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 '
<html><title>회원정보수정</title><meta http-equiv="Content-Type" content="text/html; charset=$g4[charset]"></html><body>

14
lib/common.lib.php
View File

@ -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) {

2
shop/_tail.php
View File

@ -1,4 +1,4 @@
<?
if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
include_once(G4_PATH.'/shop.tail.php');
include_once(G4_SHOP_PATH.'/shop.tail.php');
?>

5
shop/kcp/pp_ax_hub.php
View File

@ -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', '' );

18
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);
$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,12 +502,10 @@ 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);
}
$od_bank_account = $bankname.' '.$account;
$od_deposit_name = $depositor;
$bankname = iconv("cp949", "utf8", $bankname);
$depositor = iconv("cp949", "utf8", $depositor);
$od_bank_account = $bankname.' '.$account.' '.$depositor;
$od_deposit_name = $od_name;
}
else if ($od_settle_case == "휴대폰")
{
@ -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;
}

7
shop/settle_kcp.inc.php
View File

@ -2,14 +2,15 @@
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__';
}
@ -26,4 +27,4 @@ else
$g_conf_js_url = "https://pay.kcp.co.kr/plugin/payplus{$test}.js";
$g_conf_log_level = "3"; // 변경불가
$g_conf_gw_port = "8090"; // 포트번호(변경불가)
$g_conf_gw_port = "8090"; // 포트번호(변경불가)

25
shop/settle_kcp_common.php
View File

@ -1,7 +1,16 @@
<?
include_once("./_common.php");
include_once($g4['path'].'/lib/etc.lib.php');
include_once($g4['path'].'/lib/mailer.lib.php');
include_once(G4_LIB_PATH.'/etc.lib.php');
include_once(G4_LIB_PATH.'/mailer.lib.php');
/*
$fp = fopen(G4_DATA_PATH.'/log/kcp_common.log', 'w');
foreach($_POST as $key=>$value) {
fwrite($fp, $key." = ".$value." / ");
}
fclose($fp);
exit;
*/
/*------------------------------------------------------------------------------
※ KCP 에서 가맹점의 결과처리 페이지로 데이터를 전송할 때에, 아래와 같은
@ -46,7 +55,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 +147,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);
}
@ -205,4 +218,4 @@ switch ($_SERVER['REMOTE_ADDR']) {
/* = 04. result 값 세팅 하기 = */
/* ============================================================================== */
?>
<html><body><form><input type="hidden" name="result" value="0000"></form></body></html>
<html><body><form><input type="hidden" name="result" value="0000"></form></body></html>

6
skin/member/neo/register_form.skin.php
View File

@ -97,7 +97,7 @@ var member_skin_path = "<?=$member_skin_path?>";
<? } ?>
<? if ($config['cf_use_addr']) {
$zip_href = './zip.php?frm_name=fregisterform&amp;frm_zip1=mb_zip1&amp;frm_zip2=mb_zip2&amp;frm_addr1=mb_addr1&amp;frm_addr2=mb_addr2';
$zip_href = G4_BBS_URL.'/zip.php?frm_name=fregisterform&amp;frm_zip1=mb_zip1&amp;frm_zip2=mb_zip2&amp;frm_addr1=mb_addr1&amp;frm_addr2=mb_addr2';
?>
<tr>
<th scope="row">
@ -108,7 +108,7 @@ var member_skin_path = "<?=$member_skin_path?>";
<input type="text" id="reg_mb_zip1" name="mb_zip1" class="frm_input <?=$config['cf_req_addr']?"required":"";?>" size="2" maxlength="3" <?=$config['cf_req_addr']?"required":"";?> value="<?=$member['mb_zip1']?>" title="우편번호 앞자리">
-
<input type="text" id="reg_mb_zip2" name="mb_zip2" class="frm_input <?=$config['cf_req_addr']?"required":"";?>" size="2" maxlength="3" <?=$config['cf_req_addr']?"required":"";?> value="<?=$member['mb_zip2']?>" title="우편번호 뒷자리">
<a href="<? echo $zip_href; ?>" id="reg_zip_find" class="btn_frmline" target="_blank" onclick="win_zip('fregisterform', 'mb_zip1', 'mb_zip2', 'mb_addr1', 'mb_addr2'); return false;" style="display: none;">주소찾기</a>
<a href="<? echo $zip_href; ?>" id="reg_zip_find" class="btn_frmline win_zip_find" target="_blank">주소찾기</a>
<input type="text" id="reg_mb_addr1" name="mb_addr1" class="frm_input frm_address <?=$config['cf_req_addr']?"required":"";?>" size="50" <?=$config['cf_req_addr']?"required":"";?> value="<?=$member['mb_addr1']?>" title="행정구역주소">
<input type="text" id="reg_mb_addr2" name="mb_addr2" class="frm_input frm_address <?=$config['cf_req_addr']?"required":"";?>" size="50" <?=$config['cf_req_addr']?"required":"";?> value="<?=$member['mb_addr2']?>" title="상세주소">
</td>
@ -206,7 +206,7 @@ var member_skin_path = "<?=$member_skin_path?>";
</table>
<div class="btn_confirm">
<input type="submit" class="btn_submit" value="회원가입" accesskey="s">
<input type="submit" class="btn_submit" value="<?=$w==''?'회원가입':'정보수정';?>" accesskey="s">
<a href="<?=$g4['path']?>/" class="btn_cancel">취소</a>
</div>
</form>