버전 5.5.8.3.4 수정

1:1문의 답변 시 `qawrite_update` Hook에서 답변 글의 ID를 전달하도록 개선

adm/admin.lib.php

@@ -421,6 +421,16 @@ function get_sanitize_input($s, $is_html = false)
     return $s;
 }
 
+function domain_mail_host($is_at=true){
+    list($domain_host,) = explode(':', $_SERVER['HTTP_HOST']);
+
+    if ('www.' === substr($domain_host, 0, 4)) {
+        $domain_host = substr($domain_host, 4);
+    }
+
+    return $is_at ? '@'.$domain_host : $domain_host;
+}
+
 function check_log_folder($log_path, $is_delete = true)
 {
 
@@ -675,5 +685,9 @@ if (isset($_REQUEST) && $_REQUEST) {
     }
 }
 
-// 관리자에서는 추가 스크립트는 사용하지 않는다.
-//$config['cf_add_script'] = '';
+// 관리자에서는 추가 스크립트와 추가 매타태그, 방문자분석 스크립트가 실행되지 않게 빈값으로 합니다.
+if (run_replace('safe_admin_add_script_boolean', false) === false) {
+    $config['cf_analytics'] = '';
+    $config['cf_add_script'] = '';
+    $config['cf_add_meta'] = '';
+}

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_form.php

@@ -914,7 +914,7 @@ $pg_anchor = '<ul class="anchor">
         <tr>
             <th scope="row"><label for="bo_include_head">상단 파일 경로</label></th>
             <td>
-                <input type="text" name="bo_include_head" value="<?php echo $board['bo_include_head'] ?>" id="bo_include_head" class="frm_input" size="50">
+                <input type="text" name="bo_include_head" value="<?php echo get_sanitize_input($board['bo_include_head']); ?>" id="bo_include_head" class="frm_input" size="50">
             </td>
             <td class="td_grpset">
                 <input type="checkbox" name="chk_grp_include_head" value="1" id="chk_grp_include_head">
@@ -926,7 +926,7 @@ $pg_anchor = '<ul class="anchor">
         <tr>
             <th scope="row"><label for="bo_include_tail">하단 파일 경로</label></th>
             <td>
-                <input type="text" name="bo_include_tail" value="<?php echo $board['bo_include_tail'] ?>" id="bo_include_tail" class="frm_input" size="50">
+                <input type="text" name="bo_include_tail" value="<?php echo get_sanitize_input($board['bo_include_tail']); ?>" id="bo_include_tail" class="frm_input" size="50">
             </td>
             <td class="td_grpset">
                 <input type="checkbox" name="chk_grp_include_tail" value="1" id="chk_grp_include_tail">
@@ -1423,9 +1423,10 @@ function use_captcha_check(){
     });
 }
 
+var bo_include_head = jQuery.trim(jQuery("#bo_include_head").val()),
+    bo_include_tail = jQuery.trim(jQuery("#bo_include_tail").val());
+
 function frm_check_file(){
-    var bo_include_head = "<?php echo $board['bo_include_head']; ?>";
-    var bo_include_tail = "<?php echo $board['bo_include_tail']; ?>";
     var head = jQuery.trim(jQuery("#bo_include_head").val());
     var tail = jQuery.trim(jQuery("#bo_include_tail").val());
 

adm/config_form.php

@@ -8,6 +8,8 @@ if ($is_admin != 'super') {
     alert('최고관리자만 접근 가능합니다.');
 }
 
+$copy_config = get_config(true);
+
 if (!isset($config['cf_add_script'])) {
     sql_query(
         " ALTER TABLE `{$g5['config_table']}`
@@ -475,6 +477,9 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
                         <td colspan="3">
                             <?php echo help('관리자가 보내고 받는 용도로 사용하는 메일 주소를 입력합니다. (회원가입, 인증메일, 테스트, 회원메일발송 등에서 사용)') ?>
                             <input type="text" name="cf_admin_email" value="<?php echo get_sanitize_input($config['cf_admin_email']); ?>" id="cf_admin_email" required class="required email frm_input" size="40">
+                            <?php if (function_exists('domain_mail_host') && $config['cf_admin_email'] && stripos($config['cf_admin_email'], domain_mail_host()) === false) { ?>
+                            <?php echo help('외부메일설정이나 기타 설정을 하지 않았다면, 도메인과 다른 헤더로 여겨 스팸이나 차단될 가능성이 있습니다.<br>name'.domain_mail_host().' 과 같은 도메인 형식으로 설정할것을 권장합니다.') ?>
+                            <?php } ?>
                         </td>
                     </tr>
                     <tr>
@@ -693,15 +698,15 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
                     <tr>
                         <th scope="row"><label for="cf_analytics">방문자분석 스크립트</label></th>
                         <td colspan="3">
-                            <?php echo help('방문자분석 스크립트 코드를 입력합니다. 예) 구글 애널리틱스'); ?>
-                            <textarea name="cf_analytics" id="cf_analytics"><?php echo get_text($config['cf_analytics']); ?></textarea>
+                            <?php echo help('방문자분석 스크립트 코드를 입력합니다. 예) 구글 애널리틱스<br>관리자 페이지에서는 이 코드를 사용하지 않습니다.'); ?>
+                            <textarea name="cf_analytics" id="cf_analytics"><?php echo get_text($copy_config['cf_analytics']); ?></textarea>
                         </td>
                     </tr>
                     <tr>
                         <th scope="row"><label for="cf_add_meta">추가 메타태그</label></th>
                         <td colspan="3">
-                            <?php echo help('추가로 사용하실 meta 태그를 입력합니다.'); ?>
-                            <textarea name="cf_add_meta" id="cf_add_meta"><?php echo get_text($config['cf_add_meta']); ?></textarea>
+                            <?php echo help('추가로 사용하실 meta 태그를 입력합니다.<br>관리자 페이지에서는 이 코드를 사용하지 않습니다.'); ?>
+                            <textarea name="cf_add_meta" id="cf_add_meta"><?php echo get_text($copy_config['cf_add_meta']); ?></textarea>
                         </td>
                     </tr>
                     <tr>
@@ -1387,7 +1392,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($config['cf_add_script']); ?></textarea>
+                            <textarea name="cf_add_script" id="cf_add_script"><?php echo get_text($copy_config['cf_add_script']); ?></textarea>
                         </td>
                     </tr>
                 </tbody>

adm/contentform.php

@@ -137,14 +137,14 @@ require_once G5_ADMIN_PATH . '/admin.head.php';
                     <th scope="row"><label for="co_include_head">상단 파일 경로</label></th>
                     <td>
                         <?php echo help("설정값이 없으면 기본 상단 파일을 사용합니다."); ?>
-                        <input type="text" name="co_include_head" value="<?php echo $co['co_include_head']; ?>" id="co_include_head" class="frm_input" size="60">
+                        <input type="text" name="co_include_head" value="<?php echo get_sanitize_input($co['co_include_head']); ?>" id="co_include_head" class="frm_input" size="60">
                     </td>
                 </tr>
                 <tr>
                     <th scope="row"><label for="co_include_tail">하단 파일 경로</label></th>
                     <td>
                         <?php echo help("설정값이 없으면 기본 하단 파일을 사용합니다."); ?>
-                        <input type="text" name="co_include_tail" value="<?php echo $co['co_include_tail']; ?>" id="co_include_tail" class="frm_input" size="60">
+                        <input type="text" name="co_include_tail" value="<?php echo get_sanitize_input($co['co_include_tail']); ?>" id="co_include_tail" class="frm_input" size="60">
                     </td>
                 </tr>
                 <tr id="admin_captcha_box" style="display:none;">

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/css/admin.css

@@ -447,6 +447,7 @@ tfoot th {}
 .td_delino {width:130px}
 .td_device {width:70px;text-align:center}
 .td_etc {width:80px;text-align:center}
+.td_use {width:80px;text-align:center}
 .td_extra label {display:inline-block;width:100px}
 .td_extra input {margin-right:5px;width:130px}
 .td_grid {width:60px;text-align:center}
@@ -876,20 +877,6 @@ strong.sodr_nonpay {display:block;padding:5px 0;text-align:right}
 .sbn_img {text-align:center}
 .sbn_image {display:none;margin:0 0 10px;text-align:left}
 
-/* SMS문자전송 */
-#sms_send {padding-bottom:100px;zoom:1}
-#sms_send:after {display:block;visibility:hidden;clear:both;content:""}
-
-#sms_frm {float:left;width:650px}
-#sms_frm table {margin:0 0 30px}
-#sms_frm textarea {height:70px}
-
-#sms_sm {position:relative;float:left;width:229px;height:418px;background:url('../shop_admin/img/mobilebg.jpg') no-repeat}
-#sms_sm_text {position:absolute;top:75px;left:27px;width:180px;color:#fff;font-size:2em;word-break:break-all}
-#sms_sm p {position:absolute;bottom:-70px;left:0;font-size:0.95em;letter-spacing:-0.1em}
-
-#sms_send .local_desc01 {min-width:320px}
-
 /* 가격비교사이트 */
 #anc_pricecompare_info li {margin:5px 0 5px -1px}
 
@@ -1075,7 +1062,7 @@ box-shadow: 1px 2px 5px rgba(150,150,150,0.5);z-index:1000}
 #theme_detail:after{display:block;visibility:hidden;clear:both;content:""}
 #theme_detail h2{font-size:1.25em;background:#fff;padding:0 15px;line-height:40px;border-bottom:1px solid #d8d8d8;margin:0}
 .theme_dt_img{float:left;padding:20px}
-.theme_dt_img img{border:1px solid #aaa;}
+.theme_dt_img img{border:1px solid #aaa;max-width:600px;max-height:460px}
 .theme_dt_if{float:left;width:235px;padding:20px 0}
 .theme_dt_if table{width:100%;border-collapse:collapse;margin:15px 0 0 ;font-size:0.92em}
 .theme_dt_if table th{padding:5px;background:#fff;border-bottom:1px solid #f3f3f3;vertical-align:top;color:#3f51b5}

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

@@ -14,304 +14,315 @@ $new_member_rows = 5;
 $new_point_rows = 5;
 $new_write_rows = 5;
 
-$sql_common = " from {$g5['member_table']} ";
+if (! auth_check_menu($auth, '200100', 'r', true)) {
 
-$sql_search = " where (1) ";
+    $sql_common = " from {$g5['member_table']} ";
 
-if ($is_admin != 'super') {
-    $sql_search .= " and mb_level <= '{$member['mb_level']}' ";
-}
+    $sql_search = " where (1) ";
 
-if (!$sst) {
-    $sst = "mb_datetime";
-    $sod = "desc";
-}
-
-$sql_order = " order by {$sst} {$sod} ";
-
-$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>
 
-                    <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>
+        <div class="btn_list03 btn_list">
+            <a href="./member_list.php">회원 전체보기</a>
+        </div>
 
-                <?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>
+    </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>
+                        <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'];
+
+                         // 원글
+                        if ($row['wr_id'] == $row['wr_parent']) {
+                            $comment = "";
+                            $comment_link = "";
+                            $row2 = sql_fetch(" select * from $tmp_write_table where wr_id = '{$row['wr_id']}' ");
+
+                            $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']}' ");
+
+                            $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);
+                            }
+                        }
+                    ?>
+
+                        <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
 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_select_list.php

@@ -121,7 +121,7 @@ require_once './admin.head.php';
                 <?php } ?>
             </tbody>
         </table>
-        <textarea name="ma_list" style="display:none"><?php echo $ma_list ?></textarea>
+        <textarea name="ma_list" style="display:none"><?php echo html_purifier($ma_list); ?></textarea>
     </div>
 
     <div class="btn_confirm01 btn_confirm">

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/member_form.php

@@ -380,15 +380,15 @@ add_javascript(G5_POSTCODE_JS, 0);    //다음 주소 js
                 </tr>
                 <tr>
                     <th scope="row"><label for="mb_signature">서명</label></th>
-                    <td colspan="3"><textarea name="mb_signature" id="mb_signature"><?php echo $mb['mb_signature'] ?></textarea></td>
+                    <td colspan="3"><textarea name="mb_signature" id="mb_signature"><?php echo html_purifier($mb['mb_signature']); ?></textarea></td>
                 </tr>
                 <tr>
                     <th scope="row"><label for="mb_profile">자기 소개</label></th>
-                    <td colspan="3"><textarea name="mb_profile" id="mb_profile"><?php echo $mb['mb_profile'] ?></textarea></td>
+                    <td colspan="3"><textarea name="mb_profile" id="mb_profile"><?php echo html_purifier($mb['mb_profile']); ?></textarea></td>
                 </tr>
                 <tr>
                     <th scope="row"><label for="mb_memo">메모</label></th>
-                    <td colspan="3"><textarea name="mb_memo" id="mb_memo"><?php echo $mb['mb_memo'] ?></textarea></td>
+                    <td colspan="3"><textarea name="mb_memo" id="mb_memo"><?php echo html_purifier($mb['mb_memo']); ?></textarea></td>
                 </tr>
                 <tr>
                     <th scope="row"><label for="mb_cert_history">본인인증 내역</label></th>

adm/member_form_update.php

@@ -158,7 +158,13 @@ if ($w == '') {
     }
 
     if ($mb_id === $member['mb_id'] && $_POST['mb_level'] != $mb['mb_level']) {
-        alert($mb['mb_id'] . ' : 로그인 중인 관리자 레벨은 수정 할 수 없습니다.');
+        alert($mb['mb_id'] . ' : 로그인 중인 관리자 레벨은 수정할 수 없습니다.');
+    }
+
+    if ($posts['mb_leave_date'] || $posts['mb_intercept_date']){
+        if ($member['mb_id'] === $mb['mb_id'] || is_admin($mb['mb_id']) === 'super'){
+            alert('해당 관리자의 탈퇴 일자 또는 접근 차단 일자를 수정할 수 없습니다.');
+        }
     }
 
     // 닉네임중복체크

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/poll_form.php

@@ -23,6 +23,10 @@ if ($w == '') {
     alert('w 값이 제대로 넘어오지 않았습니다.');
 }
 
+if (!isset($po['po_use'])) {
+    sql_query(" alter table `{$g5['poll_table']}` add `po_use` tinyint not null default '0' after `mb_ids` ", false);
+}
+
 $g5['title'] = $html_title;
 require_once './admin.head.php';
 ?>
@@ -94,17 +98,21 @@ require_once './admin.head.php';
                 </tr>
 
                 <?php if ($w == 'u') { ?>
+                    <tr>
+                        <th scope="row">투표사용</th>
+                        <td><input type="checkbox" name="po_use" id="po_use" value="1" <?php if ($po['po_use']) { echo 'checked="checked"'; } ?>> <label for="po_use">사용</label></td>
+                    </tr>
                     <tr>
                         <th scope="row">투표등록일</th>
                         <td><?php echo $po['po_date']; ?></td>
                     </tr>
                     <tr>
                         <th scope="row"><label for="po_ips">투표참가 IP</label></th>
-                        <td><textarea name="po_ips" id="po_ips" readonly rows="10"><?php echo preg_replace("/\n/", " / ", $po['po_ips']) ?></textarea></td>
+                        <td><textarea name="po_ips" id="po_ips" readonly rows="10"><?php echo html_purifier(preg_replace("/\n/", " / ", $po['po_ips'])); ?></textarea></td>
                     </tr>
                     <tr>
                         <th scope="row"><label for="mb_ids">투표참가 회원</label></th>
-                        <td><textarea name="mb_ids" id="mb_ids" readonly rows="10"><?php echo preg_replace("/\n/", " / ", $po['mb_ids']) ?></textarea></td>
+                        <td><textarea name="mb_ids" id="mb_ids" readonly rows="10"><?php echo html_purifier(preg_replace("/\n/", " / ", $po['mb_ids'])); ?></textarea></td>
                     </tr>
                 <?php } ?>
             </tbody>

adm/poll_form_update.php

@@ -51,8 +51,8 @@ $po_id = isset($_POST['po_id']) ? $_POST['po_id'] : '';
 
 if ($w == '') {
     $sql = " insert {$g5['poll_table']}
-                    ( po_subject, po_poll1, po_poll2, po_poll3, po_poll4, po_poll5, po_poll6, po_poll7, po_poll8, po_poll9, po_cnt1, po_cnt2, po_cnt3, po_cnt4, po_cnt5, po_cnt6, po_cnt7, po_cnt8, po_cnt9, po_etc, po_level, po_point, po_date )
-             values ( '{$_POST['po_subject']}', '{$_POST['po_poll1']}', '{$_POST['po_poll2']}', '{$_POST['po_poll3']}', '{$_POST['po_poll4']}', '{$_POST['po_poll5']}', '{$_POST['po_poll6']}', '{$_POST['po_poll7']}', '{$_POST['po_poll8']}', '{$_POST['po_poll9']}', '{$_POST['po_cnt1']}', '{$_POST['po_cnt2']}', '{$_POST['po_cnt3']}', '{$_POST['po_cnt4']}', '{$_POST['po_cnt5']}', '{$_POST['po_cnt6']}', '{$_POST['po_cnt7']}', '{$_POST['po_cnt8']}', '{$_POST['po_cnt9']}', '{$_POST['po_etc']}', '{$_POST['po_level']}', '{$_POST['po_point']}', '" . G5_TIME_YMD . "' ) ";
+                    ( po_subject, po_poll1, po_poll2, po_poll3, po_poll4, po_poll5, po_poll6, po_poll7, po_poll8, po_poll9, po_cnt1, po_cnt2, po_cnt3, po_cnt4, po_cnt5, po_cnt6, po_cnt7, po_cnt8, po_cnt9, po_etc, po_level, po_point, po_date, po_use )
+             values ( '{$_POST['po_subject']}', '{$_POST['po_poll1']}', '{$_POST['po_poll2']}', '{$_POST['po_poll3']}', '{$_POST['po_poll4']}', '{$_POST['po_poll5']}', '{$_POST['po_poll6']}', '{$_POST['po_poll7']}', '{$_POST['po_poll8']}', '{$_POST['po_poll9']}', '{$_POST['po_cnt1']}', '{$_POST['po_cnt2']}', '{$_POST['po_cnt3']}', '{$_POST['po_cnt4']}', '{$_POST['po_cnt5']}', '{$_POST['po_cnt6']}', '{$_POST['po_cnt7']}', '{$_POST['po_cnt8']}', '{$_POST['po_cnt9']}', '{$_POST['po_etc']}', '{$_POST['po_level']}', '{$_POST['po_point']}', '" . G5_TIME_YMD . "', 1 ) ";
     sql_query($sql);
 
     $po_id = sql_insert_id();
@@ -79,7 +79,8 @@ if ($w == '') {
                      po_cnt9 = '{$_POST['po_cnt9']}',
                      po_etc = '{$_POST['po_etc']}',
                      po_level = '{$_POST['po_level']}',
-                     po_point = '{$_POST['po_point']}'
+                     po_point = '{$_POST['po_point']}',
+                     po_use = '{$_POST['po_use']}'
                 where po_id = '{$_POST['po_id']}' ";
     sql_query($sql);
 } elseif ($w == 'd') {

adm/poll_list.php

@@ -49,7 +49,7 @@ $listall = '<a href="' . $_SERVER['SCRIPT_NAME'] . '" class="ov_listall">전체
 $g5['title'] = '투표관리';
 require_once './admin.head.php';
 
-$colspan = 7;
+$colspan = 8;
 ?>
 
 <div class="local_ov01 local_ov">
@@ -92,6 +92,7 @@ $colspan = 7;
                     <th scope="col">투표권한</th>
                     <th scope="col">투표수</th>
                     <th scope="col">기타의견</th>
+                    <th scope="col">사용</th>
                     <th scope="col">관리</th>
                 </tr>
             </thead>
@@ -101,6 +102,7 @@ $colspan = 7;
                     $sql2 = " select sum(po_cnt1+po_cnt2+po_cnt3+po_cnt4+po_cnt5+po_cnt6+po_cnt7+po_cnt8+po_cnt9) as sum_po_cnt from {$g5['poll_table']} where po_id = '{$row['po_id']}' ";
                     $row2 = sql_fetch($sql2);
                     $po_etc = ($row['po_etc']) ? "사용" : "미사용";
+                    $po_use = ($row['po_use']) ? "사용" : "미사용";
 
                     $s_mod = '<a href="./poll_form.php?' . $qstr . '&amp;w=u&amp;po_id=' . $row['po_id'] . '" class="btn btn_03">수정</a>';
 
@@ -117,6 +119,7 @@ $colspan = 7;
                         <td class="td_num"><?php echo $row['po_level'] ?></td>
                         <td class="td_num"><?php echo $row2['sum_po_cnt'] ?></td>
                         <td class="td_etc"><?php echo $po_etc ?></td>
+                        <td class="td_use"><?php echo $po_use ?></td>
                         <td class="td_mng td_mng_s"><?php echo $s_mod ?></td>
                     </tr>
 

adm/qa_config.php

@@ -266,13 +266,13 @@ if (!isset($qaconfig['qa_include_head'])) {
                     <tr>
                         <th scope="row"><label for="qa_include_head">상단 파일 경로</label></th>
                         <td>
-                            <input type="text" name="qa_include_head" value="<?php echo $qaconfig['qa_include_head'] ?>" id="qa_include_head" class="frm_input" size="50">
+                            <input type="text" name="qa_include_head" value="<?php echo get_sanitize_input($qaconfig['qa_include_head']); ?>" id="qa_include_head" class="frm_input" size="50">
                         </td>
                     </tr>
                     <tr>
                         <th scope="row"><label for="qa_include_tail">하단 파일 경로</label></th>
                         <td>
-                            <input type="text" name="qa_include_tail" value="<?php echo $qaconfig['qa_include_tail'] ?>" id="qa_include_tail" class="frm_input" size="50">
+                            <input type="text" name="qa_include_tail" value="<?php echo get_sanitize_input($qaconfig['qa_include_tail']); ?>" id="qa_include_tail" class="frm_input" size="50">
                         </td>
                     </tr>
                     <tr id="admin_captcha_box" style="display:none;">
@@ -344,7 +344,9 @@ if (!isset($qaconfig['qa_include_head'])) {
 </form>
 
 <script>
-    var captcha_chk = false;
+    var captcha_chk = false,
+        qa_include_head = jQuery.trim(jQuery("#qa_include_head").val()),
+        qa_include_tail = jQuery.trim(jQuery("#qa_include_tail").val());
 
     function use_captcha_check() {
         $.ajax({
@@ -361,8 +363,6 @@ if (!isset($qaconfig['qa_include_head'])) {
     }
 
     function frm_check_file() {
-        var qa_include_head = "<?php echo $qaconfig['qa_include_head']; ?>";
-        var qa_include_tail = "<?php echo $qaconfig['qa_include_tail']; ?>";
         var head = jQuery.trim(jQuery("#qa_include_head").val());
         var tail = jQuery.trim(jQuery("#qa_include_tail").val());
 

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/sendmail_test.php

@@ -41,6 +41,7 @@ if (isset($_POST['email'])) {
         echo '해당 주소로 테스트 메일이 도착했는지 확인해 주십시오.<br>';
         echo '만약, 테스트 메일이 오지 않는다면 더 다양한 계정의 메일 주소로 메일을 보내 보십시오.<br>';
         echo '그래도 메일이 하나도 도착하지 않는다면 메일 서버(sendmail server)의 오류일 가능성이 높으니, 웹 서버관리자에게 문의하여 주십시오.<br>';
+        echo '도메인을 소유하고 있을시 SPF, DKIM 설정이 필요할수 있습니다.<br>';
         echo '</p></div>';
         echo '</section>';
     }
@@ -53,6 +54,10 @@ if (isset($_POST['email'])) {
         <p>
             메일서버가 정상적으로 동작 중인지 확인할 수 있습니다.<br>
             아래 입력칸에 테스트 메일을 발송하실 메일 주소를 입력하시면, [메일검사] 라는 제목으로 테스트 메일을 발송합니다.<br>
+            보내는 메일주소 : <?php echo get_sanitize_input($config['cf_admin_email']); ?><br>
+            <?php if (function_exists('domain_mail_host') && $config['cf_admin_email'] && stripos($config['cf_admin_email'], domain_mail_host()) === false) { ?>
+            <?php echo '외부메일설정이나 기타 설정을 하지 않았다면, 도메인과 다른 헤더로 여겨 스팸이나 차단될 가능성이 있습니다.<br>기본환경설정에서 관리자 메일 주소를 name'.domain_mail_host().' 과 같은 도메인 형식으로 설정할것을 권장합니다.'; ?>
+            <?php } ?>
         </p>
     </div>
     <form name="fsendmailtest" method="post">

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);
 }
@@ -593,7 +598,7 @@ if(!$default['de_kakaopay_cancelpwd']){
         <tr>
             <th scope="row"><label for="de_bank_account">은행계좌번호</label></th>
             <td>
-                <textarea name="de_bank_account" id="de_bank_account"><?php echo $default['de_bank_account']; ?></textarea>
+                <textarea name="de_bank_account" id="de_bank_account"><?php echo html_purifier($default['de_bank_account']); ?></textarea>
             </td>
         </tr>
         <tr>
@@ -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

@@ -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/itemcopy.php

@@ -32,6 +32,8 @@ include_once(G5_PATH.'/head.sub.php');
 
 <script>
 // <![CDATA[
+var g5_admin_csrf_token_key = "<?php echo (function_exists('admin_csrf_token_key')) ? admin_csrf_token_key() : ''; ?>";
+
 function _copy(link)
 {
     var new_it_id = document.getElementById('new_it_id').value;

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,22 @@ $sql = " update {$g5['g5_shop_item_table']}
             where it_id = '$new_it_id' ";
 sql_query($sql);
 
+/**
+ * 아이템 복사 처리 후 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

@@ -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/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/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/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

@@ -21,7 +21,7 @@ $fr_date = (isset($_GET['fr_date']) && preg_match("/^[0-9]{4}-(0[1-9]|1[0-2])-(0
 $to_date = (isset($_GET['to_date']) && preg_match("/^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])$/", $_GET['to_date'])) ? $_GET['to_date'] : '';
 
 $od_misu = isset($_GET['od_misu']) ? preg_replace('/[^0-9a-z]/i', '', $_GET['od_misu']) : '';
-$od_cancel_price = isset($_GET['od_cancel_price']) ? preg_replace('/[^0-9a-z]/', '', $_GET['od_cancel_price']) : '';
+$od_cancel_price = isset($_GET['od_cancel_price']) ? preg_replace('/[^0-9a-z]/i', '', $_GET['od_cancel_price']) : '';
 $od_refund_price = isset($_GET['od_refund_price']) ? preg_replace('/[^0-9a-z]/i', '', $_GET['od_refund_price']) : '';
 $od_receipt_point = isset($_GET['od_receipt_point']) ? preg_replace('/[^0-9a-z]/i', '', $_GET['od_receipt_point']) : '';
 $od_coupon = isset($_GET['od_coupon']) ? preg_replace('/[^0-9a-z]/i', '', $_GET['od_coupon']) : ''; 
@@ -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/shop_admin/personalpayform.php

@@ -227,7 +227,7 @@ if(!sql_query(" select pp_cash from {$g5['g5_shop_personalpay_table']} limit 1 "
             <?php } ?>
             <tr>
                 <th scope="row"><label for="pp_shop_memo">상점메모</label></th>
-                <td><textarea name="pp_shop_memo" id="pp_shop_memo" rows="8"><?php echo $pp['pp_shop_memo']; ?></textarea></td>
+                <td><textarea name="pp_shop_memo" id="pp_shop_memo" rows="8"><?php echo html_purifier($pp['pp_shop_memo']); ?></textarea></td>
             </tr>
             <tr>
                 <th scope="row"><label for="pp_use">사용</label></th>

adm/sms_admin/ajax.sms_write_form.php

@@ -66,6 +66,8 @@ while($res = sql_fetch_array($qry))
         $group_name = '미분류';
     else
         $group_name = $tmp['fg_name'];
+
+    $res['fo_content'] = html_purifier($res['fo_content']);
     $list_text .="
     <li class=\"screen_list sms5_box\">
         <span class=\"box_ico\"></span>

adm/sms_admin/form_list.php

@@ -174,7 +174,7 @@ function multi_update(sel)
             <input type="checkbox" name="fo_no[]" value="<?php echo $res['fo_no']?>" id="fo_no_<?php echo $i; ?>">
         </div>
         <div class="li_preview">
-            <textarea readonly class="box_txt box_square"><?php echo $res['fo_content']?></textarea>
+            <textarea readonly class="box_txt box_square"><?php echo html_purifier($res['fo_content']); ?></textarea>
         </div>
         <div class="li_info">
             <span class="sound_only">그룹 </span><b><?php echo $group_name?></b><br>

adm/sms_admin/form_write.php

@@ -67,7 +67,7 @@ include_once(G5_ADMIN_PATH.'/admin.head.php');
             <div class="sms5_box write_wrap">
                 <span class="box_ico"></span>
                 <label for="sms_contents" id="wr_message_lbl">내용</label>
-                <textarea name="fo_content" id="sms_contents" class="box_txt box_square" onkeyup="byte_check('sms_contents', 'sms_bytes');" accesskey="m"><?php echo $write['fo_content']?></textarea>
+                <textarea name="fo_content" id="sms_contents" class="box_txt box_square" onkeyup="byte_check('sms_contents', 'sms_bytes');" accesskey="m"><?php echo html_purifier($write['fo_content']); ?></textarea>
 
                 <div id="sms_byte"><span id="sms_bytes">0</span> / 80 byte</div>
 

adm/sms_admin/history_view.php

@@ -109,7 +109,7 @@ function all_send()
 
     <div id="con_sms" class="sms5_box">
         <span class="box_ico"></span>
-        <textarea class="box_txt is_overview" readonly><?php echo $write['wr_message'];?></textarea>
+        <textarea class="box_txt is_overview" readonly><?php echo html_purifier($write['wr_message']); ?></textarea>
     </div>
 
     <?php if ($write['wr_re_total'] && !$wr_renum) { ?>

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/alert_close.php

@@ -17,7 +17,17 @@ if($error) {
 
 <script>
 alert("<?php echo $msg; ?>");
-window.close();
+try {
+    window.close();
+} catch(error) {
+    history.back();
+}
+
+setTimeout(function() {
+    if (window.history.length) {
+        window.history.back();
+    }
+}, 500);
 </script>
 
 <noscript>

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/download.php

@@ -22,6 +22,14 @@ $file = sql_fetch($sql);
 if (!$file['bf_file'])
     alert_close('파일 정보가 존재하지 않습니다.');
 
+$nonce = isset($_REQUEST['nonce']) ? preg_replace('/[^0-9a-z\|]/i', '', $_REQUEST['nonce']) : '';
+
+if (function_exists('download_file_nonce_is_valid') && !defined('G5_DOWNLOAD_NONCE_CHECK')){
+    if(! download_file_nonce_is_valid($nonce, $bo_table, $wr_id)){
+        alert('토큰 유효시간이 지났거나 토큰이 유효하지 않습니다.\\n브라우저를 새로고침 후 다시 시도해 주세요.', G5_URL);
+    }
+}
+
 // JavaScript 불가일 때
 $js = (isset($_GET['js'])) ? $_GET['js'] : '';
 if($js != 'on' && $board['bo_download_point'] < 0) {

bbs/faq.php

@@ -17,12 +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/login_check.php

@@ -8,7 +8,7 @@ $mb_password = isset($_POST['mb_password']) ? trim($_POST['mb_password']) : '';
 
 run_event('member_login_check_before', $mb_id);
 
-if (!$mb_id || !$mb_password)
+if (!$mb_id || run_replace('check_empty_member_login_password', !$mb_password, $mb_id))
     alert('회원아이디나 비밀번호가 공백이면 안됩니다.');
 
 $mb = get_member($mb_id);
@@ -27,11 +27,13 @@ if(function_exists('social_is_login_check')){
     $is_social_password_check = social_is_login_password_check($mb_id);
 }
 
-//소셜 로그인이 맞다면 패스워드를 체크하지 않습니다.
+$is_need_not_password = run_replace('login_check_need_not_password', $is_social_password_check, $mb_id, $mb_password, $mb, $is_social_login);
+
+// $is_need_not_password 변수가 true 이면 패스워드를 체크하지 않습니다.
 // 가입된 회원이 아니다. 비밀번호가 틀리다. 라는 메세지를 따로 보여주지 않는 이유는
 // 회원아이디를 입력해 보고 맞으면 또 비밀번호를 입력해보는 경우를 방지하기 위해서입니다.
 // 불법사용자의 경우 회원아이디가 틀린지, 비밀번호가 틀린지를 알기까지는 많은 시간이 소요되기 때문입니다.
-if (!$is_social_password_check && (! (isset($mb['mb_id']) && $mb['mb_id']) || !login_password_check($mb, $mb_password, $mb['mb_password'])) ) {
+if (!$is_need_not_password && (! (isset($mb['mb_id']) && $mb['mb_id']) || !login_password_check($mb, $mb_password, $mb['mb_password'])) ) {
 
     run_event('password_is_wrong', 'login', $mb);
 
@@ -60,6 +62,13 @@ 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
@@ -153,7 +162,7 @@ if( is_admin($mb['mb_id']) && is_dir(G5_DATA_PATH.'/tmp/') ){
             $tmp_data_check = false;
         }
     }
-    @fclose($tmp_data_check);
+    if (is_resource($tmp_data_check)) @fclose($tmp_data_check);
     @unlink($tmp_data_file);
 
     if(! $tmp_data_check){

bbs/member_cert_refresh_update.php

@@ -77,6 +77,8 @@ if($result){
     }
 }
 
+run_event('cert_refresh_update_after', $mb_id);
+
 //===============================================================
 
 (empty($url))? goto_url(G5_URL) : goto_url($url);

bbs/member_confirm.php

@@ -17,6 +17,8 @@ if( function_exists('social_member_comfirm_redirect') && (! $url || $url === 're
     social_member_comfirm_redirect();
 }
 
+$url = run_replace('member_confirm_next_url', $url);
+
 $g5['title'] = '회원 비밀번호 확인';
 include_once('./_head.sub.php');
 
@@ -31,7 +33,6 @@ if($url){
     }
 }
 
-
 $url = get_text($url);
 
 include_once($member_skin_path.'/member_confirm.skin.php');

bbs/member_leave.php

@@ -14,9 +14,11 @@ if (!($post_mb_password && check_password($post_mb_password, $member['mb_passwor
 
 // 회원탈퇴일을 저장
 $date = date("Ymd");
-$sql = " update {$g5['member_table']} set mb_leave_date = '{$date}', mb_memo = '".date('Ymd', G5_SERVER_TIME)." 탈퇴함\n".sql_real_escape_string($mb['mb_memo'])."', mb_certify = '', mb_adult = 0, mb_dupinfo = '' where mb_id = '{$member['mb_id']}' ";
+$sql = " update {$g5['member_table']} set mb_leave_date = '{$date}', mb_memo = '".date('Ymd', G5_SERVER_TIME)." 탈퇴함\n".sql_real_escape_string($member['mb_memo'])."', mb_certify = '', mb_adult = 0, mb_dupinfo = '' where mb_id = '{$member['mb_id']}' ";
 sql_query($sql);
 
+run_event('member_leave', $member);
+
 // 3.09 수정 (로그아웃)
 unset($_SESSION['ss_mb_id']);
 

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'])

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/register_form_update.php

@@ -17,7 +17,7 @@ if ($w == 'u' && $is_admin == 'super') {
         alert('데모 화면에서는 하실(보실) 수 없는 작업입니다.');
 }
 
-if (!chk_captcha()) {
+if (run_replace('register_member_chk_captcha', !chk_captcha(), $w)) {
     alert('자동등록방지 숫자가 틀렸습니다.');
 }
 
@@ -94,10 +94,15 @@ if ($w == '' || $w == 'u') {
         alert('닉네임을 올바르게 입력해 주십시오.');
     }
 
-    if ($w == '' && !$mb_password)
-        alert('비밀번호가 넘어오지 않았습니다.');
-    if($w == '' && $mb_password != $mb_password_re)
-        alert('비밀번호가 일치하지 않습니다.');
+    // 비밀번호를 체크하는 상태의 기본값은 true이며, 비밀번호를 체크하지 않으려면 hook 을 통해 false 값으로 바꿔야 합니다.
+    $is_check_password = run_replace('register_member_password_check', true, $mb_id, $mb_nick, $mb_email, $w);
+
+    if ($is_check_password){
+        if ($w == '' && !$mb_password)
+            alert('비밀번호가 넘어오지 않았습니다.');
+        if ($w == '' && $mb_password != $mb_password_re)
+            alert('비밀번호가 일치하지 않습니다.');
+    }
 
     if ($msg = empty_mb_name($mb_name))       alert($msg, "", true, true);
     if ($msg = empty_mb_nick($mb_nick))     alert($msg, "", true, true);
@@ -111,7 +116,7 @@ if ($w == '' || $w == 'u') {
     if ($msg = prohibit_mb_email($mb_email))alert($msg, "", true, true);
 
     // 휴대폰 필수입력일 경우 휴대폰번호 유효성 체크
-    if ($config['cf_use_hp'] || ($config['cf_cert_hp'] || $config['cf_cert_simple']) && $config['cf_req_hp']) {
+    if (($config['cf_use_hp'] || $config['cf_cert_hp'] || $config['cf_cert_simple']) && $config['cf_req_hp']) {
         if ($msg = valid_mb_hp($mb_hp))     alert($msg, "", true, true);
     }
 

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/write_update.php

@@ -252,12 +252,15 @@ 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 = '';
     }
-
+    
+    // wr_num 서브쿼리 kkigomi 님 제안
     $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 sq) ") . ",
                      wr_reply = '$wr_reply',
                      wr_comment = 0,
                      ca_name = '$ca_name',

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,7 @@ 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, '/');
+session_set_cookie_params(0, '/', null, false, true);
 ini_set("session.cookie_domain", G5_COOKIE_DOMAIN);
 
 function chrome_domain_session_name(){
@@ -362,7 +367,11 @@ if( $config['cf_cert_use'] || (defined('G5_YOUNGCART_VER') && G5_YOUNGCART_VER)
 
             // IE 브라우저 또는 엣지브라우저 또는 IOS 모바일과 http환경에서는 secure; SameSite=None을 설정하지 않습니다.
             if (isset($_SERVER['HTTP_USER_AGENT'])) {
-                if( preg_match('/Edge/i', $_SERVER['HTTP_USER_AGENT']) || 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') ){
+                if (preg_match('/Edge/i', $_SERVER['HTTP_USER_AGENT'])
+                    || 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')) {
                     return $res;
                 }
             }
@@ -497,6 +506,7 @@ if (isset($_REQUEST['url'])) {
     $urlencode = urlencode($_SERVER['REQUEST_URI']);
     if (G5_DOMAIN) {
         $p = @parse_url(G5_DOMAIN);
+        $p['path'] = isset($p['path']) ? $p['path'] : '/';
         $urlencode = G5_DOMAIN.urldecode(preg_replace("/^".urlencode($p['path'])."/", "", $urlencode));
     }
 }
@@ -836,5 +846,3 @@ header('Cache-Control: pre-check=0, post-check=0, max-age=0'); // HTTP/1.1
 header('Pragma: no-cache'); // HTTP/1.0
 
 run_event('common_header');
-
-$html_process = new html_process();

config.php

@@ -28,6 +28,7 @@ define('G5_HTTPS_DOMAIN', '');
 
 // 그누보드 디버그바 설정입니다, 실제 서버운영시 false 로 설정해 주세요.
 define('G5_DEBUG', false);
+define('G5_COLLECT_QUERY', false);
 
 // Set Database table default engine is Database default_storage_engine, If you want to use MyISAM or InnoDB, change to MyISAM or InnoDB.
 // DB에 테이블 생성 시 테이블의 기본 스토리지 엔진을 설정할 수 있습니다.
@@ -233,9 +234,5 @@ define('G5_VISIT_BROWSCAP_USE', false);
 */
 define('G5_IP_DISPLAY', '\\1.♡.\\3.\\4');
 
-if ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS']=='on') || 
-    (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO']==='https')) {   //https 통신일때 daum 주소 js
-    define('G5_POSTCODE_JS', '<script src="https://spi.maps.daum.net/imap/map_js_init/postcode.v2.js"></script>');
-} else {  //http 통신일때 daum 주소 js
-    define('G5_POSTCODE_JS', '<script src="http://dmaps.daum.net/map_js_init/postcode.v2.js"></script>');
-}
+// KAKAO 우편번호 서비스 CDN
+define('G5_POSTCODE_JS', '<script src="//t1.daumcdn.net/mapjsapi/bundle/postcode/prod/postcode.v2.js" async></script>');

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

@@ -83,9 +83,9 @@ 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));
+.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);
          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}
@@ -318,7 +319,7 @@ box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
 }
 
 #sod_frm .sod_ta_wr{background: #fff}
-#sod_frm .btn_confirm{;margin:0 10px 10px}
+#sod_frm .btn_confirm{margin:0 10px 10px}
 #sod_frm .btn_submit{width:100%;height:45px;font-size: 1.167em;font-weight: bold;margin:5px 0;border-radius:4px}
 #sod_frm .btn_cancel,#sod_frm .btn01{width:100%;height:45px;line-height:43px;font-size:1.167em;font-weight: bold;padding:0;border-radius:4px}
 
@@ -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/shop.extend.php

@@ -9,19 +9,19 @@ if (!defined('G5_USE_SHOP') || !G5_USE_SHOP) return;
 */
 define('G5_DELIVERY_COMPANY',
      '(경동택배^https://kdexp.com/basicNewDelivery.kd?barcode=^080-873-2178)'
-    .'(대신택배^http://home.daesinlogistics.co.kr/daesin/jsp/d_freight_chase/d_general_process2.jsp?billno1=^043-222-4582)'
+    .'(대신택배^https://www.ds3211.co.kr/freight/internalFreightSearch.ht?billno=^043-222-4582)'
     .'(동부택배^http://www.dongbups.com/delivery/delivery_search_view.jsp?item_no=^1588-8848)'
     .'(로젠택배^https://www.ilogen.com/m/personal/trace.pop/^1588-9988)'
-    .'(우체국^http://service.epost.go.kr/trace.RetrieveRegiPrclDeliv.postal?sid1=^1588-1300)'
+    .'(우체국^https://m.epost.go.kr/postal/mobile/mobile.trace.RetrieveDomRigiTraceList.comm?ems_gubun=E&sid1=^1588-1300)'
     .'(이노지스택배^http://www.innogis.co.kr/tracking_view.asp?invoice=^1566-4082)'
-    .'(한진택배^http://www.hanjin.co.kr/Delivery_html/inquiry/result_waybill.jsp?wbl_num=^1588-0011)'
+    .'(한진택배^https://www.hanjin.co.kr/kor/CMS/DeliveryMgr/WaybillResult.do?mCode=MN038&schLang=KR&wblnumText2=^1588-0011)'
     .'(롯데택배^https://www.lotteglogis.com/open/tracking?invno=^1588-2121)'
     .'(CJ대한통운^https://www.doortodoor.co.kr/parcel/doortodoor.do?fsp_action=PARC_ACT_002&fsp_cmd=retrieveInvNoACT&invc_no=^1588-1255)'
-    .'(CVSnet편의점택배^http://was.cvsnet.co.kr/_ver2/board/ctod_status.jsp?invoice_no=^1577-1287)'
+    .'(CVSnet편의점택배^https://www.cvsnet.co.kr/invoice/tracking.do?invoice_no=^1577-1287)'
     .'(KG옐로우캡택배^http://www.yellowcap.co.kr/custom/inquiry_result.asp?invoice_no=^1588-0123)'
     .'(KGB택배^http://www.kgbls.co.kr/sub5/trace.asp?f_slipno=^1577-4577)'
     .'(KG로지스^http://www.kglogis.co.kr/contents/waybill.jsp?item_no=^1588-8848)'
-    .'(건영택배^http://www.kunyoung.com/goods/goods_01.php?mulno=^031-460-2700)'
+    .'(건영택배^https://www.kunyoung.com/goods/goods_01.php?mulno=^031-460-2700)'
     .'(호남택배^http://www.honamlogis.co.kr/04estimate/songjang_list.php?c_search1=^031-376-6070)'
 );
 

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',  '220620');
+define('G5_CSS_VER', '2303229');
+define('G5_JS_VER',  '2304171');

head.php

@@ -71,7 +71,8 @@ include_once(G5_LIB_PATH.'/popular.lib.php');
                 <script>
                 function fsearchbox_submit(f)
                 {
-                    if (f.stx.value.length < 2) {
+                    var stx = f.stx.value.trim();
+                    if (stx.length < 2) {
                         alert("검색어는 두글자 이상 입력하십시오.");
                         f.stx.select();
                         f.stx.focus();
@@ -80,8 +81,8 @@ include_once(G5_LIB_PATH.'/popular.lib.php');
 
                     // 검색에 많은 부하가 걸리는 경우 이 주석을 제거하세요.
                     var cnt = 0;
-                    for (var i=0; i<f.stx.value.length; i++) {
-                        if (f.stx.value.charAt(i) == ' ')
+                    for (var i = 0; i < stx.length; i++) {
+                        if (stx.charAt(i) == ' ')
                             cnt++;
                     }
 
@@ -91,6 +92,7 @@ include_once(G5_LIB_PATH.'/popular.lib.php');
                         f.stx.focus();
                         return false;
                     }
+                    f.stx.value = stx;
 
                     return true;
                 }

install/gnuboard5.sql

@@ -617,6 +617,7 @@ CREATE TABLE IF NOT EXISTS `g5_poll` (
   `po_date` date NOT NULL default '0000-00-00',
   `po_ips` mediumtext NOT NULL,
   `mb_ids` text NOT NULL,
+  `po_use` tinyint(4) NOT NULL default '0',
   PRIMARY KEY  (`po_id`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 

install/gnuboard5shop.sql

@@ -349,7 +349,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',

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/common.js

@@ -355,8 +355,8 @@ var win_homepage = function(href) {
  * 우편번호 창
  **/
 var win_zip = function(frm_name, frm_zip, frm_addr1, frm_addr2, frm_addr3, frm_jibeon) {
-    if(typeof daum === 'undefined'){
-        alert("다음 우편번호 postcode.v2.js 파일이 로드되지 않았습니다.");
+    if(typeof daum === "undefined"){
+        alert("KAKAO 우편번호 서비스 postcode.v2.js 파일이 로드되지 않았습니다.");
         return false;
     }
 
@@ -423,7 +423,7 @@ var win_zip = function(frm_name, frm_zip, frm_addr1, frm_addr2, frm_addr3, frm_j
                 element_wrap = document.createElement("div");
                 element_wrap.setAttribute("id", daum_pape_id);
                 element_wrap.style.cssText = 'display:none;border:1px solid;left:0;width:100%;height:300px;margin:5px 0;position:relative;-webkit-overflow-scrolling:touch;';
-                element_wrap.innerHTML = '<img src="//i1.daumcdn.net/localimg/localimages/07/postcode/320/close.png" id="btnFoldWrap" style="cursor:pointer;position:absolute;right:0px;top:-21px;z-index:1" class="close_daum_juso" alt="접기 버튼">';
+                element_wrap.innerHTML = '<img src="//t1.daumcdn.net/postcode/resource/images/close.png" id="btnFoldWrap" style="cursor:pointer;position:absolute;right:0px;top:-21px;z-index:1" class="close_daum_juso" alt="접기 버튼">';
                 jQuery('form[name="'+frm_name+'"]').find('input[name="'+frm_addr1+'"]').before(element_wrap);
                 jQuery("#"+daum_pape_id).off("click", ".close_daum_juso").on("click", ".close_daum_juso", function(e){
                     e.preventDefault();

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 {

js/sns.js

@@ -8,9 +8,4 @@ $(function() {
         window.open($(this).attr("href"), "win_twitter", "menubar=1,resizable=1,width=600,height=350");
         return false;
     });
-
-    $(".share-googleplus").click(function() {
-        window.open($(this).attr("href"), "win_googleplus", "menubar=1,resizable=1,width=600,height=600");
-        return false;
-    });
 });

lib/Cache/obj.class.php

@@ -61,29 +61,39 @@ 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
+     * kkigomi 님이 고쳐주심
+     */
+    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>";
 
@@ -144,11 +150,13 @@ function get_session($session_name)
 
 
 // 쿠키변수 생성
-function set_cookie($cookie_name, $value, $expire)
+function set_cookie($cookie_name, $value, $expire, $path='/', $domain=G5_COOKIE_DOMAIN, $secure=false, $httponly=true)
 {
     global $g5;
+    
+    $c = run_replace('set_cookie_params', array('path'=>$path, 'domain'=>$domain, 'secure'=>$secure, 'httponly'=>$httponly), $cookie_name);
 
-    setcookie(md5($cookie_name), base64_encode($value), G5_SERVER_TIME + $expire, '/', G5_COOKIE_DOMAIN);
+    setcookie(md5($cookie_name), base64_encode($value), G5_SERVER_TIME + $expire, $c['path'], $c['domain'], $c['secure'], $c['httponly']);
 }
 
 
@@ -269,12 +277,12 @@ function url_auto_link($str)
 
 
 // url에 http:// 를 붙인다
-function set_http($url)
+function set_http($url, $protocol="http://")
 {
     if (!trim($url)) return;
 
     if (!preg_match("/^(http|https|ftp|telnet|news|mms)\:\/\//i", $url))
-        $url = "http://" . $url;
+        $url = $protocol. $url;
 
     return $url;
 }
@@ -295,6 +303,30 @@ function get_filesize($size)
     return $size;
 }
 
+// 파일다운로드 링크 생성시 nonce 키 추가, 7200은 2시간동안 유효
+function download_file_nonce_key($bo_table, $wr_id, $timeoutSeconds=7200)
+{
+    $secret = get_token_encryption_key(sha1($bo_table.session_id().$wr_id));
+    $salt = get_random_token_string(10);
+    $maxTime = G5_SERVER_TIME + $timeoutSeconds;
+    $nonce = $salt . '|' . $maxTime . '|' . sha1($salt . $secret . $maxTime);
+
+    return $nonce;
+}
+
+// 파일다운로드시 nonce key를 체크한다.
+function download_file_nonce_is_valid($nonce, $bo_table, $wr_id)
+{
+    if (! is_string($nonce)) return false;
+    $secret = get_token_encryption_key(sha1($bo_table.session_id().$wr_id));
+    $a = explode('|', $nonce);
+    if (count($a) !== 3) return false;
+    list($salt, $maxTime, $hash) = $a;
+    if (sha1($salt . $secret . $maxTime) !== $hash) return false;
+    if (G5_SERVER_TIME > (int) $maxTime) return false;
+
+    return true;
+}
 
 // 게시글에 첨부된 파일을 얻는다. (배열로 반환)
 function get_file($bo_table, $wr_id)
@@ -304,11 +336,12 @@ function get_file($bo_table, $wr_id)
     $file['count'] = 0;
     $sql = " select * from {$g5['board_file_table']} where bo_table = '$bo_table' and wr_id = '$wr_id' order by bf_no ";
     $result = sql_query($sql);
+    $nonce = download_file_nonce_key($bo_table, $wr_id);
     while ($row = sql_fetch_array($result))
     {
         $no = (int) $row['bf_no'];
         $bf_content = $row['bf_content'] ? html_purifier($row['bf_content']) : '';
-        $file[$no]['href'] = G5_BBS_URL."/download.php?bo_table=$bo_table&amp;wr_id=$wr_id&amp;no=$no" . $qstr;
+        $file[$no]['href'] = G5_BBS_URL."/download.php?bo_table=$bo_table&amp;wr_id=$wr_id&amp;no=$no&amp;nonce=$nonce" . $qstr;
         $file[$no]['download'] = $row['bf_download'];
         // 4.00.11 - 파일 path 추가
         $file[$no]['path'] = G5_DATA_URL.'/file/'.$bo_table;
@@ -572,44 +605,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)
 {
-    $f = file(G5_PLUGIN_PATH.'/htmlpurifier/safeiframe.txt');
+    global $is_admin, $write;
+
+    $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);
+            }
         }
     }
-    // 내 도메인도 추가
-    array_push($domains, $_SERVER['HTTP_HOST'].'/');
-    $safeiframe = implode('|', $domains);
+    // 글쓴이가 관리자인 경우에만 현재 사이트 도메인을 허용
+    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?:)?//(' . $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);
 }
 
@@ -737,7 +796,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;
 }
 
 
@@ -834,7 +893,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.'">';
 }
 
 
@@ -1298,87 +1360,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;
 }
 
@@ -1596,7 +1709,7 @@ function sql_query($sql, $error=G5_DISPLAY_SQL_ERROR, $link=null)
 
     $is_debug = get_permission_debug_show();
     
-    $start_time = $is_debug ? get_microtime() : 0;
+    $start_time = ($is_debug || G5_COLLECT_QUERY) ? get_microtime() : 0;
 
     if(function_exists('mysqli_query') && G5_MYSQLI_USE) {
         if ($error) {
@@ -1616,18 +1729,68 @@ function sql_query($sql, $error=G5_DISPLAY_SQL_ERROR, $link=null)
         }
     }
 
-    $end_time = $is_debug ? get_microtime() : 0;
+    $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($link),
+                'error_message' => mysqli_error($link),
+            );
+        } else {
+            $error = array(
+                'error_code' => mysql_errno($link),
+                'error_message' => mysql_error($link),
+            );
+        }
+
+        $stack = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
+        $found = false;
+
+        foreach ($stack as $index => $trace) {
+            if ($trace['function'] === 'sql_query') {
+                $found = true;
+            }
+            if (isset($stack[$index + 1]) && $stack[$index + 1]['function'] === 'sql_fetch') {
+                continue;
+            }
+
+            if ($found) {
+                $trace['file'] = str_replace($_SERVER['DOCUMENT_ROOT'], '', $trace['file']);
+                $source['file'] = $trace['file'];
+                $source['line'] = $trace['line'];
+
+                $parent = (isset($stack[$index + 1])) ? $stack[$index + 1] : array();
+                if (isset($parent['function'])) {
+                    if (in_array($trace['function'], array('sql_query', 'sql_fetch')) && (isset($parent['function']) && !in_array($parent['function'], array('sql_fetch', 'include', 'include_once', 'require', 'require_once')))) {
+                        if (isset($parent['class']) && $parent['class']) {
+                            $source['class'] = $parent['class'];
+                            $source['function'] = $parent['function'];
+                            $source['type'] = $parent['type'];
+                        } else {
+                            $source['function'] = $parent['function'];
+                        }
+                    }
+                }
+                break;
+            }
+        }
 
-    if($result && $is_debug) {
-        // 여기에 실행한 sql문을 화면에 표시하는 로직 넣기
         $g5_debug['sql'][] = array(
             'sql' => $sql,
+            'result' => $result,
+            'success' => !!$result,
+            'source' => $source,
+            'error_code' => $error['error_code'],
+            'error_message' => $error['error_message'],
             'start_time' => $start_time,
             'end_time' => $end_time,
-            );
+        );
     }
 
-    run_event('sql_query_after', $result, $sql, $start_time, $end_time);
+    run_event('sql_query_after', $result, $sql, $start_time, $end_time, $error, $source);
 
     return $result;
 }
@@ -2484,37 +2647,61 @@ function get_skin_javascript($skin_path, $dir='')
     return $str;
 }
 
+if (!function_exists('get_called_class')) {
+    function get_called_class() {
+        $bt = debug_backtrace();
+        $lines = file($bt[1]['file']);
+        preg_match(
+            '/([a-zA-Z0-9\_]+)::'.$bt[1]['function'].'/',
+            $lines[$bt[1]['line']-1],
+            $matches
+        );
+        return $matches[1];
+    }
+}
+
+function get_html_process_cls() {
+    return html_process::getInstance();
+}
+
 // HTML 마지막 처리
 function html_end()
 {
-    global $html_process;
-
-    return $html_process->run();
+    return get_html_process_cls()->run();
 }
 
 function add_stylesheet($stylesheet, $order=0)
 {
-    global $html_process;
-
-    if(trim($stylesheet) && method_exists($html_process, 'merge_stylesheet') )
-        $html_process->merge_stylesheet($stylesheet, $order);
+    if(trim($stylesheet))
+        get_html_process_cls()->merge_stylesheet($stylesheet, $order);
 }
 
 function add_javascript($javascript, $order=0)
 {
-    global $html_process;
-
-    if(trim($javascript) && method_exists($html_process, 'merge_javascript') )
-        $html_process->merge_javascript($javascript, $order);
+    if(trim($javascript))
+        get_html_process_cls()->merge_javascript($javascript, $order);
 }
 
 class html_process {
-    protected $css = array();
-    protected $js  = array();
+    protected static $id = '0';
+    private static $instances = array();
+    protected static $is_end = '0';
+    protected static $css = array();
+    protected static $js  = array();
 
-    function merge_stylesheet($stylesheet, $order)
+    public static function getInstance($id = '0')
     {
-        $links = $this->css;
+        self::$id = $id;
+        if (isset(self::$instances[self::$id])) {
+            return self::$instances[self::$id];
+        }
+        $calledClass = get_called_class();
+        return self::$instances[self::$id] = new $calledClass;
+    }
+
+    public static function merge_stylesheet($stylesheet, $order)
+    {
+        $links = self::$css;
         $is_merge = true;
 
         foreach($links as $link) {
@@ -2525,12 +2712,12 @@ class html_process {
         }
 
         if($is_merge)
-            $this->css[] = array($order, $stylesheet);
+            self::$css[] = array($order, $stylesheet);
     }
 
-    function merge_javascript($javascript, $order)
+    public static function merge_javascript($javascript, $order)
     {
-        $scripts = $this->js;
+        $scripts = self::$js;
         $is_merge = true;
 
         foreach($scripts as $script) {
@@ -2541,13 +2728,17 @@ class html_process {
         }
 
         if($is_merge)
-            $this->js[] = array($order, $javascript);
+            self::$js[] = array($order, $javascript);
     }
 
-    function run()
+    public static function run()
     {
         global $config, $g5, $member;
 
+        if (self::$is_end) return;  // 여러번 호출해도 한번만 실행되게 합니다.
+
+        self::$is_end = 1;
+
         // 현재접속자 처리
         $tmp_sql = " select count(*) as cnt from {$g5['login_table']} where lo_ip = '{$_SERVER['REMOTE_ADDR']}' ";
         $tmp_row = sql_fetch($tmp_sql);
@@ -2572,7 +2763,7 @@ class html_process {
         ob_end_clean();
 
         $stylesheet = '';
-        $links = $this->css;
+        $links = self::$css;
 
         if(!empty($links)) {
             foreach ($links as $key => $row) {
@@ -2596,7 +2787,7 @@ class html_process {
         }
 
         $javascript = '';
-        $scripts = $this->js;
+        $scripts = self::$js;
         $php_eol = '';
 
         unset($order);
@@ -2630,7 +2821,12 @@ class html_process {
         <link rel="stylesheet" href="default.css">
         밑으로 스킨의 스타일시트가 위치하도록 하게 한다.
         */
-        $buffer = preg_replace('#(</title>[^<]*<link[^>]+>)#', "$1$stylesheet", $buffer);
+        $title_find_pattern = '#(</title>[^<]*<link[^>]+>)#';
+        if (preg_match($title_find_pattern, $buffer)) {
+            $buffer = preg_replace($title_find_pattern, "$1$stylesheet", $buffer);
+        } else {    // 패턴이 없다면 자바스크립트 코드 위에 위치하게 합니다.
+            $javascript = $stylesheet. PHP_EOL. $javascript;
+        }
 
         /*
         </head>
@@ -2653,6 +2849,8 @@ class html_process {
             $buffer = preg_replace('#(<title[^>]*>.*?</title>)#', "$meta_tag{$nl}$1", $buffer);
         }
 
+        $buffer = run_replace('html_process_buffer', $buffer);
+
         return $buffer;
     }
 }
@@ -3965,7 +4163,7 @@ function get_random_token_string($length=6)
 }
 
 function filter_input_include_path($path){
-    return str_replace('//', '/', $path);
+    return str_replace('//', '/', strip_tags($path));
 }
 
 function option_array_checked($option, $arr=array()){

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/poll.lib.php

@@ -8,8 +8,8 @@ function poll($skin_dir='basic', $po_id=false)
 
     // 투표번호가 넘어오지 않았다면 가장 큰(최근에 등록한) 투표번호를 얻는다
     if (!$po_id) {
-        $row = sql_fetch(" select MAX(po_id) as max_po_id from {$g5['poll_table']} ");
-        $po_id = $row['max_po_id'];
+        $row = sql_fetch(" select MAX(po_id) as max_po_id from {$g5['poll_table']} where po_use = 1 ", false);
+        $po_id = isset($row['max_po_id']) ? $row['max_po_id'] : 0;
     }
 
     if(!$po_id)
@@ -36,7 +36,7 @@ function poll($skin_dir='basic', $po_id=false)
         }
     }
 
-    $po = sql_fetch(" select * from {$g5['poll_table']} where po_id = '$po_id' ");
+    $po = sql_fetch(" select * from {$g5['poll_table']} where po_id = '$po_id' and po_use = 1 ");
 
     ob_start();
     include_once ($poll_skin_path.'/poll.skin.php');

lib/shop.lib.php

@@ -1521,9 +1521,6 @@ function get_sns_share_link($sns, $url, $title, $img)
         case 'twitter':
             $str = '<a href="https://twitter.com/share?url='.urlencode($url).'&amp;text='.urlencode($title).'" class="share-twitter" target="_blank"><img src="'.$img.'" alt="트위터에 공유"></a>';
             break;
-        case 'googleplus':
-            $str = '<a href="https://plus.google.com/share?url='.urlencode($url).'" class="share-googleplus" target="_blank"><img src="'.$img.'" alt="구글플러스에 공유"></a>';
-            break;
         case 'kakaotalk':
             if($config['cf_kakao_js_apikey'])
                 $str = '<a href="javascript:kakaolink_send(\''.str_replace('+', ' ', urlencode($title)).'\', \''.urlencode($url).'\');" class="share-kakaotalk"><img src="'.$img.'" alt="카카오톡 링크보내기"></a>';
@@ -1946,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;
@@ -1956,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'
@@ -1975,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;
@@ -2628,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;
         }
     }
 
@@ -2772,6 +2776,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/uri.lib.php

@@ -298,63 +298,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/head.php

@@ -95,7 +95,8 @@ include_once(G5_LIB_PATH.'/popular.lib.php');
                 <script>
                 function fsearchbox_submit(f)
                 {
-                    if (f.stx.value.length < 2) {
+                    var stx = f.stx.value.trim();
+                    if (stx.length < 2) {
                         alert("검색어는 두글자 이상 입력하십시오.");
                         f.stx.select();
                         f.stx.focus();
@@ -104,8 +105,8 @@ include_once(G5_LIB_PATH.'/popular.lib.php');
 
                     // 검색에 많은 부하가 걸리는 경우 이 주석을 제거하세요.
                     var cnt = 0;
-                    for (var i=0; i<f.stx.value.length; i++) {
-                        if (f.stx.value.charAt(i) == ' ')
+                    for (var i = 0; i < stx.length; i++) {
+                        if (stx.charAt(i) == ' ')
                             cnt++;
                     }
 
@@ -115,6 +116,7 @@ include_once(G5_LIB_PATH.'/popular.lib.php');
                         f.stx.focus();
                         return false;
                     }
+                    f.stx.value = stx;
 
                     return true;
                 }

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">
 
@@ -156,32 +156,32 @@ $cart_count = sql_num_rows($result);
     <div class="go_shopping"><a href="<?php echo G5_SHOP_URL; ?>/" class="btn01">쇼핑 계속하기</a></div>
     <?php } else { ?>
     <div class="sod_ta_wr">
-    <?php
-    $tot_price = $tot_sell_price + $send_cost; // 총계 = 주문상품금액합계 + 배송비
-    if ($tot_price > 0 || $send_cost > 0) {
-    ?>
-    <dl id="m_sod_bsk_tot">
-        <?php if ($send_cost > 0) { // 배송비가 0 보다 크다면 (있다면) ?>
-        <dt class="sod_bsk_dvr">배송비</dt>
-        <dd class="sod_bsk_dvr"><strong><?php echo number_format($send_cost); ?> 원</strong></dd>
+        <?php
+        $tot_price = $tot_sell_price + $send_cost; // 총계 = 주문상품금액합계 + 배송비
+        if ($tot_price > 0 || $send_cost > 0) {
+        ?>
+        <dl id="m_sod_bsk_tot">
+            <?php if ($send_cost > 0) { // 배송비가 0 보다 크다면 (있다면) ?>
+            <dt class="sod_bsk_dvr">배송비</dt>
+            <dd class="sod_bsk_dvr"><strong><?php echo number_format($send_cost); ?> 원</strong></dd>
+            <?php } ?>
+
+            <?php if ($tot_price > 0) { ?>
+            <dt>포인트</dt>
+            <dd><strong><?php echo number_format($tot_point); ?> 점</strong></dd>
+            <dt class="sod_bsk_cnt">총계</dt>
+            <dd class="sod_bsk_cnt"><strong><?php echo number_format($tot_price); ?></strong> 원</dd>
+            <?php } ?>
+        </dl>
         <?php } ?>
 
-        <?php if ($tot_price > 0) { ?>
-        <dt>포인트</dt>
-        <dd><strong><?php echo number_format($tot_point); ?> 점</strong></dd>
-        <dt class="sod_bsk_cnt">총계</dt>
-        <dd class="sod_bsk_cnt"><strong><?php echo number_format($tot_price); ?></strong> 원</dd>
-        <?php } ?>
-    </dl>
-    <?php } ?>
-
-    <div id="sod_bsk_act" class="btn_confirm">
-        <div class="total">총계 <strong class="total_cnt"><?php echo number_format($tot_price); ?>원</strong>
+        <div id="sod_bsk_act" class="btn_confirm">
+            <div class="total">총계 <strong class="total_cnt"><?php echo number_format($tot_price); ?>원</strong></div>
+            <input type="hidden" name="url" value="<?php echo G5_SHOP_URL; ?>/orderform.php">
+            <input type="hidden" name="act" value="">
+            <input type="hidden" name="records" value="<?php echo $i; ?>">
+            <button type="button" onclick="return form_check('buy');" class="btn_submit">주문하기</button>
         </div>
-        <input type="hidden" name="url" value="<?php echo G5_SHOP_URL; ?>/orderform.php">
-        <input type="hidden" name="act" value="">
-        <input type="hidden" name="records" value="<?php echo $i; ?>">
-        <button type="button" onclick="return form_check('buy');" class="btn_submit">주문하기</button>
     </div>
     <?php } ?>
         <?php if ($naverpay_button_js) { ?>

mobile/shop/item.php

@@ -87,7 +87,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 +197,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 +222,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/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; ?>">
 <!-- 인증수단(영문 소문자) * 반드시 대소문자 구분 -->