버전 5.5.14 수정

* QA설정테이블에 qa_id pkey auto_increment 추가

* 설정, 로그인, 방문자 테이블에 pkey, auto_increment 추가

* 쇼핑몰 설정테이블에 de_id pkey auto_increment 추가

adm/admin.lib.php

@@ -554,7 +554,7 @@ function admin_check_xss_params($params)
 
         if (is_array($value)) {
             admin_check_xss_params($value);
-        } else if ((preg_match('/<\s?[^\>]*\/?\s?>/i', $value) && (preg_match('/script.*?\/script/ius', $value) || preg_match('/[onload|onerror]=.*/ius', $value))) || preg_match('/^(?=.*token\()(?=.*xmlhttprequest\()(?=.*send\().*$/im', $value) || (preg_match('/[onload|onerror|focus]=.*/ius', $value) && preg_match('/(eval|expression|exec|prompt)(\s*)\((.*)\)/ius', $value))) {
+        } else if ((preg_match('/<\s?[^\>]*\/?\s?>/i', $value) && (preg_match('/script.*?\/script/ius', $value) || preg_match('/(onload|onerror)=.*/ius', $value))) || preg_match('/^(?=.*token\()(?=.*xmlhttprequest\()(?=.*send\().*$/im', $value) || (preg_match('/(onload|onerror|focus)=.*/ius', $value) && preg_match('/(eval|expression|exec|prompt)(\s*)\((.*)\)/ius', $value))) {
             alert('요청 쿼리에 잘못된 스크립트문장이 있습니다.\\nXSS 공격일수도 있습니다.', G5_URL);
             die();
         }
@@ -617,13 +617,12 @@ if (!$member['mb_id']) {
     }
 }
 
-// 관리자의 아이피, 브라우저와 다르다면 세션을 끊고 관리자에게 메일을 보낸다.
-$admin_key = md5($member['mb_datetime'] . get_real_client_ip() . $_SERVER['HTTP_USER_AGENT']);
-if (get_session('ss_mb_key') !== $admin_key) {
-
+// 관리자의 클라이언트를 검증하여 일치하지 않으면 세션을 끊고 관리자에게 메일을 보낸다.
+if (!verify_mb_key($member)) {
     session_destroy();
 
     include_once G5_LIB_PATH . '/mailer.lib.php';
+
     // 메일 알림
     mailer($member['mb_nick'], $member['mb_email'], $member['mb_email'], 'XSS 공격 알림', $_SERVER['REMOTE_ADDR'] . ' 아이피로 XSS 공격이 있었습니다.<br><br>관리자 권한을 탈취하려는 접근이므로 주의하시기 바랍니다.<br><br>해당 아이피는 차단하시고 의심되는 게시물이 있는지 확인하시기 바랍니다.' . G5_URL, 0);
 

adm/admin.tail.php

@@ -5,7 +5,7 @@ if (!defined('_GNUBOARD_')) {
 
 // 그누보드5.4.5.5 버전과 영카트5.4.5.5.1 버전이 통합됨에 따라 그누보드 버전만 표시
 // $print_version = defined('G5_YOUNGCART_VER') ? 'YoungCart Version '.G5_YOUNGCART_VER : 'Version '.G5_GNUBOARD_VER;
-$print_version = 'Version ' . G5_GNUBOARD_VER;
+$print_version = ($is_admin == 'super') ? 'Version ' . G5_GNUBOARD_VER : '';
 ?>
 
 <noscript>

adm/board_copy_update.php

@@ -8,7 +8,7 @@ auth_check_menu($auth, $sub_menu, 'w');
 
 check_admin_token();
 
-$bo_table       = isset($_POST['bo_table']) ? $_POST['bo_table'] : null;
+$bo_table       = isset($_POST['bo_table']) ? substr(preg_replace('/[^a-z0-9_]/i', '', $_POST['bo_table']), 0, 20) : null;
 $target_table   = isset($_POST['target_table']) ? trim($_POST['target_table']) : '';
 $target_subject = isset($_POST['target_subject']) ? trim($_POST['target_subject']) : '';
 
@@ -24,6 +24,8 @@ if (!preg_match('/[A-Za-z0-9_]{1,20}/', $target_table)) {
     alert('게시판 TABLE명은 공백없이 영문자, 숫자, _ 만 사용 가능합니다. (20자 이내)');
 }
 
+$target_table = substr(preg_replace('/[^a-z0-9_]/i', '', $target_table), 0, 20);
+
 // 게시판명이 금지된 단어로 되어 있으면
 if ($w == '' && in_array($target_table, get_bo_table_banned_word())) {
     alert('입력한 게시판 TABLE명을 사용할수 없습니다. 다른 이름으로 입력해 주세요.');
@@ -191,7 +193,6 @@ if ($copy_case == 'schema_data_both') {
     sql_query($sql, false);
 
     // 4.00.01
-    // 위의 코드는 같은 테이블명을 사용하였다는 오류가 발생함. (희한하네 ㅡㅡ;)
     $sql = " select * from {$g5['board_file_table']} where bo_table = '$bo_table' ";
     $result = sql_query($sql, false);
     for ($i = 0; $row = sql_fetch_array($result); $i++) {

adm/config_form.php

@@ -8,7 +8,9 @@ if ($is_admin != 'super') {
     alert('최고관리자만 접근 가능합니다.');
 }
 
-$copy_config = get_config(true);
+// https://github.com/gnuboard/gnuboard5/issues/296 이슈처리
+$sql = " select * from {$g5['config_table']} limit 1";
+$config = sql_fetch($sql);
 
 if (!isset($config['cf_add_script'])) {
     sql_query(
@@ -699,14 +701,14 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
                         <th scope="row"><label for="cf_analytics">방문자분석 스크립트</label></th>
                         <td colspan="3">
                             <?php echo help('방문자분석 스크립트 코드를 입력합니다. 예) 구글 애널리틱스<br>관리자 페이지에서는 이 코드를 사용하지 않습니다.'); ?>
-                            <textarea name="cf_analytics" id="cf_analytics"><?php echo get_text($copy_config['cf_analytics']); ?></textarea>
+                            <textarea name="cf_analytics" id="cf_analytics"><?php echo get_text($config['cf_analytics']); ?></textarea>
                         </td>
                     </tr>
                     <tr>
                         <th scope="row"><label for="cf_add_meta">추가 메타태그</label></th>
                         <td colspan="3">
                             <?php echo help('추가로 사용하실 meta 태그를 입력합니다.<br>관리자 페이지에서는 이 코드를 사용하지 않습니다.'); ?>
-                            <textarea name="cf_add_meta" id="cf_add_meta"><?php echo get_text($copy_config['cf_add_meta']); ?></textarea>
+                            <textarea name="cf_add_meta" id="cf_add_meta"><?php echo get_text($config['cf_add_meta']); ?></textarea>
                         </td>
                     </tr>
                     <tr>
@@ -1392,7 +1394,7 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
                         <th scope="row"><label for="cf_add_script">추가 script, css</label></th>
                         <td>
                             <?php echo help('HTML의 &lt;/HEAD&gt; 태그위로 추가될 JavaScript와 css 코드를 설정합니다.<br>관리자 페이지에서는 이 코드를 사용하지 않습니다.') ?>
-                            <textarea name="cf_add_script" id="cf_add_script"><?php echo get_text($copy_config['cf_add_script']); ?></textarea>
+                            <textarea name="cf_add_script" id="cf_add_script"><?php echo get_text($config['cf_add_script']); ?></textarea>
                         </td>
                     </tr>
                 </tbody>

adm/contentform.php

@@ -57,6 +57,9 @@ if ($w == "u") {
     if (!$co['co_id']) {
         alert('등록된 자료가 없습니다.');
     }
+
+    if (function_exists('check_case_exist_title')) check_case_exist_title($co, G5_CONTENT_DIR, false);
+
 } else {
     $html_title .= ' 입력';
     $co = array(

adm/contentformupdate.php

@@ -113,17 +113,20 @@ if ($w == "") {
                 set co_id = '$co_id',
                     $sql_common ";
     sql_query($sql);
+    run_event('admin_content_created', $co_id);
 } elseif ($w == "u") {
     $sql = " update {$g5['content_table']}
                 set $sql_common
               where co_id = '$co_id' ";
     sql_query($sql);
+    run_event('admin_content_updated', $co_id);
 } elseif ($w == "d") {
     @unlink(G5_DATA_PATH . "/content/{$co_id}_h");
     @unlink(G5_DATA_PATH . "/content/{$co_id}_t");
 
     $sql = " delete from {$g5['content_table']} where co_id = '$co_id' ";
     sql_query($sql);
+    run_event('admin_content_deleted', $co_id);
 }
 
 if (function_exists('get_admin_captcha_by')) {

adm/dbupgrade.php

@@ -205,6 +205,68 @@ if (defined('G5_USE_SHOP') && G5_USE_SHOP) {
             break;
         }
     }
+
+    if (!isset($default['de_id'])) {
+        sql_query(" ALTER TABLE `{$g5['g5_shop_default_table']}`
+                        ADD COLUMN `de_id` INT(11) NOT NULL AUTO_INCREMENT FIRST,
+                        ADD PRIMARY KEY (`de_id`); ", true);
+
+        $is_check = true;
+    }
+}
+
+// auth.au_menu 컬럼 크기 조정
+$sql = " SHOW COLUMNS FROM `{$g5['auth_table']}` LIKE 'au_menu' ";
+$row = sql_fetch($sql);
+if (
+    stripos($row['Type'], 'varchar') !== false
+    && (int) preg_replace('/[^0-9]/', '', $row['Type']) < 50
+) {
+    sql_query(" ALTER TABLE `{$g5['auth_table']}` CHANGE `au_menu` `au_menu` VARCHAR(50) NOT NULL; ", true);
+
+    $is_check = true;
+}
+
+// qa config 테이블 auto id key 추가
+$row = sql_fetch("select * from `{$g5['qa_config_table']}` limit 1");
+if (!isset($row['qa_id'])) {
+    sql_query(" ALTER TABLE `{$g5['qa_config_table']}` ADD COLUMN `qa_id` INT(11) NOT NULL AUTO_INCREMENT FIRST,
+                ADD PRIMARY KEY (`qa_id`); ", true);
+
+    $is_check = true;
+}
+
+// config 기본 테이블 auto id key 추가
+if (!isset($config['cf_id'])) {
+    sql_query(" ALTER TABLE `{$g5['config_table']}`
+                    ADD COLUMN `cf_id` INT(11) NOT NULL AUTO_INCREMENT FIRST,
+                    ADD PRIMARY KEY (`cf_id`); ", true);
+
+	$is_check = true;
+}
+
+// login 테이블 auto id key 추가
+$row = sql_fetch("select * from `{$g5['login_table']}` limit 1");
+if (!isset($row['lo_id'])) {
+    sql_query(" ALTER TABLE `{$g5['login_table']}`
+                    ADD COLUMN `lo_id` INT(11) NOT NULL AUTO_INCREMENT FIRST,
+                    DROP PRIMARY KEY,
+                    ADD PRIMARY KEY (`lo_id`),
+                    ADD UNIQUE KEY `lo_ip_unique` (`lo_ip`) ", true);
+
+	$is_check = true;
+}
+
+// visit 테이블 auto id key 로 변경
+$result = sql_query("describe `{$g5['visit_table']}`");
+while ($row = sql_fetch_array($result)){
+    if (isset($row['Field']) && $row['Field'] === 'vi_id' && (isset($row['Default']) && $row['Default'] == 0)){
+        sql_query("ALTER TABLE `{$g5['visit_table']}`
+                    CHANGE COLUMN `vi_id` `vi_id` INT(11) NOT NULL AUTO_INCREMENT;
+        ", false);
+
+        $is_check = true;
+    }
 }
 
 $is_check = run_replace('admin_dbupgrade', $is_check);

adm/faqformupdate.php

@@ -30,6 +30,7 @@ if ($w == "")
     sql_query($sql);
 
     $fa_id = sql_insert_id();
+    run_event('admin_faq_item_created', $fa_id, $fm_id);
 }
 else if ($w == "u")
 {
@@ -37,11 +38,14 @@ else if ($w == "u")
                 set $sql_common
               where fa_id = '$fa_id' ";
     sql_query($sql);
+    run_event('admin_faq_item_updated', $fa_id, $fm_id);
+
 }
 else if ($w == "d")
 {
 	$sql = " delete from {$g5['faq_table']} where fa_id = '$fa_id' ";
     sql_query($sql);
+    run_event('admin_faq_item_deleted', $fa_id, $fm_id);
 }
 
 if ($w == 'd')

adm/faqmasterformupdate.php

@@ -49,9 +49,13 @@ if ($w == "") {
     sql_query($sql);
 
     $fm_id = sql_insert_id();
+    run_event('admin_faq_master_created', $fm_id);
+
 } elseif ($w == "u") {
     $sql = " update {$g5['faq_master_table']} $sql_common where fm_id = '$fm_id' ";
     sql_query($sql);
+    run_event('admin_faq_master_updated', $fm_id);
+
 } elseif ($w == "d") {
     @unlink(G5_DATA_PATH . "/faq/{$fm_id}_h");
     @unlink(G5_DATA_PATH . "/faq/{$fm_id}_t");
@@ -63,6 +67,8 @@ if ($w == "") {
     // FAQ상세삭제
     $sql = " delete from {$g5['faq_table']} where fm_id = '$fm_id' ";
     sql_query($sql);
+
+    run_event('admin_faq_master_deleted', $fm_id);
 }
 
 if ($w == "" || $w == "u") {

adm/index.php

@@ -3,8 +3,10 @@ $sub_menu = '100000';
 require_once './_common.php';
 
 @require_once './safe_check.php';
+
 if (function_exists('social_log_file_delete')) {
-    social_log_file_delete(86400);      //소셜로그인 디버그 파일 24시간 지난것은 삭제
+    //소셜로그인 디버그 파일 24시간 지난것은 삭제
+    social_log_file_delete(86400);
 }
 
 $g5['title'] = '관리자메인';
@@ -14,304 +16,323 @@ $new_member_rows = 5;
 $new_point_rows = 5;
 $new_write_rows = 5;
 
-$sql_common = " from {$g5['member_table']} ";
-
-$sql_search = " where (1) ";
-
-if ($is_admin != 'super') {
-    $sql_search .= " and mb_level <= '{$member['mb_level']}' ";
+$addtional_content_before = run_replace('adm_index_addtional_content_before', '', $is_admin, $auth, $member);
+if ($addtional_content_before) {
+    echo $addtional_content_before;
 }
 
-if (!$sst) {
-    $sst = "mb_datetime";
-    $sod = "desc";
-}
+if (!auth_check_menu($auth, '200100', 'r', true)) {
+    $sql_common = " from {$g5['member_table']} ";
 
-$sql_order = " order by {$sst} {$sod} ";
+    $sql_search = " where (1) ";
 
-$sql = " select count(*) as cnt {$sql_common} {$sql_search} {$sql_order} ";
-$row = sql_fetch($sql);
-$total_count = $row['cnt'];
-
-// 탈퇴회원수
-$sql = " select count(*) as cnt {$sql_common} {$sql_search} and mb_leave_date <> '' {$sql_order} ";
-$row = sql_fetch($sql);
-$leave_count = $row['cnt'];
-
-// 차단회원수
-$sql = " select count(*) as cnt {$sql_common} {$sql_search} and mb_intercept_date <> '' {$sql_order} ";
-$row = sql_fetch($sql);
-$intercept_count = $row['cnt'];
-
-$sql = " select * {$sql_common} {$sql_search} {$sql_order} limit {$new_member_rows} ";
-$result = sql_query($sql);
-
-$colspan = 12;
-?>
-
-<section>
-    <h2>신규가입회원 <?php echo $new_member_rows ?>건 목록</h2>
-    <div class="local_desc02 local_desc">
-        총회원수 <?php echo number_format($total_count) ?>명 중 차단 <?php echo number_format($intercept_count) ?>명, 탈퇴 : <?php echo number_format($leave_count) ?>명
-    </div>
-
-    <div class="tbl_head01 tbl_wrap">
-        <table>
-            <caption>신규가입회원</caption>
-            <thead>
-                <tr>
-                    <th scope="col">회원아이디</th>
-                    <th scope="col">이름</th>
-                    <th scope="col">닉네임</th>
-                    <th scope="col">권한</th>
-                    <th scope="col">포인트</th>
-                    <th scope="col">수신</th>
-                    <th scope="col">공개</th>
-                    <th scope="col">인증</th>
-                    <th scope="col">차단</th>
-                    <th scope="col">그룹</th>
-                </tr>
-            </thead>
-            <tbody>
-                <?php
-                for ($i = 0; $row = sql_fetch_array($result); $i++) {
-                    // 접근가능한 그룹수
-                    $sql2 = " select count(*) as cnt from {$g5['group_member_table']} where mb_id = '{$row['mb_id']}' ";
-                    $row2 = sql_fetch($sql2);
-                    $group = "";
-                    if ($row2['cnt']) {
-                        $group = '<a href="./boardgroupmember_form.php?mb_id=' . $row['mb_id'] . '">' . $row2['cnt'] . '</a>';
-                    }
-
-                    if ($is_admin == 'group') {
-                        $s_mod = '';
-                        $s_del = '';
-                    } else {
-                        $s_mod = '<a href="./member_form.php?$qstr&amp;w=u&amp;mb_id=' . $row['mb_id'] . '">수정</a>';
-                        $s_del = '<a href="./member_delete.php?' . $qstr . '&amp;w=d&amp;mb_id=' . $row['mb_id'] . '&amp;url=' . $_SERVER['SCRIPT_NAME'] . '" onclick="return delete_confirm(this);">삭제</a>';
-                    }
-                    $s_grp = '<a href="./boardgroupmember_form.php?mb_id=' . $row['mb_id'] . '">그룹</a>';
-
-                    $leave_date = $row['mb_leave_date'] ? $row['mb_leave_date'] : date("Ymd", G5_SERVER_TIME);
-                    $intercept_date = $row['mb_intercept_date'] ? $row['mb_intercept_date'] : date("Ymd", G5_SERVER_TIME);
-
-                    $mb_nick = get_sideview($row['mb_id'], get_text($row['mb_nick']), $row['mb_email'], $row['mb_homepage']);
-
-                    $mb_id = $row['mb_id'];
-                ?>
-                    <tr>
-                        <td class="td_mbid"><?php echo $mb_id ?></td>
-                        <td class="td_mbname"><?php echo get_text($row['mb_name']); ?></td>
-                        <td class="td_mbname sv_use">
-                            <div><?php echo $mb_nick ?></div>
-                        </td>
-                        <td class="td_num"><?php echo $row['mb_level'] ?></td>
-                        <td><a href="./point_list.php?sfl=mb_id&amp;stx=<?php echo $row['mb_id'] ?>"><?php echo number_format($row['mb_point']) ?></a></td>
-                        <td class="td_boolean"><?php echo $row['mb_mailling'] ? '예' : '아니오'; ?></td>
-                        <td class="td_boolean"><?php echo $row['mb_open'] ? '예' : '아니오'; ?></td>
-                        <td class="td_boolean"><?php echo preg_match('/[1-9]/', $row['mb_email_certify']) ? '예' : '아니오'; ?></td>
-                        <td class="td_boolean"><?php echo $row['mb_intercept_date'] ? '예' : '아니오'; ?></td>
-                        <td class="td_category"><?php echo $group ?></td>
-                    </tr>
-                <?php
-                }
-                if ($i == 0) {
-                    echo '<tr><td colspan="' . $colspan . '" class="empty_table">자료가 없습니다.</td></tr>';
-                }
-                ?>
-            </tbody>
-        </table>
-    </div>
-
-    <div class="btn_list03 btn_list">
-        <a href="./member_list.php">회원 전체보기</a>
-    </div>
-
-</section>
-
-<?php
-$sql_common = " from {$g5['board_new_table']} a, {$g5['board_table']} b, {$g5['group_table']} c where a.bo_table = b.bo_table and b.gr_id = c.gr_id ";
-
-if ($gr_id) {
-    $sql_common .= " and b.gr_id = '$gr_id' ";
-}
-if (isset($view) && $view) {
-    if ($view == 'w') {
-        $sql_common .= " and a.wr_id = a.wr_parent ";
-    } elseif ($view == 'c') {
-        $sql_common .= " and a.wr_id <> a.wr_parent ";
+    if ($is_admin != 'super') {
+        $sql_search .= " and mb_level <= '{$member['mb_level']}' ";
     }
-}
-$sql_order = " order by a.bn_id desc ";
 
-$sql = " select count(*) as cnt {$sql_common} ";
-$row = sql_fetch($sql);
-$total_count = $row['cnt'];
+    if (!$sst) {
+        $sst = "mb_datetime";
+        $sod = "desc";
+    }
 
-$colspan = 5;
-?>
+    $sql_order = " order by {$sst} {$sod} ";
 
-<section>
-    <h2>최근게시물</h2>
+    $sql = " SELECT count(*) as cnt {$sql_common} {$sql_search} {$sql_order} ";
+    $row = sql_fetch($sql);
+    $total_count = $row['cnt'];
 
-    <div class="tbl_head01 tbl_wrap">
-        <table>
-            <caption>최근게시물</caption>
-            <thead>
-                <tr>
-                    <th scope="col">그룹</th>
-                    <th scope="col">게시판</th>
-                    <th scope="col">제목</th>
-                    <th scope="col">이름</th>
-                    <th scope="col">일시</th>
-                </tr>
-            </thead>
-            <tbody>
-                <?php
-                $sql = " select a.*, b.bo_subject, c.gr_subject, c.gr_id {$sql_common} {$sql_order} limit {$new_write_rows} ";
-                $result = sql_query($sql);
-                for ($i = 0; $row = sql_fetch_array($result); $i++) {
-                    $tmp_write_table = $g5['write_prefix'] . $row['bo_table'];
+    // 탈퇴회원수
+    $sql = " select count(*) as cnt {$sql_common} {$sql_search} and mb_leave_date <> '' {$sql_order} ";
+    $row = sql_fetch($sql);
+    $leave_count = $row['cnt'];
 
-                     // 원글
-                    if ($row['wr_id'] == $row['wr_parent']) {
-                        $comment = "";
-                        $comment_link = "";
-                        $row2 = sql_fetch(" select * from $tmp_write_table where wr_id = '{$row['wr_id']}' ");
+    // 차단회원수
+    $sql = " SELECT count(*) as cnt {$sql_common} {$sql_search} and mb_intercept_date <> '' {$sql_order} ";
+    $row = sql_fetch($sql);
+    $intercept_count = $row['cnt'];
 
-                        $name = get_sideview($row2['mb_id'], get_text(cut_str($row2['wr_name'], $config['cf_cut_name'])), $row2['wr_email'], $row2['wr_homepage']);
-                        // 당일인 경우 시간으로 표시함
-                        $datetime = substr($row2['wr_datetime'], 0, 10);
-                        $datetime2 = $row2['wr_datetime'];
-                        if ($datetime == G5_TIME_YMD) {
-                            $datetime2 = substr($datetime2, 11, 5);
-                        } else {
-                            $datetime2 = substr($datetime2, 5, 5);
-                        }
-                    } else // 코멘트
-                    {
-                        $comment = '댓글. ';
-                        $comment_link = '#c_' . $row['wr_id'];
-                        $row2 = sql_fetch(" select * from {$tmp_write_table} where wr_id = '{$row['wr_parent']}' ");
-                        $row3 = sql_fetch(" select mb_id, wr_name, wr_email, wr_homepage, wr_datetime from {$tmp_write_table} where wr_id = '{$row['wr_id']}' ");
+    $sql = " SELECT * {$sql_common} {$sql_search} {$sql_order} limit {$new_member_rows} ";
+    $result = sql_query($sql);
 
-                        $name = get_sideview($row3['mb_id'], get_text(cut_str($row3['wr_name'], $config['cf_cut_name'])), $row3['wr_email'], $row3['wr_homepage']);
-                        // 당일인 경우 시간으로 표시함
-                        $datetime = substr($row3['wr_datetime'], 0, 10);
-                        $datetime2 = $row3['wr_datetime'];
-                        if ($datetime == G5_TIME_YMD) {
-                            $datetime2 = substr($datetime2, 11, 5);
-                        } else {
-                            $datetime2 = substr($datetime2, 5, 5);
-                        }
-                    }
-                ?>
+    $colspan = 12;
+    ?>
 
+    <section>
+        <h2>신규가입회원 <?php echo $new_member_rows ?>건 목록</h2>
+        <div class="local_desc02 local_desc">
+            총회원수 <?php echo number_format($total_count) ?>명 중 차단 <?php echo number_format($intercept_count) ?>명, 탈퇴 : <?php echo number_format($leave_count) ?>명
+        </div>
+
+        <div class="tbl_head01 tbl_wrap">
+            <table>
+                <caption>신규가입회원</caption>
+                <thead>
                     <tr>
-                        <td class="td_category"><a href="<?php echo G5_BBS_URL ?>/new.php?gr_id=<?php echo $row['gr_id'] ?>"><?php echo cut_str($row['gr_subject'], 10) ?></a></td>
-                        <td class="td_category"><a href="<?php echo get_pretty_url($row['bo_table']) ?>"><?php echo cut_str($row['bo_subject'], 20) ?></a></td>
-                        <td><a href="<?php echo get_pretty_url($row['bo_table'], $row2['wr_id']); ?><?php echo $comment_link ?>"><?php echo $comment ?><?php echo conv_subject($row2['wr_subject'], 100) ?></a></td>
-                        <td class="td_mbname">
-                            <div><?php echo $name ?></div>
-                        </td>
-                        <td class="td_datetime"><?php echo $datetime ?></td>
+                        <th scope="col">회원아이디</th>
+                        <th scope="col">이름</th>
+                        <th scope="col">닉네임</th>
+                        <th scope="col">권한</th>
+                        <th scope="col">포인트</th>
+                        <th scope="col">수신</th>
+                        <th scope="col">공개</th>
+                        <th scope="col">인증</th>
+                        <th scope="col">차단</th>
+                        <th scope="col">그룹</th>
                     </tr>
-
-                <?php
-                }
-                if ($i == 0) {
-                    echo '<tr><td colspan="' . $colspan . '" class="empty_table">자료가 없습니다.</td></tr>';
-                }
-                ?>
-            </tbody>
-        </table>
-    </div>
-
-    <div class="btn_list03 btn_list">
-        <a href="<?php echo G5_BBS_URL ?>/new.php">최근게시물 더보기</a>
-    </div>
-</section>
-
-<?php
-$sql_common = " from {$g5['point_table']} ";
-$sql_search = " where (1) ";
-$sql_order = " order by po_id desc ";
-
-$sql = " select count(*) as cnt {$sql_common} {$sql_search} {$sql_order} ";
-$row = sql_fetch($sql);
-$total_count = $row['cnt'];
-
-$sql = " select * {$sql_common} {$sql_search} {$sql_order} limit {$new_point_rows} ";
-$result = sql_query($sql);
-
-$colspan = 7;
-?>
-
-<section>
-    <h2>최근 포인트 발생내역</h2>
-    <div class="local_desc02 local_desc">
-        전체 <?php echo number_format($total_count) ?> 건 중 <?php echo $new_point_rows ?>건 목록
-    </div>
-
-    <div class="tbl_head01 tbl_wrap">
-        <table>
-            <caption>최근 포인트 발생내역</caption>
-            <thead>
-                <tr>
-                    <th scope="col">회원아이디</th>
-                    <th scope="col">이름</th>
-                    <th scope="col">닉네임</th>
-                    <th scope="col">일시</th>
-                    <th scope="col">포인트 내용</th>
-                    <th scope="col">포인트</th>
-                    <th scope="col">포인트합</th>
-                </tr>
-            </thead>
-            <tbody>
-                <?php
-                $row2['mb_id'] = '';
-                for ($i = 0; $row = sql_fetch_array($result); $i++) {
-                    if ($row2['mb_id'] != $row['mb_id']) {
-                        $sql2 = " select mb_id, mb_name, mb_nick, mb_email, mb_homepage, mb_point from {$g5['member_table']} where mb_id = '{$row['mb_id']}' ";
+                </thead>
+                <tbody>
+                    <?php
+                    for ($i = 0; $row = sql_fetch_array($result); $i++) {
+                        // 접근가능한 그룹수
+                        $sql2 = " SELECT count(*) as cnt from {$g5['group_member_table']} where mb_id = '{$row['mb_id']}' ";
                         $row2 = sql_fetch($sql2);
+                        $group = "";
+                        if ($row2['cnt']) {
+                            $group = '<a href="./boardgroupmember_form.php?mb_id=' . $row['mb_id'] . '">' . $row2['cnt'] . '</a>';
+                        }
+
+                        if ($is_admin == 'group') {
+                            $s_mod = '';
+                            $s_del = '';
+                        } else {
+                            $s_mod = '<a href="./member_form.php?$qstr&amp;w=u&amp;mb_id=' . $row['mb_id'] . '">수정</a>';
+                            $s_del = '<a href="./member_delete.php?' . $qstr . '&amp;w=d&amp;mb_id=' . $row['mb_id'] . '&amp;url=' . $_SERVER['SCRIPT_NAME'] . '" onclick="return delete_confirm(this);">삭제</a>';
+                        }
+                        $s_grp = '<a href="./boardgroupmember_form.php?mb_id=' . $row['mb_id'] . '">그룹</a>';
+
+                        $leave_date = $row['mb_leave_date'] ? $row['mb_leave_date'] : date("Ymd", G5_SERVER_TIME);
+                        $intercept_date = $row['mb_intercept_date'] ? $row['mb_intercept_date'] : date("Ymd", G5_SERVER_TIME);
+
+                        $mb_nick = get_sideview($row['mb_id'], get_text($row['mb_nick']), $row['mb_email'], $row['mb_homepage']);
+
+                        $mb_id = $row['mb_id'];
+                        ?>
+                        <tr>
+                            <td class="td_mbid"><?php echo $mb_id ?></td>
+                            <td class="td_mbname"><?php echo get_text($row['mb_name']); ?></td>
+                            <td class="td_mbname sv_use">
+                                <div><?php echo $mb_nick ?></div>
+                            </td>
+                            <td class="td_num"><?php echo $row['mb_level'] ?></td>
+                            <td><a href="./point_list.php?sfl=mb_id&amp;stx=<?php echo $row['mb_id'] ?>"><?php echo number_format($row['mb_point']) ?></a></td>
+                            <td class="td_boolean"><?php echo $row['mb_mailling'] ? '예' : '아니오'; ?></td>
+                            <td class="td_boolean"><?php echo $row['mb_open'] ? '예' : '아니오'; ?></td>
+                            <td class="td_boolean"><?php echo preg_match('/[1-9]/', $row['mb_email_certify']) ? '예' : '아니오'; ?></td>
+                            <td class="td_boolean"><?php echo $row['mb_intercept_date'] ? '예' : '아니오'; ?></td>
+                            <td class="td_category"><?php echo $group ?></td>
+                        </tr>
+                        <?php
                     }
-
-                    $mb_nick = get_sideview($row['mb_id'], $row2['mb_nick'], $row2['mb_email'], $row2['mb_homepage']);
-
-                    $link1 = $link2 = "";
-                    if (!preg_match("/^\@/", $row['po_rel_table']) && $row['po_rel_table']) {
-                        $link1 = '<a href="' . get_pretty_url($row['po_rel_table'], $row['po_rel_id']) . '" target="_blank">';
-                        $link2 = '</a>';
+                    if ($i == 0) {
+                        echo '<tr><td colspan="' . $colspan . '" class="empty_table">자료가 없습니다.</td></tr>';
                     }
-                ?>
+                    ?>
+                </tbody>
+            </table>
+        </div>
 
+        <div class="btn_list03 btn_list">
+            <a href="./member_list.php">회원 전체보기</a>
+        </div>
+    </section>
+
+    <?php
+} //endif 최신 회원
+
+if (!auth_check_menu($auth, '300100', 'r', true)) {
+
+    $sql_common = " from {$g5['board_new_table']} a, {$g5['board_table']} b, {$g5['group_table']} c where a.bo_table = b.bo_table and b.gr_id = c.gr_id ";
+
+    if ($gr_id) {
+        $sql_common .= " and b.gr_id = '{$gr_id}' ";
+    }
+    if (isset($view) && $view) {
+        if ($view == 'w') {
+            $sql_common .= " and a.wr_id = a.wr_parent ";
+        } elseif ($view == 'c') {
+            $sql_common .= " and a.wr_id <> a.wr_parent ";
+        }
+    }
+    $sql_order = " order by a.bn_id desc ";
+
+    $sql = " SELECT count(*) as cnt {$sql_common} ";
+    $row = sql_fetch($sql);
+    $total_count = $row['cnt'];
+
+    $colspan = 5;
+    ?>
+
+    <section>
+        <h2>최근게시물</h2>
+
+        <div class="tbl_head01 tbl_wrap">
+            <table>
+                <caption>최근게시물</caption>
+                <thead>
                     <tr>
-                        <td class="td_mbid"><a href="./point_list.php?sfl=mb_id&amp;stx=<?php echo $row['mb_id'] ?>"><?php echo $row['mb_id'] ?></a></td>
-                        <td class="td_mbname"><?php echo get_text($row2['mb_name']); ?></td>
-                        <td class="td_name sv_use">
-                            <div><?php echo $mb_nick ?></div>
-                        </td>
-                        <td class="td_datetime"><?php echo $row['po_datetime'] ?></td>
-                        <td><?php echo $link1 . $row['po_content'] . $link2 ?></td>
-                        <td class="td_numbig"><?php echo number_format($row['po_point']) ?></td>
-                        <td class="td_numbig"><?php echo number_format($row['po_mb_point']) ?></td>
+                        <th scope="col">그룹</th>
+                        <th scope="col">게시판</th>
+                        <th scope="col">제목</th>
+                        <th scope="col">이름</th>
+                        <th scope="col">일시</th>
                     </tr>
+                </thead>
+                <tbody>
+                    <?php
+                    $sql = " SELECT a.*, b.bo_subject, c.gr_subject, c.gr_id {$sql_common} {$sql_order} limit {$new_write_rows} ";
+                    $result = sql_query($sql);
+                    for ($i = 0; $row = sql_fetch_array($result); $i++) {
+                        $tmp_write_table = $g5['write_prefix'] . $row['bo_table'];
 
-                <?php
-                }
+                        if ($row['wr_id'] == $row['wr_parent']) {
+                            // 원글
+                            $comment = "";
+                            $comment_link = "";
+                            $row2 = sql_fetch(" SELECT * from {$tmp_write_table} where wr_id = '{$row['wr_id']}' ");
 
-                if ($i == 0) {
-                    echo '<tr><td colspan="' . $colspan . '" class="empty_table">자료가 없습니다.</td></tr>';
-                }
-                ?>
-            </tbody>
-        </table>
-    </div>
+                            $name = get_sideview($row2['mb_id'], get_text(cut_str($row2['wr_name'], $config['cf_cut_name'])), $row2['wr_email'], $row2['wr_homepage']);
+                            // 당일인 경우 시간으로 표시함
+                            $datetime = substr($row2['wr_datetime'], 0, 10);
+                            $datetime2 = $row2['wr_datetime'];
+                            if ($datetime == G5_TIME_YMD) {
+                                $datetime2 = substr($datetime2, 11, 5);
+                            } else {
+                                $datetime2 = substr($datetime2, 5, 5);
+                            }
+                        } else {
+                            // 코멘트
+                            $comment = '댓글. ';
+                            $comment_link = '#c_' . $row['wr_id'];
+                            $row2 = sql_fetch(" SELECT * from {$tmp_write_table} where wr_id = '{$row['wr_parent']}' ");
+                            $row3 = sql_fetch(" SELECT mb_id, wr_name, wr_email, wr_homepage, wr_datetime from {$tmp_write_table} where wr_id = '{$row['wr_id']}' ");
 
-    <div class="btn_list03 btn_list">
-        <a href="./point_list.php">포인트내역 전체보기</a>
-    </div>
-</section>
+                            $name = get_sideview($row3['mb_id'], get_text(cut_str($row3['wr_name'], $config['cf_cut_name'])), $row3['wr_email'], $row3['wr_homepage']);
+                            // 당일인 경우 시간으로 표시함
+                            $datetime = substr($row3['wr_datetime'], 0, 10);
+                            $datetime2 = $row3['wr_datetime'];
+                            if ($datetime == G5_TIME_YMD) {
+                                $datetime2 = substr($datetime2, 11, 5);
+                            } else {
+                                $datetime2 = substr($datetime2, 5, 5);
+                            }
+                        }
+                        ?>
 
-<?php
-require_once './admin.tail.php';
+                        <tr>
+                            <td class="td_category"><a href="<?php echo G5_BBS_URL ?>/new.php?gr_id=<?php echo $row['gr_id'] ?>"><?php echo cut_str($row['gr_subject'], 10) ?></a></td>
+                            <td class="td_category"><a href="<?php echo get_pretty_url($row['bo_table']) ?>"><?php echo cut_str($row['bo_subject'], 20) ?></a></td>
+                            <td><a href="<?php echo get_pretty_url($row['bo_table'], $row2['wr_id']); ?><?php echo $comment_link ?>"><?php echo $comment ?><?php echo conv_subject($row2['wr_subject'], 100) ?></a></td>
+                            <td class="td_mbname">
+                                <div><?php echo $name ?></div>
+                            </td>
+                            <td class="td_datetime"><?php echo $datetime ?></td>
+                        </tr>
+
+                        <?php
+                    }
+                    if ($i == 0) {
+                        echo '<tr><td colspan="' . $colspan . '" class="empty_table">자료가 없습니다.</td></tr>';
+                    }
+                    ?>
+                </tbody>
+            </table>
+        </div>
+
+        <div class="btn_list03 btn_list">
+            <a href="<?php echo G5_BBS_URL ?>/new.php">최근게시물 더보기</a>
+        </div>
+    </section>
+
+    <?php
+} //endif 최근게시물
+
+if (!auth_check_menu($auth, '200200', 'r', true)) {
+
+    $sql_common = " from {$g5['point_table']} ";
+    $sql_search = " where (1) ";
+    $sql_order = " order by po_id desc ";
+
+    $sql = " SELECT count(*) as cnt {$sql_common} {$sql_search} {$sql_order} ";
+    $row = sql_fetch($sql);
+    $total_count = $row['cnt'];
+
+    $sql = " SELECT * {$sql_common} {$sql_search} {$sql_order} limit {$new_point_rows} ";
+    $result = sql_query($sql);
+
+    $colspan = 7;
+    ?>
+
+    <section>
+        <h2>최근 포인트 발생내역</h2>
+        <div class="local_desc02 local_desc">
+            전체 <?php echo number_format($total_count) ?> 건 중 <?php echo $new_point_rows ?>건 목록
+        </div>
+
+        <div class="tbl_head01 tbl_wrap">
+            <table>
+                <caption>최근 포인트 발생내역</caption>
+                <thead>
+                    <tr>
+                        <th scope="col">회원아이디</th>
+                        <th scope="col">이름</th>
+                        <th scope="col">닉네임</th>
+                        <th scope="col">일시</th>
+                        <th scope="col">포인트 내용</th>
+                        <th scope="col">포인트</th>
+                        <th scope="col">포인트합</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <?php
+                    $row2['mb_id'] = '';
+                    for ($i = 0; $row = sql_fetch_array($result); $i++) {
+                        if ($row2['mb_id'] != $row['mb_id']) {
+                            $sql2 = " SELECT mb_id, mb_name, mb_nick, mb_email, mb_homepage, mb_point from {$g5['member_table']} where mb_id = '{$row['mb_id']}' ";
+                            $row2 = sql_fetch($sql2);
+                        }
+
+                        $mb_nick = get_sideview($row['mb_id'], $row2['mb_nick'], $row2['mb_email'], $row2['mb_homepage']);
+
+                        $link1 = $link2 = "";
+                        if (!preg_match("/^\@/", $row['po_rel_table']) && $row['po_rel_table']) {
+                            $link1 = '<a href="' . get_pretty_url($row['po_rel_table'], $row['po_rel_id']) . '" target="_blank">';
+                            $link2 = '</a>';
+                        }
+                        ?>
+
+                        <tr>
+                            <td class="td_mbid"><a href="./point_list.php?sfl=mb_id&amp;stx=<?php echo $row['mb_id'] ?>"><?php echo $row['mb_id'] ?></a></td>
+                            <td class="td_mbname"><?php echo get_text($row2['mb_name']); ?></td>
+                            <td class="td_name sv_use">
+                                <div><?php echo $mb_nick ?></div>
+                            </td>
+                            <td class="td_datetime"><?php echo $row['po_datetime'] ?></td>
+                            <td><?php echo $link1 . $row['po_content'] . $link2 ?></td>
+                            <td class="td_numbig"><?php echo number_format($row['po_point']) ?></td>
+                            <td class="td_numbig"><?php echo number_format($row['po_mb_point']) ?></td>
+                        </tr>
+
+                        <?php
+                    }
+
+                    if ($i == 0) {
+                        echo '<tr><td colspan="' . $colspan . '" class="empty_table">자료가 없습니다.</td></tr>';
+                    }
+                    ?>
+                </tbody>
+            </table>
+        </div>
+
+        <div class="btn_list03 btn_list">
+            <a href="./point_list.php">포인트내역 전체보기</a>
+        </div>
+    </section>
+
+    <?php
+} //endif
+
+$addtional_content_after = run_replace('adm_index_addtional_content_after', '', $is_admin, $auth, $member);
+if ($addtional_content_after) {
+    echo $addtional_content_after;
+}
+require_once './admin.tail.php';

adm/mail_delete.php

@@ -19,6 +19,7 @@ for ($i = 0; $i < $post_count_chk; $i++) {
 
     $sql = " delete from {$g5['mail_table']} where ma_id = '$ma_id' ";
     sql_query($sql);
+    run_event('admin_mail_deleted', $ma_id);
 }
 
 goto_url('./mail_list.php');

adm/mail_update.php

@@ -21,6 +21,10 @@ if ($w == '') {
                      ma_time = '" . G5_TIME_YMDHIS . "',
                      ma_ip = '{$_SERVER['REMOTE_ADDR']}' ";
     sql_query($sql);
+
+    $ma_id = sql_insert_id();
+    run_event('admin_mail_created', $ma_id);
+
 } elseif ($w == 'u') {
     $sql = " update {$g5['mail_table']}
                 set ma_subject = '{$ma_subject}',
@@ -29,9 +33,12 @@ if ($w == '') {
                      ma_ip = '{$_SERVER['REMOTE_ADDR']}'
                 where ma_id = '{$ma_id}' ";
     sql_query($sql);
+    run_event('admin_mail_updated', $ma_id);
+
 } elseif ($w == 'd') {
     $sql = " delete from {$g5['mail_table']} where ma_id = '{$ma_id}' ";
     sql_query($sql);
+    run_event('admin_mail_deleted', $ma_id);
 }
 
 goto_url('./mail_list.php');

adm/newwinformupdate.php

@@ -59,14 +59,16 @@ $sql_common = " nw_device = '{$posts['nw_device']}',
 if ($w == "") {
     $sql = " insert {$g5['new_win_table']} set $sql_common ";
     sql_query($sql);
-
     $nw_id = sql_insert_id();
+    run_event('admin_newwin_created', $nw_id);
 } elseif ($w == "u") {
     $sql = " update {$g5['new_win_table']} set $sql_common where nw_id = '$nw_id' ";
     sql_query($sql);
+    run_event('admin_newwin_updated', $nw_id);
 } elseif ($w == "d") {
     $sql = " delete from {$g5['new_win_table']} where nw_id = '$nw_id' ";
     sql_query($sql);
+    run_event('admin_newwin_deleted', $nw_id);
 }
 
 if ($w == "d") {

adm/qa_config.php

@@ -12,6 +12,7 @@ require_once './admin.head.php';
 if (!sql_query(" DESCRIBE `{$g5['qa_config_table']}` ", false)) {
     sql_query(
         " CREATE TABLE IF NOT EXISTS `{$g5['qa_config_table']}` (
+                  `qa_id` int(11) NOT NULL auto_increment,
                   `qa_title` varchar(255) NOT NULL DEFAULT'',
                   `qa_category` varchar(255) NOT NULL DEFAULT'',
                   `qa_skin` varchar(255) NOT NULL DEFAULT '',
@@ -46,7 +47,8 @@ if (!sql_query(" DESCRIBE `{$g5['qa_config_table']}` ", false)) {
                   `qa_2` varchar(255) NOT NULL DEFAULT '',
                   `qa_3` varchar(255) NOT NULL DEFAULT '',
                   `qa_4` varchar(255) NOT NULL DEFAULT '',
-                  `qa_5` varchar(255) NOT NULL DEFAULT ''
+                  `qa_5` varchar(255) NOT NULL DEFAULT '',
+                  PRIMARY KEY (`qa_id`)
                 )",
         true
     );

adm/qa_config_update.php

@@ -108,6 +108,8 @@ $sql = " update {$g5['qa_config_table']}
                 qa_5                    = '{$_POST['qa_5']}' ";
 sql_query($sql);
 
+run_event('admin_qa_config_updated');
+
 if (function_exists('get_admin_captcha_by')) {
     get_admin_captcha_by('remove');
 }

adm/shop_admin/categoryform.php

@@ -12,7 +12,6 @@ $ca = array(
 'ca_name'=>'',
 'ca_order'=>'',
 'ca_mb_id'=>'',
-'ca_skin_dir'=>'',
 'ca_cert_use'=>0,
 'ca_adult_use'=>0,
 'ca_sell_email'=>'',

adm/shop_admin/categoryformupdate.php

@@ -193,6 +193,7 @@ if ($w == "")
                     ca_name = '$ca_name',
                     $sql_common ";
     sql_query($sql);
+    run_event('shop_admin_category_created', $ca_id);
 }
 else if ($w == "u")
 {
@@ -212,6 +213,7 @@ else if ($w == "u")
             $sql .= " and ca_mb_id = '{$member['mb_id']}' ";
         sql_query($sql);
     }
+    run_event('shop_admin_category_updated', $ca_id);
 }
 else if ($w == "d")
 {
@@ -243,6 +245,7 @@ else if ($w == "d")
     // 분류 삭제
     $sql = " delete from {$g5['g5_shop_category_table']} where ca_id = '$ca_id' ";
     sql_query($sql);
+    run_event('shop_admin_category_deleted', $ca_id);
 }
 
 if(function_exists('get_admin_captcha_by'))

adm/shop_admin/categorylist.php

@@ -17,7 +17,7 @@ if ($stx != "") {
         $sql_search .= " $where $sfl like '%$stx%' ";
         $where = " and ";
     }
-    if ($save_stx && ($save_stx != $stx))
+    if (isset($save_stx) && $save_stx && ($save_stx != $stx))
         $page = 1;
 }
 

adm/shop_admin/configform.php

@@ -13,8 +13,6 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
     $userinfo = get_icode_userinfo($config['cf_icode_id'], $config['cf_icode_pw']);
 }
 
-check_log_folder(G5_SHOP_PATH.'/inicis/key', false);
-
 $g5['title'] = '쇼핑몰설정';
 include_once (G5_ADMIN_PATH.'/admin.head.php');
 
@@ -68,8 +66,7 @@ if(!isset($default['de_pg_service'])) {
 // inicis 필드 추가
 if(!isset($default['de_inicis_mid'])) {
     sql_query(" ALTER TABLE `{$g5['g5_shop_default_table']}`
-                    ADD `de_inicis_mid` varchar(255) NOT NULL DEFAULT '' AFTER `de_kcp_site_key`,
-                    ADD `de_inicis_admin_key` varchar(255) NOT NULL DEFAULT '' AFTER `de_inicis_mid` ", true);
+                    ADD `de_inicis_mid` varchar(255) NOT NULL DEFAULT '' AFTER `de_kcp_site_key` ", true);
 }
 
 // 모바일 초기화면 이미지 줄 수 필드 추가
@@ -137,7 +134,7 @@ if(!isset($default['de_kakaopay_mid'])) {
 // 이니시스 웹결제 사인키 필드 추가
 if(!isset($default['de_inicis_sign_key'])) {
     sql_query(" ALTER TABLE `{$g5['g5_shop_default_table']}`
-                    ADD `de_inicis_sign_key` varchar(255) NOT NULL DEFAULT '' AFTER `de_inicis_admin_key` ", true);
+                    ADD `de_inicis_sign_key` varchar(255) NOT NULL DEFAULT '' ", true);
 }
 
 // 네이버페이 필드추가
@@ -202,6 +199,14 @@ if( ! isset($default['de_easy_pay_services']) ){
     sql_query($sql, false);
 }
 
+// KG 이니시스 iniapi_key 추가
+if( ! isset($default['de_inicis_iniapi_key']) ){
+    $sql = "ALTER TABLE `{$g5['g5_shop_default_table']}` 
+            ADD COLUMN `de_inicis_iniapi_key` VARCHAR(30) NOT NULL DEFAULT '' AFTER `de_inicis_sign_key`,
+            ADD COLUMN `de_inicis_iniapi_iv` VARCHAR(30) NOT NULL DEFAULT '' AFTER `de_inicis_iniapi_key`; ";
+    sql_query($sql, false);
+}
+
 if( function_exists('pg_setting_check') ){
     pg_setting_check(true);
 }
@@ -781,10 +786,11 @@ if(!$default['de_kakaopay_cancelpwd']){
         <tr class="pg_info_fld kcp_info_fld">
             <th scope="row"><label for="de_kcp_easy_pays">NHN KCP 간편결제</label></th>
             <td>
-                <?php echo help("체크시 NHN KCP 간편결제들을 활성화 합니다.\nNHN_KCP > 네이버페이, 카카오페이는 테스트결제가 되지 않습니다."); ?>
+                <?php echo help("체크시 NHN KCP 간편결제들을 활성화 합니다.\nNHN_KCP > 네이버페이, 카카오페이는 테스트결제가 되지 않습니다.\n애플페이는 IOS 기기에 모바일결제만 가능합니다."); ?>
                 <input type="checkbox" id="de_easy_nhnkcp_payco" name="de_easy_pays[]" value="nhnkcp_payco" <?php if(stripos($default['de_easy_pay_services'], 'nhnkcp_payco') !== false){ echo 'checked="checked"'; } ?> > <label for="de_easy_nhnkcp_payco" disabled>PAYCO (페이코)</label><br>
                 <input type="checkbox" id="de_easy_nhnkcp_naverpay" name="de_easy_pays[]" value="nhnkcp_naverpay" <?php if(stripos($default['de_easy_pay_services'], 'nhnkcp_naverpay') !== false){ echo 'checked="checked"'; } ?> > <label for="de_easy_nhnkcp_naverpay">NAVERPAY (네이버페이)</label><br>
-                <input type="checkbox" id="de_easy_nhnkcp_kakaopay" name="de_easy_pays[]" value="nhnkcp_kakaopay" <?php if(stripos($default['de_easy_pay_services'], 'nhnkcp_kakaopay') !== false){ echo 'checked="checked"'; } ?> > <label for="de_easy_nhnkcp_kakaopay">KAKAOPAY (카카오페이)</label>
+                <input type="checkbox" id="de_easy_nhnkcp_kakaopay" name="de_easy_pays[]" value="nhnkcp_kakaopay" <?php if(stripos($default['de_easy_pay_services'], 'nhnkcp_kakaopay') !== false){ echo 'checked="checked"'; } ?> > <label for="de_easy_nhnkcp_kakaopay">KAKAOPAY (카카오페이)</label><br>
+                <input type="checkbox" id="de_easy_nhnkcp_applepay" name="de_easy_pays[]" value="nhnkcp_applepay" <?php if(stripos($default['de_easy_pay_services'], 'nhnkcp_applepay') !== false){ echo 'checked="checked"'; } ?> > <label for="de_easy_nhnkcp_applepay">APPLEPAY (애플페이)</label>
             </td>
         </tr>
         <tr class="pg_info_fld kcp_info_fld">
@@ -829,17 +835,24 @@ if(!$default['de_kakaopay_cancelpwd']){
             </td>
         </tr>
         <tr class="pg_info_fld inicis_info_fld">
-            <th scope="row"><label for="de_inicis_admin_key">KG이니시스 키패스워드</label></th>
+            <th scope="row"><label for="de_inicis_sign_key">KG이니시스 웹결제 사인키</label></th>
             <td>
-                <?php echo help("KG이니시스에서 발급받은 4자리 상점 키패스워드를 입력합니다.\nKG이니시스 상점관리자 패스워드와 관련이 없습니다.\n키패스워드 값을 확인하시려면 상점측에 발급된 키파일 안의 readme.txt 파일을 참조해 주십시오"); ?>
-                <input type="text" name="de_inicis_admin_key" value="<?php echo get_sanitize_input($default['de_inicis_admin_key']); ?>" id="de_inicis_admin_key" class="frm_input" size="5" maxlength="4">
+                <?php echo help("KG이니시스에서 발급받은 웹결제 사인키를 입력합니다.\n<a href='https://iniweb.inicis.com/' target='_blank'>KG이니시스 가맹점관리자</a> > 상점정보 > 계약정보 > 부가정보의 웹결제 signkey생성 조회 버튼 클릭, 팝업창에서 생성 버튼 클릭 후 해당 값을 입력합니다."); ?>
+                <input type="text" name="de_inicis_sign_key" value="<?php echo get_sanitize_input($default['de_inicis_sign_key']); ?>" id="de_inicis_sign_key" class="frm_input" size="40" maxlength="50">
             </td>
         </tr>
         <tr class="pg_info_fld inicis_info_fld">
-            <th scope="row"><label for="de_inicis_sign_key">KG이니시스 웹결제 사인키</label></th>
+            <th scope="row"><label for="de_inicis_iniapi_key">KG이니시스 INIAPI KEY</label></th>
             <td>
-                <?php echo help("KG이니시스에서 발급받은 웹결제 사인키를 입력합니다.\nKG이니시스 상점관리자 > 상점정보 > 계약정보 > 부가정보의 웹결제 signkey생성 조회 버튼 클릭, 팝업창에서 생성 버튼 클릭 후 해당 값을 입력합니다."); ?>
-                <input type="text" name="de_inicis_sign_key" value="<?php echo get_sanitize_input($default['de_inicis_sign_key']); ?>" id="de_inicis_sign_key" class="frm_input" size="40" maxlength="50">
+                <?php echo help("<a href='https://iniweb.inicis.com/' target='_blank'>KG이니시스 가맹점관리자</a> > 상점정보 > 계약정보 > 부가정보 > INIAPI key 생성 조회 하여 KEY를 여기에 입력합니다.\n이 항목은 영카트 주문에서 kg이니시스 PG 결제 취소, 부분취소, 에스크로 배송등록, 현금영수증 발급에 필요합니다."); ?>
+                <input type="text" name="de_inicis_iniapi_key" value="<?php echo get_sanitize_input($default['de_inicis_iniapi_key']); ?>" id="de_inicis_iniapi_key" class="frm_input" size="30" maxlength="30">
+            </td>
+        </tr>
+        <tr class="pg_info_fld inicis_info_fld">
+            <th scope="row"><label for="de_inicis_iniapi_iv">KG이니시스 INIAPI IV</label></th>
+            <td>
+                <?php echo help("<a href='https://iniweb.inicis.com/' target='_blank'>KG이니시스 가맹점관리자</a> > 상점정보 > 계약정보 > 부가정보 > INIAPI IV 생성 조회 하여 KEY를 여기에 입력합니다.\n이 항목은 영카트 주문에서 kg이니시스 현금영수증 발급에 필요합니다."); ?>
+                <input type="text" name="de_inicis_iniapi_iv" value="<?php echo get_sanitize_input($default['de_inicis_iniapi_iv']); ?>" id="de_inicis_iniapi_iv" class="frm_input" size="30" maxlength="30">
             </td>
         </tr>
         <tr class="pg_info_fld inicis_info_fld">
@@ -848,7 +861,7 @@ if(!$default['de_kakaopay_cancelpwd']){
                 <a href="http://sir.kr/main/service/samsungpay.php" target="_blank" class="kg_btn">삼성페이 서비스신청하기</a>
             </th>
             <td>
-                <?php echo help("KG이니시스와 별도로 <strong>삼성페이 사용 계약을 하신 경우</strong>에만 체크해주세요. (모바일 주문서 결제수단에 삼성페이가 노출됩니다.) <br >실결제시 반드시 결제대행사 KG이니시스 항목에 상점 아이디와 키패스워드를 입력해 주세요.", 50); ?>
+                <?php echo help("KG이니시스와 별도로 <strong>삼성페이 사용 계약을 하신 경우</strong>에만 체크해주세요. (모바일 주문서 결제수단에 삼성페이가 노출됩니다.) <br >실결제시 반드시 결제대행사 KG이니시스 항목에 상점 아이디와 웹결제 사인키를 입력해 주세요.", 50); ?>
                 <input type="checkbox" name="de_samsung_pay_use" value="1" id="de_samsung_pay_use"<?php echo $default['de_samsung_pay_use']?' checked':''; ?>> <label for="de_samsung_pay_use">사용</label>
             </td>
         </tr>
@@ -857,7 +870,7 @@ if(!$default['de_kakaopay_cancelpwd']){
                 <label for="de_inicis_lpay_use">KG이니시스 L.pay 사용</label>
             </th>
             <td>
-                <?php echo help("체크시 KG이니시스 L.pay를 사용합니다. <br >실결제시 반드시 결제대행사 KG이니시스 항목의 상점 정보( 아이디, 키패스워드, 웹결제 사인키 )를 입력해 주세요.", 50); ?>
+                <?php echo help("체크시 KG이니시스 L.pay를 사용합니다. <br >실결제시 반드시 결제대행사 KG이니시스 항목의 상점 정보( 아이디, 웹결제 사인키 )를 입력해 주세요.", 50); ?>
                 <input type="checkbox" name="de_inicis_lpay_use" value="1" id="de_inicis_lpay_use"<?php echo $default['de_inicis_lpay_use']?' checked':''; ?>> <label for="de_inicis_lpay_use">사용</label>
             </td>
         </tr>
@@ -866,7 +879,7 @@ if(!$default['de_kakaopay_cancelpwd']){
                 <label for="de_inicis_kakaopay_use">KG이니시스 카카오페이 사용</label>
             </th>
             <td>
-                <?php echo help("체크시 KG이니시스 결제의 카카오페이를 사용합니다. 주문서 결제수단에 카카오페이가 노출됩니다. <br>실결제시 반드시 결제대행사 KG이니시스 항목의 상점 정보( 아이디, 키패스워드, 웹결제 사인키 )를 입력해 주세요.", 50); ?>
+                <?php echo help("체크시 KG이니시스 결제의 카카오페이를 사용합니다. 주문서 결제수단에 카카오페이가 노출됩니다. <br>실결제시 반드시 결제대행사 KG이니시스 항목의 상점 정보( 아이디, 웹결제 사인키 )를 입력해 주세요.", 50); ?>
                 <input type="checkbox" name="de_inicis_kakaopay_use" value="1" id="de_inicis_kakaopay_use"<?php echo $default['de_inicis_kakaopay_use']?' checked':''; ?>> <label for="de_inicis_kakaopay_use">사용</label>
             </td>
         </tr>
@@ -2011,20 +2024,8 @@ if($default['de_iche_use'] || $default['de_vbank_use'] || $default['de_hp_use']
         } catch(Exception $e) {
         }
 
-        if(!is_dir($log_path)) {
-            echo '<script>'.PHP_EOL;
-            echo 'alert("'.str_replace(G5_PATH.'/', '', G5_SHOP_PATH).'/inicis 폴더 안에 log 폴더를 생성하신 후 쓰기권한을 부여해 주십시오.\n> mkdir log\n> chmod 707 log");'.PHP_EOL;
-            echo '</script>'.PHP_EOL;
-        } else {
-            if(!is_writable($log_path)) {
-                echo '<script>'.PHP_EOL;
-                echo 'alert("'.str_replace(G5_PATH.'/', '',$log_path).' 폴더에 쓰기권한을 부여해 주십시오.\n> chmod 707 log");'.PHP_EOL;
-                echo '</script>'.PHP_EOL;
-            } else {
-                if( function_exists('check_log_folder') && is_writable($log_path) ){
-                    check_log_folder($log_path);
-                }
-            }
+        if( function_exists('check_log_folder') && is_writable($log_path) ){
+            check_log_folder($log_path);
         }
     }
 

adm/shop_admin/configformupdate.php

@@ -28,8 +28,8 @@ if ($_FILES['mobile_logo_img2']['name']) upload_file($_FILES['mobile_logo_img2']
 $de_kcp_mid = isset($_POST['de_kcp_mid']) ? substr($_POST['de_kcp_mid'], 0, 3) : '';
 $cf_icode_server_port = isset($cf_icode_server_port) ? preg_replace('/[^0-9]/', '', $cf_icode_server_port) : '7295';
 
-$de_shop_skin = isset($_POST['de_shop_skin']) ? preg_replace('#\.+(\/|\\\)#', '', $_POST['de_shop_skin']) : 'basic';
-$de_shop_mobile_skin = isset($_POST['de_shop_mobile_skin']) ? preg_replace('#\.+(\/|\\\)#', '', $_POST['de_shop_mobile_skin']) : 'basic';
+$de_shop_skin = isset($_POST['de_shop_skin']) ? preg_replace(array('#\.+(\/|\\\)#', '#[\'\"]#'), array('', ''), $_POST['de_shop_skin']) : 'basic';
+$de_shop_mobile_skin = isset($_POST['de_shop_mobile_skin']) ? preg_replace(array('#\.+(\/|\\\)#', '#[\'\"]#'), array('', ''), $_POST['de_shop_mobile_skin']) : 'basic';
 
 $skins = get_skin_dir('shop');
 
@@ -59,7 +59,7 @@ $de_shop_mobile_skin = in_array($de_shop_mobile_skin, $mobile_skins) ? $de_shop_
 $check_skin_keys = array('de_type1_list_skin', 'de_type2_list_skin', 'de_type3_list_skin', 'de_type4_list_skin', 'de_type5_list_skin', 'de_mobile_type1_list_skin', 'de_mobile_type2_list_skin', 'de_mobile_type3_list_skin', 'de_mobile_type4_list_skin', 'de_mobile_type5_list_skin', 'de_rel_list_skin', 'de_mobile_rel_list_skin', 'de_search_list_skin', 'de_mobile_search_list_skin', 'de_listtype_list_skin', 'de_mobile_listtype_list_skin');
 
 foreach($check_skin_keys as $key){
-    $$key = $_POST[$key] = isset($_POST[$key]) ? preg_replace('#\.+(\/|\\\)#', '', strip_tags($_POST[$key])) : '';
+    $$key = $_POST[$key] = isset($_POST[$key]) ? preg_replace(array('#\.+(\/|\\\)#', '#[\'\"]#'), array('', ''), strip_tags($_POST[$key])) : '';
 
     if( isset($_POST[$key]) && preg_match('#\.+(\/|\\\)#', $_POST[$key]) ){
         alert('스킨설정에 유효하지 문자가 포함되어 있습니다.');
@@ -160,7 +160,8 @@ $check_sanitize_keys = array(
 'cf_lg_mid',                    //LG유플러스 상점아이디
 'cf_lg_mert_key',               //LG유플러스 MERT KEY
 'de_inicis_mid',                //KG이니시스 상점아이디
-'de_inicis_admin_key',          //KG이니시스 키패스워드
+'de_inicis_iniapi_key',         //KG이니시스 INIAPI KEY
+'de_inicis_iniapi_iv',          //KG이니시스 INIAPI IV
 'de_inicis_sign_key',           //KG이니시스 웹결제 사인키
 'de_samsung_pay_use',           //KG이니시스 삼성페이 사용
 'de_inicis_lpay_use',           //KG이니시스 Lpay 사용
@@ -399,7 +400,8 @@ $sql = " update {$g5['g5_shop_default_table']}
                 de_kcp_mid                    = '{$de_kcp_mid}',
                 de_kcp_site_key               = '{$de_kcp_site_key}',
                 de_inicis_mid                 = '{$de_inicis_mid}',
-                de_inicis_admin_key           = '{$de_inicis_admin_key}',
+                de_inicis_iniapi_key          = '{$de_inicis_iniapi_key}',
+                de_inicis_iniapi_iv           = '{$de_inicis_iniapi_iv}',
                 de_inicis_sign_key            = '{$de_inicis_sign_key}',
                 de_iche_use                   = '{$de_iche_use}',
                 de_sms_cont1                  = '{$_POST['de_sms_cont1']}',

adm/shop_admin/couponmember.php

@@ -45,7 +45,7 @@ $qstr1 = 'mb_name='.urlencode($mb_name);
     <form name="fmember" method="get">
     <div id="scp_list_find">
         <label for="mb_name">회원이름</label>
-        <input type="text" name="mb_name" id="mb_name" value="<?php echo get_text($mb_name); ?>" class="frm_input required" required size="20">
+        <input type="text" name="mb_name" id="mb_name" value="<?php echo get_text($mb_name); ?>" class="frm_input" size="20">
         <input type="submit" value="검색" class="btn_frmline">
     </div>
     <div class="tbl_head01 tbl_wrap new_win_con">

adm/shop_admin/index.php

@@ -112,7 +112,7 @@ function get_max_value($arr)
     return array_pop($arr);
 }
 ?>
-
+<?php if (! auth_check_menu($auth, '400400', 'r', true)) { ?>
 <div class="sidx">
     <section id="anc_sidx_ord">
         <h2>주문현황</h2>
@@ -368,6 +368,66 @@ function get_max_value($arr)
     </div>
 </section>
 
+<script>
+jQuery(function($) {
+    graph_draw();
+
+    $("#sidx_graph_area div").hover(
+        function() {
+            if($(this).is(":animated"))
+                return false;
+
+            var title = $(this).attr("title");
+            if(title && $(this).data("title") == undefined)
+                $(this).data("title", title);
+            var left = parseInt($(this).css("left")) + 10;
+            var bottom = $(this).height() + 5;
+
+            $(this)
+                .attr("title", "")
+                .append("<div id=\"price_tooltip\"><div></div></div>");
+            $("#price_tooltip")
+                .find("div")
+                .html(title)
+                .end()
+//                .css({ left: left+"px", bottom: bottom+"px" })
+                .show(200);
+        },
+        function() {
+            if($(this).is(":animated"))
+                return false;
+
+            $(this).attr("title", $(this).data("title"));
+            $("#price_tooltip").remove();
+        }
+    );
+});
+
+function graph_draw()
+{
+    var g_h1 = new Array("<?php echo implode('", "', $h_val['order']); ?>");
+    var g_h2 = new Array("<?php echo implode('", "', $h_val['cancel']); ?>");
+    var duration = 600;
+
+    var $el = $("#sidx_graph_area li");
+    var h1, h2;
+    var $g1, $g2;
+
+    $el.each(function(index) {
+        h1 = g_h1[index];
+        h2 = g_h2[index];
+
+        $g1 = $(this).find(".order");
+        $g2 = $(this).find(".cancel");
+
+        $g1.animate({ height: h1+"px" }, duration);
+        $g2.animate({ height: h2+"px" }, duration);
+    });
+}
+</script>
+
+<?php } //endif ?>
+<?php if ($is_admin === 'super') { ?>
 <div class="sidx sidx_cs">
     <section id="anc_sidx_oneq">
         <h2>1:1문의</h2>
@@ -480,64 +540,6 @@ function get_max_value($arr)
         </div>
     </section>
 </div>
-
-<script>
-$(function() {
-    graph_draw();
-
-    $("#sidx_graph_area div").hover(
-        function() {
-            if($(this).is(":animated"))
-                return false;
-
-            var title = $(this).attr("title");
-            if(title && $(this).data("title") == undefined)
-                $(this).data("title", title);
-            var left = parseInt($(this).css("left")) + 10;
-            var bottom = $(this).height() + 5;
-
-            $(this)
-                .attr("title", "")
-                .append("<div id=\"price_tooltip\"><div></div></div>");
-            $("#price_tooltip")
-                .find("div")
-                .html(title)
-                .end()
-//                .css({ left: left+"px", bottom: bottom+"px" })
-                .show(200);
-        },
-        function() {
-            if($(this).is(":animated"))
-                return false;
-
-            $(this).attr("title", $(this).data("title"));
-            $("#price_tooltip").remove();
-        }
-    );
-});
-
-function graph_draw()
-{
-    var g_h1 = new Array("<?php echo implode('", "', $h_val['order']); ?>");
-    var g_h2 = new Array("<?php echo implode('", "', $h_val['cancel']); ?>");
-    var duration = 600;
-
-    var $el = $("#sidx_graph_area li");
-    var h1, h2;
-    var $g1, $g2;
-
-    $el.each(function(index) {
-        h1 = g_h1[index];
-        h2 = g_h2[index];
-
-        $g1 = $(this).find(".order");
-        $g2 = $(this).find(".cancel");
-
-        $g1.animate({ height: h1+"px" }, duration);
-        $g2.animate({ height: h2+"px" }, duration);
-    });
-}
-</script>
-
 <?php
+}   //end if
 include_once (G5_ADMIN_PATH.'/admin.tail.php');

adm/shop_admin/itemcopyupdate.php

@@ -53,6 +53,7 @@ $opt_sql = " insert ignore into {$g5['g5_shop_item_option_table']} ( io_id, io_t
 sql_query($opt_sql);
 
 // html 에디터로 첨부된 이미지 파일 복사
+$copied_editor_images = array();
 if($cp['it_explan']) {
     $matchs = get_editor_image($cp['it_explan'], false);
     $count_matchs = (isset($matchs[1]) && is_array($matchs[1])) ? count($matchs[1]) : 0;
@@ -73,7 +74,13 @@ if($cp['it_explan']) {
 
             $newfile = preg_replace("/\.([^\.]+)$/", "_".$new_it_id.".\\1", $matchs[1][$i]);
             $cp['it_explan'] = str_replace($matchs[1][$i], $newfile, $cp['it_explan']);
+
+            $copied_editor_images[] = array(
+                'original' => $srcfile,
+                'new' => $dstfile
+            );
         }
+        
     }
 
     $sql = " update {$g5['g5_shop_item_table']} set it_explan = '".addslashes($cp['it_explan'])."' where it_id = '$new_it_id' ";
@@ -100,6 +107,11 @@ if($cp['it_mobile_explan']) {
 
             $newfile = preg_replace("/\.([^\.]+)$/", "_".$new_it_id.".\\1", $matchs[1][$i]);
             $cp['it_mobile_explan'] = str_replace($matchs[1][$i], $newfile, $cp['it_mobile_explan']);
+
+            $copied_editor_images[] = array(
+                'original' => $srcfile,
+                'new' => $dstfile
+            );
         }
     }
 
@@ -140,6 +152,7 @@ function copy_directory($src_dir, $dest_dir)
 }
 
 // 파일복사
+$copied_item_files = array();
 $dest_path = G5_DATA_PATH.'/item/'.$new_it_id;
 @mkdir($dest_path, G5_DIR_PERMISSION);
 @chmod($dest_path, G5_DIR_PERMISSION);
@@ -155,6 +168,11 @@ for($i=1; $i<=10; $i++) {
         copy($file, $dstfile);
         @chmod($dstfile, G5_FILE_PERMISSION);
         $new_img = $new_it_id.'/'.basename($file);
+
+        $copied_item_files[] = array(
+            'original' => $file,
+            'new' => $dstfile,
+        );
     }
 
     $sql_img .= $comma." it_img{$i} = '$new_img' ";
@@ -166,6 +184,24 @@ $sql = " update {$g5['g5_shop_item_table']}
             where it_id = '$new_it_id' ";
 sql_query($sql);
 
+if( function_exists('shop_seo_title_update') ) shop_seo_title_update($new_it_id, true);
+
+/**
+ * 아이템 복사 처리 후 Event Hook
+ * @var string $it_id 원본 아이템 ID
+ * @var string $new_it_id 복사한 새로운 아이템 ID
+ * @var array $cp 복사한 아이템 정보
+ * @var array $copied_item_files 복사한 파일 목록
+ * @var array $copied_editor_images 복사한 에디터 이미지 목록
+ */
+run_event('shop_admin_itemcopy', array(
+    'it_id' => (string) $it_id,
+    'new_it_id' => (string) $new_it_id,
+    'cp' => $cp,
+    'copied_item_files' => $copied_item_files,
+    'copied_editor_images' => $copied_editor_images
+));
+
 $qstr = "ca_id=$ca_id&amp;sfl=$sfl&amp;sca=$sca&amp;page=$page&amp;stx=".urlencode($stx);
 
 goto_url("itemlist.php?$qstr");

adm/shop_admin/itemeventformupdate.php

@@ -41,8 +41,8 @@ if ($ev_mimg_del)  @unlink(G5_DATA_PATH."/event/{$ev_id}_m");
 if ($ev_himg_del)  @unlink(G5_DATA_PATH."/event/{$ev_id}_h");
 if ($ev_timg_del)  @unlink(G5_DATA_PATH."/event/{$ev_id}_t");
 
-$ev_skin = preg_replace('#\.+(\/|\\\)#', '', $ev_skin);
-$ev_mobile_skin = preg_replace('#\.+(\/|\\\)#', '', $ev_mobile_skin);
+$ev_skin = preg_replace(array('#\.+(\/|\\\)#', '#[\'\"]#'), array('', ''), $ev_skin);
+$ev_mobile_skin = preg_replace(array('#\.+(\/|\\\)#', '#[\'\"]#'), array('', ''), $ev_mobile_skin);
 
 $skin_regex_patten = "^list.[0-9]+\.skin\.php";
 
@@ -75,6 +75,7 @@ if ($w == "")
                     $sql_common
                   , ev_id = '$ev_id' ";
     sql_query($sql);
+    run_event('shop_admin_event_created', $ev_id);
 }
 else if ($w == "u")
 {
@@ -82,6 +83,7 @@ else if ($w == "u")
                 $sql_common
               where ev_id = '$ev_id' ";
     sql_query($sql);
+    run_event('shop_admin_event_updated', $ev_id);
 }
 else if ($w == "d")
 {
@@ -92,6 +94,7 @@ else if ($w == "d")
     // 이벤트상품삭제
     $sql = " delete from {$g5['g5_shop_event_item_table']} where ev_id = '$ev_id' ";
     sql_query($sql);
+    run_event('shop_admin_event_deleted', $ev_id);
 
     $sql = " delete from {$g5['g5_shop_event_table']} where ev_id = '$ev_id' ";
     sql_query($sql);

adm/shop_admin/itemform.php

@@ -112,6 +112,8 @@ else if ($w == "u")
 
     if(!$it)
         alert('상품정보가 존재하지 않습니다.');
+    
+    if (function_exists('check_case_exist_title')) check_case_exist_title($it, G5_SHOP_DIR, false);
 
     if (! (isset($ca_id) && $ca_id))
         $ca_id = $it['ca_id'];

adm/shop_admin/itemformupdate.php

@@ -285,8 +285,8 @@ if($supply_count) {
 $value_array = array();
 $count_ii_article = (isset($_POST['ii_article']) && is_array($_POST['ii_article'])) ? count($_POST['ii_article']) : 0;
 for($i=0; $i<$count_ii_article; $i++) {
-    $key = isset($_POST['ii_article'][$i]) ? strip_tags($_POST['ii_article'][$i], '<br><span><strong><b>') : '';
-    $val = isset($_POST['ii_value'][$i]) ? strip_tags($_POST['ii_value'][$i], '<br><span><strong><b>') : '';
+    $key = isset($_POST['ii_article'][$i]) ? html_purifier($_POST['ii_article'][$i]) : '';
+    $val = isset($_POST['ii_value'][$i]) ? html_purifier($_POST['ii_value'][$i]) : '';
     $value_array[$key] = $val;
 }
 $it_info_value = addslashes(serialize($value_array));

adm/shop_admin/itemlist.php

@@ -4,6 +4,10 @@ include_once('./_common.php');
 
 auth_check_menu($auth, $sub_menu, "r");
 
+if (isset($sfl) && $sfl && !in_array($sfl, array('it_name','it_id','it_maker','it_brand','it_model','it_origin','it_sell_email'))) {
+    $sfl = '';
+}
+
 $g5['title'] = '상품관리';
 include_once (G5_ADMIN_PATH.'/admin.head.php');
 

adm/shop_admin/itemqaformupdate.php

@@ -19,6 +19,7 @@ if ($w == "u")
                    iq_answer = '$iq_answer'
              where iq_id = '$iq_id' ";
     sql_query($sql);
+    run_event('shop_admin_item_qa_updated', $iq_id);
 
     if(trim($iq_answer)) {
         $sql = " select a.iq_email, a.iq_hp, b.it_name

adm/shop_admin/itemqalist.php

@@ -4,6 +4,10 @@ include_once('./_common.php');
 
 auth_check_menu($auth, $sub_menu, "r");
 
+if (isset($sfl) && $sfl && !in_array($sfl, array('it_name','a.it_id'))) {
+    $sfl = '';
+}
+
 $g5['title'] = '상품문의';
 include_once (G5_ADMIN_PATH.'/admin.head.php');
 

adm/shop_admin/itemqalistupdate.php

@@ -23,6 +23,7 @@ if ($_POST['act_button'] == "선택삭제") {
 
         $sql = "delete from {$g5['g5_shop_item_qa_table']} where iq_id = '{$iiq_id}' ";
         sql_query($sql);
+        run_event('shop_admin_item_qa_deleted', $iiq_id);
     }
 }
 

adm/shop_admin/itemuseformupdate.php

@@ -34,6 +34,7 @@ if ($w == "u")
                    is_reply_name = '".$member['mb_nick']."'
              where is_id = '".$posts['is_id']."'";
     sql_query($sql);
+    run_event('shop_admin_item_use_updated', $posts['is_id']);
 
     if( isset($_POST['it_id']) ) {
         update_use_cnt($_POST['it_id']);

adm/shop_admin/itemuselist.php

@@ -4,6 +4,10 @@ include_once('./_common.php');
 
 auth_check_menu($auth, $sub_menu, "r");
 
+if (isset($sfl) && $sfl && !in_array($sfl, array('it_name','a.it_id','is_name'))) {
+    $sfl = '';
+}
+
 $g5['title'] = '사용후기';
 include_once (G5_ADMIN_PATH.'/admin.head.php');
 

adm/shop_admin/itemuselistupdate.php

@@ -40,6 +40,7 @@ for ($i=0; $i<$count_post_chk; $i++)
     {
         $sql = "delete from {$g5['g5_shop_item_use_table']} where is_id = '{$iis_id}' ";
         sql_query($sql);
+        run_event('shop_admin_item_use_deleted', $iis_id);
     }
     
     if($iit_id){

adm/shop_admin/orderformcartupdate.php

@@ -222,46 +222,27 @@ if (in_array($_POST['ct_status'], $status_cancel)) {
                         break;
                     case 'inicis':
                         include_once(G5_SHOP_PATH.'/settle_inicis.inc.php');
-                        $cancel_msg = iconv_euckr('쇼핑몰 운영자 승인 취소');
+                        $cancel_msg = '쇼핑몰 운영자 승인 취소';
+                        
+                        $args = array(
+                            'paymethod' => get_type_inicis_paymethod($od['od_settle_case']),
+                            'tid' => $od['od_tno'],
+                            'msg' => $cancel_msg
+                        );
 
-                        /*********************
-                         * 3. 취소 정보 설정 *
-                         *********************/
-                        $inipay->SetField("type",      "cancel");                        // 고정 (절대 수정 불가)
-                        $inipay->SetField("mid",       $default['de_inicis_mid']);       // 상점아이디
-                        /**************************************************************************************************
-                         * admin 은 키패스워드 변수명입니다. 수정하시면 안됩니다. 1111의 부분만 수정해서 사용하시기 바랍니다.
-                         * 키패스워드는 상점관리자 페이지(https://iniweb.inicis.com)의 비밀번호가 아닙니다. 주의해 주시기 바랍니다.
-                         * 키패스워드는 숫자 4자리로만 구성됩니다. 이 값은 키파일 발급시 결정됩니다.
-                         * 키패스워드 값을 확인하시려면 상점측에 발급된 키파일 안의 readme.txt 파일을 참조해 주십시오.
-                         **************************************************************************************************/
-                        $inipay->SetField("admin",     $default['de_inicis_admin_key']); //비대칭 사용키 키패스워드
-                        $inipay->SetField("tid",       $od['od_tno']);                   // 취소할 거래의 거래아이디
-                        $inipay->SetField("cancelmsg", $cancel_msg);                     // 취소사유
+                        $response = inicis_tid_cancel($args);
+                        $result = json_decode($response, true);
 
-                        /****************
-                         * 4. 취소 요청 *
-                         ****************/
-                        $inipay->startAction();
-
-                        /****************************************************************
-                         * 5. 취소 결과                                           	*
-                         *                                                        	*
-                         * 결과코드 : $inipay->getResult('ResultCode') ("00"이면 취소 성공)  	*
-                         * 결과내용 : $inipay->getResult('ResultMsg') (취소결과에 대한 설명) 	*
-                         * 취소날짜 : $inipay->getResult('CancelDate') (YYYYMMDD)          	*
-                         * 취소시각 : $inipay->getResult('CancelTime') (HHMMSS)            	*
-                         * 현금영수증 취소 승인번호 : $inipay->getResult('CSHR_CancelNum')    *
-                         * (현금영수증 발급 취소시에만 리턴됨)                          *
-                         ****************************************************************/
-
-                        $res_cd  = $inipay->getResult('ResultCode');
-                        $res_msg = $inipay->getResult('ResultMsg');
-
-                        if($res_cd != '00') {
-                            $pg_res_cd = $res_cd;
-                            $pg_res_msg = iconv_utf8($res_msg);
+                        if (isset($result['resultCode'])) {
+                            if ($result['resultCode'] != '00') {
+                                $pg_res_cd = $result['resultCode'];
+                                $pg_res_msg = $result['resultMsg'];
+                            }
+                        } else {
+                            $pg_res_cd = '';
+                            $pg_res_msg = 'curl 로 데이터를 받지 못했습니다.';
                         }
+
                         break;
                     case 'KAKAOPAY':
                         include_once(G5_SHOP_PATH.'/settle_kakaopay.inc.php');

adm/shop_admin/orderlist.php

@@ -222,7 +222,7 @@ if( function_exists('pg_setting_check') ){
     <input type="radio" name="od_settle_case" value="신용카드" id="od_settle_case06" <?php echo get_checked($od_settle_case, '신용카드');  ?>>
     <label for="od_settle_case06">신용카드</label>
     <input type="radio" name="od_settle_case" value="간편결제" id="od_settle_case07" <?php echo get_checked($od_settle_case, '간편결제');  ?>>
-    <label for="od_settle_case07" data-tooltip-text="NHN_KCP 간편결제 : PAYCO, 네이버페이, 카카오페이(NHN_KCP) &#xa;LG유플러스 간편결제 : PAYNOW &#xa;KG 이니시스 간편결제 : KPAY, 삼성페이, LPAY, 카카오페이(KG이니시스)">PG간편결제</label>
+    <label for="od_settle_case07" data-tooltip-text="NHN_KCP 간편결제 : PAYCO, 네이버페이, 카카오페이(NHN_KCP), 애플페이(NHN_KCP) &#xa;LG유플러스 간편결제 : PAYNOW &#xa;KG 이니시스 간편결제 : KPAY, 삼성페이, LPAY, 카카오페이(KG이니시스)">PG간편결제</label>
     <input type="radio" name="od_settle_case" value="KAKAOPAY" id="od_settle_case08" <?php echo get_checked($od_settle_case, 'KAKAOPAY');  ?>>
     <label for="od_settle_case08">KAKAOPAY</label>
 </div>

adm/sms_admin/num_book_write.php

@@ -33,7 +33,16 @@ if ($w == 'u' && is_numeric($bk_no)) {
     $g5['title'] .= '수정';
 }
 else  {
-    $write = array('bg_no' => (int) $bg_no);
+    $write = array(
+        'bg_no' => (int) $bg_no,
+        'bk_no' => 0,
+        'mb_id' => '',
+        'bk_name' => '',
+        'bk_hp' => '',
+        'bk_memo' => '',
+        'bk_receipt' => 1,
+        'bk_datetime' => ''
+    );
     $g5['title'] .= '추가';
 }
 

adm/sms_admin/number_move_update.php

@@ -71,18 +71,16 @@ if( count($save_group) ){ //그룹테이블 업데이트
 
 $msg = '해당 번호를 선택한 그룹으로 '.$act.' 하였습니다.';
 $opener_href = './num_book.php?page='.$page;
-
-echo <<<HEREDOC
+?>
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
 <script>
-alert("$msg");
-opener.document.location.href = "$opener_href";
+alert("<?php echo $msg; ?>");
+opener.document.location.href = "<?php echo $opener_href; ?>";
 window.close();
 </script>
 <noscript>
 <p>
-    "$msg"
+    <?php echo $msg; ?>
 </p>
-<a href="$opener_href">돌아가기</a>
-</noscript>
-HEREDOC;
+<a href="<?php echo $opener_href; ?>">돌아가기</a>
+</noscript>

adm/view.php

@@ -16,13 +16,13 @@ if( ! $is_admin ){
 	}
 }
 
-run_event('admin_request_handler_'.$call, $arr_query, $token);
-
 $sub_menu = admin_menu_find_by($call, 'sub_menu');
 $g5['title'] = admin_menu_find_by($call, 'title');
 
+run_event('admin_request_handler_'.$call, $arr_query, $token);
+
 include_once ('./admin.head.php');
 
 run_event('admin_get_page_'.$call, $arr_query, $token);
 
-include_once ('./admin.tail.php');
+include_once ('./admin.tail.php');

bbs/board_head.php

@@ -5,7 +5,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 if (G5_IS_MOBILE) {
     // 모바일의 경우 설정을 따르지 않는다.
     include_once(G5_BBS_PATH.'/_head.php');
-    echo html_purifier(stripslashes($board['bo_mobile_content_head']));
+    echo run_replace('board_mobile_content_head', html_purifier(stripslashes($board['bo_mobile_content_head'])), $board);
 } else {
     // 상단 파일 경로를 입력하지 않았다면 기본 상단 파일도 include 하지 않음
     if (trim($board['bo_include_head'])) {
@@ -15,5 +15,5 @@ if (G5_IS_MOBILE) {
             include_once(G5_BBS_PATH.'/_head.php');
         }
     }
-    echo html_purifier(stripslashes($board['bo_content_head']));
+    echo run_replace('board_content_head', html_purifier(stripslashes($board['bo_content_head'])), $board);
 }

bbs/board_tail.php

@@ -3,11 +3,11 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 
 // 게시판 관리의 하단 파일 경로
 if (G5_IS_MOBILE) {
-    echo html_purifier(stripslashes($board['bo_mobile_content_tail']));
+    echo run_replace('board_mobile_content_tail', html_purifier(stripslashes($board['bo_mobile_content_tail'])), $board);
     // 모바일의 경우 설정을 따르지 않는다.
     include_once(G5_BBS_PATH.'/_tail.php');
 } else {
-    echo html_purifier(stripslashes($board['bo_content_tail']));
+    echo run_replace('board_content_tail', html_purifier(stripslashes($board['bo_content_tail'])), $board);
     // 하단 파일 경로를 입력하지 않았다면 기본 하단 파일도 include 하지 않음
     if (trim($board['bo_include_tail'])) {
         if (is_include_path_check($board['bo_include_tail'])) {  //파일경로 체크

bbs/content.php

@@ -81,20 +81,20 @@ $content_skin_url  = get_skin_url('content', $co['co_skin']);
 $skin_file = $content_skin_path.'/content.skin.php';
 
 if ($is_admin)
-    echo '<div class="ctt_admin"><a href="'.G5_ADMIN_URL.'/contentform.php?w=u&amp;co_id='.$co_id.'" class="btn_admin btn"><span class="sound_only">내용 수정</span><i class="fa fa-cog fa-spin fa-fw"></i></a></div>';
+    echo run_replace('content_admin_button_html', '<div class="ctt_admin"><a href="'.G5_ADMIN_URL.'/contentform.php?w=u&amp;co_id='.$co_id.'" class="btn_admin btn"><span class="sound_only">내용 수정</span><i class="fa fa-cog fa-spin fa-fw"></i></a></div>', $co);
 ?>
 
 <?php
 if(is_file($skin_file)) {
     $himg = G5_DATA_PATH.'/content/'.$co_id.'_h';
     if (file_exists($himg)) // 상단 이미지
-        echo '<div id="ctt_himg" class="ctt_img"><img src="'.G5_DATA_URL.'/content/'.$co_id.'_h" alt=""></div>';
+        echo run_replace('content_head_image_html', '<div id="ctt_himg" class="ctt_img"><img src="'.G5_DATA_URL.'/content/'.$co_id.'_h" alt=""></div>', $co);
 
     include($skin_file);
 
     $timg = G5_DATA_PATH.'/content/'.$co_id.'_t';
     if (file_exists($timg)) // 하단 이미지
-        echo '<div id="ctt_timg" class="ctt_img"><img src="'.G5_DATA_URL.'/content/'.$co_id.'_t" alt=""></div>';
+        echo run_replace('content_tail_image_html', '<div id="ctt_timg" class="ctt_img"><img src="'.G5_DATA_URL.'/content/'.$co_id.'_t" alt=""></div>', $co);
 } else {
     echo '<p>'.str_replace(G5_PATH.'/', '', $skin_file).'이 존재하지 않습니다.</p>';
 }

bbs/faq.php

@@ -17,13 +17,15 @@ while ($row=sql_fetch_array($result))
     $faq_master_list[$key] = $row;
 }
 
+$fm = array();
 if (isset($fm_id) && $fm_id){
     $fm_id = (int) $fm_id;
     $qstr .= '&fm_id=' . $fm_id; // 마스터faq key_id
+
+    $fm = $faq_master_list[$fm_id];
 }
 
-$fm = $faq_master_list[$fm_id];
-if (!$fm['fm_id'])
+if (! (isset($fm['fm_id']) && $fm['fm_id']))
     alert('등록된 내용이 없습니다.');
 
 $g5['title'] = $fm['fm_subject'];

bbs/good.php

@@ -62,7 +62,7 @@ if(isset($_POST['js']) && $_POST['js'] === "on") {
                     and mb_id = '{$member['mb_id']}'
                     and bg_flag in ('good', 'nogood') ";
         $row = sql_fetch($sql);
-        if ($row['bg_flag'])
+        if (isset($row['bg_flag']) && $row['bg_flag'])
         {
             if ($row['bg_flag'] == 'good')
                 $status = '추천';
@@ -127,7 +127,7 @@ if(isset($_POST['js']) && $_POST['js'] === "on") {
                     and mb_id = '{$member['mb_id']}'
                     and bg_flag in ('good', 'nogood') ";
         $row = sql_fetch($sql);
-        if ($row['bg_flag'])
+        if (isset($row['bg_flag']) && $row['bg_flag'])
         {
             if ($row['bg_flag'] == 'good')
                 $status = '추천';

bbs/list.php

@@ -104,6 +104,13 @@ if (!$is_search_bbs) {
 
         $list[$i] = get_list($row, $board, $board_skin_url, G5_IS_MOBILE ? $board['bo_mobile_subject_len'] : $board['bo_subject_len']);
         $list[$i]['is_notice'] = true;
+        $list[$i]['list_content'] = $list[$i]['wr_content'];
+
+        // 비밀글인 경우 리스트에서 내용이 출력되지 않게 글 내용을 지웁니다. 
+        if (strstr($list[$i]['wr_option'], "secret")) {
+            $list[$i]['wr_content'] = '';
+        }
+
         $list[$i]['num'] = 0;
         $i++;
         $notice_count++;
@@ -197,6 +204,13 @@ if($page_rows > 0) {
             $list[$i]['subject'] = search_font($stx, $list[$i]['subject']);
         }
         $list[$i]['is_notice'] = false;
+        $list[$i]['list_content'] = $list[$i]['wr_content'];
+
+        // 비밀글인 경우 리스트에서 내용이 출력되지 않게 글 내용을 지웁니다. 
+        if (strstr($list[$i]['wr_option'], "secret")) {
+            $list[$i]['wr_content'] = '';
+        }
+
         $list_num = $total_count - ($page - 1) * $list_page_rows - $notice_count;
         $list[$i]['num'] = $list_num - $k;
 

bbs/login_check.php

@@ -62,10 +62,18 @@ run_event('login_session_before', $mb, $is_social_login);
 
 @include_once($member_skin_path.'/login_check.skin.php');
 
+if (! (defined('SKIP_SESSION_REGENERATE_ID') && SKIP_SESSION_REGENERATE_ID)) {
+    session_regenerate_id(false);
+    if (function_exists('session_start_samesite')) {
+        session_start_samesite();
+    }
+}
+
 // 회원아이디 세션 생성
 set_session('ss_mb_id', $mb['mb_id']);
-// FLASH XSS 공격에 대응하기 위하여 회원의 고유키를 생성해 놓는다. 관리자에서 검사함 - 110106
-set_session('ss_mb_key', md5($mb['mb_datetime'] . get_real_client_ip() . $_SERVER['HTTP_USER_AGENT']));
+// FLASH XSS 공격에 대응하기 위하여 회원의 고유키를 생성해 놓는다. 관리자에서 검사함
+generate_mb_key($mb);
+
 // 회원의 토큰키를 세션에 저장한다. /common.php 에서 해당 회원의 토큰값을 검사한다.
 if(function_exists('update_auth_session_token')) update_auth_session_token($mb['mb_datetime']);
 

bbs/logout.php

@@ -19,7 +19,11 @@ if ($url) {
     if ( substr($url, 0, 2) == '//' )
         $url = 'http:' . $url;
 
-    $p = @parse_url(urldecode($url));
+    if (preg_match('#\\\0#', $url) || preg_match('/^\/{1,}\\\/', $url)) {
+        alert('url 에 올바르지 않은 값이 포함되어 있습니다.', G5_URL);
+    }
+
+    $p = @parse_url(urldecode(str_replace('\\', '', $url)));
     /*
         // OpenRediect 취약점관련, PHP 5.3 이하버전에서는 parse_url 버그가 있음 ( Safflower 님 제보 ) 아래 url 예제
         // http://localhost/bbs/logout.php?url=http://sir.kr%23@/

bbs/move_update.php

@@ -49,7 +49,9 @@ while ($row = sql_fetch_array($result))
         $count_write = 0;
         $count_comment = 0;
 
-        $next_wr_num = get_next_num($move_write_table);
+        // get_next_num 함수는 mysql 지연시 중복이 될수 있는 문제로 더 이상 사용하지 않습니다.
+        // $next_wr_num = get_next_num($move_write_table);
+        $next_wr_num = 0;
 
         $sql2 = " select * from $write_table where wr_num = '$wr_num' order by wr_parent, wr_is_comment, wr_comment desc, wr_id ";
         $result2 = sql_query($sql2);
@@ -78,7 +80,7 @@ while ($row = sql_fetch_array($result))
             }
 
             $sql = " insert into $move_write_table
-                        set wr_num = '$next_wr_num',
+                        set wr_num = " . ($next_wr_num ? "'$next_wr_num'" : "(SELECT IFNULL(MIN(wr_num) - 1, -1) FROM $move_write_table sq) ") . ",
                              wr_reply = '{$row2['wr_reply']}',
                              wr_is_comment = '{$row2['wr_is_comment']}',
                              wr_comment = '{$row2['wr_comment']}',
@@ -116,6 +118,11 @@ while ($row = sql_fetch_array($result))
             sql_query($sql);
 
             $insert_id = sql_insert_id();
+            
+            if ($next_wr_num === 0) {
+                $tmp = sql_fetch("select wr_num from $move_write_table where wr_id = '$insert_id'");
+                $next_wr_num = $tmp['wr_num'];
+            }
 
             // 코멘트가 아니라면
             if (!$row2['wr_is_comment'])
@@ -126,6 +133,8 @@ while ($row = sql_fetch_array($result))
                 $result3 = sql_query($sql3);
                 for ($k=0; $row3 = sql_fetch_array($result3); $k++)
                 {
+                    $copy_file_name = '';
+                    
                     if ($row3['bf_file'])
                     {
                         // 원본파일을 복사하고 퍼미션을 변경

bbs/qadelete.php

@@ -15,6 +15,7 @@ if (!($token && $delete_token === $token))
     alert('토큰 에러로 삭제 불가합니다.');
 
 $tmp_array = array();
+$deleted = array();
 if ($qa_id) // 건별삭제
     $tmp_array[0] = $qa_id;
 else // 일괄삭제
@@ -56,21 +57,23 @@ for($i=0; $i<$count; $i++) {
     delete_editor_thumbnail($row['qa_content']);
 
     // 답변이 있는 질문글이라면 답변글 삭제
-    if(!$row['qa_type'] && $row['qa_status']) {
-        $row2 = sql_fetch(" select qa_content, qa_file1, qa_file2 from {$g5['qa_content_table']} where qa_parent = '$qa_id' ");
+    if (!$row['qa_type'] && $row['qa_status']) {
+        $answer = sql_fetch(" SELECT qa_id, qa_content, qa_file1, qa_file2 from {$g5['qa_content_table']} where qa_type = 1 AND qa_parent = {$qa_id} ");
         // 첨부파일 삭제
-        for($k=1; $k<=2; $k++) {
-            @unlink(G5_DATA_PATH.'/qa/'.clean_relative_paths($row2['qa_file'.$k]));
+        for ($k = 1; $k <= 2; $k++) {
+            @unlink(G5_DATA_PATH . '/qa/' . clean_relative_paths($answer['qa_file' . $k]));
             // 썸네일삭제
-            if(preg_match("/\.({$config['cf_image_extension']})$/i", $row2['qa_file'.$k])) {
-                delete_qa_thumbnail($row2['qa_file'.$k]);
+            if (preg_match("/\.({$config['cf_image_extension']})$/i", $answer['qa_file' . $k])) {
+                delete_qa_thumbnail($answer['qa_file' . $k]);
             }
         }
 
         // 에디터 썸네일 삭제
-        delete_editor_thumbnail($row2['qa_content']);
+        delete_editor_thumbnail($answer['qa_content']);
 
-        sql_query(" delete from {$g5['qa_content_table']} where qa_type = '1' and qa_parent = '$qa_id' ");
+        // 답변글 삭제
+        sql_query(" DELETE from {$g5['qa_content_table']} where qa_type = 1 and qa_parent = {$qa_id} ");
+        $deleted[] = (int) $answer['qa_id'];
     }
 
     // 답변글 삭제시 질문글의 상태변경
@@ -80,6 +83,14 @@ for($i=0; $i<$count; $i++) {
 
     // 글삭제
     sql_query(" delete from {$g5['qa_content_table']} where qa_id = '$qa_id' ");
+    $deleted[] = $qa_id;
 }
 
+/**
+ * QA 글 삭제 후 Event Hook
+ * @var array $tmp_array 삭제 요청된 qa_id 목록. 소유자 확인, 답변글 존재 여부 등의 이유로 실제로 삭제처리가 안 된 ID가 포함될 수 있으며, 삭제처리 되었더라도 답변글은 이 목록에 포함되지 않음
+ * @var array $deleted 답변글을 포함한 삭제가 완료된 qa_id 목록
+ */
+run_event('qa_delete', $tmp_array, $deleted);
+
 goto_url(G5_BBS_URL.'/qalist.php'.preg_replace('/^&amp;/', '?', $qstr));

bbs/qahead.php

@@ -7,11 +7,11 @@ $qa_skin_url  = get_skin_url('qa', (G5_IS_MOBILE ? $qaconfig['qa_mobile_skin'] :
 if (G5_IS_MOBILE) {
     // 모바일의 경우 설정을 따르지 않는다.
     include_once('./_head.php');
-    echo conv_content($qaconfig['qa_mobile_content_head'], 1);
+    echo run_replace('qa_mobile_content_head', conv_content($qaconfig['qa_mobile_content_head'], 1), $qaconfig);
 } else {
     if($qaconfig['qa_include_head'] && is_include_path_check($qaconfig['qa_include_head']))
         @include ($qaconfig['qa_include_head']);
     else
         include ('./_head.php');
-    echo conv_content($qaconfig['qa_content_head'], 1);
+    echo run_replace('qa_content_head', conv_content($qaconfig['qa_content_head'], 1), $qaconfig);
 }

bbs/qatail.php

@@ -2,11 +2,11 @@
 if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 
 if (G5_IS_MOBILE) {
-    echo conv_content($qaconfig['qa_mobile_content_tail'], 1);
+    echo run_replace('qa_mobile_content_tail', conv_content($qaconfig['qa_mobile_content_tail'], 1), $qaconfig);
     // 모바일의 경우 설정을 따르지 않는다.
     include_once('./_tail.php');
 } else {
-    echo conv_content($qaconfig['qa_content_tail'], 1);
+    echo run_replace('qa_content_tail', conv_content($qaconfig['qa_content_tail'], 1), $qaconfig);
     if($qaconfig['qa_include_tail'] && is_include_path_check($qaconfig['qa_include_tail']))
         @include ($qaconfig['qa_include_tail']);
     else

bbs/qaview.php

@@ -135,6 +135,32 @@ if(is_file($skin_file)) {
             $answer_update_href = G5_BBS_URL.'/qawrite.php?w=u&qa_id='.$answer['qa_id'].$qstr;
             $answer_delete_href = G5_BBS_URL.'/qadelete.php?qa_id='.$answer['qa_id'].'&token='.$token.$qstr;
         }
+
+        $ss_name = 'ss_qa_view_'.$answer['qa_id'];
+        if(!get_session($ss_name))
+            set_session($ss_name, TRUE);
+
+        // 답변 첨부파일
+        $answer['img_file'] = array();
+        $answer['download_href'] = array();
+        $answer['download_source'] = array();
+        $answer['img_count'] = 0;
+        $answer['download_count'] = 0;
+
+        for ($i=1; $i<=2; $i++) {
+            if(preg_match("/\.({$config['cf_image_extension']})$/i", $answer['qa_file'.$i])) {
+                $attr_href = run_replace('thumb_view_image_href', G5_BBS_URL.'/view_image.php?fn='.urlencode('/'.G5_DATA_DIR.'/qa/'.$answer['qa_file'.$i]), '/'.G5_DATA_DIR.'/qa/'.$answer['qa_file'.$i], '', '', '', '');
+                $answer['img_file'][] = '<a href="'.$attr_href.'" target="_blank" class="view_image"><img src="'.G5_DATA_URL.'/qa/'.$answer['qa_file'.$i].'"></a>';
+                $answer['img_count']++;
+                continue;
+            }
+
+            if ($answer['qa_file'.$i]) {
+                $answer['download_href'][] = G5_BBS_URL.'/qadownload.php?qa_id='.$answer['qa_id'].'&amp;no='.$i;
+                $answer['download_source'][] = $answer['qa_source'.$i];
+                $answer['download_count']++;
+            }
+        }
     }
 
     $stx = get_text(stripslashes($stx));

bbs/qawrite_update.php

@@ -86,6 +86,7 @@ $qa_related = 0;
 $qa_email_recv = (isset($_POST['qa_email_recv']) && $_POST['qa_email_recv']) ? 1 : 0;
 $qa_sms_recv = (isset($_POST['qa_sms_recv']) && $_POST['qa_sms_recv']) ? 1 : 0;
 $qa_status = 0;
+$answer_id = null;
 
 for ($i=1; $i<=5; $i++) {
     $var = "qa_$i";
@@ -301,6 +302,7 @@ if($w == '' || $w == 'a' || $w == 'r') {
     }
 
     if($w == 'a') {
+        $answer_id = (int) sql_insert_id();
         $sql = " update {$g5['qa_content_table']}
                     set qa_status = '1'
                     where qa_id = '{$write['qa_parent']}' ";
@@ -339,7 +341,15 @@ if($w == '' || $w == 'a' || $w == 'r') {
     sql_query($sql);
 }
 
-run_event('qawrite_update', $qa_id, $write, $w, $qaconfig);
+/**
+ * 1:1 문의/답변의 변경 시 Event Hook
+ * @var int $qa_id 삽입/수정 또는 답글/추가질문 대상 글의 ID
+ * @var array $write 삽입/수정 또는 답글/추가질문 대상 글의 데이터
+ * @var string $w 동작 모드 ('': 질문글 작성, 'a': 답변글 작성, 'u': 질문/답변 수정, 'r': 추가(관련) 질문)
+ * @var array $qaconfig 1:1 문의 설정
+ * @var ?int $answer_id 답변글 작성($w = 'a') 시 답변글의 ID
+*/
+run_event('qawrite_update', $qa_id, $write, $w, $qaconfig, ($w === 'a') ? $answer_id : null);
 
 // SMS 알림
 if($config['cf_sms_use'] == 'icode' && $qaconfig['qa_use_sms']) {

bbs/rss.php

@@ -49,9 +49,7 @@ echo '<?xml version="1.0" encoding="utf-8" ?>'."\n";
 <channel>
 <title><?php echo specialchars_replace($config['cf_title'].' &gt; '.$subj1.' &gt; '.$subj2); ?></title>
 <link><?php echo specialchars_replace(get_pretty_url($bo_table)); ?></link>
-<description>테스트 버전 0.2 (2004-04-26)</description>
 <language>ko</language>
-
 <?php
 $sql = " select wr_id, wr_subject, wr_content, wr_name, wr_datetime, wr_option
             from {$g5['write_prefix']}$bo_table
@@ -66,6 +64,10 @@ for ($i=0; $row=sql_fetch_array($result); $i++) {
         $html = 1;
     else
         $html = 0;
+
+if ($i === 0) {
+    echo '<description>'. specialchars_replace($subj2). ' ('. $row['wr_datetime'] .')</description>'.PHP_EOL;
+}
 ?>
 
 <item>
@@ -76,8 +78,8 @@ for ($i=0; $row=sql_fetch_array($result); $i++) {
 <?php
 $date = $row['wr_datetime'];
 // rss 리더 스킨으로 호출하면 날짜가 제대로 표시되지 않음
-//$date = substr($date,0,10) . "T" . substr($date,11,8) . "+09:00";
-$date = date('r', strtotime($date));
+$date = substr($date,0,10) . "T" . substr($date,11,8) . "+09:00";
+//$date = date('r', strtotime($date));  // 구글 서치 콘솔에서 오류가 난다
 ?>
 <dc:date><?php echo $date ?></dc:date>
 </item>

bbs/search.php

@@ -25,7 +25,7 @@ if ($stx) {
     $sql = " select gr_id, bo_table, bo_read_level from {$g5['board_table']} where bo_use_search = 1 and bo_list_level <= '{$member['mb_level']}' ";
     if ($gr_id)
         $sql .= " and gr_id = '{$gr_id}' ";
-    $onetable = isset($onetable) ? $onetable : "";
+    $onetable = isset($onetable) ? preg_replace('/[^a-z0-9_]/i', '', $onetable) : '';
     if ($onetable) // 하나의 게시판만 검색한다면
         $sql .= " and bo_table = '{$onetable}' ";
     $sql .= " order by bo_order, gr_id, bo_table ";

bbs/view.php

@@ -1,6 +1,8 @@
 <?php
 if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 
+if (function_exists('check_case_exist_title')) check_case_exist_title($write, G5_BBS_DIR, true);
+
 // 게시판에서 두단어 이상 검색 후 검색된 게시물에 코멘트를 남기면 나오던 오류 수정
 $sop = strtolower($sop);
 if ($sop != 'and' && $sop != 'or')

bbs/write_update.php

@@ -252,12 +252,14 @@ if ($w == '' || $w == 'r') {
         $wr_num = $write['wr_num'];
         $wr_reply = $reply;
     } else {
-        $wr_num = get_next_num($write_table);
+        // get_next_num 함수는 mysql 지연시 중복이 될수 있는 문제로 더 이상 사용하지 않습니다.
+        // $wr_num = get_next_num($write_table);
+        $wr_num = 0;
         $wr_reply = '';
     }
-
+    
     $sql = " insert into $write_table
-                set wr_num = '$wr_num',
+                set wr_num = " . ($w == 'r' ? "'$wr_num'" : "(SELECT IFNULL(MIN(wr_num) - 1, -1) FROM $write_table as sq) ") . ",
                      wr_reply = '$wr_reply',
                      wr_comment = 0,
                      ca_name = '$ca_name',
@@ -676,8 +678,14 @@ sql_query(" delete from {$g5['autosave_table']} where as_uid = '{$uid}' ");
 //------------------------------------------------------------------------------
 
 // 비밀글이라면 세션에 비밀글의 아이디를 저장한다. 자신의 글은 다시 비밀번호를 묻지 않기 위함
-if ($secret)
+if ($secret) {
+    if (! $wr_num) {
+        $write = get_write($write_table, $wr_id, true);
+        $wr_num = $write['wr_num'];
+    }
+
     set_session("ss_secret_{$bo_table}_{$wr_num}", TRUE);
+}
 
 // 메일발송 사용 (수정글은 발송하지 않음)
 if (!($w == 'u' || $w == 'cu') && $config['cf_email_use'] && $board['bo_use_email']) {

common.php

@@ -62,6 +62,11 @@ if(! isset($_SERVER['SERVER_ADDR'])) {
     $_SERVER['SERVER_ADDR'] = isset($_SERVER['LOCAL_ADDR']) ? $_SERVER['LOCAL_ADDR'] : '';
 }
 
+// Cloudflare 환경을 고려한 https 사용여부
+if (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] === "https") {
+    $_SERVER['HTTPS'] = 'on';
+}
+
 // multi-dimensional array에 사용자지정 함수적용
 function array_map_deep($fn, $array)
 {
@@ -221,7 +226,12 @@ ini_set("session.gc_maxlifetime", 10800); // session data의 garbage collection
 ini_set("session.gc_probability", 1); // session.gc_probability는 session.gc_divisor와 연계하여 gc(쓰레기 수거) 루틴의 시작 확률을 관리합니다. 기본값은 1입니다. 자세한 내용은 session.gc_divisor를 참고하십시오.
 ini_set("session.gc_divisor", 100); // session.gc_divisor는 session.gc_probability와 결합하여 각 세션 초기화 시에 gc(쓰레기 수거) 프로세스를 시작할 확률을 정의합니다. 확률은 gc_probability/gc_divisor를 사용하여 계산합니다. 즉, 1/100은 각 요청시에 GC 프로세스를 시작할 확률이 1%입니다. session.gc_divisor의 기본값은 100입니다.
 
-session_set_cookie_params(0, '/');
+if (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off') {
+    session_set_cookie_params(0, '/', null, true, true);
+} else {
+    session_set_cookie_params(0, '/', null, false, true);
+}
+
 ini_set("session.cookie_domain", G5_COOKIE_DOMAIN);
 
 function chrome_domain_session_name(){
@@ -366,8 +376,7 @@ if( $config['cf_cert_use'] || (defined('G5_YOUNGCART_VER') && G5_YOUNGCART_VER)
                     || preg_match('/(iPhone|iPod|iPad).*AppleWebKit.*Safari/i', $_SERVER['HTTP_USER_AGENT'])
                     || preg_match('~MSIE|Internet Explorer~i', $_SERVER['HTTP_USER_AGENT'])
                     || preg_match('~Trident/7.0(; Touch)?; rv:11.0~',$_SERVER['HTTP_USER_AGENT'])
-                    || !(isset($_SERVER['HTTPS']) && $_SERVER['HTTPS']=='on')
-                    || !(isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == "https")){
+                    || !(isset($_SERVER['HTTPS']) && $_SERVER['HTTPS']=='on')) {
                     return $res;
                 }
             }
@@ -377,7 +386,7 @@ if( $config['cf_cert_use'] || (defined('G5_YOUNGCART_VER') && G5_YOUNGCART_VER)
             $cookie_session_name = method_exists('XenoPostToForm', 'g5_session_name') ? XenoPostToForm::g5_session_name() : 'PHPSESSID'; 
             foreach ($headers as $header) {
                 if (!preg_match('~^Set-Cookie: '.$cookie_session_name.'=~', $header)) continue;
-                $header = preg_replace('~; secure(; HttpOnly)?$~', '', $header) . '; secure; SameSite=None';
+                $header = preg_replace('~(; secure; HttpOnly)?$~', '; secure; HttpOnly; SameSite=None', $header);
                 header($header, false);
                 $g5['session_cookie_samesite'] = 'none';
                 break;
@@ -417,7 +426,7 @@ if (isset($_REQUEST['sca']))  {
 
 if (isset($_REQUEST['sfl']))  {
     $sfl = trim($_REQUEST['sfl']);
-    $sfl = preg_replace("/[\<\>\'\"\\\'\\\"\%\=\(\)\/\^\*\s]/", "", $sfl);
+    $sfl = preg_replace("/[\<\>\'\"\\\'\\\"\%\=\(\)\/\^\*\s\#]/", "", $sfl);
     if ($sfl)
         $qstr .= '&amp;sfl=' . urlencode($sfl); // search field (검색 필드)
 } else {
@@ -480,6 +489,7 @@ if (isset($_REQUEST['w'])) {
     $w = '';
 }
 
+/** @var int $wr_id 게시판 글의 ID */
 if (isset($_REQUEST['wr_id'])) {
     $wr_id = (int)$_REQUEST['wr_id'];
 } else {
@@ -502,7 +512,8 @@ if (isset($_REQUEST['url'])) {
     $urlencode = urlencode($_SERVER['REQUEST_URI']);
     if (G5_DOMAIN) {
         $p = @parse_url(G5_DOMAIN);
-        $urlencode = G5_DOMAIN.urldecode(preg_replace("/^".urlencode($p['path'])."/", "", $urlencode));
+        $p['path'] = isset($p['path']) ? $p['path'] : '/';
+        $urlencode = rtrim(G5_DOMAIN, '%2F').'%2F'.ltrim(urldecode(preg_replace("/^".urlencode($p['path'])."/", "", $urlencode)), '%2F');
     }
 }
 
@@ -576,27 +587,30 @@ if (isset($_SESSION['ss_mb_id']) && $_SESSION['ss_mb_id']) { // 로그인중이
 }
 
 
+/** @var array $write 글 데이터 */
 $write = array();
+/** @var string $write_table 게시판 테이블 전체이름 */
 $write_table = '';
 if ($bo_table) {
     $board = get_board_db($bo_table, true);
     if (isset($board['bo_table']) && $board['bo_table']) {
         set_cookie("ck_bo_table", $board['bo_table'], 86400 * 1);
         $gr_id = $board['gr_id'];
-        $write_table = $g5['write_prefix'] . $bo_table; // 게시판 테이블 전체이름
+        // 게시판 테이블 전체이름
+        $write_table = $g5['write_prefix'] . $bo_table; 
 
         if (isset($wr_id) && $wr_id) {
             $write = get_write($write_table, $wr_id);
         } else if (isset($wr_seo_title) && $wr_seo_title) {
             $write = get_content_by_field($write_table, 'bbs', 'wr_seo_title', generate_seo_title($wr_seo_title));
-            if( isset($write['wr_id']) ){
-                $wr_id = $write['wr_id'];
+            if (isset($write['wr_id'])) {
+                $wr_id = (int) $write['wr_id'];
             }
         }
     }
-    
-    // 게시판에서 
-    if (isset($board['bo_select_editor']) && $board['bo_select_editor']){
+
+    // 게시판에서 사용하는 에디터를 설정
+    if (isset($board['bo_select_editor']) && $board['bo_select_editor']) {
         $config['cf_editor'] = $board['bo_select_editor'];
     }
 }

css/default_shop.css

@@ -799,7 +799,7 @@ box-shadow: 1px 2px 2px #eee;}
 #od_tot_price strong{font-size:1.5em;color:#ff006c}
 #sod_frm #sod_frm_pt_alert {margin:5px 0;color:#38b2bb }
 #od_pay_sl h3{font-size:1.167em;margin:20px 0 5px}
-#od_pay_sl input[type="radio"]{position:absolute;width:0;height:0;overflow:hidden;visibility:hidden;text-indent:-999px;left: 0;z-index: -1px;}
+#od_pay_sl input[type="radio"]{position:absolute;width:0;height:0;overflow:hidden;visibility:hidden;text-indent:-999px;left: 0;z-index: -1;}
 #od_pay_sl .lb_icon {display: inline-block;float:left;width:50%;background:#fff;border:1px solid #eceff4;margin:-1px 0 0 -1px;cursor: pointer;height:60px;position:relative;padding-left:65px;padding-top:20px;z-index:1}
 #od_pay_sl input[type="radio"]:checked+.lb_icon {border:1px solid #ff006c;z-index:3}
 #sod_frm_paysel {}
@@ -1148,6 +1148,7 @@ box-shadow: 1px 2px 2px #eee;}
 .sod_frm_mobile #m_sod_frm_paysel .inicis_lpay{background:url(../img/lpay_logo.png) no-repeat;width:35px;height:12px;overflow:hidden;text-indent:-999px;display:inline-block;background-size:100%}
 .sod_frm_mobile #m_sod_frm_paysel .inicis_kakaopay{background:url(../img/kakao.png) no-repeat 50% 50% #f4dc34;border-radius:30px;height:22px;width:74px;display:inline-block;overflow:hidden;text-indent:-999px;background-size:35px auto}
 .sod_frm_mobile #m_sod_frm_paysel .kakaopay_icon{background:url(../img/kakao.png) no-repeat 50% 50% #f4dc34;border-radius:30px;height:22px;width:74px;display:inline-block;overflow:hidden;text-indent:-999px;background-size:35px auto}
+.sod_frm_mobile #m_sod_frm_paysel .applepay_icon{background:url(../img/ico-mobile-applepay.png) no-repeat 50% 50% #fff;border-radius:30px;height:23px;width:50px;display:inline-block;overflow:hidden;text-indent:-999px;background-size:35px auto}
 .sod_frm_mobile #m_sod_frm_paysel .samsung_pay{margin-left:-23px;background:url(../img/samsungpay.png) no-repeat 24px 3px;height:25px;width:106px;display:inline-block;overflow:hidden;text-indent:-999px}
 .sod_frm_mobile #sod_frm_pay{border-top:1px solid #f3f3f3}
 .sod_frm_mobile #sod_frm_pay h2{margin:10px 0;font-size:1.25em}

css/mobile_shop.css

@@ -84,8 +84,8 @@ input[type=radio] {-webkit-appearance: radio}
 /*카테고리*/
 .menu {display:none;position:fixed;top:0;height:100%;z-index:99999;-webkit-backface-visibility:hidden;width:100%;background:#efefef}
 .menu .menu_wr{width:100%;height:100%;overflow-y:auto;background:#eee;position:relative;z-index:199919;
- -webkit-box-shadow: 0 0 5px rgba(55,55,5,0.4));
-    -moz-box-shadow: 0 0 5px rgba(55,55,5,0.4));
+ -webkit-box-shadow: 0 0 5px rgba(55,55,5,0.4);
+    -moz-box-shadow: 0 0 5px rgba(55,55,5,0.4);
          box-shadow: 0 0 5px rgba(55,55,5,0.4);}
 .menu .menu_close {position:absolute;top:50%;right:0px;width:40px;height:40px;background:none;color:#fff;font-size:20px;margin-top:-20px;border:0;z-index:199999}
 
@@ -220,14 +220,15 @@ box-shadow: 0 0 6px rgba(0,0,0,0.2);}
 #m_sod_frm_paysel h3{background:#fff;padding:15px 10px ;border:1px solid #e3e5e8;border-bottom:0}
 #m_sod_frm_paysel ul {margin:0 0 ;background:#fff;padding:10px;border:1px solid #e3e5e8}
 #m_sod_frm_paysel ul:after {display:block;visibility:hidden;clear:both;content:""}
-#m_sod_frm_paysel li {float:left;padding:5px ;width:46%;height:25px}
+#m_sod_frm_paysel li {float:left;padding:5px;width:46%;height:35px}
 #m_sod_frm_paysel .KPAY{background:url('../img/kpay.png') no-repeat;width:37px;height:15px;overflow:hidden;text-indent:-999px;display:inline-block;background-size:100%}
 #m_sod_frm_paysel .PAYNOW{background:url('../img/paynow.png') no-repeat;width:46px;height:15px;overflow:hidden;text-indent:-999px;display:inline-block;background-size:100%;}
-#m_sod_frm_paysel .PAYCO{background:url('../img/payco.png') no-repeat 1px;width:46px;height:15px;overflow:hidden;text-indent:-999px;display:inline-block;background-size:100%;}
+#m_sod_frm_paysel .PAYCO{background:url('../img/payco.png') no-repeat 1px;width:50px;height:15px;overflow:hidden;text-indent:-999px;display:inline-block;background-size:100%}
 #m_sod_frm_paysel .inicis_lpay{background:url('../img/lpay_logo.png') no-repeat;width:35px;height:12px;overflow:hidden;text-indent:-999px;display:inline-block;background-size:100%;}
-#m_sod_frm_paysel .inicis_kakaopay{background:url('../img/kakao.png') no-repeat 50% 50% #ffeb00;border-radius:30px;height:22px;width:74px;display:inline-block;overflow:hidden;text-indent:-999px;background-size:35px auto}
-#m_sod_frm_paysel .kakaopay_icon{background:url('../img/ico-mobile-kakaopay.png') no-repeat #fff;height:15px;width:43px;display:inline-block;overflow:hidden;text-indent:-999px;background-size:35px auto}
-#m_sod_frm_paysel .naverpay_icon{background:url('../img/ico-mobile-naverpay.png') no-repeat #fff;height:15px;width:40px;display:inline-block;overflow:hidden;text-indent:-999px;background-size:35px auto}
+#m_sod_frm_paysel .inicis_kakaopay{background:url('../img/kakao.png') no-repeat 50% 50% #ffeb00;border-radius:30px;height:26px;width:74px;display:inline-block;overflow:hidden;text-indent:-999px;background-size:36px auto}
+#m_sod_frm_paysel .kakaopay_icon{background:url('../img/ico-mobile-kakaopay.png') no-repeat #fff;height:23px;width:63px;display:inline-block;overflow:hidden;text-indent:-999px;background-size:45px auto;background-position: 10% 40%}
+#m_sod_frm_paysel .naverpay_icon{background:url('../img/ico-mobile-naverpay.png') no-repeat #fff;height:23px;width:60px;display:inline-block;overflow:hidden;text-indent:-999px;background-size:45px auto;background-position: 0% 30%}
+#m_sod_frm_paysel .applepay_icon{background:url('../img/ico-mobile-applepay.png') no-repeat #fff;height:30px;width:60px;display:inline-block;overflow:hidden;text-indent:-999px;background-size:43px auto}
 #m_sod_frm_paysel .samsung_pay{margin-left:-23px;background:url('../img/samsungpay.png') no-repeat 24px 3px;height:25px;width:106px;display:inline-block;overflow:hidden;text-indent:-999px}
 
 #sod_frm_pay{padding:10px;;border-top:1px solid #f3f3f3}
@@ -358,7 +359,7 @@ box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
 #sod_addr .addr_btn:after {display:block;visibility:hidden;clear:both;content:""}
 #sod_addr .sel_address {width:32%;float:left;margin-right:1%;height:30px;background:none;border:1px solid #333;color:#333;padding:0 5px}
 #sod_addr .del_address {display:block;width:32%;text-align:center;float:left;margin-right:1%;border:1px solid #aaa;background:none;color:#888;padding:0 5px;height:30px;line-height:28px;vertical-align:middle}
-#sod_addr input[type="radio"] {position:absolute;width:0;height:0;overflow:hidden;visibility:hidden;text-indent:-999px;left:0;z-index:-1px}
+#sod_addr input[type="radio"] {position:absolute;width:0;height:0;overflow:hidden;visibility:hidden;text-indent:-999px;left:0;z-index:-1}
 #sod_addr .add_lb {display:inline-block;float:left;width:32%;text-align:center;border:1px solid #4162ff;color:#4162ff;height:30px;line-height:28px}
 #sod_addr input[type="radio"]:checked+.add_lb {z-index:3;background:#4162ff;color:#fff}
 
@@ -578,7 +579,7 @@ a.btn02 {display:inline-block;padding:8px 7px 7px;border:1px solid #3b3c3f;backg
 a.btn02:focus, .btn02:hover {text-decoration:none}
 button.btn02 {display:inline-block;margin:0;padding:7px;border:1px solid #3b3c3f;background:#4b545e;color:#fff;text-decoration:none}
 .btn_confirm {text-align:center} /* 서식단계 진행 */
-.btn_submit {padding:0 5px;border:0;background:#3a8afd;border:1px solid #1c70e9;color:#fff;letter-spacing:-0.1em;border-radius:3px}}
+.btn_submit {padding:0 5px;border:0;background:#3a8afd;border:1px solid #1c70e9;color:#fff;letter-spacing:-0.1em;border-radius:3px}
 fieldset .btn_submit {padding:0 7px;height:24px;line-height:1em}
 a.btn_cancel {display:inline-block;padding:8px 7px 7px;border:1px solid #ccc;background:#fff;color:#000;text-decoration:none;vertical-align:middle}
 button.btn_cancel {display:inline-block;padding:7px;border:1px solid #ccc;background:#fafafa;color:#000;vertical-align:top;text-decoration:none}
@@ -820,7 +821,7 @@ box-shadow:0 0 8px rgba(65,98,255,0.8)}
 .sod_right #sod_bsk_tot{margin:10px}
 #sod_frm_taker textarea{width:100%;height:80px}
 
-#od_pay_sl input[type="radio"] {position:absolute;width:0;height:0;overflow:hidden;visibility:hidden;text-indent:-999px;left:0;z-index:-1px}
+#od_pay_sl input[type="radio"] {position:absolute;width:0;height:0;overflow:hidden;visibility:hidden;text-indent:-999px;left:0;z-index:-1}
 #od_pay_sl .lb_icon {display:inline-block;float:left;width:150px;background:#fff;border:1px solid #eceff4;margin:-1px 0 0 -1px;cursor:pointer;height:60px;position:relative;padding-left:65px;padding-top:20px;z-index:1}
 #od_pay_sl input[type="radio"]:checked+.lb_icon {border:1px solid #ff006c;z-index:3}
 
@@ -899,7 +900,7 @@ box-shadow:0 0 8px rgba(65,98,255,0.8)}
 #od_tot_price span{float:left;font-weight:bold}
 #od_tot_price strong{font-size:1.5em;color:#ff006c}
 #od_pay_sl h3{font-size:1.167em;margin:20px 0 5px}
-#od_pay_sl input[type="radio"]{position:absolute;width:0;height:0;overflow:hidden;visibility:hidden;text-indent:-999px;left: 0;z-index: -1px;}
+#od_pay_sl input[type="radio"]{position:absolute;width:0;height:0;overflow:hidden;visibility:hidden;text-indent:-999px;left: 0;z-index: -1;}
 #od_pay_sl .lb_icon {display: inline-block;float:left;width:50%;background:#fff;border:1px solid #eceff4;margin:-1px 0 0 -1px;cursor: pointer;height:60px;position:relative;padding-left:65px;padding-top:20px;z-index:1}
 #od_pay_sl input[type="radio"]:checked+.lb_icon {border:1px solid #ff006c;z-index:3}
 #sod_frm_paysel {}

extend/user.config.php

@@ -1,2 +0,0 @@
-<?php
-if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가;

extend/version.extend.php

@@ -4,5 +4,5 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 // 자바스크립트와 CSS 파일을 새로 다운로드 하도록 파일의 끝에 년월일 지정
 // 예) https://도메인/css/default.css?ver=220620
 // 예) https://도메인/js/common.js?ver=220620
-define('G5_CSS_VER', '220620');
-define('G5_JS_VER',  '221017');
+define('G5_CSS_VER', '2303229');
+define('G5_JS_VER',  '2304171');

install/gnuboard5.sql

@@ -7,7 +7,7 @@
 DROP TABLE IF EXISTS `g5_auth`;
 CREATE TABLE IF NOT EXISTS `g5_auth` (
   `mb_id` varchar(20) NOT NULL default '',
-  `au_menu` varchar(20) NOT NULL default '',
+  `au_menu` varchar(50) NOT NULL default '',
   `au_auth` set('r','w','d') NOT NULL default '',
   PRIMARY KEY  (`mb_id`,`au_menu`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -189,6 +189,7 @@ CREATE TABLE IF NOT EXISTS `g5_board_new` (
 
 DROP TABLE IF EXISTS `g5_config`;
 CREATE TABLE IF NOT EXISTS `g5_config` (
+  `cf_id` int(11) NOT NULL auto_increment,
   `cf_title` varchar(255) NOT NULL DEFAULT '',
   `cf_theme` varchar(100) NOT NULL DEFAULT '',
   `cf_admin` varchar(100) NOT NULL DEFAULT '',
@@ -342,7 +343,8 @@ CREATE TABLE IF NOT EXISTS `g5_config` (
   `cf_7` varchar(255) NOT NULL DEFAULT '',
   `cf_8` varchar(255) NOT NULL DEFAULT '',
   `cf_9` varchar(255) NOT NULL DEFAULT '',
-  `cf_10` varchar(255) NOT NULL DEFAULT ''
+  `cf_10` varchar(255) NOT NULL DEFAULT '',
+  PRIMARY KEY  (`cf_id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 -- --------------------------------------------------------
@@ -445,12 +447,14 @@ CREATE TABLE IF NOT EXISTS `g5_group_member` (
 
 DROP TABLE IF EXISTS `g5_login`;
 CREATE TABLE IF NOT EXISTS `g5_login` (
+  `lo_id` int(11) NOT NULL AUTO_INCREMENT,
   `lo_ip` varchar(100) NOT NULL default '',
   `mb_id` varchar(20) NOT NULL default '',
   `lo_datetime` datetime NOT NULL default '0000-00-00 00:00:00',
   `lo_location` text NOT NULL,
   `lo_url` text NOT NULL,
-  PRIMARY KEY  (`lo_ip`)
+  PRIMARY KEY (`lo_id`),
+  UNIQUE KEY `lo_ip_unique` (`lo_ip`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 -- --------------------------------------------------------
@@ -679,7 +683,7 @@ CREATE TABLE IF NOT EXISTS `g5_scrap` (
 
 DROP TABLE IF EXISTS `g5_visit`;
 CREATE TABLE IF NOT EXISTS `g5_visit` (
-  `vi_id` int(11) NOT NULL default '0',
+  `vi_id` int(11) NOT NULL AUTO_INCREMENT,
   `vi_ip` varchar(100) NOT NULL default '',
   `vi_date` date NOT NULL default '0000-00-00',
   `vi_time` time NOT NULL default '00:00:00',
@@ -747,6 +751,7 @@ CREATE TABLE IF NOT EXISTS `g5_autosave` (
 
 DROP TABLE IF EXISTS `g5_qa_config`;
 CREATE TABLE IF NOT EXISTS `g5_qa_config` (
+  `qa_id` int(11) NOT NULL AUTO_INCREMENT,
   `qa_title` varchar(255) NOT NULL DEFAULT'',
   `qa_category` varchar(255) NOT NULL DEFAULT'',
   `qa_skin` varchar(255) NOT NULL DEFAULT '',
@@ -782,7 +787,8 @@ CREATE TABLE IF NOT EXISTS `g5_qa_config` (
   `qa_2` varchar(255) NOT NULL DEFAULT '',
   `qa_3` varchar(255) NOT NULL DEFAULT '',
   `qa_4` varchar(255) NOT NULL DEFAULT '',
-  `qa_5` varchar(255) NOT NULL DEFAULT ''
+  `qa_5` varchar(255) NOT NULL DEFAULT '',
+  PRIMARY KEY (`qa_id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 -- --------------------------------------------------------

install/gnuboard5shop.sql

@@ -209,6 +209,7 @@ CREATE TABLE IF NOT EXISTS `g5_shop_coupon_zone` (
 
 DROP TABLE IF EXISTS `g5_shop_default`;
 CREATE TABLE IF NOT EXISTS `g5_shop_default` (
+  `de_id` int(11) NOT NULL auto_increment,
   `de_admin_company_owner` varchar(255) NOT NULL DEFAULT '',
   `de_admin_company_name` varchar(255) NOT NULL DEFAULT '',
   `de_admin_company_saupja_no` varchar(255) NOT NULL DEFAULT '',
@@ -349,7 +350,8 @@ CREATE TABLE IF NOT EXISTS `g5_shop_default` (
   `de_kcp_mid` varchar(255) NOT NULL DEFAULT '',
   `de_kcp_site_key` varchar(255) NOT NULL DEFAULT '',
   `de_inicis_mid` varchar(255) NOT NULL DEFAULT '',
-  `de_inicis_admin_key` varchar(255) NOT NULL DEFAULT '',
+  `de_inicis_iniapi_key` varchar(30) NOT NULL DEFAULT '',
+  `de_inicis_iniapi_iv` varchar(30) NOT NULL 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',
@@ -385,7 +387,8 @@ CREATE TABLE IF NOT EXISTS `g5_shop_default` (
   `de_member_reg_coupon_use` tinyint(4) NOT NULL DEFAULT '0',
   `de_member_reg_coupon_term` int(11) NOT NULL DEFAULT '0',
   `de_member_reg_coupon_price` int(11) NOT NULL DEFAULT '0',
-  `de_member_reg_coupon_minimum` int(11) NOT NULL DEFAULT '0'
+  `de_member_reg_coupon_minimum` int(11) NOT NULL DEFAULT '0',
+  PRIMARY KEY  (`de_id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 -- --------------------------------------------------------

install/install_db.php

@@ -268,6 +268,18 @@ if ($g5_install || $is_install === false) {
 
         $bo_skin = ($tmp_bo_table[$i] === 'gallery') ? 'gallery' : 'basic';
 
+        if (in_array($tmp_bo_table[$i], array('gallery', 'qa'))) {
+            $read_bo_point = -1;
+            $write_bo_point = 5;
+            $comment_bo_point = 1;
+            $download_bo_point = -20;
+        } else {
+            $read_bo_point = $read_point;
+            $write_bo_point = $write_point;
+            $comment_bo_point = $comment_point;
+            $download_bo_point = $download_point;
+        }
+
         $sql = " insert into `{$table_prefix}board`
                     set bo_table = '$tmp_bo_table[$i]',
                         gr_id = '$tmp_gr_id',
@@ -285,10 +297,10 @@ if ($g5_install || $is_install === false) {
                         bo_count_delete     = '1',
                         bo_upload_level     = '1',
                         bo_download_level   = '1',
-                        bo_read_point       = '-1',
-                        bo_write_point      = '5',
-                        bo_comment_point    = '1',
-                        bo_download_point   = '-20',
+                        bo_read_point       = '$read_bo_point',
+                        bo_write_point      = '$write_bo_point',
+                        bo_comment_point    = '$comment_bo_point',
+                        bo_download_point   = '$download_bo_point',
                         bo_use_category     = '0',
                         bo_category_list    = '',
                         bo_use_sideview     = '0',

js/certify.js

@@ -19,9 +19,17 @@ function certify_win_open(type, url, event) {
         if($("input[name=veri_up_hash]").length < 1)
                 $("input[name=cert_no]").after('<input type="hidden" name="veri_up_hash" value="">');
 
-        if( navigator.userAgent.indexOf("Android") > - 1 || navigator.userAgent.indexOf("iPhone") > - 1 )
+        // iframe에서 세션공유 문제가 있어서 더 이상 iframe 을 사용하지 않습니다.
+        var use_iframe = false;
+
+        if(use_iframe && (navigator.userAgent.indexOf("Android") > - 1 || navigator.userAgent.indexOf("iPhone") > - 1))
         {
             var $frm = $(event.target.form);
+
+            if($frm.length < 1){
+                $frm = $(event.target).parent();
+            }
+
             if($("#kcp_cert").length < 1) {
                 $frm.wrap('<div id="cert_info"></div>');
 
@@ -31,7 +39,7 @@ function certify_win_open(type, url, event) {
             }
 
             $("#cert_info")
-                .after('<iframe id="kcp_cert" name="kcp_cert" width="100%" height="700" frameborder="0" scrolling="no" style="display:none"></iframe>');
+                .after('<iframe id="kcp_cert" name="kcp_cert" width="100%" height="700" frameborder="0" scrolling="yes" style="display:none"></iframe>');
 
             var temp_form = document.form_temp;
             temp_form.target = "kcp_cert";

js/kakaolink.js

@@ -1,5 +1,11 @@
 function kakaolink_send(text, url, image)
 {
+    if (window.Kakao && (kakao_javascript_apikey !== undefined)) {
+        if (! Kakao.isInitialized()) {
+            Kakao.init(kakao_javascript_apikey);
+        }
+    }
+
     if( image === undefined ){
         image = '';
     }

js/shop.js

@@ -40,7 +40,7 @@ $(function() {
     });
 
     if(isAndroid) {
-        $(document).on("touchend", "select.it_option", function() {
+        $(document).on("touchend mouseup", "select.it_option", function() {
             option_add = true;
         });
     } else {
@@ -151,7 +151,7 @@ $(function() {
     });
 
     if(isAndroid) {
-        $(document).on("touchend", "select.it_supply", function() {
+        $(document).on("touchend mouseup", "select.it_supply", function() {
             supply_add = true;
         });
     } else {

lib/Cache/obj.class.php

@@ -61,29 +61,38 @@ Class G5_object_cache {
                 $this->contents[$group][$key] = $data;
                 break;
             default :
-                $datas = $this->etcs[$group][$key] = $data;
+                $this->etcs[$group][$key] = $data;
                 break;
         }
 
     }
+    /**
+     * cache 데이터 제거
+     * @param string $type
+     * @param string $key
+     * @param string $group
+     * @return bool
+     */
+    function delete($type, $key, $group = 'default')
+    {
+        if (!$this->exists($type, $key, $group)) {
+            return false;
+        }
 
-    function delete($key, $group='default') {
-        switch ($key) {
+        switch ($type) {
             case 'bbs':
-                $datas = $this->writes;
+                $datas = &$this->writes;
                 break;
             case 'content':
-                $datas = $this->contents;
+                $datas = &$this->contents;
                 break;
-            default :
-                $datas = $this->etcs;
+            default:
+                $datas = &$this->etcs;
                 break;
         }
 
-        if ( ! $this->exists('bbs', $key, $group) )
-            return false;
+        unset($datas[$group][$key]);
 
-        unset( $datas[$group][$key] );
         return true;
     }
 

lib/Hook/hook.extends.class.php

@@ -19,7 +19,7 @@ Class GML_Hook extends Hook {
 
         $args = $this->getArguments($argsNumber, $args);
 
-        if (! ($class && $method) && function_exists($function)) {
+        if (! ($class && $method) && is_callable($function)) {
             return call_user_func_array($function, $args);
         } elseif ($obj = call_user_func(array($class, $this->singleton))) {
             if ($obj !== false) {
@@ -161,4 +161,4 @@ Class GML_Hook extends Hook {
     }
 }
 
-// end  Hook Class;
+// end  Hook Class;

lib/common.lib.php

@@ -9,11 +9,14 @@ include_once(dirname(__FILE__) .'/pbkdf2.compat.php');
 **
 *************************************************************************/
 
-// 마이크로 타임을 얻어 계산 형식으로 만듦
+/**
+ * 마이크로타임을 반환
+ * @return float
+ * @deprecated use `microtime(true)`
+ */
 function get_microtime()
 {
-    list($usec, $sec) = explode(" ",microtime());
-    return ((float)$usec + (float)$sec);
+    return microtime(true);
 }
 
 
@@ -23,6 +26,7 @@ function get_paging($write_pages, $cur_page, $total_page, $url, $add="")
     //$url = preg_replace('#&page=[0-9]*(&page=)$#', '$1', $url);
     $url = preg_replace('#(&)?page=[0-9]*#', '', $url);
 	$url .= substr($url, -1) === '?' ? 'page=' : '&page=';
+    $url = preg_replace('|[^\w\-~+_.?#=!&;,/:%@$\|*\'()\[\]\\x80-\\xff]|i', '', clean_xss_tags($url));
 
     $str = '';
     if ($cur_page > 1) {
@@ -96,6 +100,8 @@ function print_r2($var)
 // header("location:URL") 을 대체
 function goto_url($url)
 {
+    run_event('goto_url', $url);
+
     $url = str_replace("&", "&", $url);
     //echo "<script> location.replace('$url'); </script>";
 
@@ -149,6 +155,10 @@ function set_cookie($cookie_name, $value, $expire, $path='/', $domain=G5_COOKIE_
     global $g5;
     
     $c = run_replace('set_cookie_params', array('path'=>$path, 'domain'=>$domain, 'secure'=>$secure, 'httponly'=>$httponly), $cookie_name);
+    
+    if (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off') {
+        $c['secure'] = true;
+    }
 
     setcookie(md5($cookie_name), base64_encode($value), G5_SERVER_TIME + $expire, $c['path'], $c['domain'], $c['secure'], $c['httponly']);
 }
@@ -599,46 +609,70 @@ function check_html_link_nofollow($type=''){
     return true;
 }
 
-// http://htmlpurifier.org/
-// Standards-Compliant HTML Filtering
-// Safe  : HTML Purifier defeats XSS with an audited whitelist
-// Clean : HTML Purifier ensures standards-compliant output
-// Open  : HTML Purifier is open-source and highly customizable
+/**
+ * HTMLPurifier 필터를 거친 HTML 코드를 반환
+ * 
+ * http://htmlpurifier.org/
+ * Standards-Compliant HTML Filtering
+ * Safe  : HTML Purifier defeats XSS with an audited whitelist
+ * Clean : HTML Purifier ensures standards-compliant output
+ * Open  : HTML Purifier is open-source and highly customizable
+ *
+ * @param string $html
+ * @return string
+ */
 function html_purifier($html)
 {
     global $is_admin, $write;
 
-    $f = file(G5_PLUGIN_PATH.'/htmlpurifier/safeiframe.txt');
+    $f = file(G5_PLUGIN_PATH . '/htmlpurifier/safeiframe.txt');
     $domains = array();
-    foreach($f as $domain){
+    foreach ($f as $domain) {
         // 첫행이 # 이면 주석 처리
         if (!preg_match("/^#/", $domain)) {
             $domain = trim($domain);
-            if ($domain)
+            if ($domain) {
                 array_push($domains, $domain);
+            }
         }
     }
     // 글쓴이가 관리자인 경우에만 현재 사이트 도메인을 허용
-    if (isset($write['mb_id']) && $write['mb_id'] && is_admin($write['mb_id'])) array_push($domains, $_SERVER['HTTP_HOST'].'/');
+    if (isset($write['mb_id']) && $write['mb_id'] && is_admin($write['mb_id'])) {
+        array_push($domains, $_SERVER['HTTP_HOST'] . '/');
+    }
     $safeiframe = implode('|', run_replace('html_purifier_safeiframes', $domains, $html));
 
-    include_once(G5_PLUGIN_PATH.'/htmlpurifier/HTMLPurifier.standalone.php');
-    include_once(G5_PLUGIN_PATH.'/htmlpurifier/extend.video.php');
+    include_once(G5_PLUGIN_PATH . '/htmlpurifier/HTMLPurifier.standalone.php');
+    include_once(G5_PLUGIN_PATH . '/htmlpurifier/extend.video.php');
+
     $config = HTMLPurifier_Config::createDefault();
     // data/cache 디렉토리에 CSS, HTML, URI 디렉토리 등을 만든다.
-    $config->set('Cache.SerializerPath', G5_DATA_PATH.'/cache');
+    $config->set('Cache.SerializerPath', G5_DATA_PATH . '/cache');
     $config->set('HTML.SafeEmbed', false);
     $config->set('HTML.SafeObject', false);
     $config->set('Output.FlashCompat', false);
     $config->set('HTML.SafeIframe', true);
-    if( (function_exists('check_html_link_nofollow') && check_html_link_nofollow('html_purifier')) ){
-        $config->set('HTML.Nofollow', true);    // rel=nofollow 으로 스팸유입을 줄임
+    if ((function_exists('check_html_link_nofollow') && check_html_link_nofollow('html_purifier'))) {
+        $config->set('HTML.Nofollow', true); // rel=nofollow 으로 스팸유입을 줄임
     }
-    $config->set('URI.SafeIframeRegexp','%^(https?:)?//('.$safeiframe.')%');
+    $config->set('URI.SafeIframeRegexp', '%^(https?:)?//(' . preg_replace('/\\\?\./', '\.', $safeiframe) . ')%');
     $config->set('Attr.AllowedFrameTargets', array('_blank'));
     //유튜브, 비메오 전체화면 가능하게 하기
     $config->set('Filter.Custom', array(new HTMLPurifier_Filter_Iframevideo()));
+
+    /*
+     * HTMLPurifier 설정을 변경할 수 있는 Event hook
+     * 리스너에서는 첫번째 인자($config)로 `HTMLPurifier_Config` 객체를 받을 수 있다
+     */
+    run_event('html_purifier_config', $config, array(
+        'html' => $html,
+        'write' => $write,
+        'is_admin' => $is_admin
+    )
+    );
+
     $purifier = new HTMLPurifier($config);
+
     return run_replace('html_purifier_result', $purifier->purify($html), $purifier, $html);
 }
 
@@ -766,7 +800,7 @@ function get_next_num($table)
     $sql = " select min(wr_num) as min_wr_num from $table ";
     $row = sql_fetch($sql);
     // 가장 작은 번호에 1을 빼서 넘겨줌
-    return (int)($row['min_wr_num'] - 1);
+    return isset($row['min_wr_num']) ? (int)($row['min_wr_num'] - 1) : -1;
 }
 
 
@@ -863,7 +897,10 @@ function subject_sort_link($col, $query_string='', $flag='asc')
     $arr_query[] = 'page='.$page;
     $qstr = implode("&amp;", $arr_query);
 
-    return "<a href=\"{$_SERVER['SCRIPT_NAME']}?{$qstr}\">";
+    parse_str(html_entity_decode($qstr), $qstr_array);
+    $url = short_url_clean(get_params_merge_url($qstr_array));
+
+    return '<a href="'.$url.'">';
 }
 
 
@@ -1327,87 +1364,138 @@ function get_sideview($mb_id, $name='', $email='', $homepage='')
     global $g5;
     global $bo_table, $sca, $is_admin, $member;
 
-    $email = get_string_encrypt($email);
-    $homepage = set_http(clean_xss_tags($homepage));
+    static $cache = array();
 
-    $name     = get_text($name, 0, true);
-    $email    = get_text($email);
+    $name = get_text($name, 0, true);
+
+    if (isset($cache['id:' . $mb_id]) && $cache['id:' . $mb_id]) {
+        return $cache['id:' . $mb_id];
+    } else if (
+        isset($name)
+        && isset($cache['name:' . $name])
+        && $cache['name:' . $name]
+    ) {
+        return $cache['name:' . $name];
+    }
+
+    $email = get_string_encrypt($email);
+    $email = get_text($email);
+
+    $homepage = set_http(clean_xss_tags($homepage));
     $homepage = get_text($homepage);
 
-    $tmp_name = "";
     $en_mb_id = $mb_id;
 
+    $name_tag = array();
+    $menus = array();
+
     if ($mb_id) {
-        //$tmp_name = "<a href=\"".G5_BBS_URL."/profile.php?mb_id=".$mb_id."\" class=\"sv_member\" title=\"$name 자기소개\" rel="nofollow" target=\"_blank\" onclick=\"return false;\">$name</a>";
-        $tmp_name = '<a href="'.G5_BBS_URL.'/profile.php?mb_id='.$mb_id.'" class="sv_member" title="'.$name.' 자기소개" target="_blank" rel="nofollow" onclick="return false;">';
+        // $tmp_name = "<a href=\"".G5_BBS_URL."/profile.php?mb_id=".$mb_id."\" class=\"sv_member\" title=\"$name 자기소개\" rel="nofollow" target=\"_blank\" onclick=\"return false;\">$name</a>";
+        $name_tag_open = '<a href="' . G5_BBS_URL . '/profile.php?mb_id=' . $mb_id . '" class="sv_member" title="' . $name . ' 자기소개" target="_blank" rel="nofollow" onclick="return false;">';
 
         if ($config['cf_use_member_icon']) {
-            $mb_dir = substr($mb_id,0,2);
-            $icon_file = G5_DATA_PATH.'/member/'.$mb_dir.'/'.get_mb_icon_name($mb_id).'.gif';
+            $mb_dir = substr($mb_id, 0, 2);
+            $icon_file = G5_DATA_PATH . '/member/' . $mb_dir . '/' . get_mb_icon_name($mb_id) . '.gif';
 
             if (file_exists($icon_file)) {
-                $icon_filemtile = (defined('G5_USE_MEMBER_IMAGE_FILETIME') && G5_USE_MEMBER_IMAGE_FILETIME) ? '?'.filemtime($icon_file) : '';
+                $icon_filemtile = (defined('G5_USE_MEMBER_IMAGE_FILETIME') && G5_USE_MEMBER_IMAGE_FILETIME) ? '?' . filemtime($icon_file) : '';
                 $width = $config['cf_member_icon_width'];
                 $height = $config['cf_member_icon_height'];
-                $icon_file_url = G5_DATA_URL.'/member/'.$mb_dir.'/'.get_mb_icon_name($mb_id).'.gif'.$icon_filemtile;
-                $tmp_name .= '<span class="profile_img"><img src="'.$icon_file_url.'" width="'.$width.'" height="'.$height.'" alt=""></span>';
+                $icon_file_url = G5_DATA_URL . '/member/' . $mb_dir . '/' . get_mb_icon_name($mb_id) . '.gif' . $icon_filemtile;
+                $name_tag['profile_image'] = '<span class="profile_img"><img src="' . $icon_file_url . '" width="' . $width . '" height="' . $height . '" alt=""></span>';
 
-                if ($config['cf_use_member_icon'] == 2) // 회원아이콘+이름
-                    $tmp_name = $tmp_name.' '.$name;
+                // 회원아이콘+이름
+                if ($config['cf_use_member_icon'] == 2) {
+                    $name_tag['name'] = $name;
+                }
             } else {
-                if( defined('G5_THEME_NO_PROFILE_IMG') ){
-                    $tmp_name .= G5_THEME_NO_PROFILE_IMG;
-                } else if( defined('G5_NO_PROFILE_IMG') ){
-                    $tmp_name .= G5_NO_PROFILE_IMG;
+                if (defined('G5_THEME_NO_PROFILE_IMG')) {
+                    $name_tag['profile_image'] = G5_THEME_NO_PROFILE_IMG;
+                } else if (defined('G5_NO_PROFILE_IMG')) {
+                    $name_tag['profile_image'] = G5_NO_PROFILE_IMG;
+                }
+
+                // 회원아이콘+이름
+                if ($config['cf_use_member_icon'] == 2) {
+                    $name_tag['name'] = $name;
                 }
-                if ($config['cf_use_member_icon'] == 2) // 회원아이콘+이름
-                    $tmp_name = $tmp_name.' '.$name;
             }
         } else {
-            $tmp_name = $tmp_name.' '.$name;
+            $name_tag['name'] = $name;
         }
-        $tmp_name .= '</a>';
-
-        $title_mb_id = '['.$mb_id.']';
     } else {
-        if(!$bo_table)
+        if (!$bo_table) {
             return $name;
+        }
 
-        $tmp_name = '<a href="'.get_pretty_url($bo_table, '', 'sca='.$sca.'&amp;sfl=wr_name,1&amp;stx='.$name).'" title="'.$name.' 이름으로 검색" class="sv_guest" rel="nofollow" onclick="return false;">'.$name.'</a>';
-        $title_mb_id = '[비회원]';
+        $name_tag_open = '<a href="' . get_pretty_url($bo_table, '', 'sca=' . $sca . '&amp;sfl=wr_name,1&amp;stx=' . $name) . '" title="' . $name . ' 이름으로 검색" class="sv_guest" rel="nofollow" onclick="return false;">';
+        $name_tag['name'] = $name;
     }
 
-    $str = "<span class=\"sv_wrap\">\n";
-    $str .= $tmp_name."\n";
+    if ($mb_id) {
+        $menus['memo'] = '<a href="' . G5_BBS_URL . '/memo_form.php?me_recv_mb_id=' . $mb_id . '" rel="nofollow" onclick="win_memo(this.href); return false;">쪽지보내기</a>';
+    }
 
-    $str2 = "<span class=\"sv\">\n";
-    if($mb_id)
-        $str2 .= "<a href=\"".G5_BBS_URL."/memo_form.php?me_recv_mb_id=".$mb_id."\" onclick=\"win_memo(this.href); return false;\">쪽지보내기</a>\n";
-    if($email)
-        $str2 .= "<a href=\"".G5_BBS_URL."/formmail.php?mb_id=".$mb_id."&amp;name=".urlencode($name)."&amp;email=".$email."\" onclick=\"win_email(this.href); return false;\">메일보내기</a>\n";
-    if($homepage)
-        $str2 .= "<a href=\"".$homepage."\" target=\"_blank\">홈페이지</a>\n";
-    if($mb_id)
-        $str2 .= "<a href=\"".G5_BBS_URL."/profile.php?mb_id=".$mb_id."\" onclick=\"win_profile(this.href); return false;\">자기소개</a>\n";
-    if($bo_table) {
-        if($mb_id) {
-            $str2 .= "<a href=\"".get_pretty_url($bo_table, '', "sca=".$sca."&amp;sfl=mb_id,1&amp;stx=".$en_mb_id)."\">아이디로 검색</a>\n";
+    if ($email) {
+        $menus['email'] = '<a href="' . G5_BBS_URL . '/formmail.php?mb_id=' . $mb_id . '&amp;name=' . urlencode($name) . '&amp;email=' . $email . '" onclick="win_email(this.href); return false;" rel="nofollow">메일보내기</a>';
+    }
+
+    if ($homepage) {
+        $menus['homepage'] = '<a href="' . $homepage . '" rel="nofollow noopener" target="_blank">홈페이지</a>';
+    }
+
+    if ($mb_id) {
+        $menus['profile'] = '<a href="' . G5_BBS_URL . '/profile.php?mb_id=' . $mb_id . '" onclick="win_profile(this.href); return false;" rel="nofollow">자기소개</a>';
+    }
+
+    if ($bo_table) {
+        if ($mb_id) {
+            $menus['search_id'] = '<a href="' . get_pretty_url($bo_table, '', 'sca=' . $sca . '&amp;sfl=mb_id,1&amp;stx=' . $en_mb_id) . '" rel="nofollow">아이디로 검색</a>';
         } else {
-            $str2 .= "<a href=\"".get_pretty_url($bo_table, '', "sca=".$sca."&amp;sfl=wr_name,1&amp;stx=".$name)."\">이름으로 검색</a>\n";
+            $menus['search_name'] = '<a href="' . get_pretty_url($bo_table, '', 'sca=' . $sca . '&amp;sfl=wr_name,1&amp;stx=' . $name) . '" rel="nofollow">이름으로 검색</a>';
         }
     }
-    if($mb_id)
-        $str2 .= "<a href=\"".G5_BBS_URL."/new.php?mb_id=".$mb_id."\" class=\"link_new_page\" onclick=\"check_goto_new(this.href, event);\">전체게시물</a>\n";
-    if($is_admin == "super" && $mb_id) {
-        $str2 .= "<a href=\"".G5_ADMIN_URL."/member_form.php?w=u&amp;mb_id=".$mb_id."\" target=\"_blank\">회원정보변경</a>\n";
-        $str2 .= "<a href=\"".G5_ADMIN_URL."/point_list.php?sfl=mb_id&amp;stx=".$mb_id."\" target=\"_blank\">포인트내역</a>\n";
-    }
-    $str2 .= "</span>\n";
-    $str .= $str2;
-    $str .= "\n<noscript class=\"sv_nojs\">".$str2."</noscript>";
 
+    if ($mb_id) {
+        $menus['search_all'] = '<a href="' . G5_BBS_URL . '/new.php?mb_id=' . $mb_id . '" class="link_new_page" onclick="check_goto_new(this.href, event);" rel="nofollow">전체게시물</a>';
+
+        if ($is_admin == 'super') {
+            $menus['admin_member_modify'] = '<a href="' . G5_ADMIN_URL . '/member_form.php?w=u&amp;mb_id=' . $mb_id . '" target="_blank" rel="nofollow">회원정보변경</a>';
+            $menus['admin_member_point'] = '<a href="' . G5_ADMIN_URL . '/point_list.php?sfl=mb_id&amp;stx=' . $mb_id . '" target="_blank" rel="nofollow">포인트내역</a>';
+        }
+    }
+
+    $name_tag_close = '</a>';
+
+    $items = run_replace('member_sideview_items', array(
+        'name_tag_open' => $name_tag_open,
+        'name_tag_close' => $name_tag_close,
+        'name_tag' => $name_tag,
+        'menus' => $menus
+    ), array(
+            'mb_id' => $mb_id,
+            'name' => $name,
+            'bo_table' => $bo_table,
+        )
+    );
+
+    $str = '<span class="sv_wrap">';
+    $str .= $items['name_tag_open'] . implode(' ', $items['name_tag']) . $items['name_tag_close'];
+
+    $str2 = '<span class="sv">';
+    $str2 .= implode("\n", $items['menus']);
+    $str2 .= '</span>';
+
+    $str .= $str2;
+    $str .= '<noscript class="sv_nojs">' . $str2 . '</noscript>';
     $str .= "</span>";
 
+    if ($mb_id) {
+        $cache['id:' . $mb_id] = $str;
+    } else {
+        $cache['name:' . $name] = $str;
+    }
+
     return $str;
 }
 
@@ -1648,21 +1736,21 @@ function sql_query($sql, $error=G5_DISPLAY_SQL_ERROR, $link=null)
     $end_time = ($is_debug || G5_COLLECT_QUERY) ? get_microtime() : 0;
 
     $error = null;
+    $source = array();
     if ($is_debug || G5_COLLECT_QUERY) {
         if(function_exists('mysqli_error') && G5_MYSQLI_USE) {
             $error = array(
-                'error_code' => mysqli_errno($g5['connect_db']),
-                'error_message' => mysqli_error($g5['connect_db']),
+                'error_code' => mysqli_errno($link),
+                'error_message' => mysqli_error($link),
             );
         } else {
             $error = array(
-                'error_code' => mysql_errno($g5['connect_db']),
-                'error_message' => mysql_error($g5['connect_db']),
+                'error_code' => mysql_errno($link),
+                'error_message' => mysql_error($link),
             );
         }
 
         $stack = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-        $source = array();
         $found = false;
 
         foreach ($stack as $index => $trace) {
@@ -1706,7 +1794,7 @@ function sql_query($sql, $error=G5_DISPLAY_SQL_ERROR, $link=null)
         );
     }
 
-    run_event('sql_query_after', $result, $sql, $start_time, $end_time, $error);
+    run_event('sql_query_after', $result, $sql, $start_time, $end_time, $error, $source);
 
     return $result;
 }
@@ -1759,11 +1847,22 @@ function sql_free_result($result)
 }
 
 
+/**
+ * MySQL PASSWORD() 함수로 생성된 비밀번호의 hash 값을 반환
+ * 
+ * MySQL 버전에 따라 결과가 다르게 나올 수 있음.
+ * MySQL 8.0.11 버전 이상에서는 오류 발생(PASSWORD 함수가 제거됨)으로 사용할 수 없음.
+ * 
+ * @deprecated 이 함수는 안전하지 않으므로 사용하지 않는 것을 권장 함
+ * @see get_encrypt_string() and check_password()
+ * @param string $value
+ * @return string
+ */
 function sql_password($value)
 {
     // mysql 4.0x 이하 버전에서는 password() 함수의 결과가 16bytes
     // mysql 4.1x 이상 버전에서는 password() 함수의 결과가 41bytes
-    $row = sql_fetch(" select password('$value') as pass ");
+    $row = sql_fetch(" SELECT password('{$value}') as pass ");
 
     return $row['pass'];
 }
@@ -2171,6 +2270,53 @@ function check_token()
     return true;
 }
 
+/**
+ * 브라우저 검증을 위한 세션 반환 및 재생성
+ * @param array $member 로그인 된 회원의 정보. 가입일시(mb_datetime)를 반드시 포함해야 한다.
+ * @param bool $regenerate true 이면 재생성
+ * @return string
+ */
+function ss_mb_key($member, $regenerate = false)
+{
+    $client_key = ($regenerate) ? null : get_cookie('mb_client_key');
+
+    if (!$client_key) {
+        $client_key = get_random_token_string(16);
+        set_cookie('mb_client_key', $client_key, G5_SERVER_TIME * -1);
+    }
+
+    $mb_key = md5($member['mb_datetime'] . $client_key) . run_replace('ss_mb_key_user_agent', md5($_SERVER['HTTP_USER_AGENT']));
+
+    return $mb_key;
+}
+
+/**
+ * 회원의 클라이언트 검증
+ * @param array $member 로그인 된 회원의 정보. 가입일시(mb_datetime)를 반드시 포함해야 한다.
+ * @return bool
+ */
+function verify_mb_key($member)
+{
+    $mb_key = ss_mb_key($member);
+    $verified = get_session('ss_mb_key') === $mb_key;
+
+    if (!$verified) {
+        ss_mb_key($member, true);
+    }
+
+    return $verified;
+}
+
+/**
+ * 회원의 클라이언트 검증 키 생성
+ * 클라이언트 키를 다시 생성하여 생성된 키는 `ss_mb_key` 세션에 저장됨
+ * @param array $member 로그인 된 회원의 정보. 가입일시(mb_datetime)를 반드시 포함해야 한다.
+ */
+function generate_mb_key($member)
+{
+    $mb_key = ss_mb_key($member, true);
+    set_session('ss_mb_key', $mb_key);
+}
 
 // 문자열에 utf8 문자가 들어 있는지 검사하는 함수
 // 코드 : http://in2.php.net/manual/en/function.mb-check-encoding.php#95289
@@ -2380,14 +2526,19 @@ function check_device($device)
 }
 
 
-// 게시판 최신글 캐시 파일 삭제
+/**
+ * 게시판 최신글 캐시 파일 삭제
+ * @param string $bo_table 게시판 ID
+ */
 function delete_cache_latest($bo_table)
 {
     if (!preg_match("/^([A-Za-z0-9_]{1,20})$/", $bo_table)) {
         return;
     }
 
-    g5_delete_cache_by_prefix('latest-'.$bo_table.'-');
+    run_event('delete_cache_latest', $bo_table);
+
+    g5_delete_cache_by_prefix('latest-' . $bo_table . '-');
 }
 
 // 게시판 첨부파일 썸네일 삭제
@@ -2765,6 +2916,8 @@ class html_process {
             $buffer = preg_replace('#(<title[^>]*>.*?</title>)#', "$meta_tag{$nl}$1", $buffer);
         }
 
+        $buffer = run_replace('html_process_buffer', $buffer);
+
         return $buffer;
     }
 }
@@ -3452,14 +3605,15 @@ function check_url_host($url, $msg='', $return_url=G5_URL, $is_redirect=false)
     }
 
     // KVE-2021-1277 Open Redirect 취약점 해결
-    if (preg_match('#\\\0#', $url)) {
+    if (preg_match('#\\\0#', $url) || preg_match('/^\/{1,}\\\/', $url)) {
         alert('url 에 올바르지 않은 값이 포함되어 있습니다.');
     }
 
     while ( ( $replace_url = preg_replace(array('/\/{2,}/', '/\\@/'), array('//', ''), urldecode($url)) ) != $url ) {
         $url = $replace_url;
     }
-    $p = @parse_url(trim($url));
+
+    $p = @parse_url(trim(str_replace('\\', '', $url)));
     $host = preg_replace('/:[0-9]+$/', '', $_SERVER['HTTP_HOST']);
     $is_host_check = false;
     
@@ -3718,7 +3872,7 @@ function check_vaild_callback($callback){
 class str_encrypt
 {
     var $salt;
-    var $lenght;
+    var $length;
 
     function __construct($salt='')
     {
@@ -4071,7 +4225,7 @@ function get_random_token_string($length=6)
     }
 
     $characters = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
-    $output = substr(str_shuffle($characters), 0, $length);     // jihan001 님 제안코드로 수정
+    $output = substr(str_shuffle($characters), 0, $length);
 
     return bin2hex($output);
 }

lib/get_data.lib.php

@@ -145,8 +145,12 @@ function get_content_by_field($write_table, $type='bbs', $where_field='', $where
 {
     global $g5, $g5_object;
 
+    $order_key = 'wr_id';
+
     if( $type === 'content' ){
         $check_array = array('co_id', 'co_html', 'co_subject', 'co_content', 'co_seo_title', 'co_mobile_content', 'co_skin', 'co_mobile_skin', 'co_tag_filter_use', 'co_hit', 'co_include_head', 'co_include_tail');
+
+        $order_key = 'co_id';
     } else {
         $check_array = array('wr_id', 'wr_num', 'wr_reply', 'wr_parent', 'wr_is_comment', 'ca_name', 'wr_option', 'wr_subject', 'wr_content', 'wr_seo_title', 'wr_link1', 'wr_link2', 'wr_hit', 'wr_good', 'wr_nogood', 'mb_id', 'wr_name', 'wr_email', 'wr_homepage', 'wr_datetime', 'wr_ip', 'wr_1', 'wr_2', 'wr_3', 'wr_4', 'wr_5', 'wr_6', 'wr_7', 'wr_8', 'wr_9', 'wr_10');
     }
@@ -162,7 +166,7 @@ function get_content_by_field($write_table, $type='bbs', $where_field='', $where
         return $cache[$key];
     }
 
-    $sql = " select * from {$write_table} where $where_field = '".sql_real_escape_string($where_value)."' ";
+    $sql = " select * from {$write_table} where $where_field = '".sql_real_escape_string($where_value)."' order by $order_key desc limit 1 ";
 
     $cache[$key] = sql_fetch($sql);
 
@@ -394,7 +398,7 @@ function get_mb_icon_name($mb_id){
 // 생성되면 안되는 게시판명
 function get_bo_table_banned_word(){
 
-    $folders = array();
+    $folders = array(G5_CONTENT_DIR, 'rss');
 
     foreach(glob(G5_PATH.'/*', GLOB_ONLYDIR) as $dir) {
         $folders[] = basename($dir);

lib/hook.lib.php

@@ -65,7 +65,7 @@ function run_event($tag, $arg = ''){
     }
 }
 
-function add_replace($tag, $func, $priority=G5_HOOK_DEFAULT_PRIORITY, $args=0){
+function add_replace($tag, $func, $priority=G5_HOOK_DEFAULT_PRIORITY, $args=1){
 
     if( $hook = get_hook_class() ){
         return $hook->addFilter($tag, $func, $priority, $args);
@@ -130,4 +130,4 @@ function get_hook_datas($type='', $is_callback=''){
     }
 
     return null;
-}
+}

lib/icode.lms.lib.php

@@ -195,6 +195,7 @@ class LMS {
 
             foreach($this->Data as $puts) {
                 fputs($fsocket, $puts);
+                $gets = '';
                 while(!$gets) { $gets = fgets($fsocket,32); }
                 $json = json_decode(substr($puts,6), true);
 
@@ -206,7 +207,6 @@ class LMS {
                     $this->Result[$dest] = $dest.":Error(".substr($gets,6,2).")";
                     if(substr($gets,6,2) >= "80") break;
                 }
-                $gets = "";
             }
 
             fclose($fsocket);
@@ -217,6 +217,7 @@ class LMS {
 
             foreach($this->Data as $puts) {
                 fputs($fsocket, $puts);
+                $gets = '';
                 while(!$gets) { $gets = fgets($fsocket,30); }
                 $dest = substr($puts,26,11);
                 if (substr($gets,0,19) == "0223  00".$dest) {
@@ -224,7 +225,6 @@ class LMS {
                 } else {
                     $this->Result[$dest] = $dest.":Error(".substr($gets,6,2).")";
                 }
-                $gets = "";
             }
 
             fclose($fsocket);

lib/icode.sms.lib.php

@@ -198,6 +198,7 @@ class SMS {
 
             foreach($this->Data as $puts) {
                 fputs($fsocket, $puts);
+                $gets = '';
                 while(!$gets) { $gets = fgets($fsocket,32); }
                 $json = json_decode(substr($puts,6), true);
 
@@ -209,7 +210,6 @@ class SMS {
                     $this->Result[$dest] = $dest.":Error(".substr($gets,6,2).")";
                     if(substr($gets,6,2) >= "80") break;
                 }
-                $gets = "";
             }
             fclose($fsocket);
 
@@ -226,10 +226,10 @@ class SMS {
             foreach($this->Data as $puts) {
                 $dest = substr($puts,26,11);
                 fputs($fp,$puts);
+                $gets = '';
                 while(!$gets) { $gets=fgets($fp,30); }
                 if (substr($gets,0,19)=="0223  00".$dest) $this->Result[]=$dest.":".substr($gets,19,10);
                 else $this->Result[$dest]=$dest.":Error";
-                $gets="";
             }
             fclose($fp);
         }

lib/shop.data.lib.php

@@ -32,9 +32,9 @@ function get_shop_item_with_category($it_id, $seo_title='', $add_query=''){
     global $g5, $default;
 
     if( $seo_title ){
-        $sql = " select a.*, b.ca_name, b.ca_use from {$g5['g5_shop_item_table']} a, {$g5['g5_shop_category_table']} b where a.it_seo_title = '".sql_real_escape_string(generate_seo_title($seo_title))."' and a.ca_id = b.ca_id $add_query";
+        $sql = " select a.*, b.ca_name, b.ca_use from {$g5['g5_shop_item_table']} a, {$g5['g5_shop_category_table']} b where a.it_seo_title = '".sql_real_escape_string(generate_seo_title($seo_title))."' and a.ca_id = b.ca_id $add_query order by it_id desc limit 1";
     } else {
-        $sql = " select a.*, b.ca_name, b.ca_use from {$g5['g5_shop_item_table']} a, {$g5['g5_shop_category_table']} b where a.it_id = '$it_id' and a.ca_id = b.ca_id $add_query";
+        $sql = " select a.*, b.ca_name, b.ca_use from {$g5['g5_shop_item_table']} a, {$g5['g5_shop_category_table']} b where a.it_id = '$it_id' and a.ca_id = b.ca_id $add_query order by it_id desc limit 1";
     }
     
     $item = sql_fetch($sql);

lib/shop.lib.php

@@ -1943,8 +1943,9 @@ function is_soldout($it_id, $is_cache=false)
     // 상품정보
     $it = get_shop_item($it_id, $is_cache);
 
-    if($it['it_soldout'] || $it['it_stock_qty'] <= 0)
+    if ($it['it_soldout']) {
         return true;
+    }
 
     $count = 0;
     $soldout = false;
@@ -1953,7 +1954,7 @@ function is_soldout($it_id, $is_cache=false)
     $sql = " select count(*) as cnt from {$g5['g5_shop_item_option_table']} where it_id = '$it_id' and io_type = '0' ";
     $row = sql_fetch($sql);
 
-    if($row['cnt']) {
+    if (isset($row['cnt']) && $row['cnt']) {
         $sql = " select io_id, io_type, io_stock_qty
                     from {$g5['g5_shop_item_option_table']}
                     where it_id = '$it_id'
@@ -1972,12 +1973,18 @@ function is_soldout($it_id, $is_cache=false)
         // 모든 선택옵션 품절이면 상품 품절
         if($i == $count)
             $soldout = true;
-    } else {
-        // 상품 재고수량
-        $stock_qty = get_it_stock_qty($it_id);
 
-        if($stock_qty <= 0)
+    } else {
+
+        if ($it['it_stock_qty'] <= 0) {
             $soldout = true;
+        } else {
+            // 상품 재고수량
+            $stock_qty = get_it_stock_qty($it_id);
+
+            if($stock_qty <= 0)
+                $soldout = true;
+        }
     }
     
     $cache[$key] = $soldout;
@@ -2625,10 +2632,10 @@ function make_order_field($data, $exclude)
 
         if(is_array($value)) {
             foreach($value as $k=>$v) {
-                $field .= '<input type="hidden" name="'.$key.'['.$k.']" value="'.$v.'">'.PHP_EOL;
+                $field .= '<input type="hidden" name="'.$key.'['.$k.']" value="'.get_text($v).'">'.PHP_EOL;
             }
         } else {
-            $field .= '<input type="hidden" name="'.$key.'" value="'.$value.'">'.PHP_EOL;
+            $field .= '<input type="hidden" name="'.$key.'" value="'.get_text($value).'">'.PHP_EOL;
         }
     }
 
@@ -2745,6 +2752,39 @@ function get_item_images_info($it, $size=array(), $image_width, $image_height){
     return $images; 
 }
 
+function check_payment_method($od_settle_case) {
+    global $default;
+
+    $is_block = 0;
+
+    if ($od_settle_case === '무통장') {
+        if (! $default['de_bank_use']) {
+            $is_block = 1;
+        }
+    } else if ($od_settle_case === '계좌이체') {
+        if (! $default['de_iche_use']) {
+            $is_block = 1;
+        }
+    } else if ($od_settle_case === '가상계좌') {
+        if (! $default['de_vbank_use']) {
+            $is_block = 1;
+        }
+    } else if ($od_settle_case === '휴대폰') {
+        if (! $default['de_hp_use']) {
+            $is_block = 1;
+        }
+    } else if ($od_settle_case === '신용카드') {
+        if (! $default['de_card_use']) {
+            $is_block = 1;
+        }
+    }
+
+    if ($is_block) {
+        alert($od_settle_case.' 은 결제수단에서 사용이 금지되어 있습니다.', G5_SHOP_URL);
+        die('');
+    }
+}
+
 //결제방식 이름을 체크하여 치환 대상인 문자열은 따로 리턴합니다.
 function check_pay_name_replace($payname, $od=array(), $is_client=0){
 
@@ -2769,6 +2809,8 @@ function check_pay_name_replace($payname, $od=array(), $is_client=0){
                 return '네이버페이_NHNKCP'.$add_str;
             } else if( isset($od['od_other_pay_type']) && ($od['od_other_pay_type'] === 'OT13' || $od['od_other_pay_type'] === 'NHNKCP_KAKAOMONEY') ){
                 return '카카오페이_NHNKCP'.$add_str;
+            } else if( isset($od['od_other_pay_type']) && $od['od_other_pay_type'] === 'OT21' ){
+                return '애플페이_NHNKCP'.$add_str;
             }
 
             return 'PAYCO'.$add_str;

lib/shop.uri.lib.php

@@ -142,6 +142,7 @@ function shop_short_url_clean($string_url, $url, $page_name, $array_page_names){
             $add_param .= $add_param ? '&'.$add_qry : '?'.$add_qry;
         }
 
+        $return_url = '';
         foreach($s as $k => $v) { $return_url .= '/'.$v; }
 
         return $host.$return_url.$add_param.$fragment;

lib/thumbnail.lib.php

@@ -10,15 +10,22 @@ function get_list_thumbnail($bo_table, $wr_id, $thumb_width, $thumb_height, $is_
     $filename = $alt = $data_path = '';
     $edt = false;
 
-    $row = get_thumbnail_find_cache($bo_table, $wr_id, 'file');
     $empty_array = array('src'=>'', 'ori'=>'', 'alt'=>'');
 
-    if(isset($row['bf_file']) && $row['bf_file']) {
+    $write = get_thumbnail_find_cache($bo_table, $wr_id, 'content');
+
+    // 비밀글이면 썸네일을 노출하지 않습니다.
+    if (isset($write['wr_option']) && strstr($write['wr_option'], "secret")) {
+        return run_replace('is_secret_list_thumbnail', $empty_array, $bo_table, $write);
+    }
+
+    $row = get_thumbnail_find_cache($bo_table, $wr_id, 'file');
+
+    if (isset($row['bf_file']) && $row['bf_file']) {
         $filename = $row['bf_file'];
         $filepath = G5_DATA_PATH.'/file/'.$bo_table;
         $alt = get_text($row['bf_content']);
     } else {
-        $write = get_thumbnail_find_cache($bo_table, $wr_id, 'content');
         $edt = true;
         
         if( $matches = get_editor_image($write['wr_content'], false) ){

lib/uri.lib.php

@@ -253,10 +253,61 @@ function exist_seo_url($type, $seo_title, $write_table, $sql_id=0){
         return '';
 }
 
+function check_case_exist_title($data, $case=G5_BBS_DIR, $is_redirect=false) {
+    global $config, $g5, $board;
+
+    if ((int) $config['cf_bbs_rewrite'] !== 2) {
+        return;
+    }
+
+    $seo_title = '';
+    $redirect_url = '';
+
+    if ($case == G5_BBS_DIR && isset($data['wr_seo_title'])) {
+        $db_table = $g5['write_prefix'].$board['bo_table'];
+
+        if (exist_seo_url($case, $data['wr_seo_title'], $db_table, $data['wr_id'])) {
+            $seo_title = $data['wr_seo_title'].'-'.$data['wr_id'];
+            $sql = " update `{$db_table}` set wr_seo_title = '".sql_real_escape_string($seo_title)."' where wr_id = '{$data['wr_id']}' ";
+            sql_query($sql, false);
+
+            get_write($db_table, $data['wr_id'], false);
+            $redirect_url = get_pretty_url($board['bo_table'], $data['wr_id']);
+        }
+    } else if ($case == G5_CONTENT_DIR && isset($data['co_seo_title'])) {
+        $db_table = $g5['content_table'];
+
+        if (exist_seo_url($case, $data['co_seo_title'], $db_table, $data['co_id'])) {
+            $seo_title = $data['co_seo_title'].'-'.substr(get_random_token_string(4), 4);
+            $sql = " update `{$db_table}` set co_seo_title = '".sql_real_escape_string($seo_title)."' where co_id = '{$data['co_id']}' ";
+            sql_query($sql, false);
+            
+            get_content_db($data['co_id'], false);
+            g5_delete_cache_by_prefix('content-' . $data['co_id'] . '-');
+            $redirect_url = get_pretty_url($case, $data['co_id']);
+        }
+    } else if (defined('G5_SHOP_DIR') && $case == G5_SHOP_DIR && isset($data['it_seo_title'])) {
+        $db_table = $g5['g5_shop_item_table'];
+
+        if (shop_exist_check_seo_title($data['it_seo_title'], $case, $db_table, $data['it_id'])) {
+            $seo_title = $data['it_seo_title'].'-'.substr(get_random_token_string(4), 4);
+            $sql = " update `{$db_table}` set it_seo_title = '".sql_real_escape_string($seo_title)."' where it_id = '{$data['it_id']}' ";
+            sql_query($sql, false);
+
+            get_shop_item($data['it_id'], false);
+            $redirect_url = get_pretty_url($case, $data['it_id']);
+        }
+    }
+
+    if ($is_redirect && $seo_title && $redirect_url) {
+        goto_url($redirect_url);
+    }
+}
+
 function exist_seo_title_recursive($type, $seo_title, $write_table, $sql_id=0){
     static $count = 0;
 
-    $seo_title_add = ($count > 0) ? utf8_strcut($seo_title, 200 - ($count+1), '')."-$count" : $seo_title;
+    $seo_title_add = ($count > 0) ? utf8_strcut($seo_title, 100000 - ($count+1), '')."-$count" : $seo_title;
 
     if( ! exist_seo_url($type, $seo_title_add, $write_table, $sql_id) ){
         return $seo_title_add;
@@ -264,7 +315,7 @@ function exist_seo_title_recursive($type, $seo_title, $write_table, $sql_id=0){
     
     $count++;
 
-    if( $count > 198 ){
+    if( $count > 99998 ){
         return $seo_title_add;
     }
 
@@ -298,63 +349,69 @@ function seo_title_update($db_table, $pk_id, $type='bbs'){
     }
 }
 
-function get_nginx_conf_rules($return_string=false){
-
+function get_nginx_conf_rules($return_string = false)
+{
     $get_path_url = parse_url(G5_URL);
-
-    $base_path = isset($get_path_url['path']) ? $get_path_url['path'].'/' : '/';
+    $base_path = isset($get_path_url['path']) ? $get_path_url['path'] . '/' : '/';
 
     $rules = array();
-    
-    $rules[] = '#### '.G5_VERSION.' nginx rules BEGIN #####';
-    $rules[] = 'if (!-e $request_filename){';
+    $rules[] = '#### ' . G5_VERSION . ' nginx rules BEGIN #####';
 
-    if( $add_rules = run_replace('add_nginx_conf_rules', '', $get_path_url, $base_path, $return_string) ){
+    if ($add_rules = run_replace('add_nginx_conf_pre_rules', '', $get_path_url, $base_path, $return_string)) {
         $rules[] = $add_rules;
     }
 
-    $rules[] = "rewrite ^{$base_path}content/([0-9a-zA-Z_]+)$ {$base_path}".G5_BBS_DIR."/content.php?co_id=$1&rewrite=1 break;";
-    $rules[] = "rewrite ^{$base_path}content/([^/]+)/$ {$base_path}".G5_BBS_DIR."/content.php?co_seo_title=$1&rewrite=1 break;";
-    $rules[] = "rewrite ^{$base_path}rss/([0-9a-zA-Z_]+)$ {$base_path}".G5_BBS_DIR."/rss.php?bo_table=$1 break;";
-    $rules[] = "rewrite ^{$base_path}([0-9a-zA-Z_]+)$ {$base_path}".G5_BBS_DIR."/board.php?bo_table=$1&rewrite=1 break;";
-    $rules[] = "rewrite ^{$base_path}([0-9a-zA-Z_]+)/write$ {$base_path}".G5_BBS_DIR."/write.php?bo_table=$1&rewrite=1 break;";
-    $rules[] = "rewrite ^{$base_path}([0-9a-zA-Z_]+)/([^/]+)/$ {$base_path}".G5_BBS_DIR."/board.php?bo_table=$1&wr_seo_title=$2&rewrite=1 break;";
-    $rules[] = "rewrite ^{$base_path}([0-9a-zA-Z_]+)/([0-9]+)$ {$base_path}".G5_BBS_DIR."/board.php?bo_table=$1&wr_id=$2&rewrite=1 break;";
+    $rules[] = 'if (!-e $request_filename) {';
+
+    if ($add_rules = run_replace('add_nginx_conf_rules', '', $get_path_url, $base_path, $return_string)) {
+        $rules[] = $add_rules;
+    }
+
+    $rules[] = "rewrite ^{$base_path}content/([0-9a-zA-Z_]+)$ {$base_path}" . G5_BBS_DIR . "/content.php?co_id=$1&rewrite=1 break;";
+    $rules[] = "rewrite ^{$base_path}content/([^/]+)/$ {$base_path}" . G5_BBS_DIR . "/content.php?co_seo_title=$1&rewrite=1 break;";
+    $rules[] = "rewrite ^{$base_path}rss/([0-9a-zA-Z_]+)$ {$base_path}" . G5_BBS_DIR . "/rss.php?bo_table=$1 break;";
+    $rules[] = "rewrite ^{$base_path}([0-9a-zA-Z_]+)$ {$base_path}" . G5_BBS_DIR . "/board.php?bo_table=$1&rewrite=1 break;";
+    $rules[] = "rewrite ^{$base_path}([0-9a-zA-Z_]+)/write$ {$base_path}" . G5_BBS_DIR . "/write.php?bo_table=$1&rewrite=1 break;";
+    $rules[] = "rewrite ^{$base_path}([0-9a-zA-Z_]+)/([^/]+)/$ {$base_path}" . G5_BBS_DIR . "/board.php?bo_table=$1&wr_seo_title=$2&rewrite=1 break;";
+    $rules[] = "rewrite ^{$base_path}([0-9a-zA-Z_]+)/([0-9]+)$ {$base_path}" . G5_BBS_DIR . "/board.php?bo_table=$1&wr_id=$2&rewrite=1 break;";
     $rules[] = '}';
-    $rules[] = '#### '.G5_VERSION.' nginx rules END #####';
+    $rules[] = '#### ' . G5_VERSION . ' nginx rules END #####';
 
     return $return_string ? implode("\n", $rules) : $rules;
 }
 
-function get_mod_rewrite_rules($return_string=false){
-
+function get_mod_rewrite_rules($return_string = false)
+{
     $get_path_url = parse_url(G5_URL);
-
-    $base_path = isset($get_path_url['path']) ? $get_path_url['path'].'/' : '/';
+    $base_path = isset($get_path_url['path']) ? $get_path_url['path'] . '/' : '/';
 
     $rules = array();
-    
-    $rules[] = '#### '.G5_VERSION.' rewrite BEGIN #####';
+    $rules[] = '#### ' . G5_VERSION . ' rewrite BEGIN #####';
     $rules[] = '<IfModule mod_rewrite.c>';
     $rules[] = 'RewriteEngine On';
-    $rules[] = 'RewriteBase '.$base_path;
+    $rules[] = 'RewriteBase ' . $base_path;
+
+    if ($add_rules = run_replace('add_mod_rewrite_pre_rules', '', $get_path_url, $base_path, $return_string)) {
+        $rules[] = $add_rules;
+    }
+
     $rules[] = 'RewriteCond %{REQUEST_FILENAME} -f [OR]';
     $rules[] = 'RewriteCond %{REQUEST_FILENAME} -d';
     $rules[] = 'RewriteRule ^ - [L]';
 
-    if( $add_rules = run_replace('add_mod_rewrite_rules', '', $get_path_url, $base_path, $return_string) ){
+    if ($add_rules = run_replace('add_mod_rewrite_rules', '', $get_path_url, $base_path, $return_string)) {
         $rules[] = $add_rules;
     }
 
-    $rules[] = 'RewriteRule ^content/([0-9a-zA-Z_]+)$  '.G5_BBS_DIR.'/content.php?co_id=$1&rewrite=1  [QSA,L]';
-    $rules[] = 'RewriteRule ^content/([^/]+)/$  '.G5_BBS_DIR.'/content.php?co_seo_title=$1&rewrite=1      [QSA,L]';
-    $rules[] = 'RewriteRule ^rss/([0-9a-zA-Z_]+)$  '.G5_BBS_DIR.'/rss.php?bo_table=$1        [QSA,L]';
-    $rules[] = 'RewriteRule ^([0-9a-zA-Z_]+)$  '.G5_BBS_DIR.'/board.php?bo_table=$1&rewrite=1      [QSA,L]';
-    $rules[] = 'RewriteRule ^([0-9a-zA-Z_]+)/([^/]+)/$ '.G5_BBS_DIR.'/board.php?bo_table=$1&wr_seo_title=$2&rewrite=1      [QSA,L]';
-    $rules[] = 'RewriteRule ^([0-9a-zA-Z_]+)/write$  '.G5_BBS_DIR.'/write.php?bo_table=$1&rewrite=1    [QSA,L]';
-    $rules[] = 'RewriteRule ^([0-9a-zA-Z_]+)/([0-9]+)$  '.G5_BBS_DIR.'/board.php?bo_table=$1&wr_id=$2&rewrite=1  [QSA,L]';
+    $rules[] = 'RewriteRule ^content/([0-9a-zA-Z_]+)$ ' . G5_BBS_DIR . '/content.php?co_id=$1&rewrite=1 [QSA,L]';
+    $rules[] = 'RewriteRule ^content/([^/]+)/$ ' . G5_BBS_DIR . '/content.php?co_seo_title=$1&rewrite=1 [QSA,L]';
+    $rules[] = 'RewriteRule ^rss/([0-9a-zA-Z_]+)$ ' . G5_BBS_DIR . '/rss.php?bo_table=$1 [QSA,L]';
+    $rules[] = 'RewriteRule ^([0-9a-zA-Z_]+)$ ' . G5_BBS_DIR . '/board.php?bo_table=$1&rewrite=1 [QSA,L]';
+    $rules[] = 'RewriteRule ^([0-9a-zA-Z_]+)/([^/]+)/$ ' . G5_BBS_DIR . '/board.php?bo_table=$1&wr_seo_title=$2&rewrite=1 [QSA,L]';
+    $rules[] = 'RewriteRule ^([0-9a-zA-Z_]+)/write$ ' . G5_BBS_DIR . '/write.php?bo_table=$1&rewrite=1 [QSA,L]';
+    $rules[] = 'RewriteRule ^([0-9a-zA-Z_]+)/([0-9]+)$ ' . G5_BBS_DIR . '/board.php?bo_table=$1&wr_id=$2&rewrite=1 [QSA,L]';
     $rules[] = '</IfModule>';
-    $rules[] = '#### '.G5_VERSION.' rewrite END #####';
+    $rules[] = '#### ' . G5_VERSION . ' rewrite END #####';
 
     return $return_string ? implode("\n", $rules) : $rules;
 }

mobile/shop/cart.php

@@ -36,8 +36,8 @@ $result = sql_query($sql);
 $cart_count = sql_num_rows($result);
 ?>
 
-<script src="<?php echo G5_JS_URL; ?>/shop.js"></script>
-<script src="<?php echo G5_JS_URL; ?>/shop.override.js"></script>
+<script src="<?php echo G5_JS_URL; ?>/shop.js?ver=<?php echo G5_JS_VER; ?>"></script>
+<script src="<?php echo G5_JS_URL; ?>/shop.override.js?ver=<?php echo G5_JS_VER; ?>"></script>
 
 <div id="sod_bsk">
 

mobile/shop/event.php

@@ -33,7 +33,7 @@ else
     $order_by = 'b.it_order, b.it_id desc';
 
 if ($skin) {
-    $skin = preg_replace('#\.+(\/|\\\)#', '', $skin);
+    $skin = preg_replace(array('#\.+(\/|\\\)#', '#[\'\"]#'), array('', ''), $skin);
     $ev['ev_skin'] = $skin;
 }
 

mobile/shop/item.php

@@ -16,6 +16,8 @@ if( isset($row['it_seo_title']) && ! $row['it_seo_title'] ){
     shop_seo_title_update($row['it_id']);
 }
 
+if (function_exists('check_case_exist_title')) check_case_exist_title($it, G5_SHOP_DIR, true);
+
 if (!($it['ca_use'] && $it['it_use'])) {
     if (!$is_admin)
         alert('판매가능한 상품이 아닙니다.');
@@ -87,7 +89,7 @@ $sql = " select it_id, it_name from {$g5['g5_shop_item_table']}
           limit 1 ";
 $row = sql_fetch($sql);
 if (isset($row['it_id']) && $row['it_id']) {
-    $next_title = '다음 상품 <span>'.$row['it_name'].'</span>';
+    $next_title = '다음상품 <span>'.$row['it_name'].'</span>';
     $next_href = '<a href="'.shop_item_url($row['it_id']).'" id="siblings_next">';
     $next_href2 = '</a>';
 } else {
@@ -197,11 +199,11 @@ include_once(G5_MSHOP_PATH.'/_head.php');
 include_once(G5_SHOP_PATH.'/settle_naverpay.inc.php');
 
 // 상단 HTML
-echo '<div id="sit_hhtml">'.conv_content($it['it_mobile_head_html'], 1).'</div>';
+echo run_replace('shop_it_mobile_head_html', '<div id="sit_hhtml">'.conv_content($it['it_mobile_head_html'], 1).'</div>', $it);
 ?>
 
 <?php if($is_orderable) { ?>
-<script src="<?php echo G5_JS_URL; ?>/shop.js"></script>
+<script src="<?php echo G5_JS_URL; ?>/shop.js?ver=<?php echo G5_JS_VER; ?>"></script>
 <?php } ?>
 
 <?php
@@ -222,6 +224,6 @@ else
 
 <?php
 // 하단 HTML
-echo conv_content($it['it_mobile_tail_html'], 1);
+echo run_replace('shop_it_mobile_tail_html', conv_content($it['it_mobile_tail_html'], 1), $it);
 
 include_once(G5_MSHOP_PATH.'/_tail.php');

mobile/shop/kcp/KCPComLibrary.php

@@ -99,7 +99,7 @@ class PayService extends  SoapClient
     var   $resMsg;
 
 
-    public  function  PayService( $wsdl = "", $options = array() )
+    public function __construct( $wsdl = "", $options = array() )
     {
         foreach( self::$classmap as $key => $value )
         {

mobile/shop/kcp/easypay_form.1.php

@@ -29,6 +29,7 @@ $param_opt_3 = isset($_REQUEST['param_opt_3']) ? clean_xss_tags($_REQUEST['param
 <input type="hidden" name="naverpay_point_direct" value="Y">    <!-- 네이버페이 포인트 결제를 하려면 naverpay_point_direct 를 Y  -->
 <?php } ?>
 <input type="hidden" name="kakaopay_direct" value="A" >    <!-- KAKAOPAY 결제창 호출 -->
+<input type="hidden" name="applepay_direct" value="A" >    <!-- APPLEPAY 결제창 호출 -->
 <!-- 주문번호 -->
 <input type="hidden" name="ordr_idxx" value="<?php echo $od_id; ?>">
 <!-- 인증수단(영문 소문자) * 반드시 대소문자 구분 -->

mobile/shop/kcp/order_approval_form.php

@@ -67,6 +67,7 @@ include_once('./_common.php');
     $payco_direct    = isset($_POST["payco_direct"]) ? $_POST["payco_direct"] : ''; // PAYCO 결제창 호출
     $naverpay_direct = isset($_POST["naverpay_direct"]) ? $_POST["naverpay_direct"] : ''; // NAVERPAY 결제창 호출
     $kakaopay_direct = isset($_POST["kakaopay_direct"]) ? $_POST["kakaopay_direct"] : ''; // KAKAOPAY 결제창 호출
+    $applepay_direct = isset($_POST["applepay_direct"]) ? $_POST["applepay_direct"] : ''; // APPLEPAY 결제창 호출
 
 	/*
      * 기타 파라메터 추가 부분 - Start -
@@ -157,7 +158,7 @@ include_once('./_common.php');
     {
 
        var v_frm = document.sm_form;
-
+        
         layer_cont_obj   = document.getElementById("content");
         layer_receipt_obj = document.getElementById("layer_receipt");
 
@@ -165,9 +166,16 @@ include_once('./_common.php');
         layer_receipt_obj.style.display = "block";
         
         v_frm.target = "frm_receipt";
+        
+        // IOS 환경의 경우 iframe에서 네이버페이와 애플페이의 cors 문제가 일어나므로 iframe으로 열지 않는다.
+        var isIOS = /iPad|iPhone|iPod/.test(navigator.platform) || (navigator.platform === 'MacIntel' && navigator.maxTouchPoints > 1);
 
-        // 네이버페이면 반드시 페이지전환 방식이어야 하며, 그 외에는 iframe 방식으로 한다.
-        if(typeof v_frm.naverpay_direct !== "undefined" && v_frm.naverpay_direct.value == "Y") {
+        if (isIOS) {
+            v_frm.target = "";
+        }
+
+        // 네이버페이 또는 애플페이의 경우 반드시 페이지전환 방식이어야 하며, 그 외에는 iframe 방식으로 한다.
+        if((typeof v_frm.naverpay_direct !== "undefined" && v_frm.naverpay_direct.value == "Y") || (typeof v_frm.applepay_direct !== "undefined" && v_frm.applepay_direct.value == "Y")) {
             v_frm.target = "";
         }
 
@@ -267,18 +275,20 @@ if($enc_data != '' && $enc_info != '' && $tran_cd != '') {
 ?>
 
 <?php if($payco_direct){ ?>
-<input type="hidden" name="payco_direct"   value="<?php echo $payco_direct; ?>">      <!-- PAYCO 결제창 호출 -->
+<input type="hidden" name="payco_direct"   value="<?php echo get_text($payco_direct); ?>">      <!-- PAYCO 결제창 호출 -->
 <?php } ?>
 <?php if($naverpay_direct){ ?>
-<input type="hidden" name="naverpay_direct"   value="<?php echo $naverpay_direct; ?>">      <!-- 네이버페이 결제창 호출 -->
+<input type="hidden" name="naverpay_direct"   value="<?php echo get_text($naverpay_direct); ?>">      <!-- 네이버페이 결제창 호출 -->
     <?php if(isset($default['de_easy_pay_services']) && in_array('used_nhnkcp_naverpay_point', explode(',', $default['de_easy_pay_services'])) ){     // 네이버페이 포인트 결제 옵션 ?>
     <input type="hidden" name="naverpay_point_direct" value="Y">    <!-- 네이버페이 포인트 결제를 하려면 naverpay_point_direct 를 Y  -->
     <?php } ?>
 <?php } ?>
+<?php if($applepay_direct === "Y"){ ?>
+<input type="hidden" name="applepay_direct" value="<?php echo get_text($applepay_direct); ?>">  <!-- 애플페이 결제창 호출 -->
+<?php } ?>
 <?php if($kakaopay_direct){ ?>
-<input type="hidden" name="kakaopay_direct"   value="<?php echo $kakaopay_direct; ?>">      <!-- 카카오페이 결제창 호출 -->
+<input type="hidden" name="kakaopay_direct"   value="<?php echo get_text($kakaopay_direct); ?>">      <!-- 카카오페이 결제창 호출 -->
 <?php } ?>
-
 <!-- 필수 사항 -->
 
 <!-- 요청 구분 -->

mobile/shop/kcp/orderform.1.php

@@ -24,6 +24,7 @@ $param_opt_3 = isset($_REQUEST['param_opt_3']) ? clean_xss_tags($_REQUEST['param
 <input type="hidden" name="payco_direct"   value="">      <!-- PAYCO 결제창 호출 -->
 <input type="hidden" name="naverpay_direct" value="A" >    <!-- NAVERPAY 결제창 호출 -->
 <input type="hidden" name="kakaopay_direct" value="A" >    <!-- KAKAOPAY 결제창 호출 -->
+<input type="hidden" name="applepay_direct" value="A" >    <!-- APPLEPAY 결제창 호출 -->
 <!-- 주문번호 -->
 <input type="hidden" name="ordr_idxx" value="<?php echo $od_id; ?>">
 <!-- 인증수단(영문 소문자) * 반드시 대소문자 구분 -->

mobile/shop/lg/mispwapurl.php

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

mobile/shop/list.php

@@ -168,7 +168,7 @@ var g5_shop_url = "<?php echo G5_SHOP_URL; ?>";
 
     <?php
     $qstr1 = '';
-    if($i > 0 && $total_count > $items) {
+    if($total_count > $items) {
         $qstr1 .= 'ca_id='.$ca_id;
         $qstr1 .='&sort='.$sort.'&sortodr='.$sortodr;
         $ajax_url = G5_SHOP_URL.'/ajax.list.php?'.$qstr1.'&use_sns=1';

mobile/shop/listtype.php

@@ -1,12 +1,12 @@
 <?php
 include_once('./_common.php');
 
-$type = isset($_REQUEST['type']) ? preg_replace("/[\<\>\'\"\\\'\\\"\%\=\(\)\s]/", "", $_REQUEST['type']) : '';
-if ($type == 1)      $g5['title'] = '히트상품';
-else if ($type == 2) $g5['title'] = '추천상품';
-else if ($type == 3) $g5['title'] = '최신상품';
-else if ($type == 4) $g5['title'] = '인기상품';
-else if ($type == 5) $g5['title'] = '세일상품';
+$type = isset($_REQUEST['type']) ? (int) preg_replace("/[^0-9]/", "", $_REQUEST['type']) : 1;
+if ($type === 1)      $g5['title'] = '히트상품';
+else if ($type === 2) $g5['title'] = '추천상품';
+else if ($type === 3) $g5['title'] = '최신상품';
+else if ($type === 4) $g5['title'] = '인기상품';
+else if ($type === 5) $g5['title'] = '세일상품';
 else
     alert('상품유형이 아닙니다.');
 
@@ -32,7 +32,7 @@ else
 if (!$skin)
     $skin = $default['de_mobile_listtype_list_skin'];
 else
-    $skin = preg_replace('#\.+[\\\/]#', '', $skin);
+    $skin = preg_replace('#\.+[\\\/]#', '', strip_tags($skin));
 
 define('G5_SHOP_CSS_URL', G5_MSHOP_SKIN_URL);
 
@@ -65,7 +65,7 @@ if (file_exists($list_file)) {
 }
 else
 {
-    echo '<div align="center">'.$skin.' 파일을 찾을 수 없습니다.<br>관리자에게 알려주시면 감사하겠습니다.</div>';
+    echo '<div align="center">'.get_text($skin).' 파일을 찾을 수 없습니다.<br>관리자에게 알려주시면 감사하겠습니다.</div>';
 }
 ?>
 </div>

mobile/shop/mypage.php

@@ -111,7 +111,7 @@ $cp_count = get_shop_member_coupon_count($member['mb_id'], true);
             <li>
                 <div class="wish_img"><?php echo $image; ?></div>
                 <div class="wish_info">
-                    <a href="<?php echo get_shop_item($row['it_id'], true); ?>" class="info_link"><?php echo stripslashes($row['it_name']); ?></a>
+                    <a href="<?php echo shop_item_url($row['it_id']); ?>" class="info_link"><?php echo stripslashes($row['it_name']); ?></a>
                      <span class="info_date"><?php echo substr($row['wi_time'], 2, 8); ?></span>
                 </div>
             </li>

mobile/shop/orderform.sub.php

@@ -624,6 +624,9 @@ if($is_kakaopay_use) {
                 if( in_array('nhnkcp_kakaopay', $de_easy_pay_service_array) ){
                     $easypay_prints['nhnkcp_kakaopay'] = '<li><input type="radio" id="od_settle_nhnkcp_kakaopay" name="od_settle_case" data-pay="kakaopay" value="간편결제" > <label for="od_settle_nhnkcp_kakaopay" class="kakaopay_icon nhnkcp_kakaopay lb_icon" title="NHN_KCP - 카카오페이">카카오페이</label></li>';
                 }
+                if( in_array('nhnkcp_applepay', $de_easy_pay_service_array) && preg_match('~^(?:(?:(?:Mozilla/\d\.\d\s*\()+|Mobile\s*Safari\s*\d+\.\d+(\.\d+)?\s*)(?:iPhone(?:\s+Simulator)?|iPad|iPod);\s*(?:U;\s*)?(?:[a-z]+(?:-[a-z]+)?;\s*)?CPU\s*(?:iPhone\s*)?(?:OS\s*\d+_\d+(?:_\d+)?\s*)?(?:like|comme)\s*Mac\s*O?S?\s*X(?:;\s*[a-z]+(?:-[a-z]+)?)?\)\s*)?(?:AppleWebKit/\d+(?:\.\d+(?:\.\d+)?|\s*\+)?\s*)?(?:\(KHTML,\s*(?:like|comme)\s*Gecko\s*\)\s*)?(?:Version/\d+\.\d+(?:\.\d+)?\s*)?(?:Mobile/\w+\s*)?(?:Safari/\d+\.\d+(?:\.\d+)?.*)?$~', $_SERVER['HTTP_USER_AGENT']) ){
+                    $easypay_prints['nhnkcp_applepay'] = '<li><input type="radio" id="od_settle_nhnkcp_applepay" name="od_settle_case" data-pay="applepay" value="간편결제" > <label for="od_settle_nhnkcp_applepay" class="applepay_icon nhnkcp_applepay lb_icon" title="NHN_KCP - 애플페이">애플페이</label></li>';
+                }
             } else {
                 $easypay_prints[strtolower($pg_easy_pay_name)] = '<li><input type="radio" id="od_settle_easy_pay" name="od_settle_case" value="간편결제" '.$checked.'> <label for="od_settle_easy_pay" class="'.$pg_easy_pay_name.' lb_icon">'.$pg_easy_pay_name.'</label></li>';
             }
@@ -1233,6 +1236,7 @@ var temp_point = 0;
 
 function pay_approval()
 {
+    // 무통장 아닌 가상계좌, 계좌이체, 휴대폰, 신용카드, 기타 등등 을 처리한다.
     // 재고체크
     var stock_msg = order_stock_check();
     if(stock_msg != "") {
@@ -1299,6 +1303,7 @@ function pay_approval()
         if(typeof f.payco_direct !== "undefined") f.payco_direct.value = "";
         if(typeof f.naverpay_direct !== "undefined") f.naverpay_direct.value = "A";
         if(typeof f.kakaopay_direct !== "undefined") f.kakaopay_direct.value = "A";
+        if(typeof f.applepay_direct !== "undefined") f.applepay_direct.value = "A";
         if(typeof f.ActionResult !== "undefined") f.ActionResult.value = "";
         if(typeof f.pay_method !== "undefined") f.pay_method.value = "";
 
@@ -1311,6 +1316,8 @@ function pay_approval()
                 }
             } else if(nhnkcp_easy_pay === "kakaopay"){
                 if(typeof f.kakaopay_direct !== "undefined") f.kakaopay_direct.value = "Y";
+            } else if(nhnkcp_easy_pay === "applepay"){
+                if(typeof f.applepay_direct !== "undefined") f.applepay_direct.value = "Y";
             } else {
                 if(typeof f.payco_direct !== "undefined") f.payco_direct.value = "Y";
             }
@@ -1318,6 +1325,10 @@ function pay_approval()
             if(typeof f.ActionResult !== "undefined") f.ActionResult.value = "CARD";    // 대소문자 구분
             if(typeof f.pay_method !== "undefined") f.pay_method.value = "card";        // 대소문자 구분
 
+            //if(nhnkcp_easy_pay === "applepay"){
+            //    if(typeof f.ActionResult !== "undefined") f.ActionResult.value = "card";
+            //    if(typeof f.pay_method !== "undefined") f.pay_method.value = "CARD";
+            //}
         }
 
         <?php } else if($default['de_pg_service'] == 'lg') { ?>
@@ -1435,6 +1446,14 @@ function pay_approval()
 
 function forderform_check()
 {
+    // 무통장만 여기에처 처리한다.
+    // 재고체크
+    var stock_msg = order_stock_check();
+    if(stock_msg != "") {
+        alert(stock_msg);
+        return false;
+    }
+
     var f = document.forderform;
 
     // 필드체크

mobile/shop/orderformupdate.php

@@ -335,6 +335,11 @@ $order_price = $tot_od_price + $send_cost + $send_cost2 - $tot_sc_cp_price - $od
 
 $od_status = '주문';
 $od_tno    = '';
+
+if (function_exists('check_payment_method')) {
+    check_payment_method($od_settle_case);
+}
+
 if ($od_settle_case == "무통장")
 {
     $od_receipt_point   = $i_temp_point;
@@ -705,10 +710,18 @@ $sql_card_point = "";
 if ($od_receipt_price > 0 && !$default['de_card_point']) {
     $sql_card_point = " , ct_point = '0' ";
 }
+
+// 회원 아이디 값 변경
+$sql_mb_id = "";
+if ($is_member) {
+    $sql_mb_id = " , mb_id = '{$member['mb_id']}' ";
+}
+
 $sql = "update {$g5['g5_shop_cart_table']}
            set od_id = '$od_id',
                ct_status = '$cart_status'
                $sql_card_point
+               $sql_mb_id
          where od_id = '$tmp_cart_id'
            and ct_select = '1' ";
 $result = sql_query($sql, false);
@@ -758,7 +771,7 @@ $od_memo = nl2br(htmlspecialchars2(stripslashes($od_memo))) . " ";
 if($is_member) {
     $it_cp_cnt = (isset($_POST['cp_id']) && is_array($_POST['cp_id'])) ? count($_POST['cp_id']) : 0;
     for($i=0; $i<$it_cp_cnt; $i++) {
-        $cid = isset($_POST['cp_id'][$i]) ? $_POST['cp_id'][$i] : '';
+        $cid = isset($_POST['cp_id'][$i]) ? clean_xss_tags($_POST['cp_id'][$i], 1, 1) : '';
         $cp_it_id = isset($_POST['it_id'][$i]) ? safe_replace_regex($_POST['it_id'][$i], 'it_id') : '';
         $cp_prc = isset($arr_it_cp_prc[$cp_it_id]) ? (int) $arr_it_cp_prc[$cp_it_id] : 0;
 

mobile/shop/orderinquiryview.php

@@ -1,5 +1,7 @@
 <?php
-include_once('./_common.php');
+if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
+
+$od_id = isset($_REQUEST['od_id']) ? safe_replace_regex($_REQUEST['od_id'], 'od_id') : '';
 
 // 테마에 orderinquiryview.php 있으면 include
 if(defined('G5_THEME_MSHOP_PATH')) {

mobile/shop/search.php

@@ -17,10 +17,10 @@ if (isset($_GET['qname']) || isset($_GET['qexplan']) || isset($_GET['qid']) || i
     $search_all = false;
 
 $q       = utf8_strcut(get_search_string(trim($_GET['q'])), 30, "");
-$qname   = isset($_GET['qname']) ? trim($_GET['qname']) : '';
-$qexplan = isset($_GET['qexplan']) ? trim($_GET['qexplan']) : '';
-$qid     = isset($_GET['qid']) ? trim($_GET['qid']) : '';
-$qbasic  = isset($_GET['qbasic']) ? trim($_GET['qbasic']) : '';
+$qname   = isset($_GET['qname']) ? trim(clean_xss_tags($_GET['qname'])) : '';
+$qexplan = isset($_GET['qexplan']) ? trim(clean_xss_tags($_GET['qexplan'])) : '';
+$qid     = isset($_GET['qid']) ? trim(clean_xss_tags($_GET['qid'])) : '';
+$qbasic  = isset($_GET['qbasic']) ? trim(clean_xss_tags($_GET['qbasic'])) : '';
 $qcaid   = isset($_GET['qcaid']) ? preg_replace('#[^a-z0-9]#i', '', trim($_GET['qcaid'])) : '';
 $qfrom   = isset($_GET['qfrom']) ? preg_replace('/[^0-9]/', '', trim($_GET['qfrom'])) : '';
 $qto     = isset($_GET['qto']) ? preg_replace('/[^0-9]/', '', trim($_GET['qto'])) : '';

mobile/shop/settle_inicis.inc.php

@@ -14,12 +14,10 @@ if ($default['de_card_test']) {
     if ($default['de_escrow_use'] == 1) {
         // 에스크로결제 테스트
         $default['de_inicis_mid'] = 'iniescrow0';
-        $default['de_inicis_admin_key'] = '1111';
     }
     else {
         // 일반결제 테스트
         $default['de_inicis_mid'] = 'INIpayTest';
-        $default['de_inicis_admin_key'] = '1111';
     }
 }
 else {
@@ -109,6 +107,8 @@ $inicis_cardpoint = $default['de_inicis_cartpoint_use'] ? '&cp_yn=Y' : '';
 // 예) BC 2,3,6개월, 국민 3,6개월, 삼성 6,9개월 무이자 : 11-2:3:6^06-3:6^12-3:6:4
 //$inicis_cardpoint .= '';        // &merc_noint=Y&noint_quota=카드사코드-개월:개월^추가카드사코드-개월:개월:개월 형식으로 설정
 
+require_once(G5_SHOP_PATH.'/inicis/libs/inicis_youngcart_fn.php');
+
 $noti_url   = G5_MSHOP_URL.'/inicis/settle_common.php';
 $next_url   = G5_MSHOP_URL.'/inicis/pay_approval.php';
 $return_url = G5_MSHOP_URL.'/inicis/pay_return.php?oid=';

mobile/skin/member/basic/login.skin.php

@@ -33,14 +33,14 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
         <h2>회원로그인 안내</h2>
         <div>
             <a href="<?php echo G5_BBS_URL ?>/password_lost.php">아이디/비밀번호 찾기</a>
-            <a href="./register.php">회원 가입</a>
+            <a href="<?php echo G5_BBS_URL ?>/register.php">회원 가입</a>
         </div>
     </section>
     </form>
 
 
     <?php // 쇼핑몰 사용시 여기부터 ?>
-    <?php if ($default['de_level_sell'] == 1) { // 상품구입 권한 ?>
+    <?php if (isset($default['de_level_sell']) && $default['de_level_sell'] == 1) { // 상품구입 권한 ?>
 
         <!-- 주문하기, 신청하기 -->
         <?php if (preg_match("/orderform.php/", $url)) { ?>

mobile/skin/member/basic/password_lost.skin.php

@@ -12,6 +12,7 @@ if($config['cf_cert_use'] && ($config['cf_cert_simple'] || $config['cf_cert_ipin
 <div id="find_info" class="new_win<?php if($config['cf_cert_use'] != 0 && $config['cf_cert_find'] != 0) { ?> cert<?php } ?>">
     <div class="new_win_con">
         <form name="fpasswordlost" action="<?php echo $action_url ?>" onsubmit="return fpasswordlost_submit(this);" method="post" autocomplete="off">
+        <input type="hidden" name="cert_no" value="">
         <h3>이메일로 찾기</h3>
         <fieldset id="info_fs">
             <p>

mobile/skin/member/basic/style.css

@@ -13,7 +13,7 @@
 
 /* 회원가입 약관 */
 #fregister section {position:relative;background:#fff;border-bottom:1px solid #e5e9f0;padding:15px}
-#fregister_chkall {position:relative;font-size:bold;text-align:left;background:#fff;padding:15px;border-top:1px solid #e5e9f0;border-bottom:1px solid #e5e9f0;border-radius:3px}
+#fregister_chkall {position:relative;font-weight:bold;text-align:left;background:#fff;padding:15px;border-top:1px solid #e5e9f0;border-bottom:1px solid #e5e9f0;border-radius:3px}
 #fregister h2 {text-align:left;padding-bottom:15px;line-height:1.7em;font-size:1.4em}
 #fregister textarea {display:block;width:100%;height:180px;padding:10px;background:#fbfbfb;border:1px solid #d1d7d8;line-height:1.5em;color:#555}
 #fregister p {position:relative;text-align:left;color:#fff;line-height:18px;padding:15px;font-size:1.1em;background:#f2838f;margin:15px;border-radius:5px}
@@ -98,7 +98,7 @@
 
 /* 기존 회원 본인인증 */
 #member_cert_refresh section {position:relative;background:#fff;border-bottom:1px solid #e5e9f0;padding:15px}
-#member_cert_refresh_chkall {position:relative;font-size:bold;text-align:left;background:#fff;padding:15px;border-top:1px solid #e5e9f0;border-bottom:1px solid #e5e9f0;border-radius:3px}
+#member_cert_refresh_chkall {position:relative;font-weight:bold;text-align:left;background:#fff;padding:15px;border-top:1px solid #e5e9f0;border-bottom:1px solid #e5e9f0;border-radius:3px}
 #member_cert_refresh h2 {text-align:left;padding-bottom:15px;line-height:1.7em;font-size:1.4em}
 #member_cert_refresh textarea {display:block;width:100%;height:180px;padding:10px;background:#fbfbfb;border:1px solid #d1d7d8;line-height:1.5em;color:#555}
 #member_cert_refresh p {position:relative;text-align:left;color:#fff;line-height:18px;padding:15px;font-size:1.1em;background:#f2838f;margin:15px;border-radius:5px}