From 66c6e9b8aac8b73eae5e5576a8a41f2e358c301d Mon Sep 17 00:00:00 2001 From: thisgun Date: Thu, 14 Jan 2021 11:34:37 +0900 Subject: [PATCH] =?UTF-8?q?PHP8=EC=97=90=EC=84=9C=20=EA=B2=BD=EA=B3=A0?= =?UTF-8?q?=EB=AC=B8=EC=9D=B4=20=EB=9C=A8=EB=8A=94=20=EC=BD=94=EB=93=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common.php | 1 + mobile/shop/inicis/pay_approval.php | 2 +- mobile/shop/kcp/order_approval_form.php | 2 +- mobile/shop/lg/returnurl.php | 2 +- mobile/shop/orderformupdate.php | 2 ++ shop/inicis/inistdpay_result.php | 6 ++--- shop/kakaopay/kakaopay_result.php | 4 +-- shop/kakaopay/mobile_pay_approval.php | 34 ++++++++++++------------- shop/kakaopay/orderform.1.php | 2 +- shop/kakaopay/pc_pay_result.php | 10 ++++---- 10 files changed, 34 insertions(+), 31 deletions(-) diff --git a/common.php b/common.php index 3481744fa..48113ba98 100644 --- a/common.php +++ b/common.php @@ -271,6 +271,7 @@ if( !function_exists('shop_check_is_pay_page') ){ $mobile_dir.'/'.$shop_dir.'/lg/returnurl.php', $mobile_dir.'/'.$shop_dir.'/lg/xpay_approval.php', $mobile_dir.'/'.$shop_dir.'/kcp/order_approval_form.php', + $shop_dir.'/kakaopay/inicis_kk_return.php', // 이니시스 카카오페이 (SIRK 로 시작하는 아이디 전용) ); $server_script_name = str_replace('\\', '/', $_SERVER['SCRIPT_NAME']); diff --git a/mobile/shop/inicis/pay_approval.php b/mobile/shop/inicis/pay_approval.php index 367e339f3..5befa5b30 100644 --- a/mobile/shop/inicis/pay_approval.php +++ b/mobile/shop/inicis/pay_approval.php @@ -20,7 +20,7 @@ if( ! $p_req_url || !preg_match('/^https\:\/\//i', $p_req_url)){ $sql = " select * from {$g5['g5_shop_order_data_table']} where od_id = '$oid' "; $row = sql_fetch($sql); -$data = unserialize(base64_decode($row['dt_data'])); +$data = isset($row['dt_data']) ? unserialize(base64_decode($row['dt_data'])) : array(); if(isset($data['pp_id']) && $data['pp_id']) { $order_action_url = G5_HTTPS_MSHOP_URL.'/personalpayformupdate.php'; diff --git a/mobile/shop/kcp/order_approval_form.php b/mobile/shop/kcp/order_approval_form.php index 0f561ca6a..deb72826c 100644 --- a/mobile/shop/kcp/order_approval_form.php +++ b/mobile/shop/kcp/order_approval_form.php @@ -232,7 +232,7 @@ if($enc_data != '' && $enc_info != '' && $tran_cd != '') { $sql = " select * from {$g5['g5_shop_order_data_table']} where od_id = '$ordr_idxx' "; $row = sql_fetch($sql); - $data = unserialize(base64_decode($row['dt_data'])); + $data = isset($row['dt_data']) ? unserialize(base64_decode($row['dt_data'])) : array(); if(isset($data['pp_id']) && $data['pp_id']) { $order_action_url = G5_HTTPS_MSHOP_URL.'/personalpayformupdate.php'; diff --git a/mobile/shop/lg/returnurl.php b/mobile/shop/lg/returnurl.php index 9f6cd7e55..fb7d9195c 100644 --- a/mobile/shop/lg/returnurl.php +++ b/mobile/shop/lg/returnurl.php @@ -25,7 +25,7 @@ $LGD_OID = $payReqMap['LGD_OID']; $sql = " select * from {$g5['g5_shop_order_data_table']} where od_id = '$LGD_OID' "; $row = sql_fetch($sql); -$data = unserialize(base64_decode($row['dt_data'])); +$data = isset($row['dt_data']) ? unserialize(base64_decode($row['dt_data'])) : array(); if(isset($data['pp_id']) && $data['pp_id']) { $order_action_url = G5_HTTPS_MSHOP_URL.'/personalpayformupdate.php'; diff --git a/mobile/shop/orderformupdate.php b/mobile/shop/orderformupdate.php index 14e4daf40..ad0d12442 100644 --- a/mobile/shop/orderformupdate.php +++ b/mobile/shop/orderformupdate.php @@ -344,6 +344,7 @@ if ($od_settle_case == "무통장") $od_status = '입금'; $od_receipt_time = G5_TIME_YMDHIS; } + $tno = $od_receipt_time = $od_app_no = ''; } else if ($od_settle_case == "계좌이체") { @@ -395,6 +396,7 @@ else if ($od_settle_case == "가상계좌") $od_deposit_name = $depositor; $pg_price = $amount; $od_misu = $i_price - $od_receipt_price; + $od_receipt_time = ''; } else if ($od_settle_case == "휴대폰") { diff --git a/shop/inicis/inistdpay_result.php b/shop/inicis/inistdpay_result.php index 2f850ee51..96feac3a0 100644 --- a/shop/inicis/inistdpay_result.php +++ b/shop/inicis/inistdpay_result.php @@ -16,7 +16,7 @@ try { //##################### // 인증이 성공일 경우만 //##################### - if (strcmp('0000', $_REQUEST['resultCode']) == 0) { + if (isset($_REQUEST['resultCode']) && strcmp('0000', $_REQUEST['resultCode']) == 0) { //############################################ // 1.전문 필드 값 설정(***가맹점 개발수정***) @@ -100,13 +100,13 @@ try { $sql = " select * from {$g5['g5_shop_order_data_table']} where od_id = '$oid' "; $row = sql_fetch($sql); - $data = unserialize(base64_decode($row['dt_data'])); + $data = isset($row['dt_data']) ? unserialize(base64_decode($row['dt_data'])) : array(); if(isset($data['pp_id']) && $data['pp_id']) { $page_return_url = G5_SHOP_URL.'/personalpayform.php?pp_id='.$data['pp_id']; } else { $page_return_url = G5_SHOP_URL.'/orderform.php'; - if($_SESSION['ss_direct']) + if(get_session('ss_direct')) $page_return_url .= '?sw_direct=1'; } diff --git a/shop/kakaopay/kakaopay_result.php b/shop/kakaopay/kakaopay_result.php index f7f333662..ee0508a2e 100644 --- a/shop/kakaopay/kakaopay_result.php +++ b/shop/kakaopay/kakaopay_result.php @@ -6,10 +6,10 @@ if( isset($_POST['P_NOTI']) ){ $sql = " select * from {$g5['g5_shop_order_data_table']} where od_id = '".preg_replace("/\s+/", "", $_POST['P_NOTI'])."' "; $row = sql_fetch($sql); - if ( base64_encode(base64_decode($row['dt_data'], true)) === $row['dt_data']){ + if (isset($row['dt_data']) && (base64_encode(base64_decode($row['dt_data'], true)) === $row['dt_data'])){ $data = unserialize(base64_decode($row['dt_data'])); } else { - $data = unserialize($row['dt_data']); + $data = isset($row['dt_data']) ? unserialize($row['dt_data']) : array(); } if( isset($data['is_inicis_mobile_kakaopay']) && $data['is_inicis_mobile_kakaopay'] == 'mobile' ){ diff --git a/shop/kakaopay/mobile_pay_approval.php b/shop/kakaopay/mobile_pay_approval.php index 13b34b8d1..f587d83ba 100644 --- a/shop/kakaopay/mobile_pay_approval.php +++ b/shop/kakaopay/mobile_pay_approval.php @@ -12,8 +12,8 @@ set_session('P_TID', ''); set_session('P_AMT', ''); set_session('P_HASH', ''); -$oid = trim($_REQUEST['P_NOTI']); -$p_req_url = trim($_REQUEST['P_REQ_URL']); +$oid = isset($_REQUEST['P_NOTI']) ? trim($_REQUEST['P_NOTI']) : ''; +$p_req_url = isset($_REQUEST['P_REQ_URL']) ? trim($_REQUEST['P_REQ_URL']) : ''; if( ! $p_req_url || !preg_match('/^https\:\/\//i', $p_req_url)){ alert("잘못된 요청 URL 입니다."); @@ -22,10 +22,10 @@ if( ! $p_req_url || !preg_match('/^https\:\/\//i', $p_req_url)){ $sql = " select * from {$g5['g5_shop_order_data_table']} where od_id = '$oid' "; $row = sql_fetch($sql); -if ( base64_encode(base64_decode($row['dt_data'], true)) === $row['dt_data']){ +if (isset($row['dt_data']) && (base64_encode(base64_decode($row['dt_data'], true)) === $row['dt_data'])){ $data = unserialize(base64_decode($row['dt_data'])); } else { - $data = unserialize($row['dt_data']); + $data = isset($row['dt_data']) ? unserialize($row['dt_data']) : array(); } if(isset($data['pp_id']) && $data['pp_id']) { @@ -34,7 +34,7 @@ if(isset($data['pp_id']) && $data['pp_id']) { } else { $order_action_url = G5_HTTPS_MSHOP_URL.'/orderformupdate.php'; $page_return_url = G5_SHOP_URL.'/orderform.php'; - if($_SESSION['ss_direct']) + if(get_session('ss_direct')) $page_return_url .= '?sw_direct=1'; // 장바구니가 비어있는가? @@ -151,12 +151,12 @@ if(isset($data['pp_id']) && !empty($data['pp_id'])) { $_POST['P_TYPE'] = $PAY['P_TYPE']; $_POST['P_AUTH_DT'] = $PAY['P_AUTH_DT']; $_POST['P_AUTH_NO'] = $PAY['P_AUTH_NO']; - $_POST['P_HPP_CORP'] = $PAY['P_HPP_CORP']; - $_POST['P_APPL_NUM'] = $PAY['P_APPL_NUM']; - $_POST['P_VACT_NUM'] = $PAY['P_VACT_NUM']; - $_POST['P_VACT_NAME'] = iconv_utf8($PAY['P_VACT_NAME']); - $_POST['P_VACT_BANK'] = $BANK_CODE[$PAY['P_VACT_BANK_CODE']]; - $_POST['P_CARD_ISSUER'] = $CARD_CODE[$PAY['P_CARD_ISSUER_CODE']]; + $_POST['P_HPP_CORP'] = isset($PAY['P_HPP_CORP']) ? $PAY['P_HPP_CORP'] : ''; + $_POST['P_APPL_NUM'] = isset($PAY['P_APPL_NUM']) ? $PAY['P_APPL_NUM'] : ''; + $_POST['P_VACT_NUM'] = isset($PAY['P_VACT_NUM']) ? $PAY['P_VACT_NUM'] : ''; + $_POST['P_VACT_NAME'] = isset($PAY['P_VACT_NAME']) ? iconv_utf8($PAY['P_VACT_NAME']) : ''; + $_POST['P_VACT_BANK'] = (isset($PAY['P_VACT_BANK_CODE']) && isset($BANK_CODE[$PAY['P_VACT_BANK_CODE']])) ? $BANK_CODE[$PAY['P_VACT_BANK_CODE']] : ''; + $_POST['P_CARD_ISSUER'] = (isset($PAY['P_CARD_ISSUER_CODE']) && isset($CARD_CODE[$PAY['P_CARD_ISSUER_CODE']])) ? $CARD_CODE[$PAY['P_CARD_ISSUER_CODE']] : ''; $_POST['P_UNAME'] = iconv_utf8($PAY['P_UNAME']); include_once( G5_MSHOP_PATH.'/personalpayformupdate.php' ); @@ -184,12 +184,12 @@ if(isset($data['pp_id']) && !empty($data['pp_id'])) { $P_TYPE = $_POST['P_TYPE'] = $PAY['P_TYPE']; $P_AUTH_DT = $_POST['P_AUTH_DT'] = $PAY['P_AUTH_DT']; $P_AUTH_NO = $_POST['P_AUTH_NO'] = $PAY['P_AUTH_NO']; - $P_HPP_CORP = $_POST['P_HPP_CORP'] = $PAY['P_HPP_CORP']; - $P_APPL_NUM = $_POST['P_APPL_NUM'] = $PAY['P_APPL_NUM']; - $P_VACT_NUM = $_POST['P_VACT_NUM'] = $PAY['P_VACT_NUM']; - $P_VACT_NAME = $_POST['P_VACT_NAME'] = iconv_utf8($PAY['P_VACT_NAME']); - $P_VACT_BANK = $_POST['P_VACT_BANK'] = $BANK_CODE[$PAY['P_VACT_BANK_CODE']]; - $P_CARD_ISSUER = $_POST['P_CARD_ISSUER'] = $CARD_CODE[$PAY['P_CARD_ISSUER_CODE']]; + $P_HPP_CORP = $_POST['P_HPP_CORP'] = isset($PAY['P_HPP_CORP']) ? $PAY['P_HPP_CORP'] : ''; + $P_APPL_NUM = $_POST['P_APPL_NUM'] = isset($PAY['P_APPL_NUM']) ? $PAY['P_APPL_NUM'] : ''; + $P_VACT_NUM = $_POST['P_VACT_NUM'] = isset($PAY['P_VACT_NUM']) ? $PAY['P_VACT_NUM'] : ''; + $P_VACT_NAME = $_POST['P_VACT_NAME'] = isset($PAY['P_VACT_NAME']) ? iconv_utf8($PAY['P_VACT_NAME']) : ''; + $P_VACT_BANK = $_POST['P_VACT_BANK'] = (isset($PAY['P_VACT_BANK_CODE']) && isset($BANK_CODE[$PAY['P_VACT_BANK_CODE']])) ? $BANK_CODE[$PAY['P_VACT_BANK_CODE']] : ''; + $P_CARD_ISSUER = $_POST['P_CARD_ISSUER'] = (isset($PAY['P_CARD_ISSUER_CODE']) && isset($CARD_CODE[$PAY['P_CARD_ISSUER_CODE']])) ? $CARD_CODE[$PAY['P_CARD_ISSUER_CODE']] : ''; $P_UNAME = $_POST['P_UNAME'] = iconv_utf8($PAY['P_UNAME']); $check_keys = array('od_name', 'od_tel', 'od_pwd', 'od_hp', 'od_zip', 'od_addr1', 'od_addr2', 'od_addr3', 'od_addr_jibeon', 'od_email', 'ad_default', 'ad_subject', 'od_hope_date', 'od_b_name', 'od_b_tel', 'od_b_hp', 'od_b_zip', 'od_b_addr1', 'od_b_addr2', 'od_b_addr3', 'od_b_addr_jibeon', 'od_memo', 'od_settle_case', 'max_temp_point', 'od_temp_point', 'od_send_cost', 'od_send_cost2', 'od_bank_account', 'od_deposit_name', 'od_test', 'od_ip'); diff --git a/shop/kakaopay/orderform.1.php b/shop/kakaopay/orderform.1.php index f7fcbcfaa..1ea853970 100644 --- a/shop/kakaopay/orderform.1.php +++ b/shop/kakaopay/orderform.1.php @@ -41,7 +41,7 @@ if($default['de_tax_flag_use']) { - + diff --git a/shop/kakaopay/pc_pay_result.php b/shop/kakaopay/pc_pay_result.php index add7a2e5f..f32823b4a 100644 --- a/shop/kakaopay/pc_pay_result.php +++ b/shop/kakaopay/pc_pay_result.php @@ -16,7 +16,7 @@ try { //##################### // 인증이 성공일 경우만 //##################### - if (strcmp('0000', $_REQUEST['resultCode']) == 0) { + if (isset($_REQUEST['resultCode']) && strcmp('0000', $_REQUEST['resultCode']) == 0) { //############################################ // 1.전문 필드 값 설정(***가맹점 개발수정***) @@ -100,13 +100,13 @@ try { $sql = " select * from {$g5['g5_shop_order_data_table']} where od_id = '$oid' "; $row = sql_fetch($sql); - $data = unserialize(base64_decode($row['dt_data'])); + $data = isset($row['dt_data']) ? unserialize(base64_decode($row['dt_data'])) : array(); if(isset($data['pp_id']) && $data['pp_id']) { $page_return_url = G5_SHOP_URL.'/personalpayform.php?pp_id='.$data['pp_id']; } else { $page_return_url = G5_SHOP_URL.'/orderform.php'; - if($_SESSION['ss_direct']) + if(get_session('ss_direct')) $page_return_url .= '?sw_direct=1'; } @@ -124,9 +124,9 @@ try { $app_time = $resultMap['applDate'].$resultMap['applTime']; $pay_method = $resultMap['payMethod']; $pay_type = $PAY_METHOD[$pay_method]; - $depositor = $resultMap['VACT_InputName']; + $depositor = isset($resultMap['VACT_InputName']) ? $resultMap['VACT_InputName'] : ''; $commid = ''; - $mobile_no = $resultMap['HPP_Num']; + $mobile_no = isset($resultMap['HPP_Num']) ? $resultMap['HPP_Num'] : ''; $app_no = $resultMap['applNum']; $card_name = $CARD_CODE[$resultMap['CARD_Code']]; switch($pay_type) {