From bc37a2cd599bf1cbc52c83ae49e8e4ecaf31660b Mon Sep 17 00:00:00 2001 From: thisgun Date: Mon, 15 Feb 2021 10:33:16 +0900 Subject: [PATCH 01/20] =?UTF-8?q?=EA=B2=8C=EC=8B=9C=ED=8C=90=20=EC=8A=A4?= =?UTF-8?q?=ED=82=A8=EC=97=90=EC=84=9C=20=EB=AC=B8=EC=A0=9C=EA=B0=80=20?= =?UTF-8?q?=EB=90=98=EB=8A=94=20download=20attribute=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mobile/skin/board/basic/view.skin.php | 2 +- mobile/skin/board/gallery/view.skin.php | 2 +- skin/board/basic/view.skin.php | 2 +- skin/board/gallery/view.skin.php | 2 +- theme/basic/mobile/skin/board/basic/view.skin.php | 2 +- theme/basic/mobile/skin/board/gallery/view.skin.php | 2 +- theme/basic/skin/board/basic/view.skin.php | 2 +- theme/basic/skin/board/gallery/view.skin.php | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mobile/skin/board/basic/view.skin.php b/mobile/skin/board/basic/view.skin.php index f72574070..8a3f2dd57 100644 --- a/mobile/skin/board/basic/view.skin.php +++ b/mobile/skin/board/basic/view.skin.php @@ -143,7 +143,7 @@ jQuery(function($){ if (isset($view['file'][$i]['source']) && $view['file'][$i]['source'] && !$view['file'][$i]['view']) { ?>
  • - + () diff --git a/mobile/skin/board/gallery/view.skin.php b/mobile/skin/board/gallery/view.skin.php index d75600e81..37237904e 100644 --- a/mobile/skin/board/gallery/view.skin.php +++ b/mobile/skin/board/gallery/view.skin.php @@ -145,7 +145,7 @@ jQuery(function($){ if (isset($view['file'][$i]['source']) && $view['file'][$i]['source'] && !$view['file'][$i]['view']) { ?>
  • - + () diff --git a/skin/board/basic/view.skin.php b/skin/board/basic/view.skin.php index cbf54f971..ffe1ef78f 100644 --- a/skin/board/basic/view.skin.php +++ b/skin/board/basic/view.skin.php @@ -161,7 +161,7 @@ add_stylesheet('', 0 ?>
  • - + ()
    diff --git a/skin/board/gallery/view.skin.php b/skin/board/gallery/view.skin.php index 293af3bf1..e94e3f08b 100644 --- a/skin/board/gallery/view.skin.php +++ b/skin/board/gallery/view.skin.php @@ -161,7 +161,7 @@ add_stylesheet('', 0 ?>
  • - + ()
    diff --git a/theme/basic/mobile/skin/board/basic/view.skin.php b/theme/basic/mobile/skin/board/basic/view.skin.php index f72574070..8a3f2dd57 100644 --- a/theme/basic/mobile/skin/board/basic/view.skin.php +++ b/theme/basic/mobile/skin/board/basic/view.skin.php @@ -143,7 +143,7 @@ jQuery(function($){ if (isset($view['file'][$i]['source']) && $view['file'][$i]['source'] && !$view['file'][$i]['view']) { ?>
  • - + () diff --git a/theme/basic/mobile/skin/board/gallery/view.skin.php b/theme/basic/mobile/skin/board/gallery/view.skin.php index d75600e81..37237904e 100644 --- a/theme/basic/mobile/skin/board/gallery/view.skin.php +++ b/theme/basic/mobile/skin/board/gallery/view.skin.php @@ -145,7 +145,7 @@ jQuery(function($){ if (isset($view['file'][$i]['source']) && $view['file'][$i]['source'] && !$view['file'][$i]['view']) { ?>
  • - + () diff --git a/theme/basic/skin/board/basic/view.skin.php b/theme/basic/skin/board/basic/view.skin.php index cbf54f971..ffe1ef78f 100644 --- a/theme/basic/skin/board/basic/view.skin.php +++ b/theme/basic/skin/board/basic/view.skin.php @@ -161,7 +161,7 @@ add_stylesheet('', 0 ?>
  • - + ()
    diff --git a/theme/basic/skin/board/gallery/view.skin.php b/theme/basic/skin/board/gallery/view.skin.php index 293af3bf1..e94e3f08b 100644 --- a/theme/basic/skin/board/gallery/view.skin.php +++ b/theme/basic/skin/board/gallery/view.skin.php @@ -161,7 +161,7 @@ add_stylesheet('', 0 ?>
  • - + ()
    From fb840b04889a33d46f879abf7c0f488bd5dedfe6 Mon Sep 17 00:00:00 2001 From: thisgun Date: Mon, 15 Feb 2021 11:06:13 +0900 Subject: [PATCH 02/20] =?UTF-8?q?=EC=87=BC=ED=95=91=EB=AA=B0=20=ED=85=8C?= =?UTF-8?q?=EB=A7=88=EC=97=90=EC=84=9C=20=EC=BB=A4=EB=AE=A4=EB=8B=88?= =?UTF-8?q?=ED=8B=B0=20=EC=82=AC=EC=9A=A9=20=EC=95=88=ED=95=A0=EC=8B=9C=20?= =?UTF-8?q?=EB=A9=94=EB=89=B4=20html=EC=BD=94=EB=93=9C=20=EC=B2=98?= =?UTF-8?q?=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- skin/shop/basic/boxevent.skin.php | 2 +- theme/basic/shop/index.php | 2 +- theme/basic/shop/shop.head.php | 2 ++ theme/basic/skin/shop/basic/boxevent.skin.php | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/skin/shop/basic/boxevent.skin.php b/skin/shop/basic/boxevent.skin.php index cce361504..376517b9b 100644 --- a/skin/shop/basic/boxevent.skin.php +++ b/skin/shop/basic/boxevent.skin.php @@ -52,8 +52,8 @@ if(sql_num_rows($hresult)) { echo ''.display_price(get_price($row2), $row2['it_tel_inq']).''.PHP_EOL; echo '
    • '.PHP_EOL; } - echo '
  • 더보기
    • '.PHP_EOL; if($k > 1) { + echo '
  • 더보기
    • '.PHP_EOL; echo ''.PHP_EOL; } diff --git a/theme/basic/shop/index.php b/theme/basic/shop/index.php index 3505b3859..52ea8577e 100644 --- a/theme/basic/shop/index.php +++ b/theme/basic/shop/index.php @@ -6,7 +6,7 @@ if (G5_IS_MOBILE) { return; } -define("_INDEX_", TRUE); +if(! defined('_INDEX_')) define('_INDEX_', TRUE); include_once(G5_THEME_SHOP_PATH.'/shop.head.php'); ?> diff --git a/theme/basic/shop/shop.head.php b/theme/basic/shop/shop.head.php index d1c820ca6..d9466af75 100644 --- a/theme/basic/shop/shop.head.php +++ b/theme/basic/shop/shop.head.php @@ -31,10 +31,12 @@ add_stylesheet('
    + +
    '.PHP_EOL; echo ''.PHP_EOL; } - echo '
  • 더보기
    • '.PHP_EOL; if($k > 1) { + echo '
  • 더보기
    • '.PHP_EOL; echo ''.PHP_EOL; } From 6365717c0dd8f2766013a86babbcabf86198bf2b Mon Sep 17 00:00:00 2001 From: thisgun Date: Tue, 23 Feb 2021 18:29:30 +0900 Subject: [PATCH 03/20] =?UTF-8?q?=EC=98=A4=ED=83=80=20=EC=BD=94=EB=93=9C?= =?UTF-8?q?=20=EB=B0=8F=20=EC=9E=98=EB=AA=BB=EB=90=9C=20=EC=9C=84=EC=B9=98?= =?UTF-8?q?=EC=97=90=20=EC=9E=88=EB=8A=94=20=EC=BD=94=EB=93=9C=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 --- bbs/move_update.php | 4 ++-- bbs/register_form_update.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bbs/move_update.php b/bbs/move_update.php index dd5a6345a..595e6f5a6 100644 --- a/bbs/move_update.php +++ b/bbs/move_update.php @@ -193,12 +193,12 @@ while ($row = sql_fetch_array($result)) $save[$cnt]['wr_id'] = $row2['wr_parent']; $cnt++; + + run_event('bbs_move_copy', $row2, $move_bo_table, $insert_id, $next_wr_num, $sw); } sql_query(" update {$g5['board_table']} set bo_count_write = bo_count_write + '$count_write' where bo_table = '$move_bo_table' "); sql_query(" update {$g5['board_table']} set bo_count_comment = bo_count_comment + '$count_comment' where bo_table = '$move_bo_table' "); - - run_event('bbs_move_copy', $row2, $move_bo_table, $insert_id, $next_wr_num, $sw); delete_cache_latest($move_bo_table); } diff --git a/bbs/register_form_update.php b/bbs/register_form_update.php index 793b51315..9cafded03 100644 --- a/bbs/register_form_update.php +++ b/bbs/register_form_update.php @@ -512,8 +512,8 @@ if ($config['cf_use_email_certify'] && $old_email != $mb_email) { if(isset($_SESSION['ss_cert_type'])) unset($_SESSION['ss_cert_type']); if(isset($_SESSION['ss_cert_no'])) unset($_SESSION['ss_cert_no']); if(isset($_SESSION['ss_cert_hash'])) unset($_SESSION['ss_cert_hash']); -if(isset($_SESSION['ss_cert_hash'])) unset($_SESSION['ss_cert_birth']); -if(isset($_SESSION['ss_cert_hash'])) unset($_SESSION['ss_cert_adult']); +if(isset($_SESSION['ss_cert_birth'])) unset($_SESSION['ss_cert_birth']); +if(isset($_SESSION['ss_cert_adult'])) unset($_SESSION['ss_cert_adult']); if ($msg) echo ''; From f9f8d0a9f0ea656035ba53ecc5b0388e1d748796 Mon Sep 17 00:00:00 2001 From: thisgun Date: Fri, 26 Feb 2021 16:59:44 +0900 Subject: [PATCH 04/20] =?UTF-8?q?PHP8=20=EB=B2=84=EC=A0=84=EC=97=90?= =?UTF-8?q?=EC=84=9C=20KCP=20=ED=98=84=EA=B8=88=EC=98=81=EC=88=98=EC=A6=9D?= =?UTF-8?q?=20=EC=98=A4=EB=A5=98=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/ajax.orderitem.php | 3 +- shop/kcp/pp_cli_hub.php | 54 +++++++++++++++---------------- shop/kcp/pp_cli_hub_lib.php | 4 ++- 3 files changed, 32 insertions(+), 29 deletions(-) diff --git a/adm/shop_admin/ajax.orderitem.php b/adm/shop_admin/ajax.orderitem.php index 2cf8d85f6..835182ff7 100644 --- a/adm/shop_admin/ajax.orderitem.php +++ b/adm/shop_admin/ajax.orderitem.php @@ -9,7 +9,7 @@ $od_id = isset($_POST['od_id']) ? safe_replace_regex($_POST['od_id'], 'od_id') : $sql = " select * from {$g5['g5_shop_order_table']} where od_id = '$od_id' "; $od = sql_fetch($sql); -if(!$od['od_id']) +if(! ($od['od_id'] && $od['od_id'])) die('
    주문정보가 존재하지 않습니다.
    '); // 상품목록 @@ -100,6 +100,7 @@ $result = sql_query($sql); $opt_price = $opt['ct_price'] + $opt['io_price']; // 소계 + $opt['ct_point'] = isset($opt['ct_point']) ? (int) $opt['ct_point'] : 0; $ct_price['stotal'] = $opt_price * $opt['ct_qty']; $ct_point['stotal'] = $opt['ct_point'] * $opt['ct_qty']; ?> diff --git a/shop/kcp/pp_cli_hub.php b/shop/kcp/pp_cli_hub.php index a7362823f..7a9c2b590 100644 --- a/shop/kcp/pp_cli_hub.php +++ b/shop/kcp/pp_cli_hub.php @@ -59,36 +59,36 @@ setlocale(LC_CTYPE, 'ko_KR.euc-kr'); /* ============================================================================== */ /* = 01. 요청 정보 설정 = */ /* = -------------------------------------------------------------------------- = */ - $req_tx = $_POST[ "req_tx" ]; // 요청 종류 - $trad_time = $_POST[ "trad_time" ]; // 원거래 시각 + $req_tx = isset($_POST["req_tx"]) ? $_POST["req_tx"] : ''; // 요청 종류 + $trad_time = isset($_POST["trad_time"]) ? $_POST["trad_time"] : ''; // 원거래 시각 /* = -------------------------------------------------------------------------- = */ - $ordr_idxx = preg_replace('/[^0-9A-Za-z_\-\.]/i', '', $_POST[ "ordr_idxx" ]); // 주문 번호 - $buyr_name = $_POST[ "buyr_name" ]; // 주문자 이름 - $buyr_tel1 = $_POST[ "buyr_tel1" ]; // 주문자 전화번호 - $buyr_mail = $_POST[ "buyr_mail" ]; // 주문자 E-Mail - $good_name = $_POST[ "good_name" ]; // 상품 정보 - $comment = $_POST[ "comment" ]; // 비고 + $ordr_idxx = isset($_POST["ordr_idxx"]) ? preg_replace('/[^0-9A-Za-z_\-\.]/i', '', $_POST[ "ordr_idxx" ]) : ''; // 주문 번호 + $buyr_name = isset($_POST["buyr_name"]) ? $_POST["buyr_name"] : ''; // 주문자 이름 + $buyr_tel1 = isset($_POST["buyr_tel1"]) ? $_POST["buyr_tel1"] : ''; // 주문자 전화번호 + $buyr_mail = isset($_POST["buyr_mail"]) ? $_POST["buyr_mail"] : ''; // 주문자 E-Mail + $good_name = isset($_POST["good_name"]) ? $_POST["good_name"] : ''; // 상품 정보 + $comment = isset($_POST["comment"]) ? $_POST["comment"] : ''; // 비고 /* = -------------------------------------------------------------------------- = */ - $corp_type = $_POST[ "corp_type" ]; // 사업장 구분 - $corp_tax_type = $_POST[ "corp_tax_type" ]; // 과세/면세 구분 - $corp_tax_no = $_POST[ "corp_tax_no" ]; // 발행 사업자 번호 - $corp_nm = $_POST[ "corp_nm" ]; // 상호 - $corp_owner_nm = $_POST[ "corp_owner_nm" ]; // 대표자명 - $corp_addr = $_POST[ "corp_addr" ]; // 사업장 주소 - $corp_telno = $_POST[ "corp_telno" ]; // 사업장 대표 연락처 + $corp_type = isset($_POST["corp_type"]) ? $_POST["corp_type"] : ''; // 사업장 구분 + $corp_tax_type = isset($_POST["corp_tax_type"]) ? $_POST["corp_tax_type"] : ''; // 과세/면세 구분 + $corp_tax_no = isset($_POST["corp_tax_no"]) ? $_POST["corp_tax_no"] : ''; // 발행 사업자 번호 + $corp_nm = isset($_POST["corp_nm"]) ? $_POST["corp_nm"] : ''; // 상호 + $corp_owner_nm = isset($_POST["corp_owner_nm"]) ? $_POST["corp_owner_nm"] : ''; // 대표자명 + $corp_addr = isset($_POST["corp_addr"]) ? $_POST["corp_addr"] : ''; // 사업장 주소 + $corp_telno = isset($_POST["corp_telno"]) ? $_POST["corp_telno"] : ''; // 사업장 대표 연락처 /* = -------------------------------------------------------------------------- = */ - $tr_code = $_POST[ "tr_code" ]; // 발행용도 - $id_info = $_POST[ "id_info" ]; // 신분확인 ID - $amt_tot = $_POST[ "amt_tot" ]; // 거래금액 총 합 - $amt_sup = $_POST[ "amt_sup" ]; // 공급가액 - $amt_svc = $_POST[ "amt_svc" ]; // 봉사료 - $amt_tax = $_POST[ "amt_tax" ]; // 부가가치세 + $tr_code = isset($_POST["tr_code"]) ? $_POST["tr_code"] : ''; // 발행용도 + $id_info = isset($_POST["id_info"]) ? $_POST["id_info"] : ''; // 신분확인 ID + $amt_tot = isset($_POST["amt_tot"]) ? $_POST["amt_tot"] : ''; // 거래금액 총 합 + $amt_sup = isset($_POST["amt_sup"]) ? $_POST["amt_sup"] : ''; // 공급가액 + $amt_svc = isset($_POST["amt_svc"]) ? $_POST["amt_svc"] : ''; // 봉사료 + $amt_tax = isset($_POST["amt_tax"]) ? $_POST["amt_tax"] : ''; // 부가가치세 /* = -------------------------------------------------------------------------- = */ - $mod_type = $_POST[ "mod_type" ]; // 변경 타입 - $mod_value = $_POST[ "mod_value" ]; // 변경 요청 거래번호 - $mod_gubn = $_POST[ "mod_gubn" ]; // 변경 요청 거래번호 구분 - $mod_mny = $_POST[ "mod_mny" ]; // 변경 요청 금액 - $rem_mny = $_POST[ "rem_mny" ]; // 변경처리 이전 금액 + $mod_type = isset($_POST["mod_type"]) ? $_POST["mod_type"] : ''; // 변경 타입 + $mod_value = isset($_POST["mod_value"]) ? $_POST["mod_value"] : ''; // 변경 요청 거래번호 + $mod_gubn = isset($_POST["mod_gubn"]) ? $_POST["mod_gubn"] : ''; // 변경 요청 거래번호 구분 + $mod_mny = isset($_POST["mod_mny"]) ? $_POST["mod_mny"] : ''; // 변경 요청 금액 + $rem_mny = isset($_POST["rem_mny"]) ? $_POST["rem_mny"] : ''; // 변경처리 이전 금액 /* = -------------------------------------------------------------------------- = */ $cust_ip = getenv( "REMOTE_ADDR" ); // 요청 IP /* ============================================================================== */ @@ -104,7 +104,7 @@ setlocale(LC_CTYPE, 'ko_KR.euc-kr'); $c_PayPlus->mf_clear(); /* ============================================================================== */ - + $rcpt_data_set = $corp_data_set = null; /* ============================================================================== */ /* = 03. 처리 요청 정보 설정, 실행 = */ /* = -------------------------------------------------------------------------- = */ diff --git a/shop/kcp/pp_cli_hub_lib.php b/shop/kcp/pp_cli_hub_lib.php index 58fb2d13d..a24b5bb13 100644 --- a/shop/kcp/pp_cli_hub_lib.php +++ b/shop/kcp/pp_cli_hub_lib.php @@ -16,6 +16,7 @@ class C_PAYPLUS_CLI_T var $m_escw_data; var $m_modx_data; var $m_encx_data; + var $m_encx_info; /* -------------------------------------------------------------------- */ /* - 처리 결과 값 - */ @@ -37,6 +38,7 @@ class C_PAYPLUS_CLI_T $this->m_escw_data=""; $this->m_modx_data=""; $this->m_encx_data=""; + $this->m_encx_info=""; } function mf_init( $mode ) @@ -278,7 +280,7 @@ class C_PAYPLUS_CLI_T $exec_cmd = array_shift( $arg ); - while ( list(,$i) = each($arg) ) + foreach((array) $arg as $key=>$i) { $exec_cmd .= " " . escapeshellarg( $i ); } From 9367862f4b80f0576330f8024f3a5936d68610bc Mon Sep 17 00:00:00 2001 From: thisgun Date: Fri, 26 Feb 2021 17:11:57 +0900 Subject: [PATCH 05/20] =?UTF-8?q?=EC=98=81=EC=B9=B4=ED=8A=B8=20=EB=A9=94?= =?UTF-8?q?=EC=9D=B8=20=ED=9E=88=ED=8A=B8=EC=83=81=ED=92=88=20=EC=8A=A4?= =?UTF-8?q?=ED=82=A8=EC=97=90=201=EC=A4=84=EB=8B=B9=20=EC=9D=B4=EB=AF=B8?= =?UTF-8?q?=EC=A7=80=20=EC=88=98=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shop/index.php | 8 +++++++- skin/shop/basic/main.10.skin.php | 2 +- theme/basic/shop/index.php | 10 ++++++++-- theme/basic/skin/shop/basic/main.10.skin.php | 2 +- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/shop/index.php b/shop/index.php index ff2fa2c58..ebb3662cf 100644 --- a/shop/index.php +++ b/shop/index.php @@ -46,7 +46,13 @@ include_once(G5_SHOP_PATH.'/shop.head.php');