버전 5.5.4 수정

UI 수정사항 반영

adm/config_form.php

@@ -867,11 +867,12 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
             </td>
         </tr>
         <tr>
-            <th scope="row" class="cf_cert_service"><label for="cf_cert_simple">간편인증</label></th>
+            <th scope="row" class="cf_cert_service"><label for="cf_cert_simple">통합인증(간편인증)</label></th>
             <td class="cf_cert_service">
+                <?php echo help('KG이니시스의 통합인증(간편인증+전자서명) 서비스에서 전자서명을 제외한 간편인증 서비스 입니다. <a href="https://www.inicis.com/all-auth-service" target="_blank"><u>KG이니시스 통합인증 안내</u></a>') ?>
                 <select name="cf_cert_simple" id="cf_cert_simple">
                     <?php echo option_selected("", $config['cf_cert_simple'], "사용안함"); ?>
-                    <?php echo option_selected("inicis", $config['cf_cert_simple'], "KG이니시스 간편인증"); ?>
+                    <?php echo option_selected("inicis", $config['cf_cert_simple'], "KG이니시스 통합인증(간편인증)"); ?>
                 </select>
             </td>
         </tr>
@@ -882,7 +883,6 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
                     <?php echo option_selected("",    $config['cf_cert_hp'], "사용안함"); ?>
                     <?php echo option_selected("kcb", $config['cf_cert_hp'], "코리아크레딧뷰로(KCB) 휴대폰 본인확인"); ?>
                     <?php echo option_selected("kcp", $config['cf_cert_hp'], "NHN KCP 휴대폰 본인확인"); ?>
-                    <?php echo option_selected("lg",  $config['cf_cert_hp'], "LG유플러스 휴대폰 본인확인"); ?>
                 </select>
             </td>
         </tr>
@@ -900,7 +900,7 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
             <td class="cf_cert_service">
                 <span class="sitecode">SRA</span>
                 <input type="text" name="cf_cert_kg_mid" value="<?php echo get_sanitize_input($config['cf_cert_kg_mid']); ?>" id="cf_cert_kg_mid" class="frm_input" size="10" minlength="7" maxlength="7">
-                <a href="http://sir.kr/main/service/inicis_cert_form.php" target="_blank" class="btn_frmline">KG이니시스 간편인증 신청페이지</a>
+                <a href="http://sir.kr/main/service/inicis_cert_form.php" target="_blank" class="btn_frmline">KG이니시스 통합인증(간편인증) 신청페이지</a>
             </td>
         </tr>
         <tr>
@@ -913,8 +913,7 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
             <th scope="row" class="cf_cert_service"><label for="cf_cert_kcb_cd">코리아크레딧뷰로<br>KCB 회원사ID</label></th>
             <td class="cf_cert_service">
                 <?php echo help('KCB 회원사ID를 입력해 주십시오.<br>서비스에 가입되어 있지 않다면, KCB와 계약체결 후 회원사ID를 발급 받으실 수 있습니다.<br>이용하시려는 서비스에 대한 계약을 아이핀, 휴대폰 본인확인 각각 체결해주셔야 합니다.<br>아이핀 본인확인 테스트의 경우에는 KCB 회원사ID가 필요 없으나,<br>휴대폰 본인확인 테스트의 경우 KCB 에서 따로 발급 받으셔야 합니다.') ?>
-                <input type="text" name="cf_cert_kcb_cd" value="<?php echo get_sanitize_input($config['cf_cert_kcb_cd']); ?>" id="cf_cert_kcb_cd" class="frm_input" size="20"> <a href="http://sir.kr/main/service/b_ipin.php" target="_blank" class="btn_frmline">KCB 아이핀 서비스 신청페이지</a>
-                <a href="http://sir.kr/main/service/b_cert.php" target="_blank" class="btn_frmline">KCB 휴대폰 본인확인 서비스 신청페이지</a>
+                <input type="text" name="cf_cert_kcb_cd" value="<?php echo get_sanitize_input($config['cf_cert_kcb_cd']); ?>" id="cf_cert_kcb_cd" class="frm_input" size="20">
             </td>
         </tr>
         <tr>
@@ -925,21 +924,6 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
                 <input type="text" name="cf_cert_kcp_cd" value="<?php echo get_sanitize_input($config['cf_cert_kcp_cd']); ?>" id="cf_cert_kcp_cd" class="frm_input" size="3"> <a href="http://sir.kr/main/service/p_cert.php" target="_blank" class="btn_frmline">NHN KCP 휴대폰 본인확인 서비스 신청페이지</a>
             </td>
         </tr>
-        <tr>
-            <th scope="row" class="cf_cert_service"><label for="cf_lg_mid">LG유플러스 상점아이디</label></th>
-            <td class="cf_cert_service">
-                <?php echo help('LG유플러스 상점아이디 중 si_를 제외한 나머지 아이디만 입력해 주십시오.<br>서비스에 가입되어 있지 않다면, 본인확인 서비스 신청페이지에서 서비스 신청 후 상점아이디를 발급 받으실 수 있습니다.<br><strong>LG유플러스 휴대폰본인확인은 ActiveX 설치가 필요하므로 Internet Explorer 에서만 사용할 수 있습니다.</strong>') ?>
-                <span class="sitecode">si_</span>
-                <input type="text" name="cf_lg_mid" value="<?php echo get_sanitize_input($config['cf_lg_mid']); ?>" id="cf_lg_mid" class="frm_input" size="20"> <a href="http://sir.kr/main/service/lg_cert.php" target="_blank" class="btn_frmline">LG유플러스 본인확인 서비스 신청페이지</a>
-            </td>
-        </tr>
-        <tr>
-            <th scope="row" class="cf_cert_service"><label for="cf_lg_mert_key">LG유플러스 MERT KEY</label></th>
-            <td class="cf_cert_service">
-                <?php echo help('LG유플러스 상점MertKey는 상점관리자 -> 계약정보 -> 상점정보관리에서 확인하실 수 있습니다.') ?>
-                <input type="text" name="cf_lg_mert_key" value="<?php echo get_sanitize_input($config['cf_lg_mert_key']); ?>" id="cf_lg_mert_key" class="frm_input" size="40">
-            </td>
-        </tr>
         <tr>
             <th scope="row" class="cf_cert_service"><label for="cf_cert_limit">본인확인 이용제한</label></th>
             <td class="cf_cert_service">

adm/config_form_update.php

@@ -22,7 +22,7 @@ check_admin_token();
 
 $cf_social_servicelist = !empty($_POST['cf_social_servicelist']) ? implode(',', $_POST['cf_social_servicelist']) : '';
 
-$check_keys = array('cf_lg_mid', 'cf_lg_mert_key', 'cf_cert_kcb_cd', 'cf_cert_kcp_cd', 'cf_editor', 'cf_recaptcha_site_key', 'cf_recaptcha_secret_key', 'cf_naver_clientid', 'cf_naver_secret', 'cf_facebook_appid', 'cf_facebook_secret', 'cf_twitter_key', 'cf_twitter_secret', 'cf_google_clientid', 'cf_google_secret', 'cf_googl_shorturl_apikey', 'cf_kakao_rest_key', 'cf_kakao_client_secret', 'cf_kakao_js_apikey', 'cf_payco_clientid', 'cf_payco_secret','cf_cert_kg_cd','cf_cert_kg_mid');
+$check_keys = array('cf_cert_kcb_cd', 'cf_cert_kcp_cd', 'cf_editor', 'cf_recaptcha_site_key', 'cf_recaptcha_secret_key', 'cf_naver_clientid', 'cf_naver_secret', 'cf_facebook_appid', 'cf_facebook_secret', 'cf_twitter_key', 'cf_twitter_secret', 'cf_google_clientid', 'cf_google_secret', 'cf_googl_shorturl_apikey', 'cf_kakao_rest_key', 'cf_kakao_client_secret', 'cf_kakao_js_apikey', 'cf_payco_clientid', 'cf_payco_secret','cf_cert_kg_cd','cf_cert_kg_mid');
 
 foreach( $check_keys as $key ){
     if ( isset($_POST[$key]) && $_POST[$key] ){
@@ -285,8 +285,6 @@ $sql = " update {$g5['config_table']}
                 cf_cert_kg_mid = '".trim($_POST['cf_cert_kg_mid'])."',
                 cf_cert_kcb_cd = '{$_POST['cf_cert_kcb_cd']}',
                 cf_cert_kcp_cd = '{$_POST['cf_cert_kcp_cd']}',
-                cf_lg_mid = '{$_POST['cf_lg_mid']}',
-                cf_lg_mert_key = '{$_POST['cf_lg_mert_key']}',
                 cf_cert_limit = '{$_POST['cf_cert_limit']}',
                 cf_cert_req = '{$_POST['cf_cert_req']}',
                 cf_sms_use = '{$_POST['cf_sms_use']}',

adm/member_form.php

@@ -192,8 +192,11 @@ if(isset($g5['member_cert_history_table']) && !sql_query(" DESC {$g5['member_cer
                 ) ", true);
 }
 
-$sql = "select * from {$g5['member_cert_history_table']} where mb_id = '{$mb_id}' order by ch_id asc";
-$mb_cert_history = sql_query($sql);
+$mb_cert_history = '';
+if (isset($mb_id) && $mb_id) {
+    $sql = "select * from {$g5['member_cert_history_table']} where mb_id = '{$mb_id}' order by ch_id asc";
+    $mb_cert_history = sql_query($sql);
+}
 
 if ($mb['mb_intercept_date']) $g5['title'] = "차단된 ";
 else $g5['title'] .= "";

adm/menu_list.php

@@ -140,7 +140,7 @@ $(function() {
     });
 
     $(document).on("click", ".btn_del_menu", function() {
-        if(!confirm("메뉴를 삭제하시겠습니까?"))
+        if(!confirm("메뉴를 삭제하시겠습니까?\n메뉴 삭제후 메뉴설정의 확인 버튼을 눌러 메뉴를 저장해 주세요."))
             return false;
 
         var $tr = $(this).closest("tr");

adm/menu_list_update.php

@@ -15,7 +15,7 @@ sql_query($sql);
 
 $group_code = null;
 $primary_code = null;
-$count = count($_POST['code']);
+$count = isset($_POST['code']) ? count($_POST['code']) : 0;
 
 for ($i=0; $i<$count; $i++)
 {

adm/shop_admin/codedupcheck.php

@@ -1,6 +1,10 @@
 <?php
 include_once('./_common.php');
 
+$it_id = isset($it_id) ? clean_xss_tags(trim($it_id)) : '';
+$ca_id = isset($ca_id) ? clean_xss_tags(trim($ca_id)) : '';
+
+$code = '';
 $name = '';
 
 if ($it_id)

adm/shop_admin/configformupdate.php

@@ -458,6 +458,8 @@ $sql = " update {$g5['config_table']}
                 cf_lg_mert_key          = '{$cf_lg_mert_key}' ";
 sql_query($sql);
 
+run_event('shop_admin_configformupdate');
+
 if( $warning_msg ){
     alert($warning_msg, "./configform.php");
 } else {

adm/shop_admin/orderform.php

@@ -505,7 +505,7 @@ add_javascript(G5_POSTCODE_JS, 0);    //다음 주소 js
                             switch($od['od_pg']) {
                                 case 'lg':
                                     $pg_url  = 'http://pgweb.uplus.co.kr';
-                                    $pg_test = 'LG유플러스';
+                                    $pg_test = '토스페이먼츠';
                                     if ($default['de_card_test']) {
                                         $pg_url = 'http://pgweb.uplus.co.kr/tmert';
                                         $pg_test .= ' 테스트 ';

adm/shop_admin/price.php

@@ -33,7 +33,7 @@ $pg_anchor = '<ul class="anchor">
         <p>사이트 명을 클릭하시면 해당 사이트로 이동합니다.</p>
 
         <dl class="price_engine">
-            <dt><a href="http://shopping.naver.com/" target="_blank">네이버 지식쇼핑</a></dt>
+            <dt><a href="http://shopping.naver.com/" target="_blank">네이버쇼핑</a></dt>
             <dd>
                 <ul>
                     <li>입점 안내 : <a href="http://join.shopping.naver.com/join/intro.nhn" target="_blank">http://join.shopping.naver.com/join/intro.nhn</a></li>
@@ -41,10 +41,28 @@ $pg_anchor = '<ul class="anchor">
                     <li>요약상품 URL : <a href="<?php echo G5_SHOP_URL; ?>/price/naver_summary.php" target="_blank"><?php echo G5_SHOP_URL; ?>/price/naver_summary.php</a></li>
                 </ul>
             </dd>
+
+            <dt><a href="" target="_blank">구글 쇼핑</a></dt>
+            <dd>
+                <ul>
+                    <li>구글 Merchant Center : <a href="https://www.google.com/intl/ko_kr/retail/solutions/merchant-center" target="_blank">https://www.google.com/intl/ko_kr/retail/solutions/merchant-center</a></li>
+                    <li>파일 이름 : google_feed.php</a></li>
+                    <li>파일 URL : <a href="<?php echo G5_SHOP_URL; ?>/price/google_feed.php" target="_blank"><?php echo G5_SHOP_URL; ?>/price/google_feed.php</a></li>
+                </ul>
+            </dd>
+            <dt>Feed 설명</dt>
+            <dd>
+                <ul>
+                    <li>판매국가 <b>대한민국</b>, 언어 <b>한국어</b> 설정 기준입니다.</li>
+                    <li>기본 피드 이름 : 쇼핑몰피드</li>
+                    <li>상품 설명 : <b>it_basic</b> (상품기본설명을 필수 입력해주세요. HTML 태그는 자동 제거됩니다.)</li>
+                </ul>
+            </dd>
+
             <dt><a href="http://shopping.daum.net/" target="_blank">다음 쇼핑하우</a></dt>
             <dd>
                 <ul>
-                    <li>입점 안내 : <a href="http://commerceone.biz.daum.net/join/intro.daum" target="_blank">http://commerceone.biz.daum.net/join/intro.daum</a></li>
+                    <li>입점 안내 : <a href="https://shopping.biz.daum.net/join/main" target="_blank">https://shopping.biz.daum.net/join/main</a></li>
                     <li>전체상품 URL : <a href="<?php echo G5_SHOP_URL; ?>/price/daum.php" target="_blank"><?php echo G5_SHOP_URL; ?>/price/daum.php</a></li>
                     <li>요약상품 URL : <a href="<?php echo G5_SHOP_URL; ?>/price/daum_summary.php" target="_blank"><?php echo G5_SHOP_URL; ?>/price/daum_summary.php</a></li>
                 </ul>

bbs/member_cert_refresh_update.php

@@ -42,7 +42,7 @@ if ($config['cf_cert_use'] && $cert_type && $md5_cert_no) {
         $sql_certify .= " , mb_certify  = '{$cert_type}' ";
         $sql_certify .= " , mb_adult = '".get_session('ss_cert_adult')."' ";
         $sql_certify .= " , mb_birth = '".get_session('ss_cert_birth')."' ";
-        $sql_certify .= " , mb_sex = '".get_session+('ss_cert_sex')."' ";
+        $sql_certify .= " , mb_sex = '".get_session('ss_cert_sex')."' ";
         $sql_certify .= " , mb_dupinfo = '".get_session('ss_cert_dupinfo')."' ";
         $sql_certify .= " , mb_name = '{$mb_name}' ";
     } else if($cert_type != 'ipin' && get_session('ss_cert_hash') == md5($mb_name.$cert_type.get_session('ss_cert_birth').$mb_hp.$md5_cert_no)) { // 간편인증, 휴대폰일때 hash 값 체크 hp포함

bbs/memo.php

@@ -16,8 +16,7 @@ if ($kind == 'recv')
 else if ($kind == 'send')
     $unkind = 'recv';
 else {
-    $kind = clean_xss_tags(trim($kind));
-    alert(''.$kind .'값을 넘겨주세요.');
+    alert("kind 변수 값이 올바르지 않습니다.");
 }
 
 if ($page < 1) { $page = 1; } // 페이지가 없으면 첫 페이지 (1 페이지)

bbs/memo_form.php

@@ -9,7 +9,8 @@ if (!$member['mb_open'] && $is_admin != 'super' && $member['mb_id'] != $mb_id)
     alert_close("자신의 정보를 공개하지 않으면 다른분에게 쪽지를 보낼 수 없습니다. 정보공개 설정은 회원정보수정에서 하실 수 있습니다.");
 
 $content = "";
-$me_recv_mb_id = isset($_GET['me_recv_mb_id']) ? clean_xss_tags($_GET['me_recv_mb_id'], 1, 1) : '';
+$me_recv_mb_id   = isset($_REQUEST['me_recv_mb_id']) ? clean_xss_tags($_REQUEST['me_recv_mb_id'], 1, 1) : '';
+$me_id           = isset($_REQUEST['me_id']) ? clean_xss_tags($_REQUEST['me_id'], 1, 1) : '';
 
 // 탈퇴한 회원에게 쪽지 보낼 수 없음
 if ($me_recv_mb_id)
@@ -23,7 +24,7 @@ if ($me_recv_mb_id)
 
     // 4.00.15
     $row = sql_fetch(" select me_memo from {$g5['memo_table']} where me_id = '{$me_id}' and (me_recv_mb_id = '{$member['mb_id']}' or me_send_mb_id = '{$member['mb_id']}') ");
-    if ($row['me_memo'])
+    if (isset($row['me_memo']) && $row['me_memo'])
     {
         $content = "\n\n\n".' >'
                          ."\n".' >'

bbs/register_form_update.php

@@ -181,7 +181,7 @@ if ($config['cf_cert_use'] && $cert_type && $md5_cert_no) {
         $sql_certify .= " , mb_certify  = '{$cert_type}' ";
         $sql_certify .= " , mb_adult = '".get_session('ss_cert_adult')."' ";
         $sql_certify .= " , mb_birth = '".get_session('ss_cert_birth')."' ";
-        $sql_certify .= " , mb_sex = '".get_session+('ss_cert_sex')."' ";
+        $sql_certify .= " , mb_sex = '".get_session('ss_cert_sex')."' ";
         $sql_certify .= " , mb_dupinfo = '".get_session('ss_cert_dupinfo')."' ";
         if($w == 'u')
             $sql_certify .= " , mb_name = '{$mb_name}' ";

bbs/write_update.php

@@ -221,6 +221,9 @@ if (!isset($_POST['wr_subject']) || !trim($_POST['wr_subject']))
 
 $wr_seo_title = exist_seo_title_recursive('bbs', generate_seo_title($wr_subject), $write_table, $wr_id);
 
+$options = array($html,$secret,$mail);
+$wr_option = implode(',', array_filter($options, function($v) { return trim($v); }));
+
 if ($w == '' || $w == 'r') {
 
     if ($member['mb_id']) {
@@ -258,7 +261,7 @@ if ($w == '' || $w == 'r') {
                      wr_reply = '$wr_reply',
                      wr_comment = 0,
                      ca_name = '$ca_name',
-                     wr_option = '$html,$secret,$mail',
+                     wr_option = '$wr_option',
                      wr_subject = '$wr_subject',
                      wr_content = '$wr_content',
                      wr_seo_title = '$wr_seo_title',
@@ -380,7 +383,7 @@ if ($w == '' || $w == 'r') {
 
     $sql = " update {$write_table}
                 set ca_name = '{$ca_name}',
-                     wr_option = '{$html},{$secret},{$mail}',
+                     wr_option = '{$wr_option}',
                      wr_subject = '{$wr_subject}',
                      wr_content = '{$wr_content}',
                      wr_seo_title = '$wr_seo_title',

config.php

@@ -229,7 +229,8 @@ define('G5_VISIT_BROWSCAP_USE', false);
 */
 define('G5_IP_DISPLAY', '\\1.♡.\\3.\\4');
 
-if(isset($_SERVER['HTTPS']) && $_SERVER['HTTPS']=='on') {   //https 통신일때 daum 주소 js
+if ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS']=='on') || 
+    (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO']==='https')) {   //https 통신일때 daum 주소 js
     define('G5_POSTCODE_JS', '<script src="https://spi.maps.daum.net/imap/map_js_init/postcode.v2.js"></script>');
 } else {  //http 통신일때 daum 주소 js
     define('G5_POSTCODE_JS', '<script src="http://dmaps.daum.net/map_js_init/postcode.v2.js"></script>');

css/default.css

@@ -272,7 +272,7 @@ a.btn_close {text-align:center;line-height:50px}
 a.btn_cancel {display:inline-block;background:#969696;color:#fff;text-decoration:none;vertical-align:middle}
 button.btn_cancel {display:inline-block;background:#969696;color:#fff;text-decoration:none;vertical-align:middle}
 .btn_cancel:hover {background:#aaa}
-a.btn_frmline, button.btn_frmline {display:inline-block;padding:0 25px;height:40px;border:0;background:#434a54;border-radius:3px;color:#fff;text-decoration:none;vertical-align:top} /* 우편번호검색버튼 등 */
+a.btn_frmline, button.btn_frmline {display:inline-block;width:128px;padding:0 5px;height:40px;border:0;background:#434a54;border-radius:3px;color:#fff;text-decoration:none;vertical-align:top} /* 우편번호검색버튼 등 */
 a.btn_frmline {}
 button.btn_frmline {font-size:1em}
 

css/default_shop.css

@@ -329,7 +329,7 @@ a.btn_close {text-align:center;line-height:50px}
 a.btn_cancel {display:inline-block;background:#969696;color:#fff;text-decoration:none;vertical-align:middle}
 button.btn_cancel {display:inline-block;background:#969696;color:#fff;text-decoration:none;vertical-align:middle}
 .btn_cancel:hover {background:#aaa}
-a.btn_frmline, button.btn_frmline {display:inline-block;padding:0 25px;height:40px;border:0;background:#434a54;border-radius:3px;color:#fff;text-decoration:none;vertical-align:top} /* 우편번호검색버튼 등 */
+a.btn_frmline, button.btn_frmline {display:inline-block;width:128px;padding:0 5px;height:40px;border:0;background:#434a54;border-radius:3px;color:#fff;text-decoration:none;vertical-align:top} /* 우편번호검색버튼 등 */
 a.btn_frmline {}
 button.btn_frmline {font-size:1em}
 a.btn_frmline {line-height:24px}

install/gnuboard5.sql

@@ -303,6 +303,7 @@ CREATE TABLE IF NOT EXISTS `g5_config` (
   `cf_icode_pw` varchar(255) NOT NULL DEFAULT '',  
   `cf_icode_server_ip` varchar(50) NOT NULL DEFAULT '',
   `cf_icode_server_port` varchar(50) NOT NULL DEFAULT '',
+  `cf_icode_token_key` varchar(100) NOT NULL DEFAULT '',
   `cf_googl_shorturl_apikey` varchar(50) NOT NULL DEFAULT '',
   `cf_social_login_use` tinyint(4) NOT NULL DEFAULT '0',
   `cf_social_servicelist` varchar(255) NOT NULL DEFAULT '',

install/gnuboard5shop.sql

@@ -353,6 +353,7 @@ CREATE TABLE IF NOT EXISTS `g5_shop_default` (
   `de_inicis_sign_key` varchar(255) NOT NULL DEFAULT '',
   `de_iche_use` tinyint(4) NOT NULL DEFAULT '0',
   `de_easy_pay_use` tinyint(4) NOT NULL DEFAULT '0',
+  `de_easy_pay_services` varchar(255) NOT NULL DEFAULT '',
   `de_samsung_pay_use` tinyint(4) NOT NULL DEFAULT '0',
   `de_inicis_lpay_use` tinyint(4) NOT NULL DEFAULT '0',
   `de_inicis_kakaopay_use` tinyint(4) NOT NULL DEFAULT '0',

install/install_db.php

@@ -22,6 +22,8 @@ include_once('../lib/cache.lib.php');
 $title = G5_VERSION." 설치 완료 3/3";
 include_once ('./install.inc.php');
 
+$tmp_bo_table   = array ("notice", "qa", "free", "gallery");
+
 //print_r($_POST); exit;
 
 $mysql_host  = isset($_POST['mysql_host']) ? safe_install_string_check($_POST['mysql_host']) : '';
@@ -259,7 +261,6 @@ if($g5_install || !$result) {
     sql_query(" insert into `{$table_prefix}group` set gr_id = '$tmp_gr_id', gr_subject = '$tmp_gr_subject' ", true, $dblink);
 
     // 게시판 생성
-    $tmp_bo_table   = array ("notice", "qa", "free", "gallery");
     $tmp_bo_subject = array ("공지사항", "질문답변", "자유게시판", "갤러리");
     for ($i=0; $i<count($tmp_bo_table); $i++)
     {

js/shop.js

@@ -480,7 +480,7 @@ function price_calculate()
         }
     });
 
-    $("#sit_tot_price").empty().html("<span>총 금액 :</span> "+number_format(String(total))+"원");
+    $("#sit_tot_price").empty().html("<span>총 금액 :</span><strong>"+number_format(String(total))+"</strong> 원");
 
     $("#sit_tot_price").trigger("price_calculate", [total]);
 }

lib/common.lib.php

@@ -1527,7 +1527,7 @@ function sql_connect($host, $user, $pass, $db=G5_MYSQL_DB)
     global $g5;
 
     if(function_exists('mysqli_connect') && G5_MYSQLI_USE) {
-        $link = mysqli_connect($host, $user, $pass, $db);
+        $link = @mysqli_connect($host, $user, $pass, $db) or die('MySQL Host, User, Password, DB 정보에 오류가 있습니다.');
 
         // 연결 오류 발생 시 스크립트 종료
         if (mysqli_connect_errno()) {
@@ -3358,10 +3358,10 @@ function check_url_host($url, $msg='', $return_url=G5_URL, $is_redirect=false)
         }
     }
 
-    if(stripos($url, 'http:') !== false) {
-        if(!isset($p['scheme']) || !$p['scheme'] || !isset($p['host']) || !$p['host'])
-            alert('url 정보가 올바르지 않습니다.', $return_url);
-    }
+    // if(stripos($url, 'http:') !== false) {
+    //     if(!isset($p['scheme']) || !$p['scheme'] || !isset($p['host']) || !$p['host'])
+    //         alert('url 정보가 올바르지 않습니다.', $return_url);
+    // }
 
     //php 5.6.29 이하 버전에서는 parse_url 버그가 존재함
     //php 7.0.1 ~ 7.0.5 버전에서는 parse_url 버그가 존재함

mobile/shop/lg/mispwapurl.php

@@ -2,7 +2,7 @@
 // 해당 페이지는 사용자가 ISP{국민/BC) 카드 결제를 성공하였을 때, 사용자에게 보여지는 페이지입니다.
 include_once('./_common.php');
 
-$LGD_OID    = $_GET['LGD_OID'];
+$LGD_OID    = clean_xss_tags($_GET['LGD_OID']);
 
 echo "LGD_OID = ".$LGD_OID;
 

mobile/shop/mypage.php

@@ -2,7 +2,7 @@
 include_once('./_common.php');
 
 // 테마에 mypage.php 있으면 include
-if(defined('G5_THEME_SHOP_PATH')) {
+if(defined('G5_THEME_MSHOP_PATH')) {
     $theme_mypage_file = G5_THEME_MSHOP_PATH.'/mypage.php';
     if(is_file($theme_mypage_file)) {
         include_once($theme_mypage_file);

mobile/shop/orderinquiry.sub.php

@@ -4,7 +4,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
 if (!defined("_ORDERINQUIRY_")) exit; // 개별 페이지 접근 불가
 
 // 테마에 orderinquiry.sub.php 있으면 include
-if(defined('G5_THEME_SHOP_PATH')) {
+if(defined('G5_THEME_MSHOP_PATH')) {
     $theme_inquiry_file = G5_THEME_MSHOP_PATH.'/orderinquiry.sub.php';
     if(is_file($theme_inquiry_file)) {
         include_once($theme_inquiry_file);

mobile/shop/orderinquiryview.php

@@ -2,7 +2,7 @@
 include_once('./_common.php');
 
 // 테마에 orderinquiryview.php 있으면 include
-if(defined('G5_THEME_SHOP_PATH')) {
+if(defined('G5_THEME_MSHOP_PATH')) {
     $theme_inquiryview_file = G5_THEME_MSHOP_PATH.'/orderinquiryview.php';
     if(is_file($theme_inquiryview_file)) {
         include_once($theme_inquiryview_file);

mobile/shop/wishlist.php

@@ -2,7 +2,7 @@
 include_once('./_common.php');
 
 // 테마에 wishlist.php 있으면 include
-if(defined('G5_THEME_SHOP_PATH')) {
+if(defined('G5_THEME_MSHOP_PATH')) {
     $theme_wishlist_file = G5_THEME_MSHOP_PATH.'/wishlist.php';
     if(is_file($theme_wishlist_file)) {
         include_once($theme_wishlist_file);

plugin/social/register_member_update.php

@@ -122,7 +122,7 @@ if($config['cf_cert_use']) {
             $sql_certify .= " , mb_certify  = '{$cert_type}' ";
             $sql_certify .= " , mb_adult = '".get_session('ss_cert_adult')."' ";
             $sql_certify .= " , mb_birth = '".get_session('ss_cert_birth')."' ";
-            $sql_certify .= " , mb_sex = '".get_session+('ss_cert_sex')."' ";
+            $sql_certify .= " , mb_sex = '".get_session('ss_cert_sex')."' ";
             $sql_certify .= " , mb_dupinfo = '".get_session('ss_cert_dupinfo')."' ";
             if($w == 'u')
                 $sql_certify .= " , mb_name = '{$mb_name}' ";

shop/inicis/libs/HttpClient.php

@@ -32,6 +32,12 @@ class HttpClient {
         $data = substr($data, 1); // remove leading "&"
         $url_data = parse_url($url);
 
+        // host 가 inicis.com 의 주소가 아니라면 false 반환
+        // [scheme] => https, [host] => fcstdpay.inicis.com, [path] => /api/payAuth
+        if (preg_match("#inicis\.com$#", $url_data["host"]) == false) {
+            // error_log(print_r($url_data, 1));
+            return false;
+        }
 
         if ($url_data["scheme"] == "https") {
             $this->ssl = "ssl://";

shop/price/google_feed.php

@@ -0,0 +1,93 @@
+<?php
+include_once("./_common.php");
+
+$sql = "SELECT a.ca_id,
+                a.ca_adult_use AS ca_adult,
+                IF( SUBSTR(a.ca_id, 3) != \"\", (SELECT ca_adult_use FROM `{$g5['g5_shop_category_table']}` WHERE ca_id = SUBSTR(a.ca_id, 3)), 0) AS ca_adult_parent1,
+                IF( SUBSTR(a.ca_id, 5) != \"\", (SELECT ca_adult_use FROM `{$g5['g5_shop_category_table']}` WHERE ca_id = SUBSTR(a.ca_id, 5)), 0) AS ca_adult_parent2,
+                IF( SUBSTR(a.ca_id, 7) != \"\", (SELECT ca_adult_use FROM `{$g5['g5_shop_category_table']}` WHERE ca_id = SUBSTR(a.ca_id, 7)), 0) AS ca_adult_parent3, 
+                IF( SUBSTR(a.ca_id, 9) != \"\", (SELECT ca_adult_use FROM `{$g5['g5_shop_category_table']}` WHERE ca_id = SUBSTR(a.ca_id, 9)), 0) AS ca_adult_parent4
+                FROM `{$g5['g5_shop_category_table']}` AS a";
+$result = sql_query($sql);
+
+$category_adult_array = array();
+for ($i = 0; $row = sql_fetch_array($result); $i++ ) {
+    $category_adult_array[$row['ca_id']] = array( $row['ca_adult'],               // 자기자신 성인인증판단
+                                            $row['ca_adult_parent1'],       // 1depth 성인인증
+                                            $row['ca_adult_parent2'],       // 2depth 성인인증 
+                                            $row['ca_adult_parent3'],       // 3depth 성인인증
+                                            $row['ca_adult_parent4']);      // 4depth 성인인증
+}
+
+$sql =" SELECT a.*, IFNULL((SELECT MAX(`io_stock_qty`) FROM `{$g5['g5_shop_item_option_table']}` WHERE `it_id` = a.`it_id` GROUP BY `it_id`), a.`it_stock_qty`) AS in_stock
+        FROM `{$g5['g5_shop_item_table']}` as a
+        where a.`it_use` = '1' and a.`it_soldout` = '0' and a.`it_tel_inq` = '0' and a.`it_price` > '0' order by a.`ca_id`";
+$result = sql_query($sql);
+
+$xml = new SimpleXMLElement("<rss/>");
+$xml->addAttribute("xmlns:xmlns:g", "http://base.google.com/ns/1.0");
+$xml->addAttribute("version", "2.0");
+$channel = $xml->addChild("channel");
+$title = $channel->addChild("title", "쇼핑몰피드");
+$link = $channel->addChild("link", G5_URL);
+$description = $channel->addChild("description", "");
+
+for ($i = 0; $row = sql_fetch_array($result); $i++) {
+    $it_id = $row['it_id'];
+    $it_title = $row['it_name'];
+    $it_link = shop_item_url($row['it_id']);
+    $it_basic = strip_tags($row['it_basic']);
+
+    $it_image = "";
+    for($j = 1; $j <= 10; $j++) {
+        $img = $row['it_img'.$j];
+        
+        if(empty($img)) continue;
+
+        $it_image = G5_DATA_URL."/item/".$img;
+        break;
+    }
+
+    $stock = "in_stock";
+    if($row['it_stock_qty'] <= 0) {
+        $stock = "out_of_stock";
+    } else {
+        if($row['in_stock'] <= 0) $stock = "out_of_stock";
+    }
+    
+    $item = $channel->addChild("item");
+    // 필수 입력 항목
+    $item->addChild("g:g:id", $it_id);
+    $item->addChild("title", $it_title);
+    $item->addChild("description", $it_basic);
+    $item->addChild("link", $it_link);
+    $item->addChild("g:g:image_link", $it_image);
+    $item->addChild("g:g:availability", $stock);
+    
+    if($row['it_cust_price'] != null && $row['it_cust_price'] > 0) {
+        $item->addChild("g:g:price", sprintf('%.2fKRW', $row['it_cust_price']));
+        $item->addChild("g:g:sale_price", sprintf('%.2fKRW', $row['it_price']));
+    } else {
+        $item->addChild("g:g:price", sprintf('%.2fKRW', $row['it_price']));
+    }
+    
+    // 선택적 입력 항목
+    $item->addChild("g:g:condition", "new");
+
+    $cate_array = array($row['ca_id'], $row['ca_id2'], $row['ca_id3']);
+
+    $adult = "no";
+    foreach($cate_array as $key => $var) {
+        if(empty($var)) continue;
+        if(in_array(1, $category_adult_array[$var])) {
+            $adult = "yes";
+        }
+    }
+
+    $item->addChild("g:g:adult", $adult);
+}
+
+header('Content-type: text/xml'); 
+echo $xml->asXML();
+
+?>

shop/settle_inicis_common.php

@@ -14,7 +14,7 @@ $INIpayLog  = false;                  // 로그를 기록하려면 true 로 수
 
 //**********************************************************************************
 
-$PG_IP = $_SERVER['REMOTE_ADDR'];
+$PG_IP = get_real_client_ip();
 
 if( $PG_IP == "203.238.37.3" || $PG_IP == "203.238.37.15" || $PG_IP == "203.238.37.16" || $PG_IP == "203.238.37.25" || $PG_IP == "39.115.212.9" )  //PG에서 보냈는지 IP로 체크
 {

shop/settle_lg_common.php

@@ -80,7 +80,7 @@ if ( $LGD_HASHDATA2 == $LGD_HASHDATA ) { //해쉬값 검증이 성공이면
 
             $result = false;
 
-            if($row['pp_id']) {
+            if(isset($row['pp_id']) && $row['pp_id']) {
                 // 개인결제 UPDATE
                 $sql = " update {$g5['g5_shop_personalpay_table']}
                             set pp_receipt_price = '$LGD_AMOUNT',
@@ -113,7 +113,7 @@ if ( $LGD_HASHDATA2 == $LGD_HASHDATA ) { //해쉬값 검증이 성공이면
             }
 
             if($result) {
-                if($row['od_id'])
+                if(isset($row['od_id']) && $row['od_id'])
                     $od_id = $row['od_id'];
                 else
                     $od_id = $LGD_OID;

skin/latest/basic/style.css

@@ -7,7 +7,7 @@
 
 .lat ul {padding:10px 0}
 .lat li {position:relative;line-height:18px;border-bottom:1px solid #e5ecee;margin-bottom:10px}
-.lat li a {line-height:24px;font-weight:bold;font-size:1.2em;line-height:20px;vertical-align:middle}
+.lat li a {font-weight:bold;font-size:1.2em;line-height:20px;vertical-align:middle}
 .lat li a:hover {color:#3a8afd}
 .lat li .fa-heart {color:#ff0000}
 .lat li .fa-lock {display:inline-block;line-height:14px;width:16px;font-size:0.833em;color:#4f818c;background:#cbe3e8;text-align:center;border-radius:2px;font-size:12px;border:1px solid #cbe3e8;vertical-align:middle}

theme/basic/css/default.css

@@ -169,7 +169,7 @@ box-shadow:0 2px 5px rgba(0,0,0,0.2)}
 #container_wr {margin:0 auto;zoom:1}
 #aside {float:right;width:235px;padding:0;height:100%;margin:20px 0 20px 20px}
 
-#container {position:relative;float:left;min-height:500px;height:auto !important;margin:20px 0;height:500px;font-size:1em;width:930px;zoom:1}
+#container {position:relative;float:left;min-height:500px;height:auto !important;margin:20px 0;font-size:1em;width:930px;zoom:1}
 #container:after {display:block;visibility:hidden;clear:both;content:""}
 #container_title {font-size:1.333em;margin:0 auto;font-weight:bold}
 #container_title span {margin:0 auto 10px;display:block;line-height:30px}
@@ -273,7 +273,7 @@ a.btn_close {text-align:center;line-height:50px}
 a.btn_cancel {display:inline-block;background:#969696;color:#fff;text-decoration:none;vertical-align:middle}
 button.btn_cancel {display:inline-block;background:#969696;color:#fff;text-decoration:none;vertical-align:middle}
 .btn_cancel:hover {background:#aaa}
-a.btn_frmline, button.btn_frmline {display:inline-block;padding:0 25px;height:40px;border:0;background:#434a54;border-radius:3px;color:#fff;text-decoration:none;vertical-align:top} /* 우편번호검색버튼 등 */
+a.btn_frmline, button.btn_frmline {display:inline-block;width:128px;padding:0 5px;height:40px;border:0;background:#434a54;border-radius:3px;color:#fff;text-decoration:none;vertical-align:top} /* 우편번호검색버튼 등 */
 a.btn_frmline {}
 button.btn_frmline {font-size:1em}
 

theme/basic/css/default_shop.css

@@ -329,7 +329,7 @@ a.btn_close {text-align:center;line-height:50px}
 a.btn_cancel {display:inline-block;background:#969696;color:#fff;text-decoration:none;vertical-align:middle}
 button.btn_cancel {display:inline-block;background:#969696;color:#fff;text-decoration:none;vertical-align:middle}
 .btn_cancel:hover {background:#aaa}
-a.btn_frmline, button.btn_frmline {display:inline-block;padding:0 25px;height:40px;border:0;background:#434a54;border-radius:3px;color:#fff;text-decoration:none;vertical-align:top} /* 우편번호검색버튼 등 */
+a.btn_frmline, button.btn_frmline {display:inline-block;width:128px;padding:0 5px;height:40px;border:0;background:#434a54;border-radius:3px;color:#fff;text-decoration:none;vertical-align:top} /* 우편번호검색버튼 등 */
 a.btn_frmline {}
 button.btn_frmline {font-size:1em}
 a.btn_frmline {line-height:24px}

theme/basic/skin/latest/basic/style.css

@@ -7,7 +7,7 @@
 
 .lat ul {padding:10px 0}
 .lat li {position:relative;line-height:18px;border-bottom:1px solid #e5ecee;margin-bottom:10px}
-.lat li a {line-height:24px;font-weight:bold;font-size:1.2em;line-height:20px;vertical-align:middle}
+.lat li a {font-weight:bold;font-size:1.2em;line-height:20px;vertical-align:middle}
 .lat li a:hover {color:#3a8afd}
 .lat li .fa-heart {color:#ff0000}
 .lat li .fa-lock {display:inline-block;line-height:14px;width:16px;font-size:0.833em;color:#4f818c;background:#cbe3e8;text-align:center;border-radius:2px;font-size:12px;border:1px solid #cbe3e8;vertical-align:middle}

version.php

@@ -2,7 +2,7 @@
 if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 
 define('G5_VERSION', '그누보드5');
-define('G5_GNUBOARD_VER', '5.5.1-beta');
+define('G5_GNUBOARD_VER', '5.5.4');
 // 그누보드5.4.5.5 버전과 영카트5.4.5.5.1 버전을 합쳐서 그누보드5.4.6 버전에서 시작함 (kagla-210617)
 // G5_YOUNGCART_VER 이 상수를 사용하는 곳이 있으므로 주석 처리 해제함
 // 그누보드5.4.6 이상 버전 부터는 영카트를 그누보드에 포함하여 배포하므로 영카트5의 버전은 의미가 없습니다.