Merge branch 'master' of github.com:gnuboard/g5

empty_mb_name is a function checking name from user input form. But it
was not checked by empty_mb_name function. So I fix it.

_common.php

@@ -1,3 +1,2 @@
 <?php
-include_once('./common.php');
-?>
+include_once('./common.php');

_head.php

@@ -1,5 +1,4 @@
 <?php
 if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 
-include_once(G5_PATH.'/head.php');
-?>
+include_once(G5_PATH.'/head.php');

_tail.php

@@ -1,5 +1,4 @@
 <?php
 if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 
-include_once(G5_PATH.'/tail.php');
-?>
+include_once(G5_PATH.'/tail.php');

adm/_common.php

@@ -6,4 +6,5 @@ include_once(G5_ADMIN_PATH.'/admin.lib.php');
 if( isset($token) ){
     $token = @htmlspecialchars(strip_tags($token), ENT_QUOTES);
 }
-?>
+
+run_event('admin_common');

adm/_rewrite_config_form.php

@@ -0,0 +1,120 @@
+<?php
+if (!defined('_GNUBOARD_')) exit;
+
+$is_use_apache = (stripos($_SERVER['SERVER_SOFTWARE'], 'apache') !== false);
+
+$is_use_nginx = (stripos($_SERVER['SERVER_SOFTWARE'], 'nginx') !== false);
+
+$is_use_iis = !$is_use_apache && (stripos($_SERVER['SERVER_SOFTWARE'], 'microsoft-iis') !== false);
+
+$is_write_file = false;
+$is_apache_need_rules = false;
+$is_apache_rewrite = false;
+
+if( !($is_use_apache || $is_use_nginx || $is_use_iis) ){    // 셋다 아니면 다 출력시킨다.
+    $is_use_apache = true;
+    $is_use_nginx = true;
+}
+
+if ( $is_use_nginx ){
+    $is_write_file = false;
+}
+
+if ( $is_use_apache ){
+    $is_write_file = (is_writable(G5_PATH) || (file_exists(G5_PATH.'/.htaccess') && is_writable(G5_PATH.'/.htaccess'))) ? true : false;
+    $is_apache_need_rules = check_need_rewrite_rules();
+    $is_apache_rewrite = function_exists('apache_get_modules') && in_array('mod_rewrite', apache_get_modules());
+}
+
+$get_path_url = parse_url( G5_URL );
+
+$base_path = isset($get_path_url['path']) ? $get_path_url['path'].'/' : '/';
+
+// add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨
+add_stylesheet('<link rel="stylesheet" href="'.G5_JS_URL.'/remodal/remodal.css">', 11);
+add_stylesheet('<link rel="stylesheet" href="'.G5_JS_URL.'/remodal/remodal-default-theme.css">', 12);
+add_javascript('<script src="'.G5_JS_URL.'/remodal/remodal.js"></script>', 10);
+?>
+<section id="anc_cf_url">
+    <h2 class="h2_frm">짧은 주소 설정</h2>
+    <?php echo $pg_anchor ?>
+    <div class="local_desc02 local_desc">
+        <p>
+            게시판과 컨텐츠 페이지에 짧은 URL 을 사용합니다. <a href="https://sir.kr/manual/g5/286" class="btn btn_03" target="_blank" style="margin-left:10px">설정 관련 메뉴얼 보기</a>
+            <?php if( $is_use_apache && ! $is_use_nginx ){ ?>
+                <?php if( ! $is_apache_rewrite ){ ?>
+                <br><strong>Apache 서버인 경우 rewrite_module 이 비활성화 되어 있으면 짧은 주소를 사용할수 없습니다.</strong>
+                <?php } else if( ! $is_write_file && $is_apache_need_rules ) {   // apache인 경우 ?>
+                <br><strong>짧은 주소 사용시 아래 Apache 설정 코드를 참고하여 설정해 주세요.</strong>
+                <?php } ?>
+            <?php } ?>
+        </p>
+    </div>
+
+    <div class="server_config_views">
+        <?php if ( $is_use_apache ){ ?>
+            <button type="button" data-remodal-target="modal_apache" class="btn btn_03">Apache 설정 코드 보기</button>
+        <?php } ?>
+        <?php if ( $is_use_nginx ) { ?>
+            <button type="button" data-remodal-target="modal_nginx" class="btn btn_03">Nginx 설정 코드 보기</button>
+        <?php } ?>
+    </div>
+
+    <div class="tbl_frm01 tbl_wrap">
+        <table>
+        <caption>짧은주소 설정</caption>
+        <colgroup>
+            <col class="grid_4">
+            <col>
+        </colgroup>
+        <tbody>
+        <?php
+            $short_url_arrs = array(
+            '0'=>array('label'=>'사용안함', 'url'=>G5_URL.'/board.php?bo_table=free&wr_id=123'),
+            '1'=>array('label'=>'숫자', 'url'=>G5_URL.'/free/123'),
+            '2'=>array('label'=>'글 이름', 'url'=>G5_URL.'/free/안녕하세요/'),
+            );
+            foreach($short_url_arrs as $k=>$v){
+                $checked = ((int) $config['cf_bbs_rewrite'] === (int) $k) ? 'checked' : '';
+        ?>
+            <tr>
+                <td><input name="cf_bbs_rewrite" id="cf_bbs_rewrite_<?php echo $k; ?>" type="radio" value="<?php echo $k; ?>" <?php echo $checked;?> ><label for="cf_bbs_rewrite_<?php echo $k; ?>" class="rules_label"><?php echo $v['label']; ?></label></td>
+                <td><?php echo $v['url']; ?></td>
+            </tr>
+        <?php }     //end foreach ?>
+        </tbody>
+        </table>
+    </div>
+
+    <div class="server_rewrite_info">
+        <div class="is_rewrite remodal" data-remodal-id="modal_apache" role="dialog" aria-labelledby="modalApache" aria-describedby="modal1Desc">
+
+            <button type="button" class="connect-close" data-remodal-action="close">
+                <i class="fa fa-close"></i>
+                <span class="txt">닫기</span>
+            </button>
+
+            <h4 class="copy_title">.htaccess 파일에 적용할 코드입니다.
+            <?php if( ! $is_apache_rewrite ) { ?>
+            <br><span class="info-warning">Apache 서버인 경우 rewrite_module 이 비활성화 되어 있으면 짧은 주소를 사용할수 없습니다.</span>
+            <?php } else if ( ! $is_write_file && $is_apache_need_rules ) { ?>
+            <br><span class="info-warning">자동으로 .htaccess 파일을 수정 할수 있는 권한이 없습니다.<br>.htaccess 파일이 없다면 생성 후에, 아래 코드가 없으면 코드를 복사하여 붙여넣기 해 주세요.</span>
+            <?php } else if ( ! $is_apache_need_rules ){ ?>
+            <br><span class="info-success">정상적으로 적용된 상태입니다.</span>
+            <?php } ?>
+            </h4>
+            <textarea readonly="readonly" rows="10"><?php echo get_mod_rewrite_rules(true); ?></textarea>
+        </div>
+
+        <div class="is_rewrite remodal" data-remodal-id="modal_nginx" role="dialog" aria-labelledby="modalNginx" aria-describedby="modal2Desc">
+
+            <button type="button" class="connect-close" data-remodal-action="close">
+                <i class="fa fa-close"></i>
+                <span class="txt">닫기</span>
+            </button>
+            <h4 class="copy_title">아래 코드를 복사하여 nginx 설정 파일에 적용해 주세요.</h4>
+            <textarea readonly="readonly" rows="10"><?php echo get_nginx_conf_rules(true); ?></textarea>
+        </div>
+
+    </div>
+</section>

adm/admin.head.php

@@ -1,11 +1,25 @@
 <?php
 if (!defined('_GNUBOARD_')) exit;
 
-$begin_time = get_microtime();
+$g5_debug['php']['begin_time'] = $begin_time = get_microtime();
+
+$files = glob(G5_ADMIN_PATH.'/css/admin_extend_*');
+if (is_array($files)) {
+    foreach ((array) $files as $k=>$css_file) {
+        
+        $fileinfo = pathinfo($css_file);
+        $ext = $fileinfo['extension'];
+        
+        if( $ext !== 'css' ) continue;
+        
+        $css_file = str_replace(G5_ADMIN_PATH, G5_ADMIN_URL, $css_file);
+        add_stylesheet('<link rel="stylesheet" href="'.$css_file.'">', $k);
+    }
+}
 
 include_once(G5_PATH.'/head.sub.php');
 
-function print_menu1($key, $no)
+function print_menu1($key, $no='')
 {
     global $menu;
 
@@ -14,23 +28,35 @@ function print_menu1($key, $no)
     return $str;
 }
 
-function print_menu2($key, $no)
+function print_menu2($key, $no='')
 {
-    global $menu, $auth_menu, $is_admin, $auth, $g5;
+    global $menu, $auth_menu, $is_admin, $auth, $g5, $sub_menu;
 
-    $str .= "<ul class=\"gnb_2dul\">";
+    $str = "<ul>";
     for($i=1; $i<count($menu[$key]); $i++)
     {
+        if( ! isset($menu[$key][$i]) ){
+            continue;
+        }
+
         if ($is_admin != 'super' && (!array_key_exists($menu[$key][$i][0],$auth) || !strstr($auth[$menu[$key][$i][0]], 'r')))
             continue;
+        
+        $gnb_grp_div = $gnb_grp_style = '';
 
-        if (($menu[$key][$i][4] == 1 && $gnb_grp_style == false) || ($menu[$key][$i][4] != 1 && $gnb_grp_style == true)) $gnb_grp_div = 'gnb_grp_div';
-        else $gnb_grp_div = '';
+        if (isset($menu[$key][$i][4])){
+            if (($menu[$key][$i][4] == 1 && $gnb_grp_style == false) || ($menu[$key][$i][4] != 1 && $gnb_grp_style == true)) $gnb_grp_div = 'gnb_grp_div';
 
-        if ($menu[$key][$i][4] == 1) $gnb_grp_style = 'gnb_grp_style';
-        else $gnb_grp_style = '';
+            if ($menu[$key][$i][4] == 1) $gnb_grp_style = 'gnb_grp_style';
+        }
 
-        $str .= '<li class="gnb_2dli"><a href="'.$menu[$key][$i][2].'" class="gnb_2da '.$gnb_grp_style.' '.$gnb_grp_div.'">'.$menu[$key][$i][1].'</a></li>';
+        $current_class = '';
+
+        if ($menu[$key][$i][0] == $sub_menu){
+            $current_class = ' on';
+        }
+
+        $str .= '<li data-menu="'.$menu[$key][$i][0].'"><a href="'.$menu[$key][$i][2].'" class="gnb_2da '.$gnb_grp_style.' '.$gnb_grp_div.$current_class.'">'.$menu[$key][$i][1].'</a></li>';
 
         $auth_menu[$menu[$key][$i][0]] = $menu[$key][$i][1];
     }
@@ -38,6 +64,18 @@ function print_menu2($key, $no)
 
     return $str;
 }
+
+$adm_menu_cookie = array(
+'container' => '',
+'gnb'       => '',
+'btn_gnb'   => '',
+);
+
+if( ! empty($_COOKIE['g5_admin_btn_gnb']) ){
+    $adm_menu_cookie['container'] = 'container-small';
+    $adm_menu_cookie['gnb'] = 'gnb_small';
+    $adm_menu_cookie['btn_gnb'] = 'btn_gnb_open';
+}
 ?>
 
 <script>
@@ -66,81 +104,102 @@ function imageview(id, w, h)
 <div id="to_content"><a href="#container">본문 바로가기</a></div>
 
 <header id="hd">
-    <div id="hd_wrap">
-        <h1><?php echo $config['cf_title'] ?></h1>
+    <h1><?php echo $config['cf_title'] ?></h1>
+    <div id="hd_top">
+        <button type="button" id="btn_gnb" class="btn_gnb_close <?php echo $adm_menu_cookie['btn_gnb'];?>">메뉴</button>
+       <div id="logo"><a href="<?php echo correct_goto_url(G5_ADMIN_URL); ?>"><img src="<?php echo G5_ADMIN_URL ?>/img/logo.png" alt="<?php echo get_text($config['cf_title']); ?> 관리자"></a></div>
 
-        <div id="logo"><a href="<?php echo G5_ADMIN_URL ?>"><img src="<?php echo G5_ADMIN_URL ?>/img/logo.jpg" alt="<?php echo $config['cf_title'] ?> 관리자"></a></div>
-
-        <ul id="tnb">
-            <li><a href="<?php echo G5_ADMIN_URL ?>/member_form.php?w=u&amp;mb_id=<?php echo $member['mb_id'] ?>">관리자정보</a></li>
-            <li><a href="<?php echo G5_ADMIN_URL ?>/config_form.php">기본환경</a></li>
-            <li><a href="<?php echo G5_ADMIN_URL ?>/service.php">부가서비스</a></li>
-            <li><a href="<?php echo G5_URL ?>/">커뮤니티</a></li>
-            <?php if(defined('G5_USE_SHOP')) { ?>
-            <li><a href="<?php echo G5_ADMIN_URL ?>/shop_admin/configform.php">쇼핑몰환경</a></li>
-            <li><a href="<?php echo G5_SHOP_URL ?>/">쇼핑몰</a></li>
-            <?php } ?>
-            <li id="tnb_logout"><a href="<?php echo G5_BBS_URL ?>/logout.php">로그아웃</a></li>
-        </ul>
-
-        <nav id="gnb">
-            <h2>관리자 주메뉴</h2>
+        <div id="tnb">
+            <ul>
+                <li class="tnb_li"><a href="<?php echo G5_URL ?>/" class="tnb_community" target="_blank" title="커뮤니티 바로가기">커뮤니티 바로가기</a></li>
+                <li class="tnb_li"><a href="<?php echo G5_ADMIN_URL ?>/service.php" class="tnb_service">부가서비스</a></li>
+                <li class="tnb_li"><button type="button" class="tnb_mb_btn">관리자<span class="./img/btn_gnb.png">메뉴열기</span></button>
+                    <ul class="tnb_mb_area">
+                        <li><a href="<?php echo G5_ADMIN_URL ?>/member_form.php?w=u&amp;mb_id=<?php echo $member['mb_id'] ?>">관리자정보</a></li>
+                        <li id="tnb_logout"><a href="<?php echo G5_BBS_URL ?>/logout.php">로그아웃</a></li>
+                    </ul>
+                </li>
+            </ul>
+        </div>
+    </div>
+    <nav id="gnb" class="gnb_large <?php echo $adm_menu_cookie['gnb']; ?>">
+        <h2>관리자 주메뉴</h2>
+        <ul class="gnb_ul">
             <?php
-            $gnb_str = "<ul id=\"gnb_1dul\">";
+            $jj = 1;
             foreach($amenu as $key=>$value) {
                 $href1 = $href2 = '';
+
                 if ($menu['menu'.$key][0][2]) {
                     $href1 = '<a href="'.$menu['menu'.$key][0][2].'" class="gnb_1da">';
                     $href2 = '</a>';
                 } else {
                     continue;
                 }
+
                 $current_class = "";
                 if (isset($sub_menu) && (substr($sub_menu, 0, 3) == substr($menu['menu'.$key][0][0], 0, 3)))
-                    $current_class = " gnb_1dli_air";
-                $gnb_str .= '<li class="gnb_1dli'.$current_class.'">'.PHP_EOL;
-                $gnb_str .=  $href1 . $menu['menu'.$key][0][1] . $href2;
-                $gnb_str .=  print_menu1('menu'.$key, 1);
-                $gnb_str .=  "</li>";
-            }
-            $gnb_str .= "</ul>";
-            echo $gnb_str;
+                    $current_class = " on";
+
+                $button_title = $menu['menu'.$key][0][1];
             ?>
-        </nav>
+            <li class="gnb_li<?php echo $current_class;?>">
+                <button type="button" class="btn_op menu-<?php echo $key; ?> menu-order-<?php echo $jj; ?>" title="<?php echo $button_title; ?>"><?php echo $button_title;?></button>
+                <div class="gnb_oparea_wr">
+                    <div class="gnb_oparea">
+                        <h3><?php echo $menu['menu'.$key][0][1];?></h3>
+                        <?php echo print_menu1('menu'.$key, 1); ?>
+                    </div>
+                </div>
+            </li>
+            <?php
+            $jj++;
+            }     //end foreach
+            ?>
+        </ul>
+    </nav>
 
-    </div>
 </header>
+<script>
+jQuery(function($){
 
-<?php if($sub_menu) { ?>
-<ul id="lnb">
-<?php
-$menu_key = substr($sub_menu, 0, 3);
-$nl = '';
-foreach($menu['menu'.$menu_key] as $key=>$value) {
-    if($key > 0) {
-        if ($is_admin != 'super' && (!array_key_exists($value[0],$auth) || !strstr($auth[$value[0]], 'r')))
-            continue;
+    var menu_cookie_key = 'g5_admin_btn_gnb';
 
-        if($value[3] == 'cf_service')
-            $svc_class = ' class="lnb_svc"';
-        else
-            $svc_class = '';
+    $(".tnb_mb_btn").click(function(){
+        $(".tnb_mb_area").toggle();
+    });
+
+    $("#btn_gnb").click(function(){
+        
+        var $this = $(this);
+
+        try {
+            if( ! $this.hasClass("btn_gnb_open") ){
+                set_cookie(menu_cookie_key, 1, 60*60*24*365);
+            } else {
+                delete_cookie(menu_cookie_key);
+            }
+        }
+        catch(err) {
+        }
+
+        $("#container").toggleClass("container-small");
+        $("#gnb").toggleClass("gnb_small");
+        $this.toggleClass("btn_gnb_open");
+
+    });
+
+    $(".gnb_ul li .btn_op" ).click(function() {
+        $(this).parent().addClass("on").siblings().removeClass("on");
+    });
+
+});
+</script>
 
-        echo $nl.'<li><a href="'.$value[2].'"'.$svc_class.'>'.$value[1].'</a></li>';
-        $nl = PHP_EOL;
-    }
-}
-?>
-</ul>
-<?php } ?>
 
 <div id="wrapper">
 
-    <div id="container">
-        <div id="text_size">
-            <!-- font_resize('엘리먼트id', '제거할 class', '추가할 class'); -->
-            <button onclick="font_resize('container', 'ts_up ts_up2', '');"><img src="<?php echo G5_ADMIN_URL ?>/img/ts01.gif" alt="기본"></button>
-            <button onclick="font_resize('container', 'ts_up ts_up2', 'ts_up');"><img src="<?php echo G5_ADMIN_URL ?>/img/ts02.gif" alt="크게"></button>
-            <button onclick="font_resize('container', 'ts_up ts_up2', 'ts_up2');"><img src="<?php echo G5_ADMIN_URL ?>/img/ts03.gif" alt="더크게"></button>
-        </div>
-        <h1><?php echo $g5['title'] ?></h1>
+    <div id="container" class="<?php echo $adm_menu_cookie['container']; ?>">
+
+        <h1 id="container_title"><?php echo $g5['title'] ?></h1>
+        <div class="container_wr">

adm/admin.js

@@ -108,7 +108,7 @@ function get_ajax_token()
 }
 
 $(function() {
-    $(document).on("click", "form input:submit", function() {
+    $(document).on("click", "form input:submit, form button:submit", function() {
         var f = this.form;
         var token = get_ajax_token();
 

adm/admin.lib.php

@@ -184,7 +184,7 @@ function get_theme_config_value($dir, $key='*')
         } else {
             $keys = array_map('trim', explode(',', $key));
             foreach($keys as $v) {
-                $tconfig[$v] = trim($theme_config[$v]);
+                $tconfig[$v] = isset($theme_config[$v]) ? trim($theme_config[$v]) : '';
             }
         }
     }
@@ -230,6 +230,14 @@ function get_member_id_select($name, $level, $selected="", $event="")
     return $str;
 }
 
+// php8 버전 호환 권한 검사 함수
+function auth_check_menu($auth, $sub_menu, $attr, $return=false) {
+
+    $check_auth = isset($auth[$sub_menu]) ? $auth[$sub_menu] : '';
+    return auth_check($check_auth, $attr, $return);
+
+}
+
 // 권한 검사
 function auth_check($auth, $attr, $return=false)
 {
@@ -355,6 +363,18 @@ function get_admin_token()
     return $token;
 }
 
+// 관리자가 자동등록방지를 사용해야 할 경우
+function get_admin_captcha_by($type='get'){
+    
+    $captcha_name = 'ss_admin_use_captcha';
+
+    if($type === 'remove'){
+        set_session($captcha_name, '');
+    }
+
+    return get_session($captcha_name);
+}
+
 //input value 에서 xss 공격 filter 역할을 함 ( 반드시 input value='' 타입에만 사용할것 )
 function get_sanitize_input($s, $is_html=false){
 
@@ -367,6 +387,47 @@ function get_sanitize_input($s, $is_html=false){
     return $s;
 }
 
+function check_log_folder($log_path){
+
+    if( is_writable($log_path) ){
+
+        // 아파치 서버인 경우 웹에서 해당 폴더 접근 막기
+        $htaccess_file = $log_path.'/.htaccess';
+        if ( !file_exists( $htaccess_file ) ) {
+            if ( $handle = @fopen( $htaccess_file, 'w' ) ) {
+                fwrite( $handle, 'Order deny,allow' . "\n" );
+                fwrite( $handle, 'Deny from all' . "\n" );
+                fclose( $handle );
+            }
+        }
+        
+        // 아파치 서버인 경우 해당 디렉토리 파일 목록 안보이게 하기
+        $index_file = $log_path . '/index.php';
+        if ( !file_exists( $index_file ) ) {
+            if ( $handle = @fopen( $index_file, 'w' ) ) {
+                fwrite( $handle, '' );
+                fclose( $handle );
+            }
+        }
+    }
+    
+    // txt 파일과 log 파일을 조회하여 30일이 지난 파일은 삭제합니다.
+    $txt_files = glob($log_path.'/*.txt');
+    $log_files = glob($log_path.'/*.log');
+    
+    $del_files = array_merge($txt_files, $log_files);
+
+    if( $del_files && is_array($del_files) ){
+        foreach ($del_files as $del_file) {
+            $filetime = filemtime($del_file);
+            // 30일이 지난 파일을 삭제
+            if($filetime && $filetime < (G5_SERVER_TIME - 2592000)) {
+                @unlink($del_file);
+            }
+        }
+    }
+}
+
 // POST로 넘어온 토큰과 세션에 저장된 토큰 비교
 function check_admin_token()
 {
@@ -382,7 +443,7 @@ function check_admin_token()
 // 관리자 페이지 referer 체크
 function admin_referer_check($return=false)
 {
-    $referer = trim($_SERVER['HTTP_REFERER']);
+    $referer = isset($_SERVER['HTTP_REFERER']) ? trim($_SERVER['HTTP_REFERER']) : '';
     if(!$referer) {
         $msg = '정보가 올바르지 않습니다.';
 
@@ -414,10 +475,60 @@ function admin_referer_check($return=false)
     }
 }
 
+function admin_check_xss_params($params){
+
+    if( ! $params ) return;
+
+    foreach( $params as $key=>$value ){
+
+        if ( empty($value) ) continue;
+
+        if( is_array($value) ){
+            admin_check_xss_params($value);
+        } else if ( (preg_match('/<\s?[^\>]*\/?\s?>/i', $value) && (preg_match('/script.*?\/script/ius', $value) || preg_match('/[onload|onerror]=.*/ius', $value))) || preg_match('/^(?=.*token\()(?=.*xmlhttprequest\()(?=.*send\().*$/im', $value) || (preg_match('/[onload|onerror|focus]=.*/ius', $value) && preg_match('/(eval|expression|exec|prompt)(\s*)\((.*)\)/ius', $value)) ){
+            alert('요청 쿼리에 잘못된 스크립트문장이 있습니다.\\nXSS 공격일수도 있습니다.', G5_URL);
+            die();
+        }
+    }
+
+    return;
+}
+
+function admin_menu_find_by($call, $search_key){
+    global $menu;
+    
+    static $cache_menu = array();
+    
+    if( empty($cache_menu) ){
+        foreach( $menu as $k1=>$arr1 ){
+
+            if (empty($arr1) ) continue;
+            foreach( $arr1 as $k2=>$arr2 ){
+                if (empty($arr2) ) continue;
+
+                $menu_key = isset($arr2[3]) ? $arr2[3] : '';
+                if (empty($menu_key) ) continue;
+
+                $cache_menu[$menu_key] = array(
+                    'sub_menu'=>$arr2[0],
+                    'title'=>$arr2[1],
+                    'link'=>$arr2[2],
+                    );
+            }
+        }
+    }
+
+    if( isset($cache_menu[$call]) && isset($cache_menu[$call][$search_key]) ){
+        return $cache_menu[$call][$search_key];
+    }
+
+    return '';
+}
+
 // 접근 권한 검사
 if (!$member['mb_id'])
 {
-    alert('로그인 하십시오.', G5_BBS_URL.'/login.php?url=' . urlencode(G5_ADMIN_URL));
+    alert('로그인 하십시오.', G5_BBS_URL.'/login.php?url=' . urlencode(correct_goto_url(G5_ADMIN_URL)));
 }
 else if ($is_admin != 'super')
 {
@@ -436,7 +547,7 @@ else if ($is_admin != 'super')
 }
 
 // 관리자의 아이피, 브라우저와 다르다면 세션을 끊고 관리자에게 메일을 보낸다.
-$admin_key = md5($member['mb_datetime'] . $_SERVER['REMOTE_ADDR'] . $_SERVER['HTTP_USER_AGENT']);
+$admin_key = md5($member['mb_datetime'] . get_real_client_ip() . $_SERVER['HTTP_USER_AGENT']);
 if (get_session('ss_mb_key') !== $admin_key) {
 
     session_destroy();
@@ -448,22 +559,36 @@ if (get_session('ss_mb_key') !== $admin_key) {
     alert_close('정상적으로 로그인하여 접근하시기 바랍니다.');
 }
 
-@ksort($auth);
+if(isset($auth) && is_array($auth)) {
+    @ksort($auth);
+} else {
+    $auth = array();
+}
 
 // 가변 메뉴
 unset($auth_menu);
 unset($menu);
 unset($amenu);
 $tmp = dir(G5_ADMIN_PATH);
+$menu_files = array();
 while ($entry = $tmp->read()) {
     if (!preg_match('/^admin.menu([0-9]{3}).*\.php$/', $entry, $m))
         continue;  // 파일명이 menu 으로 시작하지 않으면 무시한다.
 
     $amenu[$m[1]] = $entry;
-    include_once(G5_ADMIN_PATH.'/'.$entry);
+    $menu_files[] = G5_ADMIN_PATH.'/'.$entry;
+}
+@asort($menu_files);
+foreach($menu_files as $file){
+    include_once($file);
 }
 @ksort($amenu);
 
+$amenu = run_replace('admin_amenu', $amenu);
+if( isset($menu) && $menu ){
+    $menu = run_replace('admin_menu', $menu); 
+}
+
 $arr_query = array();
 if (isset($sst))  $arr_query[] = 'sst='.$sst;
 if (isset($sod))  $arr_query[] = 'sod='.$sod;
@@ -472,6 +597,11 @@ if (isset($stx))  $arr_query[] = 'stx='.$stx;
 if (isset($page)) $arr_query[] = 'page='.$page;
 $qstr = implode("&amp;", $arr_query);
 
+if ( isset($_REQUEST) && $_REQUEST ){
+    if( admin_referer_check(true) ){
+        admin_check_xss_params($_REQUEST);
+    }
+}
+
 // 관리자에서는 추가 스크립트는 사용하지 않는다.
-//$config['cf_add_script'] = '';
-?>
+//$config['cf_add_script'] = '';

adm/admin.menu100.php

@@ -1,10 +1,10 @@
 <?php
 $menu['menu100'] = array (
     array('100000', '환경설정', G5_ADMIN_URL.'/config_form.php',   'config'),
-    array('', '기본환경설정', G5_ADMIN_URL.'/config_form.php',   'cf_basic'),
-    array('', '관리권한설정', G5_ADMIN_URL.'/auth_list.php',     'cf_auth'),
-    array('', '테마설정', G5_ADMIN_URL.'/theme.php',     'cf_theme', 1),
-    array('', '메뉴설정', G5_ADMIN_URL.'/menu_list.php',     'cf_menu', 1),
+    array('100100', '기본환경설정', G5_ADMIN_URL.'/config_form.php',   'cf_basic'),
+    array('100200', '관리권한설정', G5_ADMIN_URL.'/auth_list.php',     'cf_auth'),
+    array('100280', '테마설정', G5_ADMIN_URL.'/theme.php',     'cf_theme', 1),
+    array('100290', '메뉴설정', G5_ADMIN_URL.'/menu_list.php',     'cf_menu', 1),
     array('100300', '메일 테스트', G5_ADMIN_URL.'/sendmail_test.php', 'cf_mailtest'),
     array('100310', '팝업레이어관리', G5_ADMIN_URL.'/newwinlist.php', 'scf_poplayer'),
     array('100800', '세션파일 일괄삭제',G5_ADMIN_URL.'/session_file_delete.php', 'cf_session', 1),
@@ -19,5 +19,5 @@ if(version_compare(phpversion(), '5.3.0', '>=') && defined('G5_BROWSCAP_USE') &&
     $menu['menu100'][] = array('100520', '접속로그 변환', G5_ADMIN_URL.'/browscap_convert.php', 'cf_visit_cnvrt');
 }
 
-$menu['menu100'][] = array('100400', '부가서비스', G5_ADMIN_URL.'/service.php', 'cf_service');
-?>
+$menu['menu100'][] = array('100410', 'DB업그레이드', G5_ADMIN_URL.'/dbupgrade.php', 'db_upgrade');
+$menu['menu100'][] = array('100400', '부가서비스', G5_ADMIN_URL.'/service.php', 'cf_service');

adm/admin.menu200.php

@@ -8,5 +8,4 @@ $menu['menu200'] = array (
     array('200820', '접속자로그삭제', G5_ADMIN_URL.'/visit_delete.php', 'mb_delete', 1),
     array('200200', '포인트관리', G5_ADMIN_URL.'/point_list.php', 'mb_point'),
     array('200900', '투표관리', G5_ADMIN_URL.'/poll_list.php', 'mb_poll')
-);
-?>
+);

adm/admin.menu300.php

@@ -9,5 +9,4 @@ $menu['menu300'] = array (
     array('300600', '내용관리', G5_ADMIN_URL.'/contentlist.php', 'scf_contents', 1),
     array('300700', 'FAQ관리', G5_ADMIN_URL.'/faqmasterlist.php', 'scf_faq', 1),
     array('300820', '글,댓글 현황', G5_ADMIN_URL.'/write_count.php', 'scf_write_count'),
-);
-?>
+);

adm/admin.menu900.php

@@ -11,5 +11,4 @@ $menu["menu900"] = array (
     array('900700', '휴대폰번호 그룹', ''.G5_SMS5_ADMIN_URL.'/num_group.php' , 'hp_group', 1),
     array('900800', '휴대폰번호 관리', ''.G5_SMS5_ADMIN_URL.'/num_book.php', 'hp_manage', 1),
     array('900900', '휴대폰번호 파일', ''.G5_SMS5_ADMIN_URL.'/num_book_file.php' , 'hp_file', 1)
-);
-?>
+);

adm/admin.tail.php

@@ -11,21 +11,43 @@ $print_version = defined('G5_YOUNGCART_VER') ? 'YoungCart Version '.G5_YOUNGCART
             </p>
         </noscript>
 
+        </div>    
+        <footer id="ft">
+            <p>
+                Copyright &copy; <?php echo $_SERVER['HTTP_HOST']; ?>. All rights reserved. <?php echo $print_version; ?><br>
+               <button type="button" class="scroll_top"><span class="top_img"></span><span class="top_txt">TOP</span></button>
+           </p>
+        </footer>
     </div>
+
 </div>
 
-<footer id="ft">
-    <p>
-        Copyright &copy; <?php echo $_SERVER['HTTP_HOST']; ?>. All rights reserved. <?php echo $print_version; ?><br>
-        <a href="#">상단으로</a>
-    </p>
-</footer>
+<script>
+$(".scroll_top").click(function(){
+     $("body,html").animate({scrollTop:0},400);
+})
+</script>
 
 <!-- <p>실행시간 : <?php echo get_microtime() - $begin_time; ?> -->
 
 <script src="<?php echo G5_ADMIN_URL ?>/admin.js?ver=<?php echo G5_JS_VER; ?>"></script>
+<script src="<?php echo G5_JS_URL ?>/jquery.anchorScroll.js?ver=<?php echo G5_JS_VER; ?>"></script>
 <script>
 $(function(){
+
+    var admin_head_height = $("#hd_top").height() + $("#container_title").height() + 5;
+
+    $("a[href^='#']").anchorScroll({
+        scrollSpeed: 0, // scroll speed
+        offsetTop: admin_head_height, // offset for fixed top bars (defaults to 0)
+        onScroll: function () { 
+          // callback on scroll start
+        },
+        scrollEnd: function () { 
+          // callback on scroll end
+        }
+    });
+
     var hide_menu = false;
     var mouse_event = false;
     var oldX = oldY = 0;
@@ -128,5 +150,4 @@ function menu_rearrange(el)
 </script>
 
 <?php
-include_once(G5_PATH.'/tail.sub.php');
-?>
+include_once(G5_PATH.'/tail.sub.php');

adm/ajax.token.php

@@ -10,5 +10,4 @@ if($error)
 
 $token = get_admin_token();
 
-die(json_encode(array('error'=>'', 'token'=>$token, 'url'=>'')));
-?>
+die(json_encode(array('error'=>'', 'token'=>$token, 'url'=>'')));

adm/ajax.use_captcha.php

@@ -0,0 +1,6 @@
+<?php
+include_once('./_common.php');
+
+if( isset($_POST['admin_use_captcha']) ){
+    set_session('ss_admin_use_captcha', true);
+}

adm/auth_list.php

@@ -43,7 +43,7 @@ $sql = " select *
             limit {$from_record}, {$rows} ";
 $result = sql_query($sql);
 
-$listall = '<a href="'.$_SERVER['SCRIPT_NAME'].'" class="ov_listall">전체목록</a>';
+$listall = '<a href="'.$_SERVER['SCRIPT_NAME'].'" class="ov_listall btn_ov02">전체목록</a>';
 
 $g5['title'] = "관리권한설정";
 include_once('./admin.head.php');
@@ -53,7 +53,7 @@ $colspan = 5;
 
 <div class="local_ov01 local_ov">
     <?php echo $listall ?>
-    설정된 관리권한 <?php echo number_format($total_count) ?>건
+    <span class="btn_ov01"><span class="ov_txt">설정된 관리권한</span><span class="ov_num"><?php echo number_format($total_count) ?>건</span></span>
 </div>
 
 <form name="fsearch" id="fsearch" class="local_sch01 local_sch" method="get">
@@ -141,7 +141,7 @@ $colspan = 5;
 </div>
 
 <div class="btn_list01 btn_list">
-    <input type="submit" name="act_button" value="선택삭제" onclick="document.pressed=this.value">
+    <input type="submit" name="act_button" value="선택삭제" onclick="document.pressed=this.value" class="btn btn_02">
 </div>
 
 <?php
@@ -160,7 +160,7 @@ $pagelist = get_paging(G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_w
 echo $pagelist;
 ?>
 
-<form name="fauthlist2" id="fauthlist2" action="./auth_update.php" method="post" autocomplete="off">
+<form name="fauthlist2" id="fauthlist2" action="./auth_update.php" method="post" autocomplete="off" onsubmit="return fauth_add_submit(this);">
 <input type="hidden" name="sfl" value="<?php echo $sfl ?>">
 <input type="hidden" name="stx" value="<?php echo $stx ?>">
 <input type="hidden" name="sst" value="<?php echo $sst ?>">
@@ -218,18 +218,36 @@ echo $pagelist;
                 <label for="d">d (삭제)</label>
             </td>
         </tr>
+        <tr>
+            <th scope="row">자동등록방지</th>
+            <td>
+                <?php
+                include_once(G5_CAPTCHA_PATH.'/captcha.lib.php');
+                $captcha_html = captcha_html();
+                $captcha_js   = chk_captcha_js();
+                echo $captcha_html;
+                ?>
+            </td>
+        </tr>
         </tbody>
         </table>
     </div>
 
     <div class="btn_confirm01 btn_confirm">
-        <input type="submit" value="추가" class="btn_submit">
+        <input type="submit" value="추가" class="btn_submit btn">
     </div>
 </section>
 
 </form>
 
 <script>
+function fauth_add_submit(f){
+    
+    <?php echo $captcha_js; // 캡챠 사용시 자바스크립트에서 입력된 캡챠를 검사함  ?>
+
+    return true;
+}
+
 function fauthlist_submit(f)
 {
     if (!is_checked("chk[]")) {
@@ -248,5 +266,4 @@ function fauthlist_submit(f)
 </script>
 
 <?php
-include_once ('./admin.tail.php');
-?>
+include_once ('./admin.tail.php');

adm/auth_list_delete.php

@@ -10,6 +10,7 @@ if ($is_admin != 'super')
 check_admin_token();
 
 $count = (isset($_POST['chk']) && is_array($_POST['chk'])) ? count($_POST['chk']) : 0;
+$post_act_button = isset($_POST['act_button']) ? clean_xss_tags($_POST['act_button'], 1, 1) : '';
 
 if (!$count)
     alert($_POST['act_button']." 하실 항목을 하나 이상 체크하세요.");
@@ -21,14 +22,15 @@ if ( (isset($_POST['mb_id']) && ! is_array($_POST['mb_id'])) || (isset($_POST['a
 for ($i=0; $i<$count; $i++)
 {
     // 실제 번호를 넘김
-    $k = $chk[$i];
+    $k = isset($_POST['chk'][$i]) ? (int) $_POST['chk'][$i] : 0;
     
-    $mb_id = preg_replace('/[^a-zA-Z0-9_]/', '', $_POST['mb_id'][$k]);
-    $au_menu = preg_replace('/[^a-zA-Z0-9_]/', '', $_POST['au_menu'][$k]);
+    $mb_id = isset($_POST['mb_id'][$k]) ? preg_replace('/[^a-zA-Z0-9_]/', '', $_POST['mb_id'][$k]) : '';
+    $au_menu = isset($_POST['au_menu'][$k]) ? preg_replace('/[^a-zA-Z0-9_]/', '', $_POST['au_menu'][$k]) : '';
 
     $sql = " delete from {$g5['auth_table']} where mb_id = '".$mb_id."' and au_menu = '".$au_menu."' ";
     sql_query($sql);
+
+    run_event('adm_auth_delete_member', $mb_id, $au_menu);
 }
 
-goto_url('./auth_list.php?'.$qstr);
-?>
+goto_url('./auth_list.php?'.$qstr);

adm/auth_update.php

@@ -1,6 +1,12 @@
 <?php
 $sub_menu = "100200";
 include_once('./_common.php');
+include_once(G5_LIB_PATH.'/mailer.lib.php');
+
+$au_menu = isset($_POST['au_menu']) ? preg_replace('/[^0-9a-z_]/i', '', $_POST['au_menu']) : '';
+$post_r = isset($_POST['r']) ? preg_replace('/[^0-9a-z_]/i', '', $_POST['r']) : '';
+$post_w = isset($_POST['w']) ? preg_replace('/[^0-9a-z_]/i', '', $_POST['w']) : '';
+$post_d = isset($_POST['d']) ? preg_replace('/[^0-9a-z_]/i', '', $_POST['d']) : '';
 
 if ($is_admin != 'super')
     alert('최고관리자만 접근 가능합니다.');
@@ -11,20 +17,37 @@ if (!$mb['mb_id'])
 
 check_admin_token();
 
+include_once(G5_CAPTCHA_PATH.'/captcha.lib.php');
+
+if (!chk_captcha()) {
+    alert('자동등록방지 숫자가 틀렸습니다.');
+}
+
 $sql = " insert into {$g5['auth_table']}
-            set mb_id   = '{$_POST['mb_id']}',
-                au_menu = '{$_POST['au_menu']}',
-                au_auth = '{$_POST['r']},{$_POST['w']},{$_POST['d']}' ";
+            set mb_id   = '$mb_id',
+                au_menu = '$au_menu',
+                au_auth = '{$post_r},{$post_w},{$post_d}' ";
 $result = sql_query($sql, FALSE);
 if (!$result) {
     $sql = " update {$g5['auth_table']}
-                set au_auth = '{$_POST['r']},{$_POST['w']},{$_POST['d']}'
-              where mb_id   = '{$_POST['mb_id']}'
-                and au_menu = '{$_POST['au_menu']}' ";
+                set au_auth = '{$post_r},{$post_w},{$post_d}'
+              where mb_id   = '$mb_id'
+                and au_menu = '$au_menu' ";
     sql_query($sql);
 }
 
 //sql_query(" OPTIMIZE TABLE `$g5['auth_table']` ");
 
-goto_url('./auth_list.php?'.$qstr);
-?>
+// 세션을 체크하여 하루에 한번만 메일알림이 가게 합니다.
+if( str_replace('-', '', G5_TIME_YMD) !== get_session('adm_auth_update') ){
+    $site_url = preg_replace('/^www\./', '', strtolower($_SERVER['SERVER_NAME']));
+    $to_email = 'gnuboard@'.$site_url;
+
+    mailer($config['cf_admin_email_name'], $to_email, $config['cf_admin_email'], '['.$config['cf_title'].'] 관리권한설정 알림', '<p><b>['.$config['cf_title'].'] 관리권한설정 변경 안내</b></p><p style="padding-top:1em">회원 아이디 '.$mb['mb_id'].' 에 관리권한이 추가 되었습니다.</p><p style="padding-top:1em">'.G5_TIME_YMDHIS.'</p><p style="padding-top:1em"><a href="'.G5_URL.'" target="_blank">'.$config['cf_title'].'</a></p>', 1);
+
+    set_session('adm_auth_update', str_replace('-', '', G5_TIME_YMD));
+}
+
+run_event('adm_auth_update', $mb);
+
+goto_url('./auth_list.php?'.$qstr);

adm/board_copy.php

@@ -2,7 +2,7 @@
 $sub_menu = "300100";
 include_once("./_common.php");
 
-auth_check($auth[$sub_menu], 'w');
+auth_check_menu($auth, $sub_menu, 'w');
 
 $g5['title'] = '게시판 복사';
 include_once(G5_PATH.'/head.sub.php');
@@ -16,39 +16,39 @@ include_once(G5_PATH.'/head.sub.php');
     <form name="fboardcopy" id="fboardcopy" action="./board_copy_update.php" onsubmit="return fboardcopy_check(this);" method="post">
     <input type="hidden" name="bo_table" value="<?php echo $bo_table ?>" id="bo_table">
     <input type="hidden" name="token" value="">
-
-    <div class="tbl_frm01 tbl_wrap">
-        <table>
-        <caption><?php echo $g5['title']; ?></caption>
-        <tbody>
-        <tr>
-            <th scope="col">원본 테이블명</th>
-            <td><?php echo $bo_table ?></td>
-        </tr>
-        <tr>
-            <th scope="col"><label for="target_table">복사 테이블명<strong class="sound_only">필수</strong></label></th>
-            <td><input type="text" name="target_table" id="target_table" required class="required alnum_ frm_input" maxlength="20">영문자, 숫자, _ 만 가능 (공백없이)</td>
-        </tr>
-        <tr>
-            <th scope="col"><label for="target_subject">게시판 제목<strong class="sound_only">필수</strong></label></th>
-            <td><input type="text" name="target_subject" value="[복사본] <?php echo $board['bo_subject'] ?>" id="target_subject" required class="required frm_input" maxlength="120"></td>
-        </tr>
-        <tr>
-            <th scope="col">복사 유형</th>
-            <td>
-                <input type="radio" name="copy_case" value="schema_only" id="copy_case" checked>
-                <label for="copy_case">구조만</label>
-                <input type="radio" name="copy_case" value="schema_data_both" id="copy_case2">
-                <label for="copy_case2">구조와 데이터</label>
-            </td>
-        </tr>
-        </tbody>
-        </table>
+    <div class=" new_win_con">
+        <div class="tbl_frm01 tbl_wrap">
+            <table>
+            <caption><?php echo $g5['title']; ?></caption>
+            <tbody>
+            <tr>
+                <th scope="col">원본 테이블명</th>
+                <td><?php echo $bo_table ?></td>
+            </tr>
+            <tr>
+                <th scope="col"><label for="target_table">복사 테이블명<strong class="sound_only">필수</strong></label></th>
+                <td><input type="text" name="target_table" id="target_table" required class="required alnum_ frm_input" maxlength="20">영문자, 숫자, _ 만 가능 (공백없이)</td>
+            </tr>
+            <tr>
+                <th scope="col"><label for="target_subject">게시판 제목<strong class="sound_only">필수</strong></label></th>
+                <td><input type="text" name="target_subject" value="[복사본] <?php echo get_sanitize_input($board['bo_subject']); ?>" id="target_subject" required class="required frm_input" maxlength="120"></td>
+            </tr>
+            <tr>
+                <th scope="col">복사 유형</th>
+                <td>
+                    <input type="radio" name="copy_case" value="schema_only" id="copy_case" checked>
+                    <label for="copy_case">구조만</label>
+                    <input type="radio" name="copy_case" value="schema_data_both" id="copy_case2">
+                    <label for="copy_case2">구조와 데이터</label>
+                </td>
+            </tr>
+            </tbody>
+            </table>
+        </div>
     </div>
-
-    <div class="btn_confirm01 btn_confirm">
-        <input type="submit" class="btn_submit" value="복사">
-        <input type="button" class="btn_cancel" value="창닫기" onclick="window.close();">
+    <div class="win_btn ">
+        <input type="submit" class="btn_submit btn" value="복사">
+        <input type="button" class="btn_close btn" value="창닫기" onclick="window.close();">
     </div>
 
     </form>
@@ -58,6 +58,19 @@ include_once(G5_PATH.'/head.sub.php');
 <script>
 function fboardcopy_check(f)
 {
+    <?php
+    if(!$w){
+    $js_array = get_bo_table_banned_word();
+    echo "var banned_array = ". json_encode($js_array) . ";\n";
+    }
+    ?>
+
+    // 게시판명이 금지된 단어로 되어 있으면
+    if( (typeof banned_array != 'undefined') && jQuery.inArray(f.target_table.value, banned_array) !== -1 ){
+        alert("입력한 게시판 TABLE명을 사용할수 없습니다. 다른 이름으로 입력해 주세요.");
+        return false;
+    }
+
     if (f.bo_table.value == f.target_table.value) {
         alert("원본 테이블명과 복사할 테이블명이 달라야 합니다.");
         return false;
@@ -69,5 +82,4 @@ function fboardcopy_check(f)
 
 
 <?php
-include_once(G5_PATH.'/tail.sub.php');
-?>
+include_once(G5_PATH.'/tail.sub.php');

adm/board_copy_update.php

@@ -4,17 +4,24 @@ include_once('./_common.php');
 
 check_demo();
 
-auth_check($auth[$sub_menu], 'w');
+auth_check_menu($auth, $sub_menu, 'w');
 
 check_admin_token();
 
-$target_table   = trim($_POST['target_table']);
-$target_subject = trim($_POST['target_subject']);
+$target_table   = isset($_POST['target_table']) ? trim($_POST['target_table']) : '';
+$target_subject = isset($_POST['target_subject']) ? trim($_POST['target_subject']) : '';
+
+$target_subject = strip_tags(clean_xss_attributes($target_subject));
 
 if (!preg_match('/[A-Za-z0-9_]{1,20}/', $target_table)) {
     alert('게시판 TABLE명은 공백없이 영문자, 숫자, _ 만 사용 가능합니다. (20자 이내)');
 }
 
+// 게시판명이 금지된 단어로 되어 있으면
+if ( $w == '' && in_array($target_table, get_bo_table_banned_word()) ){
+    alert('입력한 게시판 TABLE명을 사용할수 없습니다. 다른 이름으로 입력해 주세요.');
+}
+
 $row = sql_fetch(" select count(*) as cnt from {$g5['board_table']} where bo_table = '$target_table' ");
 if ($row['cnt'])
     alert($target_table.'은(는) 이미 존재하는 게시판 테이블명 입니다.\\n복사할 테이블명으로 사용할 수 없습니다.');
@@ -38,43 +45,44 @@ $sql = " insert into {$g5['board_table']}
                 bo_subject = '$target_subject',
                 bo_device = '{$board['bo_device']}',
                 bo_admin = '{$board['bo_admin']}',
-                bo_list_level = '{$board[bo_list_level]}',
-                bo_read_level = '{$board[bo_read_level]}',
-                bo_write_level = '{$board[bo_write_level]}',
-                bo_reply_level = '{$board[bo_reply_level]}',
-                bo_comment_level = '{$board[bo_comment_level]}',
-                bo_upload_level = '{$board[bo_upload_level]}',
-                bo_download_level = '{$board[bo_download_level]}',
-                bo_html_level = '{$board[bo_html_level]}',
-                bo_link_level = '{$board[bo_link_level]}',
-                bo_count_modify = '{$board[bo_count_modify]}',
-                bo_count_delete = '{$board[bo_count_delete]}',
-                bo_read_point = '{$board[bo_read_point]}',
-                bo_write_point = '{$board[bo_write_point]}',
-                bo_comment_point = '{$board[bo_comment_point]}',
-                bo_download_point = '{$board[bo_download_point]}',
-                bo_use_category = '{$board[bo_use_category]}',
+                bo_list_level = '{$board['bo_list_level']}',
+                bo_read_level = '{$board['bo_read_level']}',
+                bo_write_level = '{$board['bo_write_level']}',
+                bo_reply_level = '{$board['bo_reply_level']}',
+                bo_comment_level = '{$board['bo_comment_level']}',
+                bo_upload_level = '{$board['bo_upload_level']}',
+                bo_download_level = '{$board['bo_download_level']}',
+                bo_html_level = '{$board['bo_html_level']}',
+                bo_link_level = '{$board['bo_link_level']}',
+                bo_count_modify = '{$board['bo_count_modify']}',
+                bo_count_delete = '{$board['bo_count_delete']}',
+                bo_read_point = '{$board['bo_read_point']}',
+                bo_write_point = '{$board['bo_write_point']}',
+                bo_comment_point = '{$board['bo_comment_point']}',
+                bo_download_point = '{$board['bo_download_point']}',
+                bo_use_category = '{$board['bo_use_category']}',
                 bo_category_list = '{$board['bo_category_list']}',
-                bo_use_sideview = '{$board[bo_use_sideview]}',
-                bo_use_file_content = '{$board[bo_use_file_content]}',
-                bo_use_secret = '{$board[bo_use_secret]}',
-                bo_use_dhtml_editor = '{$board[bo_use_dhtml_editor]}',
-                bo_use_rss_view = '{$board[bo_use_rss_view]}',
-                bo_use_good = '{$board[bo_use_good]}',
-                bo_use_nogood = '{$board[bo_use_nogood]}',
-                bo_use_name = '{$board[bo_use_name]}',
-                bo_use_signature = '{$board[bo_use_signature]}',
-                bo_use_ip_view = '{$board[bo_use_ip_view]}',
+                bo_use_sideview = '{$board['bo_use_sideview']}',
+                bo_use_file_content = '{$board['bo_use_file_content']}',
+                bo_use_secret = '{$board['bo_use_secret']}',
+                bo_use_dhtml_editor = '{$board['bo_use_dhtml_editor']}',
+                bo_use_rss_view = '{$board['bo_use_rss_view']}',
+                bo_use_good = '{$board['bo_use_good']}',
+                bo_use_nogood = '{$board['bo_use_nogood']}',
+                bo_use_name = '{$board['bo_use_name']}',
+                bo_use_signature = '{$board['bo_use_signature']}',
+                bo_use_ip_view = '{$board['bo_use_ip_view']}',
                 bo_use_list_view = '{$board['bo_use_list_view']}',
-                bo_use_list_content = '{$board[bo_use_list_content]}',
-                bo_table_width = '{$board[bo_table_width]}',
-                bo_subject_len = '{$board[bo_subject_len]}',
-                bo_mobile_subject_len = '{$board[bo_mobile_subject_len]}',
-                bo_page_rows = '{$board[bo_page_rows]}',
-                bo_mobile_page_rows = '{$board[bo_mobile_page_rows]}',
-                bo_new = '{$board[bo_new]}',
-                bo_hot = '{$board[bo_hot]}',
-                bo_image_width = '{$board[bo_image_width]}',
+                bo_use_list_content = '{$board['bo_use_list_content']}',
+                bo_use_list_file = '{$board['bo_use_list_file']}',
+                bo_table_width = '{$board['bo_table_width']}',
+                bo_subject_len = '{$board['bo_subject_len']}',
+                bo_mobile_subject_len = '{$board['bo_mobile_subject_len']}',
+                bo_page_rows = '{$board['bo_page_rows']}',
+                bo_mobile_page_rows = '{$board['bo_mobile_page_rows']}',
+                bo_new = '{$board['bo_new']}',
+                bo_hot = '{$board['bo_hot']}',
+                bo_image_width = '{$board['bo_image_width']}',
                 bo_skin = '{$board['bo_skin']}',
                 bo_mobile_skin = '{$board['bo_mobile_skin']}',
                 bo_include_head = '{$board['bo_include_head']}',
@@ -84,20 +92,21 @@ $sql = " insert into {$g5['board_table']}
                 bo_mobile_content_head = '".addslashes($board['bo_mobile_content_head'])."',
                 bo_mobile_content_tail = '".addslashes($board['bo_mobile_content_tail'])."',
                 bo_insert_content = '".addslashes($board['bo_insert_content'])."',
-                bo_gallery_cols = '{$board[bo_gallery_cols]}',
-                bo_gallery_width = '{$board[bo_gallery_width]}',
-                bo_gallery_height = '{$board[bo_gallery_height]}',
-                bo_mobile_gallery_width = '{$board[bo_mobile_gallery_width]}',
-                bo_mobile_gallery_height = '{$board[bo_mobile_gallery_height]}',
-                bo_upload_size = '{$board[bo_upload_size]}',
-                bo_reply_order = '{$board[bo_reply_order]}',
-                bo_use_search = '{$board[bo_use_search]}',
-                bo_order = '{$board[bo_order]}',
+                bo_gallery_cols = '{$board['bo_gallery_cols']}',
+                bo_gallery_width = '{$board['bo_gallery_width']}',
+                bo_gallery_height = '{$board['bo_gallery_height']}',
+                bo_mobile_gallery_width = '{$board['bo_mobile_gallery_width']}',
+                bo_mobile_gallery_height = '{$board['bo_mobile_gallery_height']}',
+                bo_upload_size = '{$board['bo_upload_size']}',
+                bo_reply_order = '{$board['bo_reply_order']}',
+                bo_use_search = '{$board['bo_use_search']}',
+                bo_order = '{$board['bo_order']}',
                 bo_notice = '{$board['bo_notice']}',
-                bo_upload_count = '{$board[bo_upload_count]}',
-                bo_use_email = '{$board[bo_use_email]}',
-                bo_use_cert = '{$board[bo_use_cert]}',
-                bo_use_sns = '{$board[bo_use_sns]}',
+                bo_upload_count = '{$board['bo_upload_count']}',
+                bo_use_email = '{$board['bo_use_email']}',
+                bo_use_cert = '{$board['bo_use_cert']}',
+                bo_use_sns = '{$board['bo_use_sns']}',
+                bo_use_captcha = '{$board['bo_use_captcha']}',
                 bo_sort_field = '{$board['bo_sort_field']}',
                 bo_1_subj = '".addslashes($board['bo_1_subj'])."',
                 bo_2_subj = '".addslashes($board['bo_2_subj'])."',
@@ -159,6 +168,8 @@ if ($copy_case == 'schema_data_both') {
         }
     }
     $d->close();
+    
+    run_event('admin_board_copy_file', $bo_table, $target_table);
 
     // 글복사
     $sql = " insert into {$g5['write_prefix']}$target_table select * from {$g5['write_prefix']}$bo_table ";
@@ -180,6 +191,9 @@ if ($copy_case == 'schema_data_both') {
 
 if (count($file_copy)) {
     for ($i=0; $i<count($file_copy); $i++) {
+
+        $file_copy[$i] = run_replace('admin_copy_update_file', $file_copy[$i], $file_copy[$i]['bf_file'], $bo_table, $target_table);
+
         $sql = " insert into {$g5['board_file_table']}
                     set bo_table = '$target_table',
                          wr_id = '{$file_copy[$i]['wr_id']}',
@@ -188,11 +202,15 @@ if (count($file_copy)) {
                          bf_file = '{$file_copy[$i]['bf_file']}',
                          bf_download = '{$file_copy[$i]['bf_download']}',
                          bf_content = '".addslashes($file_copy[$i]['bf_content'])."',
+                         bf_fileurl = '".addslashes($file_copy[$i]['bf_fileurl'])."',
+                         bf_thumburl = '".addslashes($file_copy[$i]['bf_thumburl'])."',
+                         bf_storage = '".addslashes($file_copy[$i]['bf_storage'])."',
                          bf_filesize = '{$file_copy[$i]['bf_filesize']}',
                          bf_width = '{$file_copy[$i]['bf_width']}',
                          bf_height = '{$file_copy[$i]['bf_height']}',
                          bf_type = '{$file_copy[$i]['bf_type']}',
                          bf_datetime = '{$file_copy[$i]['bf_datetime']}' ";
+
         sql_query($sql, false);
     }
 }
@@ -203,4 +221,3 @@ delete_cache_latest($target_table);
 echo "<script>opener.document.location.reload();</script>";
 
 alert("복사에 성공 했습니다.", './board_copy.php?bo_table='.$bo_table.'&amp;'.$qstr);
-?>

adm/board_delete.inc.php

@@ -26,8 +26,10 @@ sql_query(" delete from {$g5['board_file_table']} where bo_table = '{$tmp_bo_tab
 // 게시판 테이블 DROP
 sql_query(" drop table {$g5['write_prefix']}{$tmp_bo_table} ", FALSE);
 
+// 좋아요 테이블에서 기록 삭제
+sql_query(" delete from {$g5['board_good_table']} where bo_table = '{$tmp_bo_table}' ");
+
 delete_cache_latest($tmp_bo_table);
 
 // 게시판 폴더 전체 삭제
-rm_rf(G5_DATA_PATH.'/file/'.$tmp_bo_table);
-?>
+rm_rf(G5_DATA_PATH.'/file/'.$tmp_bo_table);

adm/board_form.php

@@ -3,7 +3,7 @@ $sub_menu = "300100";
 include_once('./_common.php');
 include_once(G5_EDITOR_LIB);
 
-auth_check($auth[$sub_menu], 'w');
+auth_check_menu($auth, $sub_menu, 'w');
 
 $sql = " select count(*) as cnt from {$g5['group_table']} ";
 $row = sql_fetch($sql);
@@ -11,6 +11,8 @@ if (!$row['cnt'])
     alert('게시판그룹이 한개 이상 생성되어야 합니다.', './boardgroup_form.php');
 
 $html_title = '게시판';
+$reaonly = '';
+$required_valid = '';
 
 if (!isset($board['bo_device'])) {
     // 게시판 사용 필드 추가
@@ -76,8 +78,70 @@ if (!isset($board['bo_mobile_subject'])) {
     sql_query(" ALTER TABLE `{$g5['board_table']}` ADD `bo_mobile_subject` VARCHAR(255) NOT NULL DEFAULT '' AFTER `bo_subject` ", false);
 }
 
+if (!isset($board['bo_use_captcha'])) {
+    sql_query(" ALTER TABLE `{$g5['board_table']}` ADD `bo_use_captcha` TINYINT NOT NULL DEFAULT '0' AFTER `bo_use_sns` ", false);
+}
+
+if (!isset($board['bo_select_editor'])) {
+    sql_query(" ALTER TABLE `{$g5['board_table']}` ADD `bo_select_editor` VARCHAR(50) NOT NULL DEFAULT '' AFTER `bo_use_dhtml_editor` ", false);
+}
+
+$board_default = array(
+'bo_mobile_subject'=>'',
+'bo_device'=>'',
+'bo_use_category'=>0,
+'bo_category_list'=>'',
+'bo_admin'=>'',
+'bo_list_level'=>0,
+'bo_read_level'=>0,
+'bo_write_level'=>0,
+'bo_reply_level'=>0,
+'bo_comment_level'=>0,
+'bo_link_level'=>0,
+'bo_upload_level'=>0,
+'bo_download_level'=>0,
+'bo_html_level'=>0,
+'bo_use_sideview'=>0,
+'bo_select_editor'=>'',
+'bo_use_rss_view'=>0,
+'bo_use_good'=>0,
+'bo_use_nogood'=>0,
+'bo_use_name'=>0,
+'bo_use_signature'=>0,
+'bo_use_ip_view'=>0,
+'bo_use_list_content'=>0,
+'bo_use_list_file'=>0,
+'bo_use_list_view'=>0,
+'bo_use_email'=>0,
+'bo_use_file_content'=>0,
+'bo_use_cert'=>'',
+'bo_write_min'=>0,
+'bo_write_max'=>0,
+'bo_comment_min'=>0,
+'bo_comment_max'=>0,
+'bo_use_sns'=>0,
+'bo_order'=>0,
+'bo_use_captcha'=>0,
+'bo_content_head'=>'',
+'bo_content_tail'=>'',
+'bo_mobile_content_head'=>'',
+'bo_mobile_content_tail'=>'',
+'bo_insert_content'=>'',
+'bo_sort_field'=>'',
+);
+
+for($i=0;$i<=10;$i++){
+    $board_default['bo_'.$i.'_subj'] = '';
+    $board_default['bo_'.$i] = '';
+}
+
+$board = array_merge($board_default, $board);
+
+run_event('adm_board_form_before', $board, $w);
+
 $required = "";
 $readonly = "";
+$sound_only = "";
 if ($w == '') {
 
     $html_title .= ' 생성';
@@ -94,8 +158,8 @@ if ($w == '') {
     $board['bo_download_point'] = $config['cf_download_point'];
 
     $board['bo_gallery_cols'] = 4;
-    $board['bo_gallery_width'] = 174;
-    $board['bo_gallery_height'] = 124;
+    $board['bo_gallery_width'] = 202;
+    $board['bo_gallery_height'] = 150;
     $board['bo_mobile_gallery_width'] = 125;
     $board['bo_mobile_gallery_height'] = 100;
     $board['bo_table_width'] = 100;
@@ -150,13 +214,6 @@ $pg_anchor = '<ul class="anchor">
     <li><a href="#anc_bo_extra">여분필드</a></li>
 </ul>';
 
-$frm_submit = '<div class="btn_confirm01 btn_confirm">
-    <input type="submit" value="확인" class="btn_submit" accesskey="s">
-    <a href="./board_list.php?'.$qstr.'">목록</a>'.PHP_EOL;
-if ($w == 'u') $frm_submit .= '<a href="./board_copy.php?bo_table='.$bo_table.'" id="board_copy" target="win_board_copy">게시판복사</a>
-    <a href="'.G5_BBS_URL.'/board.php?bo_table='.$board['bo_table'].'" class="btn_frmline">게시판 바로가기</a>
-    <a href="./board_thumbnail_delete.php?bo_table='.$board['bo_table'].'&amp;'.$qstr.'" onclick="return delete_confirm2(\'게시판 썸네일 파일을 삭제하시겠습니까?\');">게시판 썸네일 삭제</a>'.PHP_EOL;
-$frm_submit .= '</div>';
 ?>
 
 <form name="fboardform" id="fboardform" action="./board_form_update.php" onsubmit="return fboardform_submit(this)" method="post" enctype="multipart/form-data">
@@ -184,12 +241,12 @@ $frm_submit .= '</div>';
         <tr>
             <th scope="row"><label for="bo_table">TABLE<?php echo $sound_only ?></label></th>
             <td colspan="2">
-                <input type="text" name="bo_table" value="<?php echo $board['bo_table'] ?>" id="bo_table" <?php echo $required ?> <?php echo $readonly ?> class="frm_input <?php echo $reaonly ?> <?php echo $required ?> <?php echo $required_valid ?>" maxlength="20">
+                <input type="text" name="bo_table" value="<?php echo $board['bo_table'] ?>" id="bo_table" <?php echo $required ?> <?php echo $readonly ?> class="frm_input <?php echo $readonly ?> <?php echo $required ?> <?php echo $required_valid ?>" maxlength="20">
                 <?php if ($w == '') { ?>
                     영문자, 숫자, _ 만 가능 (공백없이 20자 이내)
                 <?php } else { ?>
-                    <a href="<?php echo G5_BBS_URL ?>/board.php?bo_table=<?php echo $board['bo_table'] ?>" class="btn_frmline">게시판 바로가기</a>
-                    <a href="./board_list.php" class="btn_frmline">목록으로</a>
+                    <a href="<?php echo get_pretty_url($board['bo_table']) ?>" class="btn_frmline">게시판 바로가기</a>
+                    <a href="./board_list.php?<?php echo $qstr;?>" class="btn_frmline">목록으로</a>
                 <?php } ?>
             </td>
         </tr>
@@ -197,7 +254,7 @@ $frm_submit .= '</div>';
             <th scope="row"><label for="gr_id">그룹<strong class="sound_only">필수</strong></label></th>
             <td colspan="2">
                 <?php echo get_group_select('gr_id', $board['gr_id'], 'required'); ?>
-                <?php if ($w=='u') { ?><a href="javascript:document.location.href='./board_list.php?sfl=a.gr_id&stx='+document.fboardform.gr_id.value;" class="btn_frmline">동일그룹 게시판목록</a><?php } ?></td>
+                <?php if ($w=='u') { ?><a href="javascript:document.location.href='./board_list.php?sfl=a.gr_id&stx='+document.fboardform.gr_id.value;" class="btn_frmline">동일그룹 게시판목록</a><?php } ?>
             </td>
         </tr>
         <tr>
@@ -259,7 +316,7 @@ $frm_submit .= '</div>';
     </div>
 </section>
 
-<?php echo $frm_submit; ?>
+
 
 <section id="anc_bo_auth">
     <h2 class="h2_frm">게시판 권한 설정</h2>
@@ -400,7 +457,7 @@ $frm_submit .= '</div>';
     </div>
 </section>
 
-<?php echo $frm_submit; ?>
+
 
 <section id="anc_bo_function">
     <h2 class="h2_frm">게시판 기능 설정</h2>
@@ -484,6 +541,27 @@ $frm_submit .= '</div>';
                 <label for="chk_all_use_dhtml_editor">전체적용</label>
             </td>
         </tr>
+        <tr>
+            <th scope="row"><label for="bo_select_editor">게시판 에디터 선택</label></th>
+            <td>
+                <?php echo help('게시판에 사용할 에디터를 설정합니다. 스킨에 따라 적용되지 않을 수 있습니다.') ?>
+                <select name="bo_select_editor" id="bo_select_editor">
+                <?php
+                $arr = get_skin_dir('', G5_EDITOR_PATH);
+                for ($i=0; $i<count($arr); $i++) {
+                    if ($i == 0) echo "<option value=\"\">기본환경설정의 에디터 사용</option>";
+                    echo "<option value=\"".$arr[$i]."\"".get_selected($board['bo_select_editor'], $arr[$i]).">".$arr[$i]."</option>\n";
+                }
+                ?>
+                </select>
+            </td>
+            <td class="td_grpset">
+                <input type="checkbox" name="chk_grp_select_editor" value="1" id="chk_grp_select_editor">
+                <label for="chk_grp_select_editor">그룹적용</label>
+                <input type="checkbox" name="chk_all_select_editor" value="1" id="chk_all_select_editor">
+                <label for="chk_all_select_editor">전체적용</label>
+            </td>
+        </tr>
         <tr>
             <th scope="row"><label for="bo_use_rss_view">RSS 보이기 사용</label></th>
             <td>
@@ -771,12 +849,25 @@ $frm_submit .= '</div>';
                 <label for="chk_all_order">전체적용</label>
             </td>
         </tr>
+        <tr>
+            <th scope="row"><label for="bo_use_captcha">캡챠 사용</label></th>
+            <td>
+                <?php echo help("체크하면 글 작성시 캡챠를 무조건 사용합니다.( 회원 + 비회원 모두 )<br>미 체크하면 비회원에게만 캡챠를 사용합니다.") ?>
+                <input type="checkbox" name="bo_use_captcha" value="1" <?php echo $board['bo_use_captcha']?'checked':''; ?> id="bo_use_captcha">
+                사용
+            </td>
+            <td class="td_grpset">
+                <input type="checkbox" name="chk_grp_use_captcha" value="1" id="chk_grp_use_captcha">
+                <label for="chk_grp_use_captcha">그룹적용</label>
+                <input type="checkbox" name="chk_all_use_captcha" value="1" id="chk_all_use_captcha">
+                <label for="chk_all_use_captcha">전체적용</label>
+            </td>
+        </tr>
         </tbody>
         </table>
     </div>
 </section>
 
-<?php echo $frm_submit; ?>
 
 <section id="anc_bo_design">
     <h2 class="h2_frm">게시판 디자인/양식</h2>
@@ -840,10 +931,26 @@ $frm_submit .= '</div>';
                 <label for="chk_all_include_tail">전체적용</label>
             </td>
         </tr>
+        <tr id="admin_captcha_box" style="display:none;">
+            <th scope="row">자동등록방지</th>
+            <td>
+                <?php
+                echo help("파일 경로를 입력 또는 수정시 캡챠를 반드시 입력해야 합니다.");
+
+                include_once(G5_CAPTCHA_PATH.'/captcha.lib.php');
+                $captcha_html = captcha_html();
+                $captcha_js   = chk_captcha_js();
+                echo $captcha_html;
+                ?>
+                <script>
+                jQuery("#captcha_key").removeAttr("required").removeClass("required");
+                </script>
+            </td>
+        </tr>
         <tr>
             <th scope="row"><label for="bo_content_head">상단 내용</label></th>
             <td>
-                <?php echo editor_html("bo_content_head", get_text($board['bo_content_head'], 0)); ?>
+                <?php echo editor_html("bo_content_head", get_text(html_purifier($board['bo_content_head']), 0)); ?>
             </td>
             <td class="td_grpset">
                 <input type="checkbox" name="chk_grp_content_head" value="1" id="chk_grp_content_head">
@@ -855,7 +962,7 @@ $frm_submit .= '</div>';
         <tr>
             <th scope="row"><label for="bo_content_tail">하단 내용</label></th>
             <td>
-                <?php echo editor_html("bo_content_tail", get_text($board['bo_content_tail'], 0)); ?>
+                <?php echo editor_html("bo_content_tail", get_text(html_purifier($board['bo_content_tail']), 0)); ?>
             </td>
             <td class="td_grpset">
                 <input type="checkbox" name="chk_grp_content_tail" value="1" id="chk_grp_content_tail">
@@ -867,7 +974,7 @@ $frm_submit .= '</div>';
         <tr>
             <th scope="row"><label for="bo_mobile_content_head">모바일 상단 내용</label></th>
             <td>
-                <?php echo editor_html("bo_mobile_content_head", get_text($board['bo_mobile_content_head'], 0)); ?>
+                <?php echo editor_html("bo_mobile_content_head", get_text(html_purifier($board['bo_mobile_content_head']), 0)); ?>
             </td>
             <td class="td_grpset">
                 <input type="checkbox" name="chk_grp_mobile_content_head" value="1" id="chk_grp_mobile_content_head">
@@ -879,7 +986,7 @@ $frm_submit .= '</div>';
         <tr>
             <th scope="row"><label for="bo_mobile_content_tail">모바일 하단 내용</label></th>
             <td>
-                <?php echo editor_html("bo_mobile_content_tail", get_text($board['bo_mobile_content_tail'], 0)); ?>
+                <?php echo editor_html("bo_mobile_content_tail", get_text(html_purifier($board['bo_mobile_content_tail']), 0)); ?>
             </td>
             <td class="td_grpset">
                 <input type="checkbox" name="chk_grp_mobile_content_tail" value="1" id="chk_grp_mobile_content_tail">
@@ -892,7 +999,7 @@ $frm_submit .= '</div>';
          <tr>
             <th scope="row"><label for="bo_insert_content">글쓰기 기본 내용</label></th>
             <td>
-                <textarea id="bo_insert_content" name="bo_insert_content" rows="5"><?php echo $board['bo_insert_content'] ?></textarea>
+                <textarea id="bo_insert_content" name="bo_insert_content" rows="5"><?php echo html_purifier($board['bo_insert_content']); ?></textarea>
             </td>
             <td class="td_grpset">
                 <input type="checkbox" name="chk_grp_insert_content" value="1" id="chk_grp_insert_content">
@@ -955,7 +1062,7 @@ $frm_submit .= '</div>';
             <th scope="row"><label for="bo_gallery_cols">갤러리 이미지 수<strong class="sound_only">필수</strong></label></th>
             <td>
                 <?php echo help('갤러리 형식의 게시판 목록에서 이미지를 한줄에 몇장씩 보여 줄 것인지를 설정하는 값') ?>
-                <input type="text" name="bo_gallery_cols" value="<?php echo $board['bo_gallery_cols'] ?>" id="bo_gallery_cols" required class="required numeric frm_input" size="4">
+                <?php echo get_member_level_select('bo_gallery_cols', 1, 10, $board['bo_gallery_cols']); ?>
             </td>
             <td class="td_grpset">
                 <input type="checkbox" name="chk_grp_gallery_cols" value="1" id="chk_grp_gallery_cols">
@@ -1088,25 +1195,23 @@ $frm_submit .= '</div>';
             <td>
                 <?php echo help('리스트에서 기본으로 정렬에 사용할 필드를 선택합니다. "기본"으로 사용하지 않으시는 경우 속도가 느려질 수 있습니다.') ?>
                 <select id="bo_sort_field" name="bo_sort_field">
-                    <option value="" <?php echo get_selected($board['bo_sort_field'], ""); ?>>wr_num, wr_reply : 기본</option>
-                    <option value="wr_datetime asc" <?php echo get_selected($board['bo_sort_field'], "wr_datetime asc"); ?>>wr_datetime asc : 날짜 이전것 부터</option>
-                    <option value="wr_datetime desc" <?php echo get_selected($board['bo_sort_field'], "wr_datetime desc"); ?>>wr_datetime desc : 날짜 최근것 부터</option>
-                    <option value="wr_hit asc, wr_num, wr_reply" <?php echo get_selected($board['bo_sort_field'], "wr_hit asc, wr_num, wr_reply"); ?>>wr_hit asc : 조회수 낮은것 부터</option>
-                    <option value="wr_hit desc, wr_num, wr_reply" <?php echo get_selected($board['bo_sort_field'], "wr_hit desc, wr_num, wr_reply"); ?>>wr_hit desc : 조회수 높은것 부터</option>
-                    <option value="wr_last asc" <?php echo get_selected($board['bo_sort_field'], "wr_last asc"); ?>>wr_last asc : 최근글 이전것 부터</option>
-                    <option value="wr_last desc" <?php echo get_selected($board['bo_sort_field'], "wr_last desc"); ?>>wr_last desc : 최근글 최근것 부터</option>
-                    <option value="wr_comment asc, wr_num, wr_reply" <?php echo get_selected($board['bo_sort_field'], "wr_comment asc, wr_num, wr_reply"); ?>>wr_comment asc : 댓글수 낮은것 부터</option>
-                    <option value="wr_comment desc, wr_num, wr_reply" <?php echo get_selected($board['bo_sort_field'], "wr_comment desc, wr_num, wr_reply"); ?>>wr_comment desc : 댓글수 높은것 부터</option>
-                    <option value="wr_good asc, wr_num, wr_reply" <?php echo get_selected($board['bo_sort_field'], "wr_good asc, wr_num, wr_reply"); ?>>wr_good asc : 추천수 낮은것 부터</option>
-                    <option value="wr_good desc, wr_num, wr_reply" <?php echo get_selected($board['bo_sort_field'], "wr_good desc, wr_num, wr_reply"); ?>>wr_good desc : 추천수 높은것 부터</option>
-                    <option value="wr_nogood asc, wr_num, wr_reply" <?php echo get_selected($board['bo_sort_field'], "wr_nogood asc, wr_num, wr_reply"); ?>>wr_nogood asc : 비추천수 낮은것 부터</option>
-                    <option value="wr_nogood desc, wr_num, wr_reply" <?php echo get_selected($board['bo_sort_field'], "wr_nogood desc, wr_num, wr_reply"); ?>>wr_nogood desc : 비추천수 높은것 부터</option>
-                    <option value="wr_subject asc, wr_num, wr_reply" <?php echo get_selected($board['bo_sort_field'], "wr_subject asc, wr_num, wr_reply"); ?>>wr_subject asc : 제목 오름차순</option>
-                    <option value="wr_subject desc, wr_num, wr_reply" <?php echo get_selected($board['bo_sort_field'], "wr_subject desc, wr_num, wr_reply"); ?>>wr_subject desc : 제목 내림차순</option>
-                    <option value="wr_name asc, wr_num, wr_reply" <?php echo get_selected($board['bo_sort_field'], "wr_name asc, wr_num, wr_reply"); ?>>wr_name asc : 글쓴이 오름차순</option>
-                    <option value="wr_name desc, wr_num, wr_reply" <?php echo get_selected($board['bo_sort_field'], "wr_name desc, wr_num, wr_reply"); ?>>wr_name desc : 글쓴이 내림차순</option>
-                    <option value="ca_name asc, wr_num, wr_reply" <?php echo get_selected($board['bo_sort_field'], "ca_name asc, wr_num, wr_reply"); ?>>ca_name asc : 분류명 오름차순</option>
-                    <option value="ca_name desc, wr_num, wr_reply" <?php echo get_selected($board['bo_sort_field'], "ca_name desc, wr_num, wr_reply"); ?>>ca_name desc : 분류명 내림차순</option>
+                    <?php foreach( get_board_sort_fields($board) as $v ){
+                        
+                        $option_value = $order_by_str = $v[0];
+                        if( $v[0] === 'wr_num, wr_reply' ){
+                            $selected = (! $board['bo_sort_field']) ? 'selected="selected"' : '';
+                            $option_value = '';
+                        } else {
+                            $selected = ($board['bo_sort_field'] === $v[0]) ? 'selected="selected"' : '';
+                        }
+                        
+                        if( $order_by_str !== 'wr_num, wr_reply' ){
+                            $tmp = explode(',', $v[0]);
+                            $order_by_str = $tmp[0];
+                        }
+
+                        echo '<option value="'.$option_value.'" '.$selected.' >'.$order_by_str.' : '.$v[1].'</option>';
+                    } //end foreach ?>
                 </select>
             </td>
             <td class="td_grpset">
@@ -1118,9 +1223,10 @@ $frm_submit .= '</div>';
         </tbody>
         </table>
     </div>
+    <button type="button" class="get_theme_galc btn btn_02" >테마 이미지설정 가져오기</button>
+
 </section>
 
-<?php echo preg_replace('#</div>$#i', '<button type="button" class="get_theme_galc">테마 이미지설정 가져오기</button></div>', $frm_submit); ?>
 
 <section id="anc_bo_point">
     <h2 class="h2_frm">게시판 포인트 설정</h2>
@@ -1195,8 +1301,6 @@ $frm_submit .= '</div>';
     </div>
 </section>
 
-<?php echo $frm_submit; ?>
-
 <section id="anc_bo_extra">
     <h2 class="h2_frm">게시판 여분필드 설정</h2>
     <?php echo $pg_anchor ?>
@@ -1217,7 +1321,7 @@ $frm_submit .= '</div>';
                 <label for="bo_<?php echo $i ?>_subj">여분필드 <?php echo $i ?> 제목</label>
                 <input type="text" name="bo_<?php echo $i ?>_subj" id="bo_<?php echo $i ?>_subj" value="<?php echo get_text($board['bo_'.$i.'_subj']) ?>" class="frm_input">
                 <label for="bo_<?php echo $i ?>">여분필드 <?php echo $i ?> 값</label>
-                <input type="text" name="bo_<?php echo $i ?>" value="<?php echo get_text($board['bo_'.$i]) ?>" id="bo_<?php echo $i ?>" class="frm_input">
+                <input type="text" name="bo_<?php echo $i ?>" value="<?php echo get_text($board['bo_'.$i]) ?>" id="bo_<?php echo $i ?>" class="frm_input extra-value-input">
             </td>
             <td class="td_grpset">
                 <input type="checkbox" name="chk_grp_<?php echo $i ?>" value="1" id="chk_grp_<?php echo $i ?>">
@@ -1232,7 +1336,15 @@ $frm_submit .= '</div>';
     </div>
 </section>
 
-<?php echo $frm_submit; ?>
+
+<div class="btn_fixed_top">
+    <?php if( $bo_table && $w ){ ?>
+        <a href="./board_copy.php?bo_table=<?php echo $board['bo_table']; ?>" id="board_copy" target="win_board_copy" class=" btn_02 btn">게시판복사</a>
+        <a href="<?php echo get_pretty_url($board['bo_table']); ?>" class=" btn_02 btn">게시판 바로가기</a>
+        <a href="./board_thumbnail_delete.php?bo_table=<?php echo $board['bo_table'].'&amp;'.$qstr;?>" onclick="return delete_confirm2('게시판 썸네일 파일을 삭제하시겠습니까?');" class="btn_02 btn">게시판 썸네일 삭제</a>
+    <?php } ?>
+    <input type="submit" value="확인" class="btn_submi btn btn_01" accesskey="s">
+</div>
 
 </form>
 
@@ -1293,8 +1405,67 @@ function set_point(f) {
     }
 }
 
+var captcha_chk = false;
+
+function use_captcha_check(){
+    $.ajax({
+        type: "POST",
+        url: g5_admin_url+"/ajax.use_captcha.php",
+        data: { admin_use_captcha: "1" },
+        cache: false,
+        async: false,
+        dataType: "json",
+        success: function(data) {
+        }
+    });
+}
+
+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());
+
+    if(bo_include_head !== head || bo_include_tail !== tail){
+        // 캡챠를 사용합니다.
+        jQuery("#admin_captcha_box").show();
+        captcha_chk = true;
+
+        use_captcha_check();
+
+        return false;
+    } else {
+        jQuery("#admin_captcha_box").hide();
+    }
+
+    return true;
+}
+
+jQuery(function($){
+    if( window.self !== window.top ){   // frame 또는 iframe을 사용할 경우 체크
+        $("#bo_include_head, #bo_include_tail").on("change paste keyup", function(e) {
+            frm_check_file();
+        });
+
+        use_captcha_check();
+    }
+});
+
 function fboardform_submit(f)
 {
+    <?php
+    if(!$w){
+    $js_array = get_bo_table_banned_word();
+    echo "var banned_array = ". json_encode($js_array) . ";\n";
+    }
+    ?>
+
+    // 게시판명이 금지된 단어로 되어 있으면
+    if( (typeof banned_array != 'undefined') && jQuery.inArray(f.bo_table.value, banned_array) !== -1 ){
+        alert("입력한 게시판 TABLE명을 사용할수 없습니다. 다른 이름으로 입력해 주세요.");
+        return false;
+    }
+
     <?php echo get_editor_js("bo_content_head"); ?>
     <?php echo get_editor_js("bo_content_tail"); ?>
     <?php echo get_editor_js("bo_mobile_content_head"); ?>
@@ -1312,10 +1483,13 @@ function fboardform_submit(f)
         return false;
     }
 
+    if( captcha_chk ) {
+        <?php echo isset($captcha_js) ? $captcha_js : ''; // 캡챠 사용시 자바스크립트에서 입력된 캡챠를 검사함  ?>
+    }
+
     return true;
 }
 </script>
 
 <?php
-include_once ('./admin.tail.php');
-?>
+include_once ('./admin.tail.php');

adm/board_form_update.php

@@ -5,44 +5,66 @@ include_once('./_common.php');
 if ($w == 'u')
     check_demo();
 
-auth_check($auth[$sub_menu], 'w');
+auth_check_menu($auth, $sub_menu, 'w');
 
 check_admin_token();
 
-if (!$_POST['gr_id']) { alert('그룹 ID는 반드시 선택하세요.'); }
+$gr_id = isset($_POST['gr_id']) ? preg_replace('/[^a-z0-9_]/i', '', $_POST['gr_id']) : '';
+$bo_admin = isset($_POST['bo_admin']) ? preg_replace('/[^a-z0-9_\, \|\#]/i', '', $_POST['bo_admin']) : '';
+$bo_subject = isset($_POST['bo_subject']) ? strip_tags(clean_xss_attributes($_POST['bo_subject'])) : '';
+$bo_mobile_subject = isset($_POST['bo_mobile_subject']) ? strip_tags(clean_xss_attributes($_POST['bo_mobile_subject'])) : '';
+
+if (!$gr_id) { alert('그룹 ID는 반드시 선택하세요.'); }
 if (!$bo_table) { alert('게시판 TABLE명은 반드시 입력하세요.'); }
 if (!preg_match("/^([A-Za-z0-9_]{1,20})$/", $bo_table)) { alert('게시판 TABLE명은 공백없이 영문자, 숫자, _ 만 사용 가능합니다. (20자 이내)'); }
-if (!$_POST['bo_subject']) { alert('게시판 제목을 입력하세요.'); }
+if (!$bo_subject) { alert('게시판 제목을 입력하세요.'); }
 
-$_POST['bo_include_head'] = preg_replace("#[\\\]+$#", "", substr($_POST['bo_include_head'], 0, 255));
-$_POST['bo_include_tail'] = preg_replace("#[\\\]+$#", "", substr($_POST['bo_include_tail'], 0, 255));
-
-if ($file = $_POST['bo_include_head']) {
-    $file_ext = pathinfo($file, PATHINFO_EXTENSION);
-
-    if( ! $file_ext || ! in_array($file_ext, array('php', 'htm', 'html')) ) {
-        alert('상단 파일 경로의 확장자는 php, html 만 허용합니다.');
-    }
-    $_POST['bo_include_head'] = $file;
+// 게시판명이 금지된 단어로 되어 있으면
+if ( $w == '' && in_array($bo_table, get_bo_table_banned_word()) ){
+    alert('입력한 게시판 TABLE명을 사용할수 없습니다. 다른 이름으로 입력해 주세요.');
 }
 
-if ($file = $_POST['bo_include_tail']) {
-    $file_ext = pathinfo($file, PATHINFO_EXTENSION);
+$bo_include_head = isset($_POST['bo_include_head']) ? preg_replace(array("#[\\\]+$#", "#(<\?php|<\?)#i"), "", substr($_POST['bo_include_head'], 0, 255)) : '';
+$bo_include_tail = isset($_POST['bo_include_tail']) ? preg_replace(array("#[\\\]+$#", "#(<\?php|<\?)#i"), "", substr($_POST['bo_include_tail'], 0, 255)) : '';
 
-    if( ! $file_ext || ! in_array($file_ext, array('php', 'htm', 'html')) ) {
-        alert('하단 파일 경로의 확장자는 php, html 만 허용합니다.');
+// 관리자가 자동등록방지를 사용해야 할 경우
+if ($board && ($board['bo_include_head'] !== $bo_include_head || $board['bo_include_tail'] !== $bo_include_tail) && function_exists('get_admin_captcha_by') && get_admin_captcha_by()){
+    include_once(G5_CAPTCHA_PATH.'/captcha.lib.php');
+
+    if (!chk_captcha()) {
+        alert('자동등록방지 숫자가 틀렸습니다.');
     }
-    $_POST['bo_include_tail'] = $file;
 }
 
-if(!is_include_path_check($_POST['bo_include_head'], 1)) {
+if ($file = $bo_include_head) {
+    $file_ext = pathinfo($file, PATHINFO_EXTENSION);
+
+    if( ! $file_ext || ! in_array($file_ext, array('php', 'htm', 'html')) || ! preg_match('/^.*\.(php|htm|html)$/i', $file) ) {
+        alert('상단 파일 경로의 확장자는 php, htm, html 만 허용합니다.');
+    }
+}
+
+if ($file = $bo_include_tail) {
+    $file_ext = pathinfo($file, PATHINFO_EXTENSION);
+
+    if( ! $file_ext || ! in_array($file_ext, array('php', 'htm', 'html')) || ! preg_match('/^.*\.(php|htm|html)$/i', $file) ) {
+        alert('하단 파일 경로의 확장자는 php, htm, html 만 허용합니다.');
+    }
+}
+
+if(!is_include_path_check($bo_include_head, 1)) {
     alert('상단 파일 경로에 포함시킬수 없는 문자열이 있습니다.');
 }
 
-if(!is_include_path_check($_POST['bo_include_tail'], 1)) {
+if(!is_include_path_check($bo_include_tail, 1)) {
     alert('하단 파일 경로에 포함시킬수 없는 문자열이 있습니다.');
 }
 
+if( function_exists('filter_input_include_path') ){
+    $bo_include_head = filter_input_include_path($bo_include_head);
+    $bo_include_tail = filter_input_include_path($bo_include_tail);
+}
+
 $board_path = G5_DATA_PATH.'/file/'.$bo_table;
 
 // 게시판 디렉토리 생성
@@ -51,115 +73,191 @@ $board_path = G5_DATA_PATH.'/file/'.$bo_table;
 
 // 디렉토리에 있는 파일의 목록을 보이지 않게 한다.
 $file = $board_path . '/index.php';
-$f = @fopen($file, 'w');
-@fwrite($f, '');
-@fclose($f);
-@chmod($file, G5_FILE_PERMISSION);
+if( $f = @fopen($file, 'w') ){
+    @fwrite($f, '');
+    @fclose($f);
+    @chmod($file, G5_FILE_PERMISSION);
+}
 
 // 분류에 & 나 = 는 사용이 불가하므로 2바이트로 바꾼다.
 $src_char = array('&', '=');
 $dst_char = array('＆', '〓');
-$bo_category_list = str_replace($src_char, $dst_char, $bo_category_list);
+$bo_category_list = isset($_POST['bo_category_list']) ? str_replace($src_char, $dst_char, $_POST['bo_category_list']) : '';
 //https://github.com/gnuboard/gnuboard5/commit/f5f4925d4eb28ba1af728e1065fc2bdd9ce1da58 에 따른 조치
-$str_bo_category_list = isset($_POST['bo_category_list']) ? preg_replace("/[\<\>\'\"\\\'\\\"\%\=\(\)\/\^\*]/", "", $_POST['bo_category_list']) : '';
+$str_bo_category_list = preg_replace("/[\<\>\'\"\\\'\\\"\%\=\(\)\/\^\*]/", "", $bo_category_list);
 
-$sql_common = " gr_id               = '{$_POST['gr_id']}',
-                bo_subject          = '{$_POST['bo_subject']}',
-                bo_mobile_subject   = '{$_POST['bo_mobile_subject']}',
-                bo_device           = '{$_POST['bo_device']}',
-                bo_admin            = '{$_POST['bo_admin']}',
-                bo_list_level       = '{$_POST['bo_list_level']}',
-                bo_read_level       = '{$_POST['bo_read_level']}',
-                bo_write_level      = '{$_POST['bo_write_level']}',
-                bo_reply_level      = '{$_POST['bo_reply_level']}',
-                bo_comment_level    = '{$_POST['bo_comment_level']}',
-                bo_html_level       = '{$_POST['bo_html_level']}',
-                bo_link_level       = '{$_POST['bo_link_level']}',
-                bo_count_modify     = '{$_POST['bo_count_modify']}',
-                bo_count_delete     = '{$_POST['bo_count_delete']}',
-                bo_upload_level     = '{$_POST['bo_upload_level']}',
-                bo_download_level   = '{$_POST['bo_download_level']}',
-                bo_read_point       = '{$_POST['bo_read_point']}',
-                bo_write_point      = '{$_POST['bo_write_point']}',
-                bo_comment_point    = '{$_POST['bo_comment_point']}',
-                bo_download_point   = '{$_POST['bo_download_point']}',
-                bo_use_category     = '{$_POST['bo_use_category']}',
+$bo_use_category = isset($_POST['bo_use_category']) ? (int) $_POST['bo_use_category'] : 0;
+$bo_use_sideview = isset($_POST['bo_use_sideview']) ? (int) $_POST['bo_use_sideview'] : 0;
+$bo_use_dhtml_editor = isset($_POST['bo_use_dhtml_editor']) ? (int) $_POST['bo_use_dhtml_editor'] : 0;
+$bo_use_good = isset($_POST['bo_use_good']) ? (int) $_POST['bo_use_good'] : 0;
+$bo_use_nogood = isset($_POST['bo_use_nogood']) ? (int) $_POST['bo_use_nogood'] : 0;
+$bo_use_name = isset($_POST['bo_use_name']) ? (int) $_POST['bo_use_name'] : 0;
+$bo_use_signature = isset($_POST['bo_use_signature']) ? (int) $_POST['bo_use_signature'] : 0;
+$bo_use_ip_view = isset($_POST['bo_use_ip_view']) ? (int) $_POST['bo_use_ip_view'] : 0;
+$bo_use_list_view = isset($_POST['bo_use_list_view']) ? (int) $_POST['bo_use_list_view'] : 0;
+$bo_use_list_file = isset($_POST['bo_use_list_file']) ? (int) $_POST['bo_use_list_file'] : 0;
+$bo_use_list_content = isset($_POST['bo_use_list_content']) ? (int) $_POST['bo_use_list_content'] : 0;
+$bo_use_email = isset($_POST['bo_use_email']) ? (int) $_POST['bo_use_email'] : 0;
+$bo_use_sns = isset($_POST['bo_use_sns']) ? (int) $_POST['bo_use_sns'] : 0;
+$bo_use_captcha = isset($_POST['bo_use_captcha']) ? (int) $_POST['bo_use_captcha'] : 0;
+$bo_table_width = isset($_POST['bo_table_width']) ? (int) $_POST['bo_table_width'] : 0;
+$bo_subject_len = isset($_POST['bo_subject_len']) ? (int) $_POST['bo_subject_len'] : 0;
+$bo_mobile_subject_len = isset($_POST['bo_mobile_subject_len']) ? (int) $_POST['bo_mobile_subject_len'] : 0;
+$bo_page_rows = isset($_POST['bo_page_rows']) ? (int) $_POST['bo_page_rows'] : 0;
+$bo_mobile_page_rows = isset($_POST['bo_mobile_page_rows']) ? (int) $_POST['bo_mobile_page_rows'] : 0;
+$bo_use_rss_view = isset($_POST['bo_use_rss_view']) ? (int) $_POST['bo_use_rss_view'] : 0;
+$bo_use_secret = isset($_POST['bo_use_secret']) ? (int) $_POST['bo_use_secret'] : 0;
+$bo_use_file_content = isset($_POST['bo_use_file_content']) ? (int) $_POST['bo_use_file_content'] : 0;
+$bo_new = isset($_POST['bo_new']) ? (int) $_POST['bo_new'] : 0;
+$bo_hot = isset($_POST['bo_hot']) ? (int) $_POST['bo_hot'] : 0;
+$bo_image_width = isset($_POST['bo_image_width']) ? (int) $_POST['bo_image_width'] : 0;
+$bo_use_search = isset($_POST['bo_use_search']) ? (int) $_POST['bo_use_search'] : 0;
+$bo_use_cert = isset($_POST['bo_use_cert']) ? preg_replace('/[^0-9a-z_]/i', '', $_POST['bo_use_cert']) : '';
+$bo_device = isset($_POST['bo_device']) ? clean_xss_tags($_POST['bo_device'], 1, 1) : '';
+$bo_list_level = isset($_POST['bo_list_level']) ? (int) $_POST['bo_list_level'] : 0;
+$bo_read_level = isset($_POST['bo_read_level']) ? (int) $_POST['bo_read_level'] : 0;
+$bo_write_level = isset($_POST['bo_write_level']) ? (int) $_POST['bo_write_level'] : 0;
+$bo_reply_level = isset($_POST['bo_reply_level']) ? (int) $_POST['bo_reply_level'] : 0;
+$bo_comment_level = isset($_POST['bo_comment_level']) ? (int) $_POST['bo_comment_level'] : 0;
+$bo_html_level = isset($_POST['bo_html_level']) ? (int) $_POST['bo_html_level'] : 0;
+$bo_link_level = isset($_POST['bo_link_level']) ? (int) $_POST['bo_link_level'] : 0;
+$bo_count_modify = isset($_POST['bo_count_modify']) ? (int) $_POST['bo_count_modify'] : 0;
+$bo_count_delete = isset($_POST['bo_count_delete']) ? (int) $_POST['bo_count_delete'] : 0;
+$bo_upload_level = isset($_POST['bo_upload_level']) ? (int) $_POST['bo_upload_level'] : 0;
+$bo_download_level = isset($_POST['bo_download_level']) ? (int) $_POST['bo_download_level'] : 0;
+$bo_read_point = isset($_POST['bo_read_point']) ? (int) $_POST['bo_read_point'] : 0;
+$bo_write_point = isset($_POST['bo_write_point']) ? (int) $_POST['bo_write_point'] : 0;
+$bo_comment_point = isset($_POST['bo_comment_point']) ? (int) $_POST['bo_comment_point'] : 0;
+$bo_download_point = isset($_POST['bo_download_point']) ? (int) $_POST['bo_download_point'] : 0;
+$bo_select_editor = isset($_POST['bo_select_editor']) ? clean_xss_tags($_POST['bo_select_editor'], 1, 1) : '';
+$bo_skin = isset($_POST['bo_skin']) ? clean_xss_tags($_POST['bo_skin'], 1, 1) : '';
+$bo_mobile_skin = isset($_POST['bo_mobile_skin']) ? clean_xss_tags($_POST['bo_mobile_skin'], 1, 1) : '';
+$bo_content_head = isset($_POST['bo_content_head']) ? $_POST['bo_content_head'] : '';
+$bo_content_tail = isset($_POST['bo_content_tail']) ? $_POST['bo_content_tail'] : '';
+$bo_mobile_content_head = isset($_POST['bo_mobile_content_head']) ? $_POST['bo_mobile_content_head'] : '';
+$bo_mobile_content_tail = isset($_POST['bo_mobile_content_tail']) ? $_POST['bo_mobile_content_tail'] : '';
+$bo_insert_content = isset($_POST['bo_insert_content']) ? $_POST['bo_insert_content'] : '';
+$bo_gallery_cols = isset($_POST['bo_gallery_cols']) ? (int) $_POST['bo_gallery_cols'] : 0;
+$bo_gallery_width = isset($_POST['bo_gallery_width']) ? (int) $_POST['bo_gallery_width'] : 0;
+$bo_gallery_height = isset($_POST['bo_gallery_height']) ? (int) $_POST['bo_gallery_height'] : 0;
+$bo_mobile_gallery_width = isset($_POST['bo_mobile_gallery_width']) ? (int) $_POST['bo_mobile_gallery_width'] : 0;
+$bo_mobile_gallery_height = isset($_POST['bo_mobile_gallery_height']) ? (int) $_POST['bo_mobile_gallery_height'] : 0;
+$bo_upload_count = isset($_POST['bo_upload_count']) ? (int) $_POST['bo_upload_count'] : 0;
+$bo_upload_size = isset($_POST['bo_upload_size']) ? (int) $_POST['bo_upload_size'] : 0;
+$bo_reply_order = isset($_POST['bo_reply_order']) ? (int) $_POST['bo_reply_order'] : 0;
+$bo_order = isset($_POST['bo_order']) ? (int) $_POST['bo_order'] : 0;
+$bo_write_min = isset($_POST['bo_write_min']) ? (int) $_POST['bo_write_min'] : 0;
+$bo_write_max = isset($_POST['bo_write_max']) ? (int) $_POST['bo_write_max'] : 0;
+$bo_comment_min = isset($_POST['bo_comment_min']) ? (int) $_POST['bo_comment_min'] : 0;
+$bo_comment_max = isset($_POST['bo_comment_max']) ? (int) $_POST['bo_comment_max'] : 0;
+$bo_sort_field = isset($_POST['bo_sort_field']) ? clean_xss_tags($_POST['bo_sort_field'], 1, 1) : '';
+
+$etcs = array();
+
+for($i=1;$i<=10;$i++){
+    $etcs['bo_'.$i.'_subj'] = ${'bo_'.$i.'_subj'} = isset($_POST['bo_'.$i.'_subj']) ? $_POST['bo_'.$i.'_subj'] : '';
+    $etcs['bo_'.$i] = ${'bo_'.$i} = isset($_POST['bo_'.$i]) ? $_POST['bo_'.$i] : '';
+}
+
+$sql_common = " gr_id               = '{$gr_id}',
+                bo_subject          = '{$bo_subject}',
+                bo_mobile_subject   = '{$bo_mobile_subject}',
+                bo_device           = '{$bo_device}',
+                bo_admin            = '{$bo_admin}',
+                bo_list_level       = '{$bo_list_level}',
+                bo_read_level       = '{$bo_read_level}',
+                bo_write_level      = '{$bo_write_level}',
+                bo_reply_level      = '{$bo_reply_level}',
+                bo_comment_level    = '{$bo_comment_level}',
+                bo_html_level       = '{$bo_html_level}',
+                bo_link_level       = '{$bo_link_level}',
+                bo_count_modify     = '{$bo_count_modify}',
+                bo_count_delete     = '{$bo_count_delete}',
+                bo_upload_level     = '{$bo_upload_level}',
+                bo_download_level   = '{$bo_download_level}',
+                bo_read_point       = '{$bo_read_point}',
+                bo_write_point      = '{$bo_write_point}',
+                bo_comment_point    = '{$bo_comment_point}',
+                bo_download_point   = '{$bo_download_point}',
+                bo_use_category     = '{$bo_use_category}',
                 bo_category_list    = '{$str_bo_category_list}',
-                bo_use_sideview     = '{$_POST['bo_use_sideview']}',
-                bo_use_file_content = '{$_POST['bo_use_file_content']}',
-                bo_use_secret       = '{$_POST['bo_use_secret']}',
-                bo_use_dhtml_editor = '{$_POST['bo_use_dhtml_editor']}',
-                bo_use_rss_view     = '{$_POST['bo_use_rss_view']}',
-                bo_use_good         = '{$_POST['bo_use_good']}',
-                bo_use_nogood       = '{$_POST['bo_use_nogood']}',
-                bo_use_name         = '{$_POST['bo_use_name']}',
-                bo_use_signature    = '{$_POST['bo_use_signature']}',
-                bo_use_ip_view      = '{$_POST['bo_use_ip_view']}',
-                bo_use_list_view    = '{$_POST['bo_use_list_view']}',
-                bo_use_list_file    = '{$_POST['bo_use_list_file']}',
-                bo_use_list_content = '{$_POST['bo_use_list_content']}',
-                bo_use_email        = '{$_POST['bo_use_email']}',
-                bo_use_cert         = '{$_POST['bo_use_cert']}',
-                bo_use_sns          = '{$_POST['bo_use_sns']}',
-                bo_table_width      = '{$_POST['bo_table_width']}',
-                bo_subject_len      = '{$_POST['bo_subject_len']}',
-                bo_mobile_subject_len      = '{$_POST['bo_mobile_subject_len']}',
-                bo_page_rows        = '{$_POST['bo_page_rows']}',
-                bo_mobile_page_rows = '{$_POST['bo_mobile_page_rows']}',
-                bo_new              = '{$_POST['bo_new']}',
-                bo_hot              = '{$_POST['bo_hot']}',
-                bo_image_width      = '{$_POST['bo_image_width']}',
-                bo_skin             = '{$_POST['bo_skin']}',
-                bo_mobile_skin      = '{$_POST['bo_mobile_skin']}',
+                bo_use_sideview     = '{$bo_use_sideview}',
+                bo_use_file_content = '{$bo_use_file_content}',
+                bo_use_secret       = '{$bo_use_secret}',
+                bo_use_dhtml_editor = '{$bo_use_dhtml_editor}',
+                bo_select_editor    = '{$bo_select_editor}',
+                bo_use_rss_view     = '{$bo_use_rss_view}',
+                bo_use_good         = '{$bo_use_good}',
+                bo_use_nogood       = '{$bo_use_nogood}',
+                bo_use_name         = '{$bo_use_name}',
+                bo_use_signature    = '{$bo_use_signature}',
+                bo_use_ip_view      = '{$bo_use_ip_view}',
+                bo_use_list_view    = '{$bo_use_list_view}',
+                bo_use_list_file    = '{$bo_use_list_file}',
+                bo_use_list_content = '{$bo_use_list_content}',
+                bo_use_email        = '{$bo_use_email}',
+                bo_use_cert         = '{$bo_use_cert}',
+                bo_use_sns          = '{$bo_use_sns}',
+                bo_use_captcha      = '{$bo_use_captcha}',
+                bo_table_width      = '{$bo_table_width}',
+                bo_subject_len      = '{$bo_subject_len}',
+                bo_mobile_subject_len      = '{$bo_mobile_subject_len}',
+                bo_page_rows        = '{$bo_page_rows}',
+                bo_mobile_page_rows = '{$bo_mobile_page_rows}',
+                bo_new              = '{$bo_new}',
+                bo_hot              = '{$bo_hot}',
+                bo_image_width      = '{$bo_image_width}',
+                bo_skin             = '{$bo_skin}',
+                bo_mobile_skin      = '{$bo_mobile_skin}',
                 ";
 
 // 최고 관리자인 경우에만 수정가능
 if ($is_admin === 'super'){
-$sql_common .= " bo_include_head     = '{$_POST['bo_include_head']}',
-                bo_include_tail     = '{$_POST['bo_include_tail']}',
-                bo_content_head     = '{$_POST['bo_content_head']}',
-                bo_content_tail     = '{$_POST['bo_content_tail']}',
-                bo_mobile_content_head     = '{$_POST['bo_mobile_content_head']}',
-                bo_mobile_content_tail     = '{$_POST['bo_mobile_content_tail']}',
+$sql_common .= " bo_include_head     = '".$bo_include_head."',
+                bo_include_tail     = '".$bo_include_tail."',
+                bo_content_head     = '{$bo_content_head}',
+                bo_content_tail     = '{$bo_content_tail}',
+                bo_mobile_content_head     = '{$bo_mobile_content_head}',
+                bo_mobile_content_tail     = '{$bo_mobile_content_tail}',
                 ";
 }
 
-$sql_common .= " bo_insert_content   = '{$_POST['bo_insert_content']}',
-                bo_gallery_cols     = '{$_POST['bo_gallery_cols']}',
-                bo_gallery_width    = '{$_POST['bo_gallery_width']}',
-                bo_gallery_height   = '{$_POST['bo_gallery_height']}',
-                bo_mobile_gallery_width = '{$_POST['bo_mobile_gallery_width']}',
-                bo_mobile_gallery_height= '{$_POST['bo_mobile_gallery_height']}',
-                bo_upload_count     = '{$_POST['bo_upload_count']}',
-                bo_upload_size      = '{$_POST['bo_upload_size']}',
-                bo_reply_order      = '{$_POST['bo_reply_order']}',
-                bo_use_search       = '{$_POST['bo_use_search']}',
-                bo_order            = '{$_POST['bo_order']}',
-                bo_write_min        = '{$_POST['bo_write_min']}',
-                bo_write_max        = '{$_POST['bo_write_max']}',
-                bo_comment_min      = '{$_POST['bo_comment_min']}',
-                bo_comment_max      = '{$_POST['bo_comment_max']}',
-                bo_sort_field       = '{$_POST['bo_sort_field']}',
-                bo_1_subj           = '{$_POST['bo_1_subj']}',
-                bo_2_subj           = '{$_POST['bo_2_subj']}',
-                bo_3_subj           = '{$_POST['bo_3_subj']}',
-                bo_4_subj           = '{$_POST['bo_4_subj']}',
-                bo_5_subj           = '{$_POST['bo_5_subj']}',
-                bo_6_subj           = '{$_POST['bo_6_subj']}',
-                bo_7_subj           = '{$_POST['bo_7_subj']}',
-                bo_8_subj           = '{$_POST['bo_8_subj']}',
-                bo_9_subj           = '{$_POST['bo_9_subj']}',
-                bo_10_subj          = '{$_POST['bo_10_subj']}',
-                bo_1                = '{$_POST['bo_1']}',
-                bo_2                = '{$_POST['bo_2']}',
-                bo_3                = '{$_POST['bo_3']}',
-                bo_4                = '{$_POST['bo_4']}',
-                bo_5                = '{$_POST['bo_5']}',
-                bo_6                = '{$_POST['bo_6']}',
-                bo_7                = '{$_POST['bo_7']}',
-                bo_8                = '{$_POST['bo_8']}',
-                bo_9                = '{$_POST['bo_9']}',
-                bo_10               = '{$_POST['bo_10']}' ";
+$sql_common .= " bo_insert_content   = '{$bo_insert_content}',
+                bo_gallery_cols     = '{$bo_gallery_cols}',
+                bo_gallery_width    = '{$bo_gallery_width}',
+                bo_gallery_height   = '{$bo_gallery_height}',
+                bo_mobile_gallery_width = '{$bo_mobile_gallery_width}',
+                bo_mobile_gallery_height= '{$bo_mobile_gallery_height}',
+                bo_upload_count     = '{$bo_upload_count}',
+                bo_upload_size      = '{$bo_upload_size}',
+                bo_reply_order      = '{$bo_reply_order}',
+                bo_use_search       = '{$bo_use_search}',
+                bo_order            = '{$bo_order}',
+                bo_write_min        = '{$bo_write_min}',
+                bo_write_max        = '{$bo_write_max}',
+                bo_comment_min      = '{$bo_comment_min}',
+                bo_comment_max      = '{$bo_comment_max}',
+                bo_sort_field       = '{$bo_sort_field}',
+                bo_1_subj           = '{$bo_1_subj}',
+                bo_2_subj           = '{$bo_2_subj}',
+                bo_3_subj           = '{$bo_3_subj}',
+                bo_4_subj           = '{$bo_4_subj}',
+                bo_5_subj           = '{$bo_5_subj}',
+                bo_6_subj           = '{$bo_6_subj}',
+                bo_7_subj           = '{$bo_7_subj}',
+                bo_8_subj           = '{$bo_8_subj}',
+                bo_9_subj           = '{$bo_9_subj}',
+                bo_10_subj          = '{$bo_10_subj}',
+                bo_1                = '{$bo_1}',
+                bo_2                = '{$bo_2}',
+                bo_3                = '{$bo_3}',
+                bo_4                = '{$bo_4}',
+                bo_5                = '{$bo_5}',
+                bo_6                = '{$bo_6}',
+                bo_7                = '{$bo_7}',
+                bo_8                = '{$bo_8}',
+                bo_9                = '{$bo_9}',
+                bo_10               = '{$bo_10}' ";
 
 if ($w == '') {
 
@@ -176,7 +274,9 @@ if ($w == '') {
 
     // 게시판 테이블 생성
     $file = file('./sql_write.sql');
-    $sql = implode($file, "\n");
+    $file = get_db_create_replace($file);
+
+    $sql = implode("\n", $file);
 
     $create_table = $g5['write_prefix'] . $bo_table;
 
@@ -266,13 +366,14 @@ if (is_checked('chk_grp_write_point'))          $grp_fields .= " , bo_write_poin
 if (is_checked('chk_grp_comment_point'))        $grp_fields .= " , bo_comment_point = '{$bo_comment_point}' ";
 if (is_checked('chk_grp_download_point'))       $grp_fields .= " , bo_download_point = '{$bo_download_point}' ";
 if (is_checked('chk_grp_category_list')) {
-    $grp_fields .= " , bo_category_list = '{$bo_category_list}' ";
+    $grp_fields .= " , bo_category_list = '{$str_bo_category_list}' ";
     $grp_fields .= " , bo_use_category = '{$bo_use_category}' ";
 }
 if (is_checked('chk_grp_use_sideview'))         $grp_fields .= " , bo_use_sideview = '{$bo_use_sideview}' ";
 if (is_checked('chk_grp_use_file_content'))     $grp_fields .= " , bo_use_file_content = '{$bo_use_file_content}' ";
 if (is_checked('chk_grp_use_secret'))           $grp_fields .= " , bo_use_secret = '{$bo_use_secret}' ";
 if (is_checked('chk_grp_use_dhtml_editor'))     $grp_fields .= " , bo_use_dhtml_editor = '{$bo_use_dhtml_editor}' ";
+if (is_checked('chk_grp_select_editor'))        $grp_fields .= " , bo_select_editor = '{$bo_select_editor}' ";
 if (is_checked('chk_grp_use_rss_view'))         $grp_fields .= " , bo_use_rss_view = '{$bo_use_rss_view}' ";
 if (is_checked('chk_grp_use_good'))             $grp_fields .= " , bo_use_good = '{$bo_use_good}' ";
 if (is_checked('chk_grp_use_nogood'))           $grp_fields .= " , bo_use_nogood = '{$bo_use_nogood}' ";
@@ -285,6 +386,7 @@ if (is_checked('chk_grp_use_list_content'))     $grp_fields .= " , bo_use_list_c
 if (is_checked('chk_grp_use_email'))            $grp_fields .= " , bo_use_email = '{$bo_use_email}' ";
 if (is_checked('chk_grp_use_cert'))             $grp_fields .= " , bo_use_cert = '{$bo_use_cert}' ";
 if (is_checked('chk_grp_use_sns'))              $grp_fields .= " , bo_use_sns = '{$bo_use_sns}' ";
+if (is_checked('chk_grp_use_captcha'))          $grp_fields .= " , bo_use_captcha = '{$bo_use_captcha}' ";
 if (is_checked('chk_grp_skin'))                 $grp_fields .= " , bo_skin = '{$bo_skin}' ";
 if (is_checked('chk_grp_mobile_skin'))          $grp_fields .= " , bo_mobile_skin = '{$bo_mobile_skin}' ";
 if (is_checked('chk_grp_gallery_cols'))         $grp_fields .= " , bo_gallery_cols = '{$bo_gallery_cols}' ";
@@ -324,8 +426,8 @@ if (is_checked('chk_grp_use_search'))           $grp_fields .= " , bo_use_search
 if (is_checked('chk_grp_order'))                $grp_fields .= " , bo_order = '{$bo_order}' ";
 for ($i=1; $i<=10; $i++) {
     if (is_checked('chk_grp_'.$i)) {
-        $grp_fields .= " , bo_{$i}_subj = '".$_POST['bo_'.$i.'_subj']."' ";
-        $grp_fields .= " , bo_{$i} = '".$_POST['bo_'.$i]."' ";
+        $grp_fields .= " , bo_{$i}_subj = '".$etcs['bo_'.$i.'_subj']."' ";
+        $grp_fields .= " , bo_{$i} = '".$etcs['bo_'.$i]."' ";
     }
 }
 
@@ -354,13 +456,14 @@ if (is_checked('chk_all_write_point'))          $all_fields .= " , bo_write_poin
 if (is_checked('chk_all_comment_point'))        $all_fields .= " , bo_comment_point = '{$bo_comment_point}' ";
 if (is_checked('chk_all_download_point'))       $all_fields .= " , bo_download_point = '{$bo_download_point}' ";
 if (is_checked('chk_all_category_list')) {
-    $all_fields .= " , bo_category_list = '{$bo_category_list}' ";
+    $all_fields .= " , bo_category_list = '{$str_bo_category_list}' ";
     $all_fields .= " , bo_use_category = '{$bo_use_category}' ";
 }
 if (is_checked('chk_all_use_sideview'))         $all_fields .= " , bo_use_sideview = '{$bo_use_sideview}' ";
 if (is_checked('chk_all_use_file_content'))     $all_fields .= " , bo_use_file_content = '{$bo_use_file_content}' ";
 if (is_checked('chk_all_use_secret'))           $all_fields .= " , bo_use_secret = '{$bo_use_secret}' ";
 if (is_checked('chk_all_use_dhtml_editor'))     $all_fields .= " , bo_use_dhtml_editor = '{$bo_use_dhtml_editor}' ";
+if (is_checked('chk_all_select_editor'))        $all_fields .= " , bo_select_editor = '{$bo_select_editor}' ";
 if (is_checked('chk_all_use_rss_view'))         $all_fields .= " , bo_use_rss_view = '{$bo_use_rss_view}' ";
 if (is_checked('chk_all_use_good'))             $all_fields .= " , bo_use_good = '{$bo_use_good}' ";
 if (is_checked('chk_all_use_nogood'))           $all_fields .= " , bo_use_nogood = '{$bo_use_nogood}' ";
@@ -373,6 +476,7 @@ if (is_checked('chk_all_use_list_content'))     $all_fields .= " , bo_use_list_c
 if (is_checked('chk_all_use_email'))            $all_fields .= " , bo_use_email = '{$bo_use_email}' ";
 if (is_checked('chk_all_use_cert'))             $all_fields .= " , bo_use_cert = '{$bo_use_cert}' ";
 if (is_checked('chk_all_use_sns'))              $all_fields .= " , bo_use_sns = '{$bo_use_sns}' ";
+if (is_checked('chk_all_use_captcha'))          $all_fields .= " , bo_use_captcha = '{$bo_use_captcha}' ";
 if (is_checked('chk_all_skin'))                 $all_fields .= " , bo_skin = '{$bo_skin}' ";
 if (is_checked('chk_all_mobile_skin'))          $all_fields .= " , bo_mobile_skin = '{$bo_mobile_skin}' ";
 if (is_checked('chk_all_gallery_cols'))         $all_fields .= " , bo_gallery_cols = '{$bo_gallery_cols}' ";
@@ -412,8 +516,8 @@ if (is_checked('chk_all_use_search'))           $all_fields .= " , bo_use_search
 if (is_checked('chk_all_order'))                $all_fields .= " , bo_order = '{$bo_order}' ";
 for ($i=1; $i<=10; $i++) {
     if (is_checked('chk_all_'.$i)) {
-        $all_fields .= " , bo_{$i}_subj = '".$_POST['bo_'.$i.'_subj']."' ";
-        $all_fields .= " , bo_{$i} = '".$_POST['bo_'.$i]."' ";
+        $all_fields .= " , bo_{$i}_subj = '".$etcs['bo_'.$i.'_subj']."' ";
+        $all_fields .= " , bo_{$i} = '".$etcs['bo_'.$i]."' ";
     }
 }
 
@@ -423,5 +527,9 @@ if ($all_fields) {
 
 delete_cache_latest($bo_table);
 
-goto_url("./board_form.php?w=u&bo_table={$bo_table}&amp;{$qstr}");
-?>
+if(function_exists('get_admin_captcha_by'))
+    get_admin_captcha_by('remove');
+
+run_event('admin_board_form_update', $bo_table, $w);
+
+goto_url("./board_form.php?w=u&bo_table={$bo_table}&amp;{$qstr}");

adm/board_list.php

@@ -2,7 +2,7 @@
 $sub_menu = "300100";
 include_once('./_common.php');
 
-auth_check($auth[$sub_menu], 'r');
+auth_check_menu($auth, $sub_menu, 'r');
 
 $sql_common = " from {$g5['board_table']} a ";
 $sql_search = " where (1) ";
@@ -56,16 +56,16 @@ $colspan = 15;
 
 <div class="local_ov01 local_ov">
     <?php echo $listall ?>
-    생성된 게시판수 <?php echo number_format($total_count) ?>개
+    <span class="btn_ov01"><span class="ov_txt">생성된 게시판수</span><span class="ov_num"> <?php echo number_format($total_count) ?>개</span></span>
 </div>
 
 <form name="fsearch" id="fsearch" class="local_sch01 local_sch" method="get">
 
 <label for="sfl" class="sound_only">검색대상</label>
 <select name="sfl" id="sfl">
-    <option value="bo_table"<?php echo get_selected($_GET['sfl'], "bo_table", true); ?>>TABLE</option>
-    <option value="bo_subject"<?php echo get_selected($_GET['sfl'], "bo_subject"); ?>>제목</option>
-    <option value="a.gr_id"<?php echo get_selected($_GET['sfl'], "a.gr_id"); ?>>그룹ID</option>
+    <option value="bo_table"<?php echo get_selected($sfl, "bo_table", true); ?>>TABLE</option>
+    <option value="bo_subject"<?php echo get_selected($sfl, "bo_subject"); ?>>제목</option>
+    <option value="a.gr_id"<?php echo get_selected($sfl, "a.gr_id"); ?>>그룹ID</option>
 </select>
 <label for="stx" class="sound_only">검색어<strong class="sound_only"> 필수</strong></label>
 <input type="text" name="stx" value="<?php echo $stx ?>" id="stx" required class="required frm_input">
@@ -73,11 +73,7 @@ $colspan = 15;
 
 </form>
 
-<?php if ($is_admin == 'super') { ?>
-<div class="btn_add01 btn_add">
-    <a href="./board_form.php" id="bo_add">게시판 추가</a>
-</div>
-<?php } ?>
+
 
 <form name="fboardlist" id="fboardlist" action="./board_list_update.php" onsubmit="return fboardlist_submit(this);" method="post">
 <input type="hidden" name="sst" value="<?php echo $sst ?>">
@@ -85,7 +81,7 @@ $colspan = 15;
 <input type="hidden" name="sfl" value="<?php echo $sfl ?>">
 <input type="hidden" name="stx" value="<?php echo $stx ?>">
 <input type="hidden" name="page" value="<?php echo $page ?>">
-<input type="hidden" name="token" value="<?php echo $token ?>">
+<input type="hidden" name="token" value="<?php echo isset($token) ? $token : ''; ?>">
 
 <div class="tbl_head01 tbl_wrap">
     <table>
@@ -99,7 +95,7 @@ $colspan = 15;
         <th scope="col"><?php echo subject_sort_link('a.gr_id') ?>그룹</a></th>
         <th scope="col"><?php echo subject_sort_link('bo_table') ?>TABLE</a></th>
         <th scope="col"><?php echo subject_sort_link('bo_skin', '', 'desc') ?>스킨</a></th>
-        <th scope="col"><?php echo subject_sort_link('bo_mobile_skin', '', 'desc') ?>모바일<br>스킨</span></a></th>
+        <th scope="col"><?php echo subject_sort_link('bo_mobile_skin', '', 'desc') ?>모바일<br>스킨</a></th>
         <th scope="col"><?php echo subject_sort_link('bo_subject') ?>제목</a></th>
         <th scope="col">읽기P<span class="sound_only">포인트</span></th>
         <th scope="col">쓰기P<span class="sound_only">포인트</span></th>
@@ -115,8 +111,8 @@ $colspan = 15;
     <tbody>
     <?php
     for ($i=0; $row=sql_fetch_array($result); $i++) {
-        $one_update = '<a href="./board_form.php?w=u&amp;bo_table='.$row['bo_table'].'&amp;'.$qstr.'">수정</a>';
-        $one_copy = '<a href="./board_copy.php?bo_table='.$row['bo_table'].'" class="board_copy" target="win_board_copy">복사</a>';
+        $one_update = '<a href="./board_form.php?w=u&amp;bo_table='.$row['bo_table'].'&amp;'.$qstr.'" class="btn btn_03">수정</a>';
+        $one_copy = '<a href="./board_copy.php?bo_table='.$row['bo_table'].'" class="board_copy btn btn_02" target="win_board_copy">복사</a>';
 
         $bg = 'bg'.($i%2);
     ?>
@@ -135,7 +131,7 @@ $colspan = 15;
         </td>
         <td>
             <input type="hidden" name="board_table[<?php echo $i ?>]" value="<?php echo $row['bo_table'] ?>">
-            <a href="<?php echo G5_BBS_URL ?>/board.php?bo_table=<?php echo $row['bo_table'] ?>"><?php echo $row['bo_table'] ?></a>
+            <a href="<?php echo get_pretty_url($row['bo_table']) ?>"><?php echo $row['bo_table'] ?></a>
         </td>
         <td>
             <label for="bo_skin_<?php echo $i; ?>" class="sound_only">스킨</label>
@@ -147,35 +143,35 @@ $colspan = 15;
         </td>
         <td>
             <label for="bo_subject_<?php echo $i; ?>" class="sound_only">게시판 제목<strong class="sound_only"> 필수</strong></label>
-            <input type="text" name="bo_subject[<?php echo $i ?>]" value="<?php echo get_text($row['bo_subject']) ?>" id="bo_subject_<?php echo $i ?>" required class="required frm_input bo_subject full_input" size="10">
+            <input type="text" name="bo_subject[<?php echo $i ?>]" value="<?php echo get_text($row['bo_subject']) ?>" id="bo_subject_<?php echo $i ?>" required class="required tbl_input bo_subject full_input" size="10">
         </td>
         <td class="td_numsmall">
             <label for="bo_read_point_<?php echo $i; ?>" class="sound_only">읽기 포인트</label>
-            <input type="text" name="bo_read_point[<?php echo $i ?>]" value="<?php echo $row['bo_read_point'] ?>" id="bo_read_point_<?php echo $i; ?>" class="frm_input" size="2">
+            <input type="text" name="bo_read_point[<?php echo $i ?>]" value="<?php echo $row['bo_read_point'] ?>" id="bo_read_point_<?php echo $i; ?>" class="tbl_input" size="2">
         </td>
         <td class="td_numsmall">
             <label for="bo_write_point_<?php echo $i; ?>" class="sound_only">쓰기 포인트</label>
-            <input type="text" name="bo_write_point[<?php echo $i ?>]" value="<?php echo $row['bo_write_point'] ?>" id="bo_write_point_<?php echo $i; ?>" class="frm_input" size="2">
+            <input type="text" name="bo_write_point[<?php echo $i ?>]" value="<?php echo $row['bo_write_point'] ?>" id="bo_write_point_<?php echo $i; ?>" class="tbl_input" size="2">
         </td>
         <td class="td_numsmall">
             <label for="bo_comment_point_<?php echo $i; ?>" class="sound_only">댓글 포인트</label>
-            <input type="text" name="bo_comment_point[<?php echo $i ?>]" value="<?php echo $row['bo_comment_point'] ?>" id="bo_comment_point_<?php echo $i; ?>" class="frm_input" size="2">
+            <input type="text" name="bo_comment_point[<?php echo $i ?>]" value="<?php echo $row['bo_comment_point'] ?>" id="bo_comment_point_<?php echo $i; ?>" class="tbl_input" size="2">
         </td>
         <td class="td_numsmall">
-            <label for="bo_download_point_<?php echo $i; ?>" class="sound_only">다운 포인트</label>
-            <input type="text" name="bo_download_point[<?php echo $i ?>]" value="<?php echo $row['bo_download_point'] ?>" id="bo_download_point_<?php echo $i; ?>" class="frm_input" size="2">
+            <label for="bo_download_point_<?php echo $i; ?>" class="sound_only">다운<br>포인트</label>
+            <input type="text" name="bo_download_point[<?php echo $i ?>]" value="<?php echo $row['bo_download_point'] ?>" id="bo_download_point_<?php echo $i; ?>" class="tbl_input" size="2">
         </td>
-        <td class="td_chk">
-            <label for="bo_use_sns_<?php echo $i; ?>" class="sound_only">SNS 사용</label>
+        <td class="td_numsmall">
+            <label for="bo_use_sns_<?php echo $i; ?>" class="sound_only">SNS<br>사용</label>
             <input type="checkbox" name="bo_use_sns[<?php echo $i ?>]" value="1" id="bo_use_sns_<?php echo $i ?>" <?php echo $row['bo_use_sns']?"checked":"" ?>>
         </td>
-        <td class="td_chk">
-            <label for="bo_use_search_<?php echo $i; ?>" class="sound_only">검색 사용</label>
+        <td class="td_numsmall">
+            <label for="bo_use_search_<?php echo $i; ?>" class="sound_only">검색<br>사용</label>
             <input type="checkbox" name="bo_use_search[<?php echo $i ?>]" value="1" id="bo_use_search_<?php echo $i ?>" <?php echo $row['bo_use_search']?"checked":"" ?>>
         </td>
-        <td class="td_chk">
-            <label for="bo_order_<?php echo $i; ?>" class="sound_only">출력 순서</label>
-            <input type="text" name="bo_order[<?php echo $i ?>]" value="<?php echo $row['bo_order'] ?>" id="bo_order_<?php echo $i ?>" class="frm_input" size="2">
+        <td class="td_numsmall">
+            <label for="bo_order_<?php echo $i; ?>" class="sound_only">출력<br>순서</label>
+            <input type="text" name="bo_order[<?php echo $i ?>]" value="<?php echo $row['bo_order'] ?>" id="bo_order_<?php echo $i ?>" class="tbl_input" size="2">
         </td>
         <td class="td_mngsmall">
             <label for="bo_device_<?php echo $i; ?>" class="sound_only">접속기기</label>
@@ -185,7 +181,7 @@ $colspan = 15;
                 <option value="mobile"<?php echo get_selected($row['bo_device'], 'mobile'); ?>>모바일</option>
             </select>
         </td>
-        <td class="td_mngsmall">
+        <td class="td_mng td_mng_m">
             <?php echo $one_update ?>
             <?php echo $one_copy ?>
         </td>
@@ -199,10 +195,13 @@ $colspan = 15;
     </table>
 </div>
 
-<div class="btn_list01 btn_list">
-    <input type="submit" name="act_button" value="선택수정" onclick="document.pressed=this.value">
+<div class="btn_fixed_top">
+    <input type="submit" name="act_button" value="선택수정" onclick="document.pressed=this.value" class="btn_02 btn">
     <?php if ($is_admin == 'super') { ?>
-    <input type="submit" name="act_button" value="선택삭제" onclick="document.pressed=this.value">
+    <input type="submit" name="act_button" value="선택삭제" onclick="document.pressed=this.value" class="btn_02 btn">
+    <?php } ?>
+    <?php if ($is_admin == 'super') { ?>
+    <a href="./board_form.php" id="bo_add" class="btn_01 btn">게시판 추가</a>
     <?php } ?>
 </div>
 
@@ -236,5 +235,4 @@ $(function(){
 </script>
 
 <?php
-include_once('./admin.tail.php');
-?>
+include_once('./admin.tail.php');

adm/board_list_update.php

@@ -4,24 +4,42 @@ include_once('./_common.php');
 
 check_demo();
 
-if (!count($_POST['chk'])) {
-    alert($_POST['act_button']." 하실 항목을 하나 이상 체크하세요.");
+$post_count_chk = (isset($_POST['chk']) && is_array($_POST['chk'])) ? count($_POST['chk']) : 0;
+$chk = (isset($_POST['chk']) && is_array($_POST['chk'])) ? $_POST['chk'] : array();
+$act_button = isset($_POST['act_button']) ? strip_tags($_POST['act_button']) : '';
+$board_table = (isset($_POST['board_table']) && is_array($_POST['board_table'])) ? $_POST['board_table'] : array();
+
+if (! $post_count_chk) {
+    alert($act_button." 하실 항목을 하나 이상 체크하세요.");
 }
 
 check_admin_token();
 
-if ($_POST['act_button'] == "선택수정") {
+if ($act_button === "선택수정") {
 
-    auth_check($auth[$sub_menu], 'w');
+    auth_check_menu($auth, $sub_menu, 'w');
 
-    for ($i=0; $i<count($_POST['chk']); $i++) {
+    for ($i=0; $i<$post_count_chk; $i++) {
 
         // 실제 번호를 넘김
-        $k = $_POST['chk'][$i];
+        $k = isset($_POST['chk'][$i]) ? (int) $_POST['chk'][$i] : 0;
+
+        $post_gr_id = isset($_POST['gr_id'][$k]) ? clean_xss_tags($_POST['gr_id'][$k], 1, 1) : '';
+        $post_bo_device = isset($_POST['bo_device'][$k]) ? clean_xss_tags($_POST['bo_device'][$k], 1, 1) : '';
+        $post_bo_skin = isset($_POST['bo_skin'][$k]) ? clean_xss_tags($_POST['bo_skin'][$k], 1, 1) : '';
+        $post_bo_mobile_skin = isset($_POST['bo_mobile_skin'][$k]) ? clean_xss_tags($_POST['bo_mobile_skin'][$k], 1, 1) : '';
+        $post_bo_read_point = isset($_POST['bo_read_point'][$k]) ? clean_xss_tags($_POST['bo_read_point'][$k], 1, 1) : '';
+        $post_bo_write_point = isset($_POST['bo_write_point'][$k]) ? clean_xss_tags($_POST['bo_write_point'][$k], 1, 1) : '';
+        $post_bo_comment_point = isset($_POST['bo_comment_point'][$k]) ? clean_xss_tags($_POST['bo_comment_point'][$k], 1, 1) : '';
+        $post_bo_download_point = isset($_POST['bo_download_point'][$k]) ? clean_xss_tags($_POST['bo_download_point'][$k], 1, 1) : '';
+        $post_bo_use_search = isset($_POST['bo_use_search'][$k]) ? clean_xss_tags($_POST['bo_use_search'][$k], 1, 1) : '';
+        $post_bo_use_sns = isset($_POST['bo_use_sns'][$k]) ? clean_xss_tags($_POST['bo_use_sns'][$k], 1, 1) : '';
+        $post_bo_order = isset($_POST['bo_order'][$k]) ? clean_xss_tags($_POST['bo_order'][$k], 1, 1) : '';
+        $post_board_table = isset($_POST['board_table'][$k]) ? clean_xss_tags($_POST['board_table'][$k], 1, 1) : '';
 
         if ($is_admin != 'super') {
             $sql = " select count(*) as cnt from {$g5['board_table']} a, {$g5['group_table']} b
-                      where a.gr_id = '".sql_real_escape_string($_POST['gr_id'][$k])."'
+                      where a.gr_id = '".sql_real_escape_string($post_gr_id)."'
                         and a.gr_id = b.gr_id
                         and b.gr_admin = '{$member['mb_id']}' ";
             $row = sql_fetch($sql);
@@ -29,40 +47,42 @@ if ($_POST['act_button'] == "선택수정") {
                 alert('최고관리자가 아닌 경우 다른 관리자의 게시판('.$board_table[$k].')은 수정이 불가합니다.');
         }
 
+        $p_bo_subject = is_array($_POST['bo_subject']) ? strip_tags(clean_xss_attributes($_POST['bo_subject'][$k])) : '';
+
         $sql = " update {$g5['board_table']}
-                    set gr_id               = '".sql_real_escape_string($_POST['gr_id'][$k])."',
-                        bo_subject          = '".sql_real_escape_string($_POST['bo_subject'][$k])."',
-                        bo_device           = '".sql_real_escape_string($_POST['bo_device'][$k])."',
-                        bo_skin             = '".sql_real_escape_string($_POST['bo_skin'][$k])."',
-                        bo_mobile_skin      = '".sql_real_escape_string($_POST['bo_mobile_skin'][$k])."',
-                        bo_read_point       = '".sql_real_escape_string($_POST['bo_read_point'][$k])."',
-                        bo_write_point      = '".sql_real_escape_string($_POST['bo_write_point'][$k])."',
-                        bo_comment_point    = '".sql_real_escape_string($_POST['bo_comment_point'][$k])."',
-                        bo_download_point   = '".sql_real_escape_string($_POST['bo_download_point'][$k])."',
-                        bo_use_search       = '".sql_real_escape_string($_POST['bo_use_search'][$k])."',
-                        bo_use_sns          = '".sql_real_escape_string($_POST['bo_use_sns'][$k])."',
-                        bo_order            = '".sql_real_escape_string($_POST['bo_order'][$k])."'
-                  where bo_table            = '".sql_real_escape_string($_POST['board_table'][$k])."' ";
+                    set gr_id               = '".sql_real_escape_string($post_gr_id)."',
+                        bo_subject          = '".$p_bo_subject."',
+                        bo_device           = '".sql_real_escape_string($post_bo_device)."',
+                        bo_skin             = '".sql_real_escape_string($post_bo_skin)."',
+                        bo_mobile_skin      = '".sql_real_escape_string($post_bo_mobile_skin)."',
+                        bo_read_point       = '".sql_real_escape_string($post_bo_read_point)."',
+                        bo_write_point      = '".sql_real_escape_string($post_bo_write_point)."',
+                        bo_comment_point    = '".sql_real_escape_string($post_bo_comment_point)."',
+                        bo_download_point   = '".sql_real_escape_string($post_bo_download_point)."',
+                        bo_use_search       = '".sql_real_escape_string($post_bo_use_search)."',
+                        bo_use_sns          = '".sql_real_escape_string($post_bo_use_sns)."',
+                        bo_order            = '".sql_real_escape_string($post_bo_order)."'
+                  where bo_table            = '".sql_real_escape_string($post_board_table)."' ";
 
         sql_query($sql);
     }
 
-} else if ($_POST['act_button'] == "선택삭제") {
+} else if ($act_button === "선택삭제") {
 
     if ($is_admin != 'super')
         alert('게시판 삭제는 최고관리자만 가능합니다.');
 
-    auth_check($auth[$sub_menu], 'd');
+    auth_check_menu($auth, $sub_menu, 'd');
 
     // _BOARD_DELETE_ 상수를 선언해야 board_delete.inc.php 가 정상 작동함
     define('_BOARD_DELETE_', true);
 
-    for ($i=0; $i<count($_POST['chk']); $i++) {
+    for ($i=0; $i<$post_count_chk; $i++) {
         // 실제 번호를 넘김
-        $k = $_POST['chk'][$i];
+        $k = isset($_POST['chk'][$i]) ? (int) $_POST['chk'][$i] : 0;
 
         // include 전에 $bo_table 값을 반드시 넘겨야 함
-        $tmp_bo_table = trim($_POST['board_table'][$k]);
+        $tmp_bo_table = isset($_POST['board_table'][$k]) ? trim(clean_xss_tags($_POST['board_table'][$k], 1, 1)) : '';
 
         if( preg_match("/^[A-Za-z0-9_]+$/", $tmp_bo_table) ){
             include ('./board_delete.inc.php');
@@ -72,5 +92,6 @@ if ($_POST['act_button'] == "선택수정") {
 
 }
 
-goto_url('./board_list.php?'.$qstr);
-?>
+run_event('admin_board_list_update', $act_button, $chk, $board_table, $qstr);
+
+goto_url('./board_list.php?'.$qstr);

adm/board_thumbnail_delete.php

@@ -2,7 +2,7 @@
 $sub_menu = '300100';
 include_once('./_common.php');
 
-auth_check($auth[$sub_menu], 'w');
+auth_check_menu($auth, $sub_menu, 'w');
 
 if(!$board['bo_table'])
     alert('존재하지 않는 게시판입니다.');
@@ -48,5 +48,4 @@ if(is_dir($dir)) {
 <div class="btn_confirm01 btn_confirm"><a href="./board_form.php?w=u&amp;bo_table=<?php echo $bo_table; ?>&amp;<?php echo $qstr; ?>">게시판 수정으로 돌아가기</a></div>
 
 <?php
-include_once('./admin.tail.php');
-?>
+include_once('./admin.tail.php');

adm/boardgroup_form.php

@@ -2,17 +2,24 @@
 $sub_menu = "300200";
 include_once('./_common.php');
 
-auth_check($auth[$sub_menu], 'w');
+auth_check_menu($auth, $sub_menu, 'w');
 
 if ($is_admin != 'super' && $w == '') alert('최고관리자만 접근 가능합니다.');
 
 $html_title = '게시판그룹';
 $gr_id_attr = '';
 $sound_only = '';
+
+if( ! isset($group['gr_id']) ){
+    $group['gr_id'] = '';
+    $group['gr_subject'] = '';
+    $group['gr_device'] = '';
+}
+
 if ($w == '') {
     $gr_id_attr = 'required';
     $sound_only = '<strong class="sound_only"> 필수</strong>';
-    $gr['gr_use_access'] = 0;
+    $gr = array('gr_use_access' => 0, 'gr_admin'=>'');
     $html_title .= ' 생성';
 } else if ($w == 'u') {
     $gr_id_attr = 'readonly';
@@ -115,9 +122,9 @@ include_once('./admin.head.php');
         <th scope="row">여분필드<?php echo $i ?></th>
         <td class="td_extra">
             <label for="gr_<?php echo $i ?>_subj">여분필드 <?php echo $i ?> 제목</label>
-            <input type="text" name="gr_<?php echo $i ?>_subj" value="<?php echo get_text($group['gr_'.$i.'_subj']) ?>" id="gr_<?php echo $i ?>_subj" class="frm_input">
+            <input type="text" name="gr_<?php echo $i ?>_subj" value="<?php echo isset($group['gr_'.$i.'_subj']) ? get_text($group['gr_'.$i.'_subj']) : ''; ?>" id="gr_<?php echo $i ?>_subj" class="frm_input">
             <label for="gr_<?php echo $i ?>">여분필드 <?php echo $i ?> 내용</label>
-            <input type="text" name="gr_<?php echo $i ?>" value="<?php echo $gr['gr_'.$i] ?>" id="gr_<?php echo $i ?>" class="frm_input">
+            <input type="text" name="gr_<?php echo $i ?>" value="<?php echo isset($gr['gr_'.$i]) ? get_sanitize_input($gr['gr_'.$i]) : ''; ?>" id="gr_<?php echo $i ?>" class="frm_input">
         </td>
     </tr>
     <?php } ?>
@@ -125,9 +132,9 @@ include_once('./admin.head.php');
     </table>
 </div>
 
-<div class="btn_confirm01 btn_confirm">
-    <input type="submit" class="btn_submit" accesskey="s" value="확인">
-    <a href="./boardgroup_list.php?<?php echo $qstr ?>">목록</a>
+<div class="btn_fixed_top">
+    <a href="./boardgroup_list.php?<?php echo $qstr ?>" class="btn btn_02">목록</a>
+    <input type="submit" class="btn_submit btn" accesskey="s" value="확인">
 </div>
 
 </form>
@@ -148,5 +155,4 @@ function fboardgroup_check(f)
 </script>
 
 <?php
-include_once ('./admin.tail.php');
-?>
+include_once ('./admin.tail.php');

adm/boardgroup_form_update.php

@@ -5,40 +5,63 @@ include_once('./_common.php');
 if ($w == 'u')
     check_demo();
 
-auth_check($auth[$sub_menu], 'w');
+auth_check_menu($auth, $sub_menu, 'w');
 
 if ($is_admin != 'super' && $w == '') alert('최고관리자만 접근 가능합니다.');
 
 check_admin_token();
 
-if (!preg_match("/^([A-Za-z0-9_]{1,10})$/", $_POST['gr_id']))
+$gr_id = isset($_POST['gr_id']) ? $_POST['gr_id'] : '';
+
+if (!preg_match("/^([A-Za-z0-9_]{1,10})$/", $gr_id))
     alert('그룹 ID는 공백없이 영문자, 숫자, _ 만 사용 가능합니다. (10자 이내)');
 
 if (!$gr_subject) alert('그룹 제목을 입력하세요.');
 
-$sql_common = " gr_subject = '{$_POST['gr_subject']}',
-                gr_device = '{$_POST['gr_device']}',
-                gr_admin  = '{$_POST['gr_admin']}',
-                gr_1_subj = '{$_POST['gr_1_subj']}',
-                gr_2_subj = '{$_POST['gr_2_subj']}',
-                gr_3_subj = '{$_POST['gr_3_subj']}',
-                gr_4_subj = '{$_POST['gr_4_subj']}',
-                gr_5_subj = '{$_POST['gr_5_subj']}',
-                gr_6_subj = '{$_POST['gr_6_subj']}',
-                gr_7_subj = '{$_POST['gr_7_subj']}',
-                gr_8_subj = '{$_POST['gr_8_subj']}',
-                gr_9_subj = '{$_POST['gr_9_subj']}',
-                gr_10_subj = '{$_POST['gr_10_subj']}',
-                gr_1 = '{$_POST['gr_1']}',
-                gr_2 = '{$_POST['gr_2']}',
-                gr_3 = '{$_POST['gr_3']}',
-                gr_4 = '{$_POST['gr_4']}',
-                gr_5 = '{$_POST['gr_5']}',
-                gr_6 = '{$_POST['gr_6']}',
-                gr_7 = '{$_POST['gr_7']}',
-                gr_8 = '{$_POST['gr_8']}',
-                gr_9 = '{$_POST['gr_9']}',
-                gr_10 = '{$_POST['gr_10']}' ";
+$posts = array();
+
+$check_keys = array(
+'gr_subject',
+'gr_device',
+'gr_admin'
+);
+
+for($i=1;$i<=10;$i++){
+    $check_keys['gr_'.$i.'_subj'] = isset($_POST['gr_'.$i.'_subj']) ? $_POST['gr_'.$i.'_subj'] : '';
+    $check_keys['gr_'.$i] = isset($_POST['gr_'.$i]) ? $_POST['gr_'.$i] : '';
+}
+
+foreach( $check_keys as $key ){
+    if( $key === 'gr_subject' ){
+        $posts[$key] = isset($_POST[$key]) ? strip_tags(clean_xss_attributes($_POST[$key])) : '';
+    } else {
+        $posts[$key] = isset($_POST[$key]) ? $_POST[$key] : '';
+    }
+}
+
+$sql_common = " gr_subject = '{$posts['gr_subject']}',
+                gr_device = '{$posts['gr_device']}',
+                gr_admin  = '{$posts['gr_admin']}',
+                gr_1_subj = '{$posts['gr_1_subj']}',
+                gr_2_subj = '{$posts['gr_2_subj']}',
+                gr_3_subj = '{$posts['gr_3_subj']}',
+                gr_4_subj = '{$posts['gr_4_subj']}',
+                gr_5_subj = '{$posts['gr_5_subj']}',
+                gr_6_subj = '{$posts['gr_6_subj']}',
+                gr_7_subj = '{$posts['gr_7_subj']}',
+                gr_8_subj = '{$posts['gr_8_subj']}',
+                gr_9_subj = '{$posts['gr_9_subj']}',
+                gr_10_subj = '{$posts['gr_10_subj']}',
+                gr_1 = '{$posts['gr_1']}',
+                gr_2 = '{$posts['gr_2']}',
+                gr_3 = '{$posts['gr_3']}',
+                gr_4 = '{$posts['gr_4']}',
+                gr_5 = '{$posts['gr_5']}',
+                gr_6 = '{$posts['gr_6']}',
+                gr_7 = '{$posts['gr_7']}',
+                gr_8 = '{$posts['gr_8']}',
+                gr_9 = '{$posts['gr_9']}',
+                gr_10 = '{$posts['gr_10']}' ";
 if (isset($_POST['gr_use_access']))
     $sql_common .= ", gr_use_access = '{$_POST['gr_use_access']}' ";
 else
@@ -46,13 +69,13 @@ else
 
 if ($w == '') {
 
-    $sql = " select count(*) as cnt from {$g5['group_table']} where gr_id = '{$_POST['gr_id']}' ";
+    $sql = " select count(*) as cnt from {$g5['group_table']} where gr_id = '{$gr_id}' ";
     $row = sql_fetch($sql);
     if ($row['cnt'])
         alert('이미 존재하는 그룹 ID 입니다.');
 
     $sql = " insert into {$g5['group_table']}
-                set gr_id = '{$_POST['gr_id']}',
+                set gr_id = '{$gr_id}',
                      {$sql_common} ";
     sql_query($sql);
 
@@ -60,12 +83,13 @@ if ($w == '') {
 
     $sql = " update {$g5['group_table']}
                 set {$sql_common}
-                where gr_id = '{$_POST['gr_id']}' ";
+                where gr_id = '{$gr_id}' ";
     sql_query($sql);
 
 } else {
     alert('제대로 된 값이 넘어오지 않았습니다.');
 }
 
-goto_url('./boardgroup_form.php?w=u&amp;gr_id='.$gr_id.'&amp;'.$qstr);
-?>
+run_event('admin_boardgroup_form_update', $gr_id, $w);
+
+goto_url('./boardgroup_form.php?w=u&amp;gr_id='.$gr_id.'&amp;'.$qstr);

adm/boardgroup_list.php

@@ -2,7 +2,7 @@
 $sub_menu = "300200";
 include_once('./_common.php');
 
-auth_check($auth[$sub_menu], 'r');
+auth_check_menu($auth, $sub_menu, 'r');
 
 if (!isset($group['gr_device'])) {
     // 게시판 그룹 사용 필드 추가
@@ -10,7 +10,7 @@ if (!isset($group['gr_device'])) {
     // pc : pc 전용 사용
     // mobile : mobile 전용 사용
     // none : 사용 안함
-    sql_query(" ALTER TABLE  `{$g5['board_group_table']}` ADD  `gr_device` ENUM(  'both',  'pc',  'mobile' ) NOT NULL DEFAULT  'both' AFTER  `gr_subject` ", false);
+    sql_query(" ALTER TABLE  `{$g5['group_table']}` ADD  `gr_device` ENUM(  'both',  'pc',  'mobile' ) NOT NULL DEFAULT  'both' AFTER  `gr_subject` ", false);
 }
 
 $sql_common = " from {$g5['group_table']} ";
@@ -60,27 +60,21 @@ $colspan = 10;
 
 <div class="local_ov01 local_ov">
     <?php echo $listall ?>
-    전체그룹 <?php echo number_format($total_count) ?>개
+    <span class="btn_ov01"><span class="ov_txt">전체그룹</span><span class="ov_num">  <?php echo number_format($total_count) ?>개</span></span>
 </div>
 
 <form name="fsearch" id="fsearch" class="local_sch01 local_sch" method="get">
 <label for="sfl" class="sound_only">검색대상</label>
 <select name="sfl" id="sfl">
-    <option value="gr_subject"<?php echo get_selected($_GET['sfl'], "gr_subject"); ?>>제목</option>
-    <option value="gr_id"<?php echo get_selected($_GET['sfl'], "gr_id"); ?>>ID</option>
-    <option value="gr_admin"<?php echo get_selected($_GET['sfl'], "gr_admin"); ?>>그룹관리자</option>
+    <option value="gr_subject"<?php echo get_selected($sfl, "gr_subject"); ?>>제목</option>
+    <option value="gr_id"<?php echo get_selected($sfl, "gr_id"); ?>>ID</option>
+    <option value="gr_admin"<?php echo get_selected($sfl, "gr_admin"); ?>>그룹관리자</option>
 </select>
 <label for="stx" class="sound_only">검색어<strong class="sound_only"> 필수</strong></label>
-<input type="text" name="stx" value="<?php echo $stx ?>" required class="required frm_input">
+<input type="text" name="stx" id="stx" value="<?php echo $stx ?>" required class="required frm_input">
 <input type="submit" value="검색" class="btn_submit">
-</fieldset>
 </form>
 
-<?php if ($is_admin == 'super') { ?>
-<div class="btn_add01 btn_add sort_with">
-    <a href="./boardgroup_form.php" id="bo_gr_add">게시판그룹 추가</a>
-</div>
-<?php } ?>
 
 <form name="fboardgrouplist" id="fboardgrouplist" action="./boardgroup_list_update.php" onsubmit="return fboardgrouplist_submit(this);" method="post">
 <input type="hidden" name="sst" value="<?php echo $sst ?>">
@@ -122,7 +116,7 @@ $colspan = 10;
         $sql2 = " select count(*) as cnt from {$g5['board_table']} where gr_id = '{$row['gr_id']}' ";
         $row2 = sql_fetch($sql2);
 
-        $s_upd = '<a href="./boardgroup_form.php?'.$qstr.'&amp;w=u&amp;gr_id='.$row['gr_id'].'">수정</a>';
+        $s_upd = '<a href="./boardgroup_form.php?'.$qstr.'&amp;w=u&amp;gr_id='.$row['gr_id'].'" class="btn_03 btn">수정</a>';
 
         $bg = 'bg'.($i%2);
     ?>
@@ -130,31 +124,31 @@ $colspan = 10;
     <tr class="<?php echo $bg; ?>">
         <td class="td_chk">
             <input type="hidden" name="group_id[<?php echo $i ?>]" value="<?php echo $row['gr_id'] ?>">
-            <label for="chk_<?php echo $i; ?>" class="sound_only"><?php echo $row['gr_subject'] ?> 그룹</label>
+            <label for="chk_<?php echo $i; ?>" class="sound_only"><?php echo get_text($row['gr_subject']); ?> 그룹</label>
             <input type="checkbox" name="chk[]" value="<?php echo $i ?>" id="chk_<?php echo $i ?>">
         </td>
-        <td class="td_grid"><a href="<?php echo G5_BBS_URL ?>/group.php?gr_id=<?php echo $row['gr_id'] ?>"><?php echo $row['gr_id'] ?></a></td>
+        <td class="td_left"><a href="<?php echo G5_BBS_URL ?>/group.php?gr_id=<?php echo $row['gr_id'] ?>"><?php echo $row['gr_id'] ?></a></td>
         <td class="td_input">
             <label for="gr_subject_<?php echo $i; ?>" class="sound_only">그룹제목</label>
-            <input type="text" name="gr_subject[<?php echo $i ?>]" value="<?php echo get_text($row['gr_subject']) ?>" id="gr_subject_<?php echo $i ?>" class="frm_input">
+            <input type="text" name="gr_subject[<?php echo $i ?>]" value="<?php echo get_text($row['gr_subject']) ?>" id="gr_subject_<?php echo $i ?>" class="tbl_input">
         </td>
         <td class="td_mng td_input">
         <?php if ($is_admin == 'super'){ ?>
             <label for="gr_admin_<?php echo $i; ?>" class="sound_only">그룹관리자</label>
-            <input type="text" name="gr_admin[<?php echo $i ?>]" value="<?php echo $row['gr_admin'] ?>" id="gr_admin_<?php echo $i ?>" class="frm_input" size="10" maxlength="20">
+            <input type="text" name="gr_admin[<?php echo $i ?>]" value="<?php echo get_sanitize_input($row['gr_admin']); ?>" id="gr_admin_<?php echo $i ?>" class="tbl_input" size="10" maxlength="20">
         <?php }else{ ?>
-            <input type="hidden" name="gr_admin[<?php echo $i ?>]" value="<?php echo $row['gr_admin'] ?>"><?php echo $row['gr_admin'] ?>
+            <input type="hidden" name="gr_admin[<?php echo $i ?>]" value="<?php echo get_sanitize_input($row['gr_admin']); ?>"><?php echo get_text($row['gr_admin']); ?>
         <?php } ?>
         </td>
-        <td class="td_numsmall"><a href="./board_list.php?sfl=a.gr_id&amp;stx=<?php echo $row['gr_id'] ?>"><?php echo $row2['cnt'] ?></a></td>
-        <td class="td_chk">
+        <td class="td_num"><a href="./board_list.php?sfl=a.gr_id&amp;stx=<?php echo $row['gr_id'] ?>"><?php echo $row2['cnt'] ?></a></td>
+        <td class="td_numsmall">
              <label for="gr_use_access_<?php echo $i; ?>" class="sound_only">접근회원 사용</label>
             <input type="checkbox" name="gr_use_access[<?php echo $i ?>]" <?php echo $row['gr_use_access']?'checked':'' ?> value="1" id="gr_use_access_<?php echo $i ?>">
         </td>
-        <td class="td_numsmall"><a href="./boardgroupmember_list.php?gr_id=<?php echo $row['gr_id'] ?>"><?php echo $row1['cnt'] ?></a></td>
-        <td class="td_chk">
+        <td class="td_num"><a href="./boardgroupmember_list.php?gr_id=<?php echo $row['gr_id'] ?>"><?php echo $row1['cnt'] ?></a></td>
+        <td class="td_numsmall">
             <label for="gr_order_<?php echo $i; ?>" class="sound_only">메인메뉴 출력순서</label>
-            <input type="text" name="gr_order[<?php echo $i ?>]" value="<?php echo $row['gr_order'] ?>" id="gr_order_<?php echo $i ?>" class="frm_input" size="2">
+            <input type="text" name="gr_order[<?php echo $i ?>]" value="<?php echo $row['gr_order'] ?>" id="gr_order_<?php echo $i ?>" class="tbl_input" size="2">
         </td>
         <td class="td_mng">
             <label for="gr_device_<?php echo $i; ?>" class="sound_only">접속기기</label>
@@ -164,7 +158,7 @@ $colspan = 10;
                 <option value="mobile"<?php echo get_selected($row['gr_device'], 'mobile'); ?>>모바일</option>
             </select>
         </td>
-        <td class="td_mngsmall"><?php echo $s_upd ?></td>
+        <td class="td_mng td_mng_s"><?php echo $s_upd ?></td>
     </tr>
 
     <?php
@@ -175,10 +169,10 @@ $colspan = 10;
     </table>
 </div>
 
-<div class="btn_list01 btn_list">
-    <input type="submit" name="act_button" onclick="document.pressed=this.value" value="선택수정">
-    <input type="submit" name="act_button" onclick="document.pressed=this.value" value="선택삭제">
-    <a href="./boardgroup_form.php">게시판그룹 추가</a>
+<div class="btn_fixed_top">
+    <input type="submit" name="act_button" onclick="document.pressed=this.value" value="선택수정" class="btn btn_02">
+    <input type="submit" name="act_button" onclick="document.pressed=this.value" value="선택삭제" class="btn btn_02">
+    <a href="./boardgroup_form.php" class="btn btn_01">게시판그룹 추가</a>
 </div>
 </form>
 
@@ -213,5 +207,4 @@ function fboardgrouplist_submit(f)
 </script>
 
 <?php
-include_once('./admin.tail.php');
-?>
+include_once('./admin.tail.php');

adm/boardgroup_list_update.php

@@ -6,32 +6,41 @@ include_once('./_common.php');
 
 check_demo();
 
-auth_check($auth[$sub_menu], 'w');
+auth_check_menu($auth, $sub_menu, 'w');
 
 check_admin_token();
 
-$count = count($_POST['chk']);
+$post_chk = isset($_POST['chk']) ? (array) $_POST['chk'] : array();
+$post_group_id = isset($_POST['group_id']) ? (array) $_POST['group_id'] : array();
+$act_button = isset($_POST['act_button']) ? $_POST['act_button'] : '';
+
+$count = count($post_chk);
 
 if(!$count)
-    alert($_POST['act_button'].'할 게시판그룹을 1개이상 선택해 주세요.');
+    alert($act_button.'할 게시판그룹을 1개이상 선택해 주세요.');
 
 for ($i=0; $i<$count; $i++)
 {
-    $k     = $_POST['chk'][$i];
-    $gr_id = $_POST['group_id'][$k];
+    $k     = isset($post_chk[$i]) ? (int) $post_chk[$i] : 0;
+    $gr_id = preg_replace('/[^a-z0-9_]/i', '', $post_group_id[$k]);
+    $gr_subject = isset($_POST['gr_subject'][$k]) ? strip_tags(clean_xss_attributes($_POST['gr_subject'][$k])) : '';
+    $gr_admin = isset($_POST['gr_admin'][$k]) ? strip_tags(clean_xss_attributes($_POST['gr_admin'][$k])) : '';
+    $gr_device = isset($_POST['gr_device'][$k]) ? clean_xss_tags($_POST['gr_device'][$k], 1, 1, 10) : '';
+    $gr_use_access = isset($_POST['gr_use_access'][$k]) ? (int) $_POST['gr_use_access'][$k] : 0;
+    $gr_order = isset($_POST['gr_order'][$k]) ? (int) $_POST['gr_order'][$k] : 0;
 
-    if($_POST['act_button'] == '선택수정') {
+    if($act_button == '선택수정') {
         $sql = " update {$g5['group_table']}
-                    set gr_subject    = '{$_POST['gr_subject'][$k]}',
-                        gr_device     = '{$_POST['gr_device'][$k]}',
-                        gr_admin      = '{$_POST['gr_admin'][$k]}',
-                        gr_use_access = '{$_POST['gr_use_access'][$k]}',
-                        gr_order      = '{$_POST['gr_order'][$k]}'
+                    set gr_subject    = '{$gr_subject}',
+                        gr_device     = '".sql_real_escape_string($gr_device)."',
+                        gr_admin      = '".sql_real_escape_string($gr_admin)."',
+                        gr_use_access = '".$gr_use_access."',
+                        gr_order      = '".$gr_order."'
                   where gr_id         = '{$gr_id}' ";
         if ($is_admin != 'super')
-            $sql .= " and gr_admin    = '{$_POST['gr_admin'][$k]}' ";
+            $sql .= " and gr_admin    = '{$gr_admin}' ";
         sql_query($sql);
-    } else if($_POST['act_button'] == '선택삭제') {
+    } else if($act_button == '선택삭제') {
         $row = sql_fetch(" select count(*) as cnt from {$g5['board_table']} where gr_id = '$gr_id' ");
         if ($row['cnt'])
             alert("이 그룹에 속한 게시판이 존재하여 게시판 그룹을 삭제할 수 없습니다.\\n\\n이 그룹에 속한 게시판을 먼저 삭제하여 주십시오.", './board_list.php?sfl=gr_id&amp;stx='.$gr_id);
@@ -44,5 +53,6 @@ for ($i=0; $i<$count; $i++)
     }
 }
 
-goto_url('./boardgroup_list.php?'.$qstr);
-?>
+run_event('admin_boardgroup_list_update', $act_button, $chk, $post_group_id, $qstr);
+
+goto_url('./boardgroup_list.php?'.$qstr);

adm/boardgroupmember_form.php

@@ -2,10 +2,12 @@
 $sub_menu = "300200";
 include_once('./_common.php');
 
-auth_check($auth[$sub_menu], 'w');
+auth_check_menu($auth, $sub_menu, 'w');
 
 $mb = get_member($mb_id);
-if (!$mb['mb_id'])
+$token = isset($token) ? $token : '';
+
+if (! (isset($mb['mb_id']) && $mb['mb_id']))
     alert('존재하지 않는 회원입니다.');
 
 $g5['title'] = '접근가능그룹';
@@ -17,8 +19,13 @@ $colspan = 4;
 <form name="fboardgroupmember_form" id="fboardgroupmember_form" action="./boardgroupmember_update.php" onsubmit="return boardgroupmember_form_check(this)" method="post">
 <input type="hidden" name="mb_id" value="<?php echo $mb['mb_id'] ?>" id="mb_id">
 <input type="hidden" name="token" value="" id="token">
+<div class="local_ov01 local_ov">
+    <span class="btn_ov01"><span class="ov_txt"> 아이디</span><span class="ov_num"><?php echo $mb['mb_id'] ?></span></span>
+    <span class="btn_ov01"><span class="ov_txt"> 이름</span><span class="ov_num"><?php echo get_text($mb['mb_name']); ?></span></span>
+    <span class="btn_ov01"><span class="ov_txt"> 닉네임</span><span class="ov_num"><?php echo $mb['mb_nick'] ?></span></span>
+</div>    
 <div class="local_cmd01 local_cmd">
-    <p>아이디 <b><?php echo $mb['mb_id'] ?></b>, 이름 <b><?php echo get_text($mb['mb_name']); ?></b>, 닉네임 <b><?php echo $mb['mb_nick'] ?></b></p>
+
     <label for="gr_id">그룹지정</label>
     <select name="gr_id" id="gr_id">
         <option value="">접근가능 그룹을 선택하세요.</option>
@@ -36,7 +43,7 @@ $colspan = 4;
         }
         ?>
     </select>
-    <input type="submit" value="선택" class="btn_submit" accesskey="s">
+    <input type="submit" value="선택" class="btn_submit btn" accesskey="s">
 </div>
 </form>
 
@@ -46,7 +53,7 @@ $colspan = 4;
 <input type="hidden" name="sfl" value="<?php echo $sfl ?>" id="sfl">
 <input type="hidden" name="stx" value="<?php echo $stx ?>" id="stx">
 <input type="hidden" name="page" value="<?php echo $page ?>" id="page">
-<input type="hidden" name="token" value="<?php echo $token ?>" id="token">
+<input type="hidden" name="token" value="<?php echo get_sanitize_input($token); ?>" id="token">
 <input type="hidden" name="mb_id" value="<?php echo $mb['mb_id'] ?>" id="mb_id">
 <input type="hidden" name="w" value="d" id="w">
 
@@ -96,7 +103,7 @@ $colspan = 4;
 </div>
 
 <div class="btn_list01 btn_list">
-    <input type="submit" name="" value="선택삭제">
+    <input type="submit" name="" value="선택삭제" class="btn btn_02">
 </div>
 </form>
 
@@ -123,5 +130,4 @@ function boardgroupmember_form_check(f)
 </script>
 
 <?php
-include_once('./admin.tail.php');
-?>
+include_once('./admin.tail.php');

adm/boardgroupmember_list.php

@@ -2,7 +2,7 @@
 $sub_menu = "300200";
 include_once('./_common.php');
 
-auth_check($auth[$sub_menu], 'r');
+auth_check_menu($auth, $sub_menu, 'r');
 
 $gr = get_group($gr_id);
 if (!$gr['gr_id']) {
@@ -59,7 +59,7 @@ $colspan = 7;
 <input type="hidden" name="gr_id" value="<?php echo $gr_id ?>">
 <label for="sfl" class="sound_only">검색대상</label>
 <select name="sfl" id="sfl">
-    <option value="a.mb_id"<?php echo get_selected($_GET['sfl'], "a.mb_id") ?>>회원아이디</option>
+    <option value="a.mb_id"<?php echo get_selected($sfl, "a.mb_id") ?>>회원아이디</option>
 </select>
 <label for="stx" class="sound_only">검색어<strong class="sound_only"> 필수</strong></label>
 <input type="text" name="stx" value="<?php echo $stx ?>" id="stx" required class="required frm_input">
@@ -152,5 +152,4 @@ function fboardgroupmember_submit(f)
 </script>
 
 <?php
-include_once('./admin.tail.php');
-?>
+include_once('./admin.tail.php');

adm/boardgroupmember_update.php

@@ -6,7 +6,7 @@ sql_query(" ALTER TABLE {$g5['group_member_table']} CHANGE `gm_id` `gm_id` INT(
 
 if ($w == '')
 {
-    auth_check($auth[$sub_menu], 'w');
+    auth_check_menu($auth, $sub_menu, 'w');
 
     $mb = get_member($mb_id);
     if (!$mb['mb_id']) {
@@ -39,7 +39,7 @@ if ($w == '')
 }
 else if ($w == 'd' || $w == 'ld')
 {
-    auth_check($auth[$sub_menu], 'd');
+    auth_check_menu($auth, $sub_menu, 'd');
 
     $count = count($_POST['chk']);
     if(!$count)
@@ -48,7 +48,7 @@ else if ($w == 'd' || $w == 'ld')
     check_admin_token();
 
     for($i=0; $i<$count; $i++) {
-        $gm_id = $_POST['chk'][$i];
+        $gm_id = (int) $_POST['chk'][$i];
         $sql = " select * from {$g5['group_member_table']} where gm_id = '$gm_id' ";
         $gm = sql_fetch($sql);
         if (!$gm['gm_id']) {
@@ -66,5 +66,4 @@ else if ($w == 'd' || $w == 'ld')
 if ($w == 'ld')
     goto_url('./boardgroupmember_list.php?gr_id='.$gr_id);
 else
-    goto_url('./boardgroupmember_form.php?mb_id='.$mb_id);
-?>
+    goto_url('./boardgroupmember_form.php?mb_id='.$mb_id);

adm/browscap.php

@@ -3,7 +3,7 @@ $sub_menu = "100510";
 include_once('./_common.php');
 
 if(!(version_compare(phpversion(), '5.3.0', '>=') && defined('G5_BROWSCAP_USE') && G5_BROWSCAP_USE))
-    alert('사용할 수 없는 기능입니다.', G5_ADMIN_URL);
+    alert('사용할 수 없는 기능입니다.', correct_goto_url(G5_ADMIN_URL));
 
 if ($is_admin != 'super')
     alert('최고관리자만 접근 가능합니다.');
@@ -41,5 +41,4 @@ $(function() {
 </script>
 
 <?php
-include_once('./admin.tail.php');
-?>
+include_once('./admin.tail.php');

adm/browscap_convert.php

@@ -3,12 +3,12 @@ $sub_menu = "100520";
 include_once('./_common.php');
 
 if(!(version_compare(phpversion(), '5.3.0', '>=') && defined('G5_BROWSCAP_USE') && G5_BROWSCAP_USE))
-    alert('사용할 수 없는 기능입니다.', G5_ADMIN_URL);
+    alert('사용할 수 없는 기능입니다.', correct_goto_url(G5_ADMIN_URL));
 
 if ($is_admin != 'super')
     alert('최고관리자만 접근 가능합니다.');
 
-$rows = preg_replace('#[^0-9]#', '', $_GET['rows']);
+$rows = isset($_GET['rows']) ? preg_replace('#[^0-9]#', '', $_GET['rows']) : 0;
 if(!$rows)
     $rows = 100;
 
@@ -42,5 +42,4 @@ $(function() {
 </script>
 
 <?php
-include_once('./admin.tail.php');
-?>
+include_once('./admin.tail.php');

adm/browscap_converter.php

@@ -71,5 +71,4 @@ for($i=0; $row=sql_fetch_array($result); $i++) {
 if(($total_count - $cnt) == 0 || $total_count == 0)
     echo '<div class="check_processing"></div><p>변환완료</p>';
 else
-    echo '<p>총 '.number_format($total_count).'건 중 '.number_format($cnt).'건 변환완료<br><br>접속로그를 추가로 변환하시려면 아래 업데이트 버튼을 클릭해 주세요.</p><button type="button" id="run_update">업데이트</button>';
-?>
+    echo '<p>총 '.number_format($total_count).'건 중 '.number_format($cnt).'건 변환완료<br><br>접속로그를 추가로 변환하시려면 아래 업데이트 버튼을 클릭해 주세요.</p><button type="button" id="run_update">업데이트</button>';

adm/browscap_update.php

@@ -20,5 +20,4 @@ $browscap->updateMethod = 'cURL';
 $browscap->cacheFilename = 'browscap_cache.php';
 $browscap->updateCache();
 
-die('');
-?>
+die('');

adm/cache_file_delete.php

@@ -5,6 +5,13 @@ include_once('./_common.php');
 if ($is_admin != 'super')
     alert('최고관리자만 접근 가능합니다.', G5_URL);
 
+@include_once('./safe_check.php');
+if(function_exists('social_log_file_delete')){
+    social_log_file_delete();
+}
+
+run_event('adm_cache_file_delete_before');
+
 $g5['title'] = '캐시파일 일괄삭제';
 include_once('./admin.head.php');
 ?>
@@ -23,9 +30,12 @@ if (!$dir=@opendir(G5_DATA_PATH.'/cache')) {
 }
 
 $cnt=0;
-echo '<ul>'.PHP_EOL;
+echo '<ul class="session_del">'.PHP_EOL;
 
 $files = glob(G5_DATA_PATH.'/cache/latest-*');
+$content_files = glob(G5_DATA_PATH.'/cache/content-*');
+
+$files = array_merge($files, $content_files);
 if (is_array($files)) {
     foreach ($files as $cache_file) {
         $cnt++;
@@ -39,10 +49,11 @@ if (is_array($files)) {
     }
 }
 
+run_event('adm_cache_file_delete');
+
 echo '<li>완료됨</li></ul>'.PHP_EOL;
 echo '<div class="local_desc01 local_desc"><p><strong>최신글 캐시파일 '.$cnt.'건 삭제 완료됐습니다.</strong><br>프로그램의 실행을 끝마치셔도 좋습니다.</p></div>'.PHP_EOL;
 ?>
 
 <?php
-include_once('./admin.tail.php');
-?>
+include_once('./admin.tail.php');

adm/captcha_file_delete.php

@@ -23,7 +23,7 @@ if (!$dir=@opendir(G5_DATA_PATH.'/cache')) {
 }
 
 $cnt=0;
-echo '<ul>'.PHP_EOL;
+echo '<ul class="session_del">'.PHP_EOL;
 
 $files = glob(G5_DATA_PATH.'/cache/?captcha-*');
 if (is_array($files)) {
@@ -49,5 +49,4 @@ echo '<div class="local_desc01 local_desc"><p><strong>캡챠파일 '.$cnt.'건
 ?>
 
 <?php
-include_once('./admin.tail.php');
-?>
+include_once('./admin.tail.php');

adm/config_form.php

@@ -2,7 +2,7 @@
 $sub_menu = "100100";
 include_once('./_common.php');
 
-auth_check($auth[$sub_menu], 'r');
+auth_check_menu($auth, $sub_menu, 'r');
 
 if ($is_admin != 'super')
     alert('최고관리자만 접근 가능합니다.');
@@ -192,6 +192,92 @@ if(!sql_query(" select vi_browser from {$g5['visit_table']} limit 1 ")) {
                     ADD `vi_device` varchar(255) NOT NULL DEFAULT '' AFTER `vi_os` ", true);
 }
 
+//소셜 로그인 관련 필드 및 구글 리챕챠 필드 추가
+if(!isset($config['cf_social_login_use'])) {
+    sql_query("ALTER TABLE `{$g5['config_table']}`
+                ADD `cf_social_login_use` tinyint(4) NOT NULL DEFAULT '0' AFTER `cf_googl_shorturl_apikey`,
+                ADD `cf_google_clientid` varchar(100) NOT NULL DEFAULT '' AFTER `cf_twitter_secret`,
+                ADD `cf_google_secret` varchar(100) NOT NULL DEFAULT '' AFTER `cf_google_clientid`,
+                ADD `cf_naver_clientid` varchar(100) NOT NULL DEFAULT '' AFTER `cf_google_secret`,
+                ADD `cf_naver_secret` varchar(100) NOT NULL DEFAULT '' AFTER `cf_naver_clientid`,
+                ADD `cf_kakao_rest_key` varchar(100) NOT NULL DEFAULT '' AFTER `cf_naver_secret`,
+                ADD `cf_social_servicelist` varchar(255) NOT NULL DEFAULT '' AFTER `cf_social_login_use`,
+                ADD `cf_payco_clientid` varchar(100) NOT NULL DEFAULT '' AFTER `cf_social_servicelist`,
+                ADD `cf_payco_secret` varchar(100) NOT NULL DEFAULT '' AFTER `cf_payco_clientid`,
+                ADD `cf_captcha` varchar(100) NOT NULL DEFAULT '' AFTER `cf_kakao_js_apikey`,
+                ADD `cf_recaptcha_site_key` varchar(100) NOT NULL DEFAULT '' AFTER `cf_captcha`,
+                ADD `cf_recaptcha_secret_key` varchar(100) NOT NULL DEFAULT '' AFTER `cf_recaptcha_site_key`
+    ", true);
+}
+
+//소셜 로그인 관련 필드 카카오 클라이언트 시크릿 추가
+if(!isset($config['cf_kakao_client_secret'])) {
+    sql_query("ALTER TABLE `{$g5['config_table']}`
+                ADD `cf_kakao_client_secret` varchar(100) NOT NULL DEFAULT '' AFTER `cf_kakao_rest_key`
+    ", true);
+}
+
+// 회원 이미지 관련 필드 추가
+if(!isset($config['cf_member_img_size'])) {
+    sql_query("ALTER TABLE `{$g5['config_table']}`
+                ADD `cf_member_img_size` int(11) NOT NULL DEFAULT '0' AFTER `cf_member_icon_height`,
+                ADD `cf_member_img_width` int(11) NOT NULL DEFAULT '0' AFTER `cf_member_img_size`,
+                ADD `cf_member_img_height` int(11) NOT NULL DEFAULT '0' AFTER `cf_member_img_width`
+    ", true);
+
+    $sql = " update {$g5['config_table']} set cf_member_img_size = 50000, cf_member_img_width = 60, cf_member_img_height = 60 ";
+    sql_query($sql, false);
+
+    $config['cf_member_img_size'] = 50000;
+    $config['cf_member_img_width'] = 60;
+    $config['cf_member_img_height'] = 60;
+}
+
+// 소셜 로그인 관리 테이블 없을 경우 생성
+if(!sql_query(" DESC {$g5['social_profile_table']} ", false)) {
+    sql_query(" CREATE TABLE IF NOT EXISTS `{$g5['social_profile_table']}` (
+                  `mp_no` int(11) NOT NULL AUTO_INCREMENT,
+                  `mb_id` varchar(255) NOT NULL DEFAULT '',
+                  `provider` varchar(50) NOT NULL DEFAULT '',
+                  `object_sha` varchar(45) NOT NULL DEFAULT '',
+                  `identifier` varchar(255) NOT NULL DEFAULT '',
+                  `profileurl` varchar(255) NOT NULL DEFAULT '',
+                  `photourl` varchar(255) NOT NULL DEFAULT '',
+                  `displayname` varchar(150) NOT NULL DEFAULT '',
+                  `description` varchar(255) NOT NULL DEFAULT '',
+                  `mp_register_day` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+                  `mp_latest_day` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+                  UNIQUE KEY `mp_no` (`mp_no`),
+                  KEY `mb_id` (`mb_id`),
+                  KEY `provider` (`provider`)
+                ) ", true);
+}
+
+// 짧은 URL 주소를 사용 여부 필드 추가
+if (!isset($config['cf_bbs_rewrite'])) {
+    sql_query(" ALTER TABLE `{$g5['config_table']}`
+                    ADD `cf_bbs_rewrite` tinyint(4) NOT NULL DEFAULT '0' AFTER `cf_link_target` ", true);
+}
+
+// 읽지 않은 메모 수 칼럼 추가
+if(!isset($member['mb_memo_cnt'])) {
+    sql_query(" ALTER TABLE `{$g5['member_table']}`
+                ADD `mb_memo_cnt` int(11) NOT NULL DEFAULT '0' AFTER `mb_memo_call`", true);
+}
+
+// 스크랩 읽은 수 추가
+if(!isset($member['mb_scrap_cnt'])) {
+    sql_query(" ALTER TABLE `{$g5['member_table']}`
+                ADD `mb_scrap_cnt` int(11) NOT NULL DEFAULT '0' AFTER `mb_memo_cnt`", true);
+}
+
+// 아이코드 토큰키 추가
+if( ! isset($config['cf_icode_token_key']) ){
+    $sql = "ALTER TABLE `{$g5['config_table']}` 
+            ADD COLUMN `cf_icode_token_key` VARCHAR(100) NOT NULL DEFAULT '' AFTER `cf_icode_server_port`; ";
+    sql_query($sql, false);
+}
+
 if(!$config['cf_faq_skin']) $config['cf_faq_skin'] = "basic";
 if(!$config['cf_mobile_faq_skin']) $config['cf_mobile_faq_skin'] = "basic";
 
@@ -203,6 +289,7 @@ $pg_anchor = '<ul class="anchor">
     <li><a href="#anc_cf_board">게시판기본</a></li>
     <li><a href="#anc_cf_join">회원가입</a></li>
     <li><a href="#anc_cf_cert">본인확인</a></li>
+    <li><a href="#anc_cf_url">짧은주소</a></li>
     <li><a href="#anc_cf_mail">기본메일환경</a></li>
     <li><a href="#anc_cf_article_mail">글작성메일</a></li>
     <li><a href="#anc_cf_join_mail">가입메일</a></li>
@@ -213,14 +300,11 @@ $pg_anchor = '<ul class="anchor">
     <li><a href="#anc_cf_extra">여분필드</a></li>
 </ul>';
 
-$frm_submit = '<div class="btn_confirm01 btn_confirm">
-    <input type="submit" value="확인" class="btn_submit" accesskey="s">
-    <a href="'.G5_URL.'/">메인으로</a>
-</div>';
 
 if (!$config['cf_icode_server_ip'])   $config['cf_icode_server_ip'] = '211.172.232.124';
 if (!$config['cf_icode_server_port']) $config['cf_icode_server_port'] = '7295';
 
+$userinfo = array('payment'=>'');
 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']);
 }
@@ -245,7 +329,7 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
         <tbody>
         <tr>
             <th scope="row"><label for="cf_title">홈페이지 제목<strong class="sound_only">필수</strong></label></th>
-            <td colspan="3"><input type="text" name="cf_title" value="<?php echo $config['cf_title'] ?>" id="cf_title" required class="required frm_input" size="40"></td>
+            <td colspan="3"><input type="text" name="cf_title" value="<?php echo get_sanitize_input($config['cf_title']); ?>" id="cf_title" required class="required frm_input" size="40"></td>
         </tr>
         <tr>
             <th scope="row"><label for="cf_admin">최고관리자<strong class="sound_only">필수</strong></label></th>
@@ -403,12 +487,23 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
             </td>
         </tr>
         <tr>
+            <th scope="row"><label for="cf_captcha">캡챠 선택<strong class="sound_only">필수</strong></label></th>
+            <td colspan="3">
+                <?php echo help('사용할 캡챠를 선택합니다.<br>1) Kcaptcha 는 그누보드5의 기본캡챠입니다. ( 문자입력 )<br>2) reCAPTCHA V2 는 구글에서 서비스하는 원클릭 형식의 간편한 캡챠입니다. ( 모바일 친화적 UI )<br>3) Invisible reCAPTCHA 는 구글에서 서비스하는 안보이는 형식의 캡챠입니다. ( 간혹 퀴즈를 풀어야 합니다. )<br>') ?>
+                <select name="cf_captcha" id="cf_captcha" required class="required">
+                <option value="kcaptcha" <?php echo get_selected($config['cf_captcha'], 'kcaptcha') ; ?>>Kcaptcha</option>
+                <option value="recaptcha" <?php echo get_selected($config['cf_captcha'], 'recaptcha') ; ?>>reCAPTCHA V2</option>
+                <option value="recaptcha_inv" <?php echo get_selected($config['cf_captcha'], 'recaptcha_inv') ; ?>>Invisible reCAPTCHA</option>
+                </select>
+            </td>
+        </tr>
+        <tr class="kcaptcha_mp3">
             <th scope="row"><label for="cf_captcha_mp3">음성캡챠 선택<strong class="sound_only">필수</strong></label></th>
             <td colspan="3">
-                <?php echo help(G5_CAPTCHA_URL.'/mp3 밑의 음성 폴더를 선택합니다.') ?>
+                <?php echo help('kcaptcha 사용시 '.str_replace(array('recaptcha_inv', 'recaptcha'), 'kcaptcha', G5_CAPTCHA_URL).'/mp3 밑의 음성 폴더를 선택합니다.') ?>
                 <select name="cf_captcha_mp3" id="cf_captcha_mp3" required class="required">
                 <?php
-                $arr = get_skin_dir('mp3', G5_CAPTCHA_PATH);
+                $arr = get_skin_dir('mp3', str_replace(array('recaptcha_inv', 'recaptcha'), 'kcaptcha', G5_CAPTCHA_PATH));
                 for ($i=0; $i<count($arr); $i++) {
                     if ($i == 0) echo "<option value=\"\">선택</option>";
                     echo "<option value=\"".$arr[$i]."\"".get_selected($config['cf_captcha_mp3'], $arr[$i]).">".$arr[$i]."</option>\n";
@@ -417,6 +512,19 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
                 </select>
             </td>
         </tr>
+		<tr>
+			<th scope="row"><label for="cf_recaptcha_site_key">구글 reCAPTCHA Site key</label></th>
+			<td colspan="3">
+            <?php echo help('reCAPTCHA V2와 Invisible reCAPTCHA 캡챠의 sitekey 와 secret 키는 동일하지 않고, 서로 발급받는 키가 다릅니다.') ?>
+            <input type="text" name="cf_recaptcha_site_key" value="<?php echo $config['cf_recaptcha_site_key']; ?>" id="cf_recaptcha_site_key" class="frm_input" size="52"> <a href="https://www.google.com/recaptcha/admin" target="_blank" class="btn_frmline">reCAPTCHA 등록하기</a>
+            </td>
+		</tr>
+		<tr>
+            <th scope="row"><label for="cf_recaptcha_secret_key">구글 reCAPTCHA Secret key</label></th>
+            <td colspan="3">
+                <input type="text" name="cf_recaptcha_secret_key" value="<?php echo $config['cf_recaptcha_secret_key']; ?>" id="cf_recaptcha_secret_key" class="frm_input" size="52">
+            </td>
+		</tr>
         <tr>
             <th scope="row"><label for="cf_use_copy_log">복사, 이동시 로그</label></th>
             <td colspan="3">
@@ -462,22 +570,21 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
             <td colspan="3">
                 <?php if (!function_exists('curl_init')) echo help('<b>경고) curl이 지원되지 않아 네이버 신디케이션을 사용할수 없습니다.</b>'); ?>
                 <?php echo help('네이버 신디케이션 연동키(token)을 입력하면 네이버 신디케이션을 사용할 수 있습니다.<br>연동키는 <a href="http://webmastertool.naver.com/" target="_blank"><u>네이버 웹마스터도구</u></a> -> 네이버 신디케이션에서 발급할 수 있습니다.') ?>
-                <input type="text" name="cf_syndi_token" value="<?php echo $config['cf_syndi_token'] ?>" id="cf_syndi_token" class="frm_input" size="70">
+                <input type="text" name="cf_syndi_token" value="<?php echo isset($config['cf_syndi_token']) ? get_sanitize_input($config['cf_syndi_token']) : ''; ?>" id="cf_syndi_token" class="frm_input" size="70">
             </td>
         </tr>
         <tr>
             <th scope="row"><label for="cf_syndi_except">네이버 신디케이션 제외게시판</label></th>
             <td colspan="3">
                 <?php echo help('네이버 신디케이션 수집에서 제외할 게시판 아이디를 | 로 구분하여 입력하십시오. 예) notice|adult<br>참고로 그룹접근사용 게시판, 글읽기 권한 2 이상 게시판, 비밀글은 신디케이션 수집에서 제외됩니다.') ?>
-                <input type="text" name="cf_syndi_except" value="<?php echo $config['cf_syndi_except'] ?>" id="cf_syndi_except" class="frm_input" size="70">
+                <input type="text" name="cf_syndi_except" value="<?php echo isset($config['cf_syndi_except']) ? get_sanitize_input($config['cf_syndi_except']) : ''; ?>" id="cf_syndi_except" class="frm_input" size="70">
             </td>
         </tr>
         </tbody>
         </table>
     </div>
 </section>
-
-<?php echo preg_replace('#</div>$#i', '<button type="button" class="get_theme_confc" data-type="conf_skin">테마 스킨설정 가져오기</button></div>', $frm_submit); ?>
+<button type="button" class="get_theme_confc btn_02 btn" data-type="conf_skin" >테마 스킨설정 가져오기</button>
 
 <section id="anc_cf_board">
     <h2 class="h2_frm">게시판 기본 설정</h2>
@@ -559,8 +666,6 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
     </div>
 </section>
 
-<?php echo $frm_submit; ?>
-
 <section id="anc_cf_join">
     <h2 class="h2_frm">회원가입 설정</h2>
     <?php echo $pg_anchor ?>
@@ -644,7 +749,7 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
                     <option value="2"<?php echo get_selected($config['cf_use_member_icon'], '2') ?>>아이콘+이름 표시
                 </select>
             </td>
-            <th scope="row"><label for="cf_icon_level">아이콘 업로드 권한</label></th>
+            <th scope="row"><label for="cf_icon_level">회원 아이콘, 이미지 업로드 권한</label></th>
             <td><?php echo get_member_level_select('cf_icon_level', 1, 9, $config['cf_icon_level']) ?> 이상</td>
         </tr>
         <tr>
@@ -659,6 +764,18 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
                 픽셀 이하
             </td>
         </tr>
+        <tr>
+            <th scope="row"><label for="cf_member_img_size">회원이미지 용량</label></th>
+            <td><input type="text" name="cf_member_img_size" value="<?php echo $config['cf_member_img_size'] ?>" id="cf_member_img_size" class="frm_input" size="10"> 바이트 이하</td>
+            <th scope="row">회원이미지 사이즈</th>
+            <td>
+                <label for="cf_member_img_width">가로</label>
+                <input type="text" name="cf_member_img_width" value="<?php echo $config['cf_member_img_width'] ?>" id="cf_member_img_width" class="frm_input" size="2">
+                <label for="cf_member_img_height">세로</label>
+                <input type="text" name="cf_member_img_height" value="<?php echo $config['cf_member_img_height'] ?>" id="cf_member_img_height" class="frm_input" size="2">
+                픽셀 이하
+            </td>
+        </tr>
         <tr>
             <th scope="row"><label for="cf_use_recommend">추천인제도 사용</label></th>
             <td><input type="checkbox" name="cf_use_recommend" value="1" id="cf_use_recommend" <?php echo $config['cf_use_recommend']?'checked':''; ?>> 사용</td>
@@ -688,9 +805,9 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
         </tbody>
         </table>
     </div>
+    <button type="button" class="get_theme_confc btn btn_02" data-type="conf_member">테마 회원스킨설정 가져오기</button>
 </section>
 
-<?php echo preg_replace('#</div>$#i', '<button type="button" class="get_theme_confc" data-type="conf_member">테마 회원스킨설정 가져오기</button></div>', $frm_submit); ?>
 
 <section id="anc_cf_cert">
     <h2 class="h2_frm">본인확인 설정</h2>
@@ -791,7 +908,9 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
     </div>
 </section>
 
-<?php echo $frm_submit; ?>
+<?php
+include_once('_rewrite_config_form.php');
+?>
 
 <section id="anc_cf_mail">
     <h2 class="h2_frm">기본 메일 환경 설정</h2>
@@ -815,7 +934,8 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
         <tr>
             <th scope="row"><label for="cf_use_email_certify">메일인증 사용</label></th>
             <td>
-                <?php echo help('메일에 배달된 인증 주소를 클릭하여야 회원으로 인정합니다.'); ?>
+                <?php $tmp = !(defined('G5_SOCIAL_CERTIFY_MAIL') && G5_SOCIAL_CERTIFY_MAIL) ? '<br>( SNS를 이용한 소셜로그인 한 회원은 회원메일인증을 하지 않습니다. 일반회원에게만 해당됩니다. )' : ''; ?>
+                <?php echo help('메일에 배달된 인증 주소를 클릭하여야 회원으로 인정합니다.'.$tmp); ?>
                 <input type="checkbox" name="cf_use_email_certify" value="1" id="cf_use_email_certify" <?php echo $config['cf_use_email_certify']?'checked':''; ?>> 사용
             </td>
         </tr>
@@ -830,7 +950,6 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
     </div>
 </section>
 
-<?php echo $frm_submit; ?>
 
 <section id="anc_cf_article_mail">
     <h2 class="h2_frm">게시판 글 작성 시 메일 설정</h2>
@@ -884,7 +1003,6 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
     </div>
 </section>
 
-<?php echo $frm_submit; ?>
 
 <section id="anc_cf_join_mail">
     <h2 class="h2_frm">회원가입 시 메일 설정</h2>
@@ -917,7 +1035,6 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
     </div>
 </section>
 
-<?php echo $frm_submit; ?>
 
 <section id="anc_cf_vote_mail">
     <h2 class="h2_frm">투표 기타의견 작성 시 메일 설정</h2>
@@ -943,7 +1060,6 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
     </div>
 </section>
 
-<?php echo $frm_submit; ?>
 
 <section id="anc_cf_sns">
     <h2 class="h2_frm">소셜네트워크서비스(SNS : Social Network Service)</h2>
@@ -959,34 +1075,136 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
             <col>
         </colgroup>
         <tbody>
+        <tr>
+            <th scope="row"><label for="cf_social_login_use">소셜로그인설정</label></th>
+            <td colspan="3">
+                <?php echo help('소셜로그인을 사용합니다. <a href="https://sir.kr/manual/g5/276" class="btn btn_03" target="_blank" style="margin-left:10px" >설정 관련 메뉴얼 보기</a> ') ?>
+                <input type="checkbox" name="cf_social_login_use" value="1" id="cf_social_login_use" <?php echo (!empty($config['cf_social_login_use']))?'checked':''; ?>> 사용
+            </td>
+        </tr>
+        <tr>
+            <th scope="row"><label for="cf_social_servicelist">소셜로그인설정</label></th>
+            <td colspan="3" class="social_config_explain">
+                <div class="explain_box">
+                    <input type="checkbox" name="cf_social_servicelist[]" id="check_social_naver" value="naver" <?php echo option_array_checked('naver', $config['cf_social_servicelist']); ?> >
+                    <label for="check_social_naver">네이버 로그인을 사용합니다</label>
+                    <div>
+                    <h3>네이버 CallbackURL</h3>
+                    <p><?php echo get_social_callbackurl('naver'); ?></p>
+                    </div>
+                </div>
+                <div class="explain_box">
+                    <input type="checkbox" name="cf_social_servicelist[]" id="check_social_kakao" value="kakao" <?php echo option_array_checked('kakao', $config['cf_social_servicelist']); ?> >
+                    <label for="check_social_kakao">카카오 로그인을 사용합니다</label>
+                    <div>
+                    <h3>카카오 로그인 Redirect URI</h3>
+                    <p><?php echo get_social_callbackurl('kakao', true); ?></p>
+                    </div>
+                </div>
+                <div class="explain_box">
+                    <input type="checkbox" name="cf_social_servicelist[]" id="check_social_facebook" value="facebook" <?php echo option_array_checked('facebook', $config['cf_social_servicelist']); ?> >
+                    <label for="check_social_facebook">페이스북 로그인을 사용합니다</label>
+                    <div>
+                    <h3>페이스북 유효한 OAuth 리디렉션 URI</h3>
+                    <p><?php echo get_social_callbackurl('facebook'); ?></p>
+                    </div>
+                </div>
+                <div class="explain_box">
+                    <input type="checkbox" name="cf_social_servicelist[]" id="check_social_google" value="google" <?php echo option_array_checked('google', $config['cf_social_servicelist']); ?> >
+                    <label for="check_social_google">구글 로그인을 사용합니다</label>
+                    <div>
+                    <h3>구글 승인된 리디렉션 URI</h3>
+                    <p><?php echo get_social_callbackurl('google'); ?></p>
+                    </div>
+                </div>
+                <div class="explain_box">
+                    <input type="checkbox" name="cf_social_servicelist[]" id="check_social_twitter" value="twitter" <?php echo option_array_checked('twitter', $config['cf_social_servicelist']); ?> >
+                    <label for="check_social_twitter">트위터 로그인을 사용합니다</label>
+                    <div>
+                    <h3>트위터 CallbackURL</h3>
+                    <p><?php echo get_social_callbackurl('twitter'); ?></p>
+                    </div>
+                </div>
+                <div class="explain_box">
+                    <input type="checkbox" name="cf_social_servicelist[]" id="check_social_payco" value="payco" <?php echo option_array_checked('payco', $config['cf_social_servicelist']); ?> >
+                    <label for="check_social_payco">페이코 로그인을 사용합니다</label>
+                    <div>
+                    <h3>페이코 CallbackURL</h3>
+                    <p><?php echo get_social_callbackurl('payco', false, true); ?></p>
+                    </div>
+                </div>
+            </td>
+        </tr>
+        <tr>
+            <th scope="row"><label for="cf_naver_clientid">네이버 Client ID</label></th>
+            <td>
+                <input type="text" name="cf_naver_clientid" value="<?php echo $config['cf_naver_clientid'] ?>" id="cf_naver_clientid" class="frm_input" size="40"> <a href="https://developers.naver.com/apps/#/register" target="_blank" class="btn_frmline">앱 등록하기</a>
+            </td>
+            <th scope="row"><label for="cf_naver_secret">네이버 Client Secret</label></th>
+            <td>
+                <input type="text" name="cf_naver_secret" value="<?php echo $config['cf_naver_secret'] ?>" id="cf_naver_secret" class="frm_input" size="45">
+            </td>
+        </tr>
         <tr>
             <th scope="row"><label for="cf_facebook_appid">페이스북 앱 ID</label></th>
             <td>
-                <input type="text" name="cf_facebook_appid" value="<?php echo $config['cf_facebook_appid'] ?>" id="cf_facebook_appid" class="frm_input"> <a href="https://developers.facebook.com/apps" target="_blank" class="btn_frmline">앱 등록하기</a>
+                <input type="text" name="cf_facebook_appid" value="<?php echo $config['cf_facebook_appid'] ?>" id="cf_facebook_appid" class="frm_input" size="40"> <a href="https://developers.facebook.com/apps" target="_blank" class="btn_frmline">앱 등록하기</a>
             </td>
             <th scope="row"><label for="cf_facebook_secret">페이스북 앱 Secret</label></th>
             <td>
-                <input type="text" name="cf_facebook_secret" value="<?php echo $config['cf_facebook_secret'] ?>" id="cf_facebook_secret" class="frm_input" size="35">
+                <input type="text" name="cf_facebook_secret" value="<?php echo $config['cf_facebook_secret'] ?>" id="cf_facebook_secret" class="frm_input" size="45">
             </td>
         </tr>
         <tr>
             <th scope="row"><label for="cf_twitter_key">트위터 컨슈머 Key</label></th>
             <td>
-                <input type="text" name="cf_twitter_key" value="<?php echo $config['cf_twitter_key'] ?>" id="cf_twitter_key" class="frm_input"> <a href="https://dev.twitter.com/apps" target="_blank" class="btn_frmline">앱 등록하기</a>
+                <input type="text" name="cf_twitter_key" value="<?php echo $config['cf_twitter_key'] ?>" id="cf_twitter_key" class="frm_input" size="40"> <a href="https://developer.twitter.com/en/apps" target="_blank" class="btn_frmline">앱 등록하기</a>
             </td>
             <th scope="row"><label for="cf_twitter_secret">트위터 컨슈머 Secret</label></th>
             <td>
-                <input type="text" name="cf_twitter_secret" value="<?php echo $config['cf_twitter_secret'] ?>" id="cf_twitter_secret" class="frm_input" size="35">
+                <input type="text" name="cf_twitter_secret" value="<?php echo $config['cf_twitter_secret'] ?>" id="cf_twitter_secret" class="frm_input" size="45">
+            </td>
+        </tr>
+        <tr>
+            <th scope="row"><label for="cf_google_clientid">구글 Client ID</label></th>
+            <td>
+                <input type="text" name="cf_google_clientid" value="<?php echo $config['cf_google_clientid'] ?>" id="cf_google_clientid" class="frm_input" size="40"> <a href="https://console.developers.google.com" target="_blank" class="btn_frmline">앱 등록하기</a>
+            </td>
+            <th scope="row"><label for="cf_google_secret">구글 Client Secret</label></th>
+            <td>
+                <input type="text" name="cf_google_secret" value="<?php echo $config['cf_google_secret'] ?>" id="cf_google_secret" class="frm_input" size="45">
             </td>
         </tr>
         <tr>
             <th scope="row"><label for="cf_googl_shorturl_apikey">구글 짧은주소 API Key</label></th>
-            <td>
-                <input type="text" name="cf_googl_shorturl_apikey" value="<?php echo $config['cf_googl_shorturl_apikey'] ?>" id="cf_googl_shorturl_apikey" class="frm_input"> <a href="http://code.google.com/apis/console/" target="_blank" class="btn_frmline">API Key 등록하기</a>
+            <td colspan="3">
+                <input type="text" name="cf_googl_shorturl_apikey" value="<?php echo $config['cf_googl_shorturl_apikey'] ?>" id="cf_googl_shorturl_apikey" class="frm_input" size="40"> <a href="http://code.google.com/apis/console/" target="_blank" class="btn_frmline">API Key 등록하기</a>
             </td>
-            <th scope="row"><label for="cf_kakao_js_apikey">카카오 Javascript API Key</label></th>
+        </tr>
+        <tr>
+            <th scope="row"><label for="cf_kakao_rest_key">카카오 REST API 키</label></th>
             <td>
-                <input type="text" name="cf_kakao_js_apikey" value="<?php echo $config['cf_kakao_js_apikey'] ?>" id="cf_kakao_js_apikey" class="frm_input"> <a href="http://developers.kakao.com/" target="_blank" class="btn_frmline">앱 등록하기</a>
+                <input type="text" name="cf_kakao_rest_key" value="<?php echo $config['cf_kakao_rest_key'] ?>" id="cf_kakao_rest_key" class="frm_input" size="40"> <a href="https://developers.kakao.com/product/kakaoLogin" target="_blank" class="btn_frmline">앱 등록하기</a>
+            </td>
+            <th scope="row"><label for="cf_kakao_client_secret">카카오 Client Secret</label></th>
+            <td>
+                <input type="text" name="cf_kakao_client_secret" value="<?php echo $config['cf_kakao_client_secret'] ?>" id="cf_kakao_client_secret" class="frm_input" size="45">
+            </td>
+        </tr>
+        <tr>
+            <th scope="row"><label for="cf_kakao_js_apikey">카카오 JavaScript 키</label></th>
+            <td colspan="3">
+                <input type="text" name="cf_kakao_js_apikey" value="<?php echo $config['cf_kakao_js_apikey'] ?>" id="cf_kakao_js_apikey" class="frm_input" size="45">
+            </td>
+        </tr>
+        <tr>
+            <th scope="row"><label for="cf_payco_clientid">페이코 Client ID</label></th>
+            <td>
+                <input type="text" name="cf_payco_clientid" value="<?php echo $config['cf_payco_clientid']; ?>" id="cf_payco_clientid" class="frm_input" size="40"> <a href="https://developers.payco.com/guide" target="_blank" class="btn_frmline">앱 등록하기</a>
+            </td>
+            <th scope="row"><label for="cf_payco_secret">페이코 Secret</label></th>
+            <td>
+                <input type="text" name="cf_payco_secret" value="<?php echo $config['cf_payco_secret']; ?>" id="cf_payco_secret" class="frm_input" size="45">
             </td>
         </tr>
         </tbody>
@@ -994,7 +1212,6 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
     </div>
 </section>
 
-<?php echo $frm_submit; ?>
 
 <section id="anc_cf_lay">
     <h2 class="h2_frm">레이아웃 추가설정</h2>
@@ -1023,7 +1240,6 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
     </div>
 </section>
 
-<?php echo $frm_submit; ?>
 
 <section id="anc_cf_sms">
     <h2 class="h2_frm">SMS</h2>
@@ -1049,29 +1265,29 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
         <tr>
             <th scope="row"><label for="cf_sms_type">SMS 전송유형</label></th>
             <td>
-                <?php echo help("전송유형을 SMS로 선택하시면 최대 80바이트까지 전송하실 수 있으며<br>LMS로 선택하시면 90바이트 이하는 SMS로, 그 이상은 1500바이트까지 LMS로 전송됩니다.<br>요금은 건당 SMS는 16원, LMS는 48원입니다."); ?>
+                <?php echo help("전송유형을 SMS로 선택하시면 최대 80바이트까지 전송하실 수 있으며<br>LMS로 선택하시면 90바이트 이하는 SMS로, 그 이상은 ".G5_ICODE_LMS_MAX_LENGTH."바이트까지 LMS로 전송됩니다.<br>요금은 건당 SMS는 16원, LMS는 48원입니다."); ?>
                 <select id="cf_sms_type" name="cf_sms_type">
                     <option value="" <?php echo get_selected($config['cf_sms_type'], ''); ?>>SMS</option>
                     <option value="LMS" <?php echo get_selected($config['cf_sms_type'], 'LMS'); ?>>LMS</option>
                 </select>
             </td>
         </tr>
-        <tr>
-            <th scope="row"><label for="cf_icode_id">아이코드 회원아이디</label></th>
+        <tr class="icode_old_version">
+            <th scope="row"><label for="cf_icode_id">아이코드 회원아이디<br>(구버전)</label></th>
             <td>
                 <?php echo help("아이코드에서 사용하시는 회원아이디를 입력합니다."); ?>
                 <input type="text" name="cf_icode_id" value="<?php echo $config['cf_icode_id']; ?>" id="cf_icode_id" class="frm_input" size="20">
             </td>
         </tr>
-        <tr>
-            <th scope="row"><label for="cf_icode_pw">아이코드 비밀번호</label></th>
+        <tr class="icode_old_version">
+            <th scope="row"><label for="cf_icode_pw">아이코드 비밀번호<br>(구버전)</label></th>
             <td>
                 <?php echo help("아이코드에서 사용하시는 비밀번호를 입력합니다."); ?>
                 <input type="password" name="cf_icode_pw" value="<?php echo $config['cf_icode_pw']; ?>" id="cf_icode_pw" class="frm_input">
             </td>
         </tr>
-        <tr>
-            <th scope="row">요금제</th>
+        <tr class="icode_old_version <?php if(!(isset($userinfo['payment']) && $userinfo['payment'])){ echo 'cf_tr_hide'; } ?>">
+            <th scope="row">요금제<br>(구버전)</th>
             <td>
                 <input type="hidden" name="cf_icode_server_ip" value="<?php echo $config['cf_icode_server_ip']; ?>">
                 <?php
@@ -1088,27 +1304,36 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
                 ?>
             </td>
         </tr>
+        <?php if ($userinfo['payment'] == 'A') { ?>
+        <tr class="icode_old_version">
+            <th scope="row">충전 잔액<br>(구버전)</th>
+            <td>
+                <?php echo number_format($userinfo['coin']); ?> 원.
+                <a href="http://www.icodekorea.com/smsbiz/credit_card_amt.php?icode_id=<?php echo $config['cf_icode_id']; ?>&amp;icode_passwd=<?php echo $config['cf_icode_pw']; ?>" target="_blank" class="btn_frmline">충전하기</a>
+            </td>
+        </tr>
+        <?php } ?>
+        <tr class="icode_json_version">
+            <th scope="row"><label for="cf_icode_token_key">아이코드 토큰키<br>(JSON버전)</label></th>
+            <td>
+                <?php echo help("아이코드 JSON 버전의 경우 아이코드 토큰키를 입력시 실행됩니다.<br>SMS 전송유형을 LMS로 설정시 90바이트 이내는 SMS, 90 ~ 2000 바이트는 LMS 그 이상은 절삭 되어 LMS로 발송됩니다."); ?>
+                <input type="text" name="cf_icode_token_key" value="<?php echo isset($config['cf_icode_token_key']) ? get_sanitize_input($config['cf_icode_token_key']) : ''; ?>" id="cf_icode_token_key" class="frm_input" size="40">
+                <?php echo help("아이코드 사이트 -> 토큰키관리 메뉴에서 생성한 토큰키를 입력합니다."); ?>
+                <br>
+                서버아이피 : <?php echo $_SERVER['SERVER_ADDR']; ?>
+            </td>
+        </tr>
         <tr>
             <th scope="row">아이코드 SMS 신청<br>회원가입</th>
             <td>
                 <a href="http://icodekorea.com/res/join_company_fix_a.php?sellid=sir2" target="_blank" class="btn_frmline">아이코드 회원가입</a>
             </td>
         </tr>
-         <?php if ($userinfo['payment'] == 'A') { ?>
-        <tr>
-            <th scope="row">충전 잔액</th>
-            <td colspan="3">
-                <?php echo number_format($userinfo['coin']); ?> 원.
-                <a href="http://www.icodekorea.com/smsbiz/credit_card_amt.php?icode_id=<?php echo $config['cf_icode_id']; ?>&amp;icode_passwd=<?php echo $config['cf_icode_pw']; ?>" target="_blank" class="btn_frmline">충전하기</a>
-            </td>
-        </tr>
-        <?php } ?>
         </tbody>
         </table>
     </div>
 </section>
 
-<?php echo $frm_submit; ?>
 
 <section id="anc_cf_extra">
     <h2 class="h2_frm">여분필드 기본 설정</h2>
@@ -1132,7 +1357,7 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
                 <label for="cf_<?php echo $i ?>_subj">여분필드<?php echo $i ?> 제목</label>
                 <input type="text" name="cf_<?php echo $i ?>_subj" value="<?php echo get_text($config['cf_'.$i.'_subj']) ?>" id="cf_<?php echo $i ?>_subj" class="frm_input" size="30">
                 <label for="cf_<?php echo $i ?>">여분필드<?php echo $i ?> 값</label>
-                <input type="text" name="cf_<?php echo $i ?>" value="<?php echo $config['cf_'.$i] ?>" id="cf_<?php echo $i ?>" class="frm_input" size="30">
+                <input type="text" name="cf_<?php echo $i ?>" value="<?php echo get_sanitize_input($config['cf_'.$i]); ?>" id="cf_<?php echo $i ?>" class="frm_input extra-value-input" size="30">
             </td>
         </tr>
         <?php } ?>
@@ -1141,7 +1366,9 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
     </div>
 </section>
 
-<?php echo $frm_submit; ?>
+<div class="btn_fixed_top btn_confirm">
+    <input type="submit" value="확인" class="btn_submit btn" accesskey="s">
+</div>
 
 </form>
 
@@ -1161,6 +1388,13 @@ $(function(){
                 break;
         }
     });
+    $("#cf_captcha").on("change", function(){
+        if ($(this).val() == 'recaptcha' || $(this).val() == 'recaptcha_inv') {
+            $("[class^='kcaptcha_']").hide();
+        } else {
+            $("[class^='kcaptcha_']").show();
+        }
+    }).trigger("change");
 
     $(".get_theme_confc").on("click", function() {
         var type = $(this).data("type");
@@ -1201,6 +1435,26 @@ $(function(){
 
 function fconfigform_submit(f)
 {
+    var current_user_ip = "<?php echo $_SERVER['REMOTE_ADDR']; ?>";
+    var cf_intercept_ip_val = f.cf_intercept_ip.value;
+
+    if( cf_intercept_ip_val && current_user_ip ){
+        var cf_intercept_ips = cf_intercept_ip_val.split("\n");
+
+        for(var i=0; i < cf_intercept_ips.length; i++){
+            if ( cf_intercept_ips[i].trim() ) {
+                cf_intercept_ips[i] = cf_intercept_ips[i].replace(".", "\.");
+                cf_intercept_ips[i] = cf_intercept_ips[i].replace("+", "[0-9\.]+");
+                
+                var re = new RegExp(cf_intercept_ips[i]);
+                if ( re.test(current_user_ip) ){
+                    alert("현재 접속 IP : "+ current_user_ip +" 가 차단될수 있기 때문에, 다른 IP를 입력해 주세요.");
+                    return false;
+                }
+            }
+        }
+    }
+
     f.action = "./config_form_update.php";
     return true;
 }
@@ -1225,14 +1479,22 @@ if($config['cf_cert_use']) {
         }
 
         echo module_exec_check($exe, 'okname');
+
+        if(is_dir(G5_OKNAME_PATH.'/log') && is_writable(G5_OKNAME_PATH.'/log') && function_exists('check_log_folder') ) {
+            check_log_folder(G5_OKNAME_PATH.'/log');
+        }
     }
 
     // kcp일 때
     if($config['cf_cert_hp'] == 'kcp') {
-        if(PHP_INT_MAX == 2147483647) // 32-bit
-            $exe = G5_KCPCERT_PATH . '/bin/ct_cli';
-        else
-            $exe = G5_KCPCERT_PATH . '/bin/ct_cli_x64';
+        if(strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN') {
+            if(PHP_INT_MAX == 2147483647) // 32-bit
+                $exe = G5_KCPCERT_PATH . '/bin/ct_cli';
+            else
+                $exe = G5_KCPCERT_PATH . '/bin/ct_cli_x64';
+        } else {
+            $exe = G5_KCPCERT_PATH . '/bin/ct_cli_exe.exe';
+        }
 
         echo module_exec_check($exe, 'ct_cli');
     }
@@ -1242,18 +1504,30 @@ if($config['cf_cert_use']) {
         $log_path = G5_LGXPAY_PATH.'/lgdacom/log';
 
         if(!is_dir($log_path)) {
-            echo '<script>'.PHP_EOL;
-            echo 'alert("'.str_replace(G5_PATH.'/', '', G5_LGXPAY_PATH).'/lgdacom 폴더 안에 log 폴더를 생성하신 후 쓰기권한을 부여해 주십시오.\n> mkdir log\n> chmod 707 log");'.PHP_EOL;
-            echo '</script>'.PHP_EOL;
-        } else {
-            if(!is_writable($log_path)) {
+
+            if( is_writable(G5_LGXPAY_PATH.'/lgdacom/') ){
+                // 디렉토리가 없다면 생성합니다. (퍼미션도 변경하구요.)
+                @mkdir($log_path, G5_DIR_PERMISSION);
+                @chmod($log_path, G5_DIR_PERMISSION);
+            }
+
+            if(!is_dir($log_path)){
                 echo '<script>'.PHP_EOL;
-                echo 'alert("'.str_replace(G5_PATH.'/', '',$log_path).' 폴더에 쓰기권한을 부여해 주십시오.\n> chmod 707 log");'.PHP_EOL;
+                echo 'alert("'.str_replace(G5_PATH.'/', '', G5_LGXPAY_PATH).'/lgdacom 폴더 안에 log 폴더를 생성하신 후 쓰기권한을 부여해 주십시오.\n> mkdir log\n> chmod 707 log");'.PHP_EOL;
                 echo '</script>'.PHP_EOL;
             }
         }
+
+        if(is_dir($log_path) && is_writable($log_path)) {
+            if( function_exists('check_log_folder') ){
+                check_log_folder($log_path);
+            }
+        } else if (is_dir($log_path)) {
+            echo '<script>'.PHP_EOL;
+            echo 'alert("'.str_replace(G5_PATH.'/', '',$log_path).' 폴더에 쓰기권한을 부여해 주십시오.\n> chmod 707 log");'.PHP_EOL;
+            echo '</script>'.PHP_EOL;
+        }
     }
 }
 
-include_once ('./admin.tail.php');
-?>
+include_once ('./admin.tail.php');

adm/config_form_update.php

@@ -4,29 +4,180 @@ include_once('./_common.php');
 
 check_demo();
 
-auth_check($auth[$sub_menu], 'w');
+auth_check_menu($auth, $sub_menu, 'w');
 
 if ($is_admin != 'super')
     alert('최고관리자만 접근 가능합니다.');
 
+$cf_title = isset($_POST['cf_title']) ? strip_tags(clean_xss_attributes($_POST['cf_title'])) : '';
+$cf_admin = isset($_POST['cf_admin']) ? clean_xss_tags($_POST['cf_admin'], 1, 1) : '';
+$posts = array();
+
 $mb = get_member($cf_admin);
-if (!$mb['mb_id'])
+
+if (! (isset($mb['mb_id']) && $mb['mb_id']))
     alert('최고관리자 회원아이디가 존재하지 않습니다.');
 
 check_admin_token();
 
+$cf_social_servicelist = !empty($_POST['cf_social_servicelist']) ? implode(',', $_POST['cf_social_servicelist']) : '';
+
+$check_keys = array('cf_lg_mid', 'cf_lg_mert_key', 'cf_cert_kcb_cd', 'cf_cert_kcp_cd', 'cf_editor', 'cf_recaptcha_site_key', 'cf_recaptcha_secret_key', 'cf_naver_clientid', 'cf_naver_secret', 'cf_facebook_appid', 'cf_facebook_secret', 'cf_twitter_key', 'cf_twitter_secret', 'cf_google_clientid', 'cf_google_secret', 'cf_googl_shorturl_apikey', 'cf_kakao_rest_key', 'cf_kakao_client_secret', 'cf_kakao_js_apikey', 'cf_payco_clientid', 'cf_payco_secret');
+
+foreach( $check_keys as $key ){
+    if ( isset($_POST[$key]) && $_POST[$key] ){
+        $posts[$key] = $_POST[$key] = preg_replace('/[^a-z0-9_\-\.]/i', '', $_POST[$key]);
+    }
+}
+
+$posts['cf_icode_server_port'] = $_POST['cf_icode_server_port'] = isset($_POST['cf_icode_server_port']) ? preg_replace('/[^0-9]/', '', $_POST['cf_icode_server_port']) : '7295';
+
+if(isset($_POST['cf_intercept_ip']) && $_POST['cf_intercept_ip']){
+
+    $pattern = explode("\n", trim($_POST['cf_intercept_ip']));
+    for ($i=0; $i<count($pattern); $i++) {
+        $pattern[$i] = trim($pattern[$i]);
+        if (empty($pattern[$i]))
+            continue;
+
+        $pattern[$i] = str_replace(".", "\.", $pattern[$i]);
+        $pattern[$i] = str_replace("+", "[0-9\.]+", $pattern[$i]);
+        $pat = "/^{$pattern[$i]}$/";
+
+        if( preg_match($pat, $_SERVER['REMOTE_ADDR']) ){
+            alert("현재 접속 IP : ".$_SERVER['REMOTE_ADDR']." 가 차단될수 있기 때문에, 다른 IP를 입력해 주세요.");
+        }
+    }
+}
+
+$check_keys = array(
+'cf_use_email_certify' => 'int',
+'cf_use_homepage' => 'int',
+'cf_req_homepage' => 'int',
+'cf_use_tel' => 'int',
+'cf_req_tel' => 'int',
+'cf_use_hp' => 'int',
+'cf_req_hp' => 'int',
+'cf_use_addr' => 'int',
+'cf_req_addr' => 'int',
+'cf_use_signature' => 'int',
+'cf_req_signature' => 'int',
+'cf_use_profile' => 'int',
+'cf_req_profile' => 'int',
+'cf_register_level' => 'int',
+'cf_register_point' => 'int',
+'cf_icon_level' => 'int',
+'cf_use_recommend' => 'int',
+'cf_leave_day' => 'int',
+'cf_search_part' => 'int',
+'cf_email_use' => 'int',
+'cf_email_wr_super_admin' => 'int',
+'cf_email_wr_group_admin' => 'int',
+'cf_email_wr_board_admin' => 'int',
+'cf_email_wr_write' => 'int',
+'cf_email_wr_comment_all' => 'int',
+'cf_email_mb_super_admin' => 'int',
+'cf_email_mb_member' => 'int',
+'cf_email_po_super_admin' => 'int',
+'cf_prohibit_id' => 'text',
+'cf_prohibit_email' => 'text',
+'cf_new_del' => 'int',
+'cf_memo_del' => 'int',
+'cf_visit_del' => 'int',
+'cf_popular_del' => 'int',
+'cf_use_member_icon' => 'int',
+'cf_member_icon_size' => 'int',
+'cf_member_icon_width' => 'int',
+'cf_member_icon_height' => 'int',
+'cf_member_img_size' => 'int',
+'cf_member_img_width' => 'int',
+'cf_member_img_height' => 'int',
+'cf_login_minutes' => 'int',
+'cf_formmail_is_member' => 'int',
+'cf_page_rows' => 'int',
+'cf_mobile_page_rows' => 'int',
+'cf_social_login_use' => 'int',
+'cf_cert_req' => 'int',
+'cf_cert_use' => 'int',
+'cf_cert_ipin' => 'char',
+'cf_cert_hp' => 'char',
+'cf_admin_email' => 'char',
+'cf_admin_email_name' => 'char',
+'cf_add_script' => 'text',
+'cf_use_point' => 'int',
+'cf_point_term' => 'int',
+'cf_use_copy_log' => 'int',
+'cf_login_point' => 'int',
+'cf_cut_name' => 'int',
+'cf_nick_modify' => 'int',
+'cf_new_skin' => 'char',
+'cf_new_rows' => 'int',
+'cf_search_skin' => 'char',
+'cf_connect_skin' => 'char',
+'cf_faq_skin' => 'char',
+'cf_read_point' => 'int',
+'cf_write_point' => 'int',
+'cf_comment_point' => 'int',
+'cf_download_point' => 'int',
+'cf_write_pages' => 'int',
+'cf_mobile_pages' => 'int',
+'cf_link_target' => 'char',
+'cf_delay_sec' => 'int',
+'cf_filter' => 'text',
+'cf_possible_ip' => 'text',
+'cf_analytics' => 'text',
+'cf_add_meta' => 'text',
+'cf_member_skin' => 'char',
+'cf_image_extension' => 'char',
+'cf_flash_extension' => 'char',
+'cf_movie_extension' => 'char',
+'cf_visit' => 'char',
+'cf_stipulation' => 'text',
+'cf_privacy' => 'text',
+'cf_open_modify' => 'int',
+'cf_memo_send_point' => 'int',
+'cf_mobile_new_skin' => 'char',
+'cf_mobile_search_skin' => 'char',
+'cf_mobile_connect_skin' => 'char',
+'cf_mobile_faq_skin' => 'char',
+'cf_mobile_member_skin' => 'char',
+'cf_captcha_mp3' => 'char',
+'cf_cert_limit' => 'int',
+'cf_sms_use' => 'char',
+'cf_sms_type' => 'char',
+'cf_icode_id' => 'char',
+'cf_icode_pw' => 'char',
+'cf_icode_server_ip' => 'char',
+'cf_captcha' => 'char',
+'cf_syndi_token' => '',
+'cf_syndi_except' => ''
+);
+
+for($i=1;$i<=10;$i++){
+    $check_keys['cf_'.$i.'_subj'] = isset($_POST['cf_'.$i.'_subj']) ? $_POST['cf_'.$i.'_subj'] : '';
+    $check_keys['cf_'.$i] = isset($_POST['cf_'.$i]) ? $_POST['cf_'.$i] : '';
+}
+
+foreach( $check_keys as $k => $v ){
+    if( $v === 'int' ){
+        $posts[$key] = $_POST[$k] = isset($_POST[$k]) ? (int) $_POST[$k] : 0;
+    } else {
+        $posts[$key] = $_POST[$k] = isset($_POST[$k]) ? $_POST[$k] : '';
+    }
+}
+
 // 본인확인을 사용할 경우 아이핀, 휴대폰인증 중 하나는 선택되어야 함
 if($_POST['cf_cert_use'] && !$_POST['cf_cert_ipin'] && !$_POST['cf_cert_hp'])
     alert('본인확인을 위해 아이핀 또는 휴대폰 본인학인 서비스를 하나이상 선택해 주십시오');
 
 if(!$_POST['cf_cert_use']) {
-    $_POST['cf_cert_ipin'] = '';
-    $_POST['cf_cert_hp'] = '';
+    $posts[$key] = $_POST['cf_cert_ipin'] = '';
+    $posts[$key] = $_POST['cf_cert_hp'] = '';
 }
 
 $sql = " update {$g5['config_table']}
-            set cf_title = '{$_POST['cf_title']}',
-                cf_admin = '{$_POST['cf_admin']}',
+            set cf_title = '{$cf_title}',
+                cf_admin = '{$cf_admin}',
                 cf_admin_email = '{$_POST['cf_admin_email']}',
                 cf_admin_email_name = '{$_POST['cf_admin_email_name']}',
                 cf_add_script = '{$_POST['cf_add_script']}',
@@ -57,6 +208,7 @@ $sql = " update {$g5['config_table']}
                 cf_add_meta = '{$_POST['cf_add_meta']}',
                 cf_syndi_token = '{$_POST['cf_syndi_token']}',
                 cf_syndi_except = '{$_POST['cf_syndi_except']}',
+                cf_bbs_rewrite = '{$_POST['cf_bbs_rewrite']}',
                 cf_member_skin = '{$_POST['cf_member_skin']}',
                 cf_use_homepage = '{$_POST['cf_use_homepage']}',
                 cf_req_homepage = '{$_POST['cf_req_homepage']}',
@@ -96,6 +248,9 @@ $sql = " update {$g5['config_table']}
                 cf_member_icon_size = '{$_POST['cf_member_icon_size']}',
                 cf_member_icon_width = '{$_POST['cf_member_icon_width']}',
                 cf_member_icon_height = '{$_POST['cf_member_icon_height']}',
+                cf_member_img_size = '{$_POST['cf_member_img_size']}',
+                cf_member_img_width = '{$_POST['cf_member_img_width']}',
+                cf_member_img_height = '{$_POST['cf_member_img_height']}',
                 cf_login_minutes = '{$_POST['cf_login_minutes']}',
                 cf_image_extension = '{$_POST['cf_image_extension']}',
                 cf_flash_extension = '{$_POST['cf_flash_extension']}',
@@ -127,6 +282,7 @@ $sql = " update {$g5['config_table']}
                 cf_sms_type = '{$_POST['cf_sms_type']}',
                 cf_icode_id = '{$_POST['cf_icode_id']}',
                 cf_icode_pw = '{$_POST['cf_icode_pw']}',
+                cf_icode_token_key = '{$_POST['cf_icode_token_key']}',
                 cf_icode_server_ip = '{$_POST['cf_icode_server_ip']}',
                 cf_icode_server_port = '{$_POST['cf_icode_server_port']}',
                 cf_googl_shorturl_apikey = '{$_POST['cf_googl_shorturl_apikey']}',
@@ -135,6 +291,19 @@ $sql = " update {$g5['config_table']}
                 cf_facebook_secret = '{$_POST['cf_facebook_secret']}',
                 cf_twitter_key = '{$_POST['cf_twitter_key']}',
                 cf_twitter_secret = '{$_POST['cf_twitter_secret']}',
+                cf_social_login_use = '{$_POST['cf_social_login_use']}',
+                cf_naver_clientid = '{$_POST['cf_naver_clientid']}',
+                cf_naver_secret = '{$_POST['cf_naver_secret']}',
+                cf_google_clientid = '{$_POST['cf_google_clientid']}',
+                cf_google_secret = '{$_POST['cf_google_secret']}',
+                cf_kakao_rest_key = '{$_POST['cf_kakao_rest_key']}',
+                cf_kakao_client_secret = '{$_POST['cf_kakao_client_secret']}',
+                cf_social_servicelist   =   '{$cf_social_servicelist}',
+                cf_captcha = '{$_POST['cf_captcha']}',
+                cf_recaptcha_site_key = '{$_POST['cf_recaptcha_site_key']}',
+                cf_recaptcha_secret_key   =   '{$_POST['cf_recaptcha_secret_key']}',
+                cf_payco_clientid = '{$_POST['cf_payco_clientid']}',
+                cf_payco_secret = '{$_POST['cf_payco_secret']}',
                 cf_1_subj = '{$_POST['cf_1_subj']}',
                 cf_2_subj = '{$_POST['cf_2_subj']}',
                 cf_3_subj = '{$_POST['cf_3_subj']}',
@@ -159,5 +328,12 @@ sql_query($sql);
 
 //sql_query(" OPTIMIZE TABLE `$g5[config_table]` ");
 
-goto_url('./config_form.php', false);
-?>
+if( isset($_POST['cf_bbs_rewrite']) ){
+    g5_delete_all_cache();
+}
+
+run_event('admin_config_form_update');
+
+update_rewrite_rules();
+
+goto_url('./config_form.php', false);

adm/contentform.php

@@ -3,7 +3,9 @@ $sub_menu = '300600';
 include_once('./_common.php');
 include_once(G5_EDITOR_LIB);
 
-auth_check($auth[$sub_menu], "w");
+auth_check_menu($auth, $sub_menu, "w");
+
+$co_id = isset($_REQUEST['co_id']) ? preg_replace('/[^a-z0-9_]/i', '', $_REQUEST['co_id']) : '';
 
 // 상단, 하단 파일경로 필드 추가
 if(!sql_query(" select co_include_head from {$g5['content_table']} limit 1 ", false)) {
@@ -35,6 +37,7 @@ if(!sql_query(" select co_skin from {$g5['content_table']} limit 1 ", false)) {
 
 $html_title = "내용";
 $g5['title'] = $html_title.' 관리';
+$readonly = '';
 
 if ($w == "u")
 {
@@ -49,9 +52,18 @@ if ($w == "u")
 else
 {
     $html_title .= ' 입력';
-    $co['co_html'] = 2;
-    $co['co_skin'] = 'basic';
-    $co['co_mobile_skin'] = 'basic';
+    $co = array(
+        'co_id' => '',
+        'co_subject' => '',
+        'co_content' => '',
+        'co_mobile_content' => '',
+        'co_include_head' => '',
+        'co_include_tail' => '',
+        'co_tag_filter_use' => 1,
+        'co_html' => 2,
+        'co_skin' => 'basic',
+        'co_mobile_skin' => 'basic'
+        );
 }
 
 include_once (G5_ADMIN_PATH.'/admin.head.php');
@@ -75,7 +87,7 @@ include_once (G5_ADMIN_PATH.'/admin.head.php');
         <td>
             <?php echo help('20자 이내의 영문자, 숫자, _ 만 가능합니다.'); ?>
             <input type="text" value="<?php echo $co['co_id']; ?>" name="co_id" id ="co_id" required <?php echo $readonly; ?> class="required <?php echo $readonly; ?> frm_input" size="20" maxlength="20">
-            <?php if ($w == 'u') { ?><a href="<?php echo G5_BBS_URL; ?>/content.php?co_id=<?php echo $co_id; ?>" class="btn_frmline">내용확인</a><?php } ?>
+            <?php if ($w == 'u') { ?><a href="<?php echo get_pretty_url('content', $co_id); ?>" class="btn_frmline">내용확인</a><?php } ?>
         </td>
     </tr>
     <tr>
@@ -84,11 +96,11 @@ include_once (G5_ADMIN_PATH.'/admin.head.php');
     </tr>
     <tr>
         <th scope="row">내용</th>
-        <td><?php echo editor_html('co_content', get_text($co['co_content'], 0)); ?></td>
+        <td><?php echo editor_html('co_content', get_text(html_purifier($co['co_content']), 0)); ?></td>
     </tr>
     <tr>
         <th scope="row">모바일 내용</th>
-        <td><?php echo editor_html('co_mobile_content', get_text($co['co_mobile_content'], 0)); ?></td>
+        <td><?php echo editor_html('co_mobile_content', get_text(html_purifier($co['co_mobile_content']), 0)); ?></td>
     </tr>
     <tr>
         <th scope="row"><label for="co_skin">스킨 디렉토리<strong class="sound_only">필수</strong></label></th>
@@ -102,16 +114,18 @@ include_once (G5_ADMIN_PATH.'/admin.head.php');
             <?php echo get_mobile_skin_select('content', 'co_mobile_skin', 'co_mobile_skin', $co['co_mobile_skin'], 'required'); ?>
         </td>
     </tr>
+    <!--
     <tr>
         <th scope="row"><label for="co_tag_filter_use">태그 필터링 사용</label></th>
         <td>
             <?php echo help("내용에서 iframe 등의 태그를 사용하려면 사용안함으로 선택해 주십시오."); ?>
             <select name="co_tag_filter_use" id="co_tag_filter_use">
-                <option value="1"<?php echo get_selected(1, $co['co_tag_filter_use']); ?>>사용함</option>
-                <option value="0"<?php echo get_selected(0, $co['co_tag_filter_use']); ?>>사용안함</option>
+                <option value="1"<?php echo get_selected($co['co_tag_filter_use'], 1); ?>>사용함</option>
+                <option value="0"<?php echo get_selected($co['co_tag_filter_use'], 0); ?>>사용안함</option>
             </select>
         </td>
     </tr>
+    -->
     <tr>
         <th scope="row"><label for="co_include_head">상단 파일 경로</label></th>
         <td>
@@ -126,12 +140,29 @@ include_once (G5_ADMIN_PATH.'/admin.head.php');
             <input type="text" name="co_include_tail" value="<?php echo $co['co_include_tail']; ?>" id="co_include_tail" class="frm_input" size="60">
         </td>
     </tr>
+    <tr id="admin_captcha_box" style="display:none;">
+        <th scope="row">자동등록방지</th>
+        <td>
+            <?php
+            echo help("파일 경로를 입력 또는 수정시 캡챠를 반드시 입력해야 합니다.");
+
+            include_once(G5_CAPTCHA_PATH.'/captcha.lib.php');
+            $captcha_html = captcha_html();
+            $captcha_js   = chk_captcha_js();
+            echo $captcha_html;
+            ?>
+            <script>
+            jQuery("#captcha_key").removeAttr("required").removeClass("required");
+            </script>
+        </td>
+    </tr>
     <tr>
         <th scope="row"><label for="co_himg">상단이미지</label></th>
         <td>
             <input type="file" name="co_himg" id="co_himg">
             <?php
             $himg = G5_DATA_PATH.'/content/'.$co['co_id'].'_h';
+            $himg_str = '';
             if (file_exists($himg)) {
                 $size = @getimagesize($himg);
                 if($size[0] && $size[0] > 750)
@@ -156,6 +187,7 @@ include_once (G5_ADMIN_PATH.'/admin.head.php');
             <input type="file" name="co_timg" id="co_timg">
             <?php
             $timg = G5_DATA_PATH.'/content/'.$co['co_id'].'_t';
+            $timg_str = '';
             if (file_exists($timg)) {
                 $size = @getimagesize($timg);
                 if($size[0] && $size[0] > 750)
@@ -178,14 +210,63 @@ include_once (G5_ADMIN_PATH.'/admin.head.php');
     </table>
 </div>
 
-<div class="btn_confirm01 btn_confirm">
-    <input type="submit" value="확인" class="btn_submit" accesskey="s">
-    <a href="./contentlist.php">목록</a>
+<div class="btn_fixed_top">
+    <a href="./contentlist.php" class="btn btn_02">목록</a>
+    <input type="submit" value="확인" class="btn btn_submit" accesskey="s">
 </div>
 
 </form>
 
+<?php
+// [KVE-2018-2089] 취약점 으로 인해 파일 경로 수정시에만 자동등록방지 코드 사용
+?>
 <script>
+var captcha_chk = false;
+
+function use_captcha_check(){
+    $.ajax({
+        type: "POST",
+        url: g5_admin_url+"/ajax.use_captcha.php",
+        data: { admin_use_captcha: "1" },
+        cache: false,
+        async: false,
+        dataType: "json",
+        success: function(data) {
+        }
+    });
+}
+
+function frm_check_file(){
+    var co_include_head = "<?php echo $co['co_include_head']; ?>";
+    var co_include_tail = "<?php echo $co['co_include_tail']; ?>";
+    var head = jQuery.trim(jQuery("#co_include_head").val());
+    var tail = jQuery.trim(jQuery("#co_include_tail").val());
+
+    if(co_include_head !== head || co_include_tail !== tail){
+        // 캡챠를 사용합니다.
+        jQuery("#admin_captcha_box").show();
+        captcha_chk = true;
+
+        use_captcha_check();
+
+        return false;
+    } else {
+        jQuery("#admin_captcha_box").hide();
+    }
+
+    return true;
+}
+
+jQuery(function($){
+    if( window.self !== window.top ){   // frame 또는 iframe을 사용할 경우 체크
+        $("#co_include_head, #co_include_tail").on("change paste keyup", function(e) {
+            frm_check_file();
+        });
+
+        use_captcha_check();
+    }
+});
+
 function frmcontentform_check(f)
 {
     errmsg = "";
@@ -204,10 +285,14 @@ function frmcontentform_check(f)
         errfld.focus();
         return false;
     }
+    
+    if( captcha_chk ) {
+        <?php echo $captcha_js; // 캡챠 사용시 자바스크립트에서 입력된 캡챠를 검사함  ?>
+    }
+
     return true;
 }
 </script>
 
 <?php
-include_once (G5_ADMIN_PATH.'/admin.tail.php');
-?>
+include_once (G5_ADMIN_PATH.'/admin.tail.php');

adm/contentformupdate.php

@@ -6,12 +6,44 @@ if ($w == "u" || $w == "d")
     check_demo();
 
 if ($w == 'd')
-    auth_check($auth[$sub_menu], "d");
+    auth_check_menu($auth, $sub_menu, "d");
 else
-    auth_check($auth[$sub_menu], "w");
+    auth_check_menu($auth, $sub_menu, "w");
 
 check_admin_token();
 
+$co_row = array('co_id'=>'', 'co_include_head'=>'', 'co_include_tail'=>'');
+
+if ($w == "" || $w == "u")
+{
+    if(isset($_REQUEST['co_id']) && preg_match("/[^a-z0-9_]/i", $_REQUEST['co_id'])) alert("ID 는 영문자, 숫자, _ 만 가능합니다.");
+
+    $sql = " select * from {$g5['content_table']} where co_id = '$co_id' ";
+    $co_row = sql_fetch($sql);
+}
+
+$co_id = isset($_REQUEST['co_id']) ? preg_replace('/[^a-z0-9_]/i', '', $_REQUEST['co_id']) : '';
+$co_subject = isset($_POST['co_subject']) ? strip_tags(clean_xss_attributes($_POST['co_subject'])) : '';
+$co_include_head = isset($_POST['co_include_head']) ? preg_replace(array("#[\\\]+$#", "#(<\?php|<\?)#i"), "", substr($_POST['co_include_head'], 0, 255)) : '';
+$co_include_tail = isset($_POST['co_include_tail']) ? preg_replace(array("#[\\\]+$#", "#(<\?php|<\?)#i"), "", substr($_POST['co_include_tail'], 0, 255)) : '';
+$co_tag_filter_use = isset($_POST['co_tag_filter_use']) ? (int) $_POST['co_tag_filter_use'] : 1;
+$co_himg_del = (isset($_POST['co_himg_del']) && $_POST['co_himg_del']) ? 1 : 0;
+$co_timg_del = (isset($_POST['co_timg_del']) && $_POST['co_timg_del']) ? 1 : 0;
+$co_html = isset($_POST['co_html']) ? (int) $_POST['co_html'] : 0;
+$co_content = isset($_POST['co_content']) ? $_POST['co_content'] : '';
+$co_mobile_content = isset($_POST['co_mobile_content']) ? $_POST['co_mobile_content'] : '';
+$co_skin = isset($_POST['co_skin']) ? clean_xss_tags($_POST['co_skin'], 1, 1) : '';
+$co_mobile_skin = isset($_POST['co_mobile_skin']) ? clean_xss_tags($_POST['co_mobile_skin'], 1, 1) : '';
+
+// 관리자가 자동등록방지를 사용해야 할 경우
+if ((( isset($co_row['co_include_head']) && $co_row['co_include_head'] !== $co_include_head ) || ( isset($co_row['co_include_tail']) && $co_row['co_include_tail'] !== $co_include_tail )) && function_exists('get_admin_captcha_by') && get_admin_captcha_by()){
+    include_once(G5_CAPTCHA_PATH.'/captcha.lib.php');
+
+    if (!chk_captcha()) {
+        alert('자동등록방지 숫자가 틀렸습니다.');
+    }
+}
+
 @mkdir(G5_DATA_PATH."/content", G5_DIR_PERMISSION);
 @chmod(G5_DATA_PATH."/content", G5_DIR_PERMISSION);
 
@@ -21,31 +53,40 @@ if ($co_timg_del)  @unlink(G5_DATA_PATH."/content/{$co_id}_t");
 $error_msg = '';
 
 if( $co_include_head ){
-    $purl = parse_url($co_include_head);
-    $file = $purl['path'];
-    if (!preg_match("/\.(php|htm['l']?)$/i", $file)) {
-        alert('상단 파일 경로의 확장자는 php, html 만 허용합니다.');
+
+    $file_ext = pathinfo($co_include_head, PATHINFO_EXTENSION);
+
+    if( ! $file_ext || ! in_array($file_ext, array('php', 'htm', 'html')) || ! preg_match('/^.*\.(php|htm|html)$/i', $co_include_head) ) {
+        alert('상단 파일 경로의 확장자는 php, htm, html 만 허용합니다.');
     }
 }
 
 if( $co_include_tail ){
-    $purl = parse_url($co_include_tail);
-    $file = $purl['path'];
-    if (!preg_match("/\.(php|htm['l']?)$/i", $file)) {
-        alert('하단 파일 경로의 확장자는 php, html 만 허용합니다.');
+
+    $file_ext = pathinfo($co_include_tail, PATHINFO_EXTENSION);
+
+    if( ! $file_ext || ! in_array($file_ext, array('php', 'htm', 'html')) || ! preg_match('/^.*\.(php|htm|html)$/i', $co_include_tail) ) {
+        alert('하단 파일 경로의 확장자는 php, htm, html 만 허용합니다.');
     }
 }
 
-if( $co_include_head && ! is_include_path_check($co_include_head) ){
+if( $co_include_head && ! is_include_path_check($co_include_head, 1) ){
     $co_include_head = '';
     $error_msg = '/data/file/ 또는 /data/editor/ 포함된 문자를 상단 파일 경로에 포함시킬수 없습니다.';
 }
 
-if( $co_include_tail && ! is_include_path_check($co_include_tail) ){
+if( $co_include_tail && ! is_include_path_check($co_include_tail, 1) ){
     $co_include_tail = '';
     $error_msg = '/data/file/ 또는 /data/editor/ 포함된 문자를 하단 파일 경로에 포함시킬수 없습니다.';
 }
 
+if( function_exists('filter_input_include_path') ){
+    $co_include_head = filter_input_include_path($co_include_head);
+    $co_include_tail = filter_input_include_path($co_include_tail);
+}
+
+$co_seo_title = exist_seo_title_recursive('content', generate_seo_title($co_subject), $g5['content_table'], $co_id);
+
 $sql_common = " co_include_head     = '$co_include_head',
                 co_include_tail     = '$co_include_tail',
                 co_html             = '$co_html',
@@ -53,17 +94,14 @@ $sql_common = " co_include_head     = '$co_include_head',
                 co_subject          = '$co_subject',
                 co_content          = '$co_content',
                 co_mobile_content   = '$co_mobile_content',
+                co_seo_title        = '$co_seo_title',
                 co_skin             = '$co_skin',
                 co_mobile_skin      = '$co_mobile_skin' ";
 
 if ($w == "")
 {
-    //if(eregi("[^a-z0-9_]", $co_id)) alert("ID 는 영문자, 숫자, _ 만 가능합니다.");
-    if(preg_match("/[^a-z0-9_]/i", $co_id)) alert("ID 는 영문자, 숫자, _ 만 가능합니다.");
-
-    $sql = " select co_id from {$g5['content_table']} where co_id = '$co_id' ";
-    $row = sql_fetch($sql);
-    if ($row['co_id'])
+    $row = $co_row;
+    if (isset($row['co_id']) && $row['co_id'])
         alert("이미 같은 ID로 등록된 내용이 있습니다.");
 
     $sql = " insert {$g5['content_table']}
@@ -87,6 +125,11 @@ else if ($w == "d")
     sql_query($sql);
 }
 
+if(function_exists('get_admin_captcha_by'))
+    get_admin_captcha_by('remove');
+
+g5_delete_cache_by_prefix('content-'.$co_id.'-');
+
 if ($w == "" || $w == "u")
 {
     if ($_FILES['co_himg']['name'])
@@ -111,5 +154,4 @@ if ($w == "" || $w == "u")
 else
 {
     goto_url("./contentlist.php");
-}
-?>
+}

adm/contentlist.php

@@ -2,7 +2,7 @@
 $sub_menu = '300600';
 include_once('./_common.php');
 
-auth_check($auth[$sub_menu], "r");
+auth_check_menu($auth, $sub_menu, "r");
 
 if( !isset($g5['content_table']) ){
     die('<meta charset="utf-8">/data/dbconfig.php 파일에 <strong>$g5[\'content_table\'] = G5_TABLE_PREFIX.\'content\';</strong> 를 추가해 주세요.');
@@ -51,11 +51,11 @@ $result = sql_query($sql);
 
 <div class="local_ov01 local_ov">
     <?php if ($page > 1) {?><a href="<?php echo $_SERVER['SCRIPT_NAME']; ?>">처음으로</a><?php } ?>
-    <span>전체 내용 <?php echo $total_count; ?>건</span>
+    <span class="btn_ov01"><span class="ov_txt">전체 내용</span><span class="ov_num"> <?php echo $total_count; ?>건</span></span>
 </div>
 
-<div class="btn_add01 btn_add">
-    <a href="./contentform.php">내용 추가</a>
+<div class="btn_fixed_top">
+    <a href="./contentform.php" class="btn btn_01">내용 추가</a>
 </div>
 
 <div class="tbl_head01 tbl_wrap">
@@ -74,11 +74,11 @@ $result = sql_query($sql);
     ?>
     <tr class="<?php echo $bg; ?>">
         <td class="td_id"><?php echo $row['co_id']; ?></td>
-        <td><?php echo htmlspecialchars2($row['co_subject']); ?></td>
-        <td class="td_mng">
-            <a href="./contentform.php?w=u&amp;co_id=<?php echo $row['co_id']; ?>"><span class="sound_only"><?php echo htmlspecialchars2($row['co_subject']); ?> </span>수정</a>
-            <a href="<?php echo G5_BBS_URL; ?>/content.php?co_id=<?php echo $row['co_id']; ?>"><span class="sound_only"><?php echo htmlspecialchars2($row['co_subject']); ?> </span> 보기</a>
-            <a href="./contentformupdate.php?w=d&amp;co_id=<?php echo $row['co_id']; ?>" onclick="return delete_confirm(this);"><span class="sound_only"><?php echo htmlspecialchars2($row['co_subject']); ?> </span>삭제</a>
+        <td class="td_left"><?php echo htmlspecialchars2($row['co_subject']); ?></td>
+        <td class="td_mng td_mng_l">
+            <a href="./contentform.php?w=u&amp;co_id=<?php echo $row['co_id']; ?>" class="btn btn_03"><span class="sound_only"><?php echo htmlspecialchars2($row['co_subject']); ?> </span>수정</a>
+            <a href="<?php echo get_pretty_url('content', $row['co_id']); ?>" class="btn btn_02"><span class="sound_only"><?php echo htmlspecialchars2($row['co_subject']); ?> </span> 보기</a>
+            <a href="./contentformupdate.php?w=d&amp;co_id=<?php echo $row['co_id']; ?>" onclick="return delete_confirm(this);" class="btn btn_02"><span class="sound_only"><?php echo htmlspecialchars2($row['co_subject']); ?> </span>삭제</a>
         </td>
     </tr>
     <?php
@@ -94,5 +94,4 @@ $result = sql_query($sql);
 <?php echo get_paging(G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, "{$_SERVER['SCRIPT_NAME']}?$qstr&amp;page="); ?>
 
 <?php
-include_once (G5_ADMIN_PATH.'/admin.tail.php');
-?>
+include_once (G5_ADMIN_PATH.'/admin.tail.php');

adm/css/theme.css

@@ -1,8 +1,8 @@
 @charset "utf-8";
 #preview_item{height:50px}
-#preview_item ul{margin:0;padding:0;top:0;width:100%;border-bottom:1px solid #eee; margin:0 auto;text-align:center;background:#333;position:fixed;top:0;z-index:999999;width:100%;}
-#preview_item ul li{list-style:none;display:inline-block;height:50px;line-height:50px;padding:0 3px;*display:inline; zoom:1;}
-#preview_item ul li a{color:#555;padding:0 8px;height:24px;line-height:24px;background:#f2f2f2;border-radius:3px;display:inline-block;vertical-align:middle;border:1px solid #dcdcdc;}
-#preview_item ul li a:hover{background:#ccc;text-decoration:none;border:1px solid #ccc;}
+#preview_item ul{margin:0;padding:0;top:0;width:100%;margin:0 auto;text-align:center;background:#000;position:fixed;top:0;z-index:999999}
+#preview_item ul li{list-style:none;display:inline-block;height:50px;line-height:50px;padding:0 2px;*display:inline; zoom:1;}
+#preview_item ul li a{color:#ccc;padding:0 8px;height:32px;line-height:30px;background:none;font-weight:bold;border-radius:5px;display:inline-block;vertical-align:middle;border:1px solid #aaa;}
+#preview_item ul li a:hover{background:#fff;text-decoration:none;border:1px solid #ccc;color:#333}
 #preview_item ul li button{color:#fff;padding:0 8px;background:#FF5191;border-radius:3px;height:26px;line-height:24px;vertical-align:middle;border:none}
 #preview_item ul li button:hover{background:#e40d5c;color:#fff;text-decoration:none;}

adm/dbupgrade.php

@@ -0,0 +1,192 @@
+<?php
+$sub_menu = '100410';
+include_once('./_common.php');
+
+auth_check_menu($auth, $sub_menu, 'r');
+
+$g5['title'] = 'DB 업그레이드';
+include_once('./admin.head.php');
+
+$is_check = false;
+
+//소셜 로그인 관련 필드 및 구글 리챕챠 필드 추가
+if(!isset($config['cf_social_login_use'])) {
+    sql_query("ALTER TABLE `{$g5['config_table']}`
+                ADD `cf_social_login_use` tinyint(4) NOT NULL DEFAULT '0' AFTER `cf_googl_shorturl_apikey`,
+                ADD `cf_google_clientid` varchar(100) NOT NULL DEFAULT '' AFTER `cf_twitter_secret`,
+                ADD `cf_google_secret` varchar(100) NOT NULL DEFAULT '' AFTER `cf_google_clientid`,
+                ADD `cf_naver_clientid` varchar(100) NOT NULL DEFAULT '' AFTER `cf_google_secret`,
+                ADD `cf_naver_secret` varchar(100) NOT NULL DEFAULT '' AFTER `cf_naver_clientid`,
+                ADD `cf_kakao_rest_key` varchar(100) NOT NULL DEFAULT '' AFTER `cf_naver_secret`,
+                ADD `cf_social_servicelist` varchar(255) NOT NULL DEFAULT '' AFTER `cf_social_login_use`,
+                ADD `cf_payco_clientid` varchar(100) NOT NULL DEFAULT '' AFTER `cf_social_servicelist`,
+                ADD `cf_payco_secret` varchar(100) NOT NULL DEFAULT '' AFTER `cf_payco_clientid`,
+                ADD `cf_captcha` varchar(100) NOT NULL DEFAULT '' AFTER `cf_kakao_js_apikey`,
+                ADD `cf_recaptcha_site_key` varchar(100) NOT NULL DEFAULT '' AFTER `cf_captcha`,
+                ADD `cf_recaptcha_secret_key` varchar(100) NOT NULL DEFAULT '' AFTER `cf_recaptcha_site_key`
+    ", true);
+
+    $is_check = true;
+}
+
+//소셜 로그인 관련 필드 카카오 클라이언트 시크릿 추가
+if(!isset($config['cf_kakao_client_secret'])) {
+    sql_query("ALTER TABLE `{$g5['config_table']}`
+                ADD `cf_kakao_client_secret` varchar(100) NOT NULL DEFAULT '' AFTER `cf_kakao_rest_key`
+    ", true);
+
+    $is_check = true;
+}
+
+// 회원 이미지 관련 필드 추가
+if(!isset($config['cf_member_img_size'])) {
+    sql_query("ALTER TABLE `{$g5['config_table']}`
+                ADD `cf_member_img_size` int(11) NOT NULL DEFAULT '0' AFTER `cf_member_icon_height`,
+                ADD `cf_member_img_width` int(11) NOT NULL DEFAULT '0' AFTER `cf_member_img_size`,
+                ADD `cf_member_img_height` int(11) NOT NULL DEFAULT '0' AFTER `cf_member_img_width`
+    ", true);
+
+    $sql = " update {$g5['config_table']} set cf_member_img_size = 50000, cf_member_img_width = 60, cf_member_img_height = 60 ";
+    sql_query($sql, false);
+
+    $is_check = true;
+}
+
+// 소셜 로그인 관리 테이블 없을 경우 생성
+if( isset($g5['social_profile_table']) && !sql_query(" DESC {$g5['social_profile_table']} ", false)) {
+    sql_query(" CREATE TABLE IF NOT EXISTS `{$g5['social_profile_table']}` (
+                  `mp_no` int(11) NOT NULL AUTO_INCREMENT,
+                  `mb_id` varchar(255) NOT NULL DEFAULT '',
+                  `provider` varchar(50) NOT NULL DEFAULT '',
+                  `object_sha` varchar(45) NOT NULL DEFAULT '',
+                  `identifier` varchar(255) NOT NULL DEFAULT '',
+                  `profileurl` varchar(255) NOT NULL DEFAULT '',
+                  `photourl` varchar(255) NOT NULL DEFAULT '',
+                  `displayname` varchar(150) NOT NULL DEFAULT '',
+                  `description` varchar(255) NOT NULL DEFAULT '',
+                  `mp_register_day` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+                  `mp_latest_day` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+                  UNIQUE KEY `mp_no` (`mp_no`),
+                  KEY `mb_id` (`mb_id`),
+                  KEY `provider` (`provider`)
+                ) ", true);
+
+    $is_check = true;
+}
+
+// 게시판 짧은 주소
+$sql = " select bo_table from {$g5['board_table']} ";
+$result = sql_query($sql);
+
+while ($row = sql_fetch_array($result)) {
+    $write_table = $g5['write_prefix'] . $row['bo_table']; // 게시판 테이블 전체이름
+
+    $sql = " SHOW COLUMNS FROM {$write_table} LIKE 'wr_seo_title' ";
+    $row = sql_fetch($sql);
+    
+    if( !$row ){
+        sql_query("ALTER TABLE `{$write_table}`
+                    ADD `wr_seo_title` varchar(200) NOT NULL DEFAULT '' AFTER `wr_content`,
+                    ADD INDEX `wr_seo_title` (`wr_seo_title`);
+        ", false);
+
+        $is_check = true;
+    }
+}
+
+// 내용 관리 짧은 주소
+$sql = " SHOW COLUMNS FROM `{$g5['content_table']}` LIKE 'co_seo_title' ";
+$row = sql_fetch($sql);
+
+if( !$row ){
+    sql_query("ALTER TABLE `{$g5['content_table']}`
+                ADD `co_seo_title` varchar(200) NOT NULL DEFAULT '' AFTER `co_content`,
+                ADD INDEX `co_seo_title` (`co_seo_title`);
+    ", false);
+
+    $is_check = true;
+}
+
+$sql = "select * from {$g5['content_table']} limit 100 ";
+$result = sql_query($sql);
+
+while ($row = sql_fetch_array($result)) {
+
+    if( ! $row['co_seo_title']){
+        
+        $co_seo_title = exist_seo_title_recursive('content', generate_seo_title($row['co_subject']), $g5['content_table'], $row['co_id']);
+        
+        $sql = " update {$g5['content_table']}
+                    set co_seo_title = '$co_seo_title'
+                  where co_id = '{$row['co_id']}' ";
+        sql_query($sql);
+
+    }
+}
+
+// 메모 테이블
+$sql = " SHOW COLUMNS FROM `{$g5['memo_table']}` LIKE 'me_send_id' ";
+$row = sql_fetch($sql);
+
+if( !$row ){
+    sql_query("ALTER TABLE `{$g5['memo_table']}`
+                ADD `me_send_id` INT(11) NOT NULL DEFAULT '0',
+                ADD `me_type` ENUM('send','recv') NOT NULL DEFAULT 'recv',
+                ADD `me_send_ip` VARCHAR(100) NOT NULL DEFAULT '',
+                CHANGE COLUMN `me_id` `me_id` INT(11) NOT NULL AUTO_INCREMENT;
+    ", false);
+
+    $is_check = true;
+}
+
+// 읽지 않은 메모 수 칼럼
+if(!isset($member['mb_memo_cnt'])) {
+    sql_query(" ALTER TABLE `{$g5['member_table']}`
+                ADD `mb_memo_cnt` int(11) NOT NULL DEFAULT '0' AFTER `mb_memo_call`", true);
+
+    $is_check = true;
+}
+
+// 스크랩 읽은 수 추가
+if(!isset($member['mb_scrap_cnt'])) {
+    sql_query(" ALTER TABLE `{$g5['member_table']}`
+                ADD `mb_scrap_cnt` int(11) NOT NULL DEFAULT '0' AFTER `mb_memo_cnt`", true);
+
+	$is_check = true;
+}
+
+// 짧은 URL 주소를 사용 여부 필드 추가
+if (!isset($config['cf_bbs_rewrite'])) {
+    sql_query(" ALTER TABLE `{$g5['config_table']}`
+                    ADD `cf_bbs_rewrite` tinyint(4) NOT NULL DEFAULT '0' AFTER `cf_link_target` ", true);
+
+	$is_check = true;
+}
+
+// 파일테이블에 추가 칼럼
+
+$sql = " SHOW COLUMNS FROM `{$g5['board_file_table']}` LIKE 'bf_fileurl' ";
+$row = sql_fetch($sql);
+
+if( !$row ) {
+    sql_query(" ALTER TABLE `{$g5['board_file_table']}` 
+                ADD COLUMN `bf_fileurl` VARCHAR(255) NOT NULL DEFAULT '' AFTER `bf_content`,
+                ADD COLUMN `bf_thumburl` VARCHAR(255) NOT NULL DEFAULT '' AFTER `bf_fileurl`,
+                ADD COLUMN `bf_storage` VARCHAR(50) NOT NULL DEFAULT '' AFTER `bf_thumburl`", true);
+
+    $is_check = true;
+}
+
+$is_check = run_replace('admin_dbupgrade', $is_check);
+
+$db_upgrade_msg = $is_check ? 'DB 업그레이드가 완료되었습니다.' : '더 이상 업그레이드 할 내용이 없습니다.<br>현재 DB 업그레이드가 완료된 상태입니다.';
+?>
+
+<div class="local_desc01 local_desc">
+    <p>
+        <?php echo $db_upgrade_msg; ?>
+    </p>
+</div>
+
+<?php
+include_once ('./admin.tail.php');

adm/faqform.php

@@ -3,13 +3,18 @@ $sub_menu = '300700';
 include_once('./_common.php');
 include_once(G5_EDITOR_LIB);
 
-auth_check($auth[$sub_menu], "w");
+auth_check_menu($auth, $sub_menu, "w");
+
+$fm_id = isset($_GET['fm_id']) ? (int) $_GET['fm_id'] : 0;
+$fa_id = isset($_GET['fa_id']) ? (int) $_GET['fa_id'] : 0;
 
 $sql = " select * from {$g5['faq_master_table']} where fm_id = '$fm_id' ";
 $fm = sql_fetch($sql);
 
 $html_title = 'FAQ '.$fm['fm_subject'];
 
+$fa = array('fa_id'=>0, 'fm_id'=>0, 'fa_subject'=>'', 'fa_content'=>'', 'fa_order'=>0);
+
 if ($w == "u")
 {
     $html_title .= " 수정";
@@ -51,19 +56,19 @@ include_once (G5_ADMIN_PATH.'/admin.head.php');
     </tr>
     <tr>
         <th scope="row">질문</th>
-        <td><?php echo editor_html('fa_subject', get_text($fa['fa_subject'], 0)); ?></td>
+        <td><?php echo editor_html('fa_subject', get_text(html_purifier($fa['fa_subject']), 0)); ?></td>
     </tr>
     <tr>
         <th scope="row">답변</th>
-        <td><?php echo editor_html('fa_content', get_text($fa['fa_content'], 0)); ?></td>
+        <td><?php echo editor_html('fa_content', get_text(html_purifier($fa['fa_content']), 0)); ?></td>
     </tr>
     </tbody>
     </table>
 </div>
 
-<div class="btn_confirm01 btn_confirm">
-    <input type="submit" value="확인" class="btn_submit" accesskey="s">
-    <a href="./faqlist.php?fm_id=<?php echo $fm_id; ?>">목록</a>
+<div class="btn_fixed_top">
+    <input type="submit" value="확인" class="btn_submit btn" accesskey="s">
+    <a href="./faqlist.php?fm_id=<?php echo $fm_id; ?>" class="btn btn_02">목록</a>
 </div>
 
 </form>
@@ -94,5 +99,4 @@ function frmfaqform_check(f)
 </script>
 
 <?php
-include_once (G5_ADMIN_PATH.'/admin.tail.php');
-?>
+include_once (G5_ADMIN_PATH.'/admin.tail.php');

adm/faqformupdate.php

@@ -6,12 +6,18 @@ if ($w == "u" || $w == "d")
     check_demo();
 
 if ($w == 'd')
-    auth_check($auth[$sub_menu], "d");
+    auth_check_menu($auth, $sub_menu, "d");
 else
-    auth_check($auth[$sub_menu], "w");
+    auth_check_menu($auth, $sub_menu, "w");
 
 check_admin_token();
 
+$fm_id = isset($_REQUEST['fm_id']) ? (int) $_REQUEST['fm_id'] : 0;
+$fa_id = isset($_REQUEST['fa_id']) ? (int) $_REQUEST['fa_id'] : 0;
+$fa_subject = isset($_POST['fa_subject']) ? $_POST['fa_subject'] : '';
+$fa_content = isset($_POST['fa_content']) ? $_POST['fa_content'] : '';
+$fa_order = isset($_POST['fa_order']) ? (int) $_POST['fa_order'] : 0;
+
 $sql_common = " fa_subject = '$fa_subject',
                 fa_content = '$fa_content',
                 fa_order = '$fa_order' ";
@@ -41,5 +47,4 @@ else if ($w == "d")
 if ($w == 'd')
     goto_url("./faqlist.php?fm_id=$fm_id");
 else
-    goto_url("./faqform.php?w=u&fm_id=$fm_id&fa_id=$fa_id");
-?>
+    goto_url("./faqform.php?w=u&fm_id=$fm_id&fa_id=$fa_id");

adm/faqlist.php

@@ -2,10 +2,16 @@
 $sub_menu = '300700';
 include_once('./_common.php');
 
-auth_check($auth[$sub_menu], "r");
+auth_check_menu($auth, $sub_menu, "r");
 
 $g5['title'] = 'FAQ 상세관리';
-if ($fm_subject) $g5['title'] .= ' : '.$fm_subject;
+if (isset($_REQUEST['fm_subject'])){
+    $fm_subject = clean_xss_tags($_REQUEST['fm_subject'], 1, 1, 255);
+    $g5['title'] .= ' : '.$fm_subject;
+}
+
+$fm_id = (int) $fm_id;
+
 include_once (G5_ADMIN_PATH.'/admin.head.php');
 
 $sql = " select * from {$g5['faq_master_table']} where fm_id = '$fm_id' ";
@@ -16,14 +22,14 @@ $sql_common = " from {$g5['faq_table']} where fm_id = '$fm_id' ";
 // 테이블의 전체 레코드수만 얻음
 $sql = " select count(*) as cnt " . $sql_common;
 $row = sql_fetch($sql);
-$total_count = $row[cnt];
+$total_count = $row['cnt'];
 
 $sql = "select * $sql_common order by fa_order , fa_id ";
 $result = sql_query($sql);
 ?>
 
 <div class="local_ov01 local_ov">
-    등록된 FAQ 상세내용 <?php echo $total_count; ?>건
+   <span class="btn_ov01"><span class="ov_txt"> 등록된 FAQ 상세내용</span><span class="ov_num"> <?php echo $total_count; ?>건</span></span>
 </div>
 
 <div class="local_desc01 local_desc">
@@ -33,8 +39,9 @@ $result = sql_query($sql);
     </ol>
 </div>
 
-<div class="btn_add01 btn_add">
-    <a href="./faqform.php?fm_id=<?php echo $fm['fm_id']; ?>">FAQ 상세내용 추가</a>
+<div class="btn_fixed_top">
+    <a href="./faqmasterlist.php" class="btn btn_02">FAQ 관리</a>
+    <a href="./faqform.php?fm_id=<?php echo $fm['fm_id']; ?>" class="btn btn_01">FAQ 상세내용 추가</a>
 </div>
 
 <div class="tbl_head01 tbl_wrap">
@@ -53,7 +60,7 @@ $result = sql_query($sql);
     for ($i=0; $row=sql_fetch_array($result); $i++)
     {
         $row1 = sql_fetch(" select COUNT(*) as cnt from {$g5['faq_table']} where fm_id = '{$row['fm_id']}' ");
-        $cnt = $row1[cnt];
+        $cnt = $row1['cnt'];
 
         $s_mod = icon("수정", "");
         $s_del = icon("삭제", "");
@@ -61,15 +68,17 @@ $result = sql_query($sql);
         $num = $i + 1;
 
         $bg = 'bg'.($i%2);
+
+        $fa_subject = conv_content($row['fa_subject'], 1);
     ?>
 
     <tr class="<?php echo $bg; ?>">
         <td class="td_num"><?php echo $num; ?></td>
-        <td><?php echo stripslashes($row['fa_subject']); ?></td>
+        <td class="td_left"><?php echo $fa_subject; ?></td>
         <td class="td_num"><?php echo $row['fa_order']; ?></td>
-        <td class="td_mngsmall">
-            <a href="./faqform.php?w=u&amp;fm_id=<?php echo $row['fm_id']; ?>&amp;fa_id=<?php echo $row['fa_id']; ?>"><span class="sound_only"><?php echo stripslashes($row['fa_subject']); ?> </span>수정</a>
-            <a href="./faqformupdate.php?w=d&amp;fm_id=<?php echo $row['fm_id']; ?>&amp;fa_id=<?php echo $row['fa_id']; ?>" onclick="return delete_confirm(this);"><span class="sound_only"><?php echo stripslashes($row['fa_subject']); ?> </span>삭제</a>
+        <td class="td_mng td_mng_m">
+            <a href="./faqform.php?w=u&amp;fm_id=<?php echo $row['fm_id']; ?>&amp;fa_id=<?php echo $row['fa_id']; ?>" class="btn btn_03"><span class="sound_only"><?php echo $fa_subject; ?> </span>수정</a>
+            <a href="./faqformupdate.php?w=d&amp;fm_id=<?php echo $row['fm_id']; ?>&amp;fa_id=<?php echo $row['fa_id']; ?>" onclick="return delete_confirm(this);" class="btn btn_02"><span class="sound_only"><?php echo $fa_subject; ?> </span>삭제</a>
         </td>
     </tr>
 
@@ -85,11 +94,6 @@ $result = sql_query($sql);
 
 </div>
 
-<div class="btn_confirm01 btn_confirm">
-    <a href="./faqmasterlist.php">FAQ 관리</a>
-</div>
-
 
 <?php
-include_once (G5_ADMIN_PATH.'/admin.tail.php');
-?>
+include_once (G5_ADMIN_PATH.'/admin.tail.php');

adm/faqmasterform.php

@@ -3,11 +3,11 @@ $sub_menu = '300700';
 include_once('./_common.php');
 include_once(G5_EDITOR_LIB);
 
-auth_check($auth[$sub_menu], "w");
+auth_check_menu($auth, $sub_menu, "w");
 
 $html_title = 'FAQ';
 
-$fm_id = preg_replace('/[^0-9]/', '', $fm_id);
+$fm_id = isset($_GET['fm_id']) ? preg_replace('/[^0-9]/', '', $_GET['fm_id']) : 0;
 
 if ($w == "u")
 {
@@ -21,6 +21,7 @@ if ($w == "u")
 else
 {
     $html_title .= ' 입력';
+    $fm = array('fm_order'=>'', 'fm_subject'=>'', 'fm_id'=>0, 'fm_head_html'=> '', 'fm_tail_html'=> '', 'fm_mobile_head_html' => '', 'fm_mobile_tail_html' => '');
 }
 
 $g5['title'] = $html_title.' 관리';
@@ -71,6 +72,7 @@ include_once (G5_ADMIN_PATH.'/admin.head.php');
             <input type="file" name="fm_himg" id="fm_himg">
             <?php
             $himg = G5_DATA_PATH.'/faq/'.$fm['fm_id'].'_h';
+            $himg_str = '';
             if (file_exists($himg)) {
                 $size = @getimagesize($himg);
                 if($size[0] && $size[0] > 750)
@@ -95,6 +97,7 @@ include_once (G5_ADMIN_PATH.'/admin.head.php');
             <input type="file" name="fm_timg" id="fm_timg">
             <?php
             $timg = G5_DATA_PATH.'/faq/'.$fm['fm_id'].'_t';
+            $timg_str = '';
             if (file_exists($timg)) {
                 $size = @getimagesize($timg);
                 if($size[0] && $size[0] > 750)
@@ -116,34 +119,34 @@ include_once (G5_ADMIN_PATH.'/admin.head.php');
     <tr>
         <th scope="row">상단 내용</th>
         <td>
-            <?php echo editor_html('fm_head_html', get_text($fm['fm_head_html'], 0)); ?>
+            <?php echo editor_html('fm_head_html', get_text(html_purifier($fm['fm_head_html']), 0)); ?>
         </td>
     </tr>
     <tr>
         <th scope="row">하단 내용</th>
         <td>
-            <?php echo editor_html('fm_tail_html', get_text($fm['fm_tail_html'], 0)); ?>
+            <?php echo editor_html('fm_tail_html', get_text(html_purifier($fm['fm_tail_html']), 0)); ?>
         </td>
     </tr>
     <tr>
         <th scope="row">모바일상단 내용</th>
         <td>
-            <?php echo editor_html('fm_mobile_head_html', get_text($fm['fm_mobile_head_html'], 0)); ?>
+            <?php echo editor_html('fm_mobile_head_html', get_text(html_purifier($fm['fm_mobile_head_html']), 0)); ?>
         </td>
     </tr>
     <tr>
         <th scope="row">모바일하단 내용</th>
         <td>
-            <?php echo editor_html('fm_mobile_tail_html', get_text($fm['fm_mobile_tail_html'], 0)); ?>
+            <?php echo editor_html('fm_mobile_tail_html', get_text(html_purifier($fm['fm_mobile_tail_html']), 0)); ?>
         </td>
     </tr>
     </tbody>
     </table>
 </div>
 
-<div class="btn_confirm01 btn_confirm">
-    <input type="submit" value="확인" class="btn_submit" accesskey="s">
-    <a href="./faqmasterlist.php">목록</a>
+<div class="btn_fixed_top">
+    <a href="./faqmasterlist.php" class="btn btn_02">목록</a>
+    <input type="submit" value="확인" class="btn_submit btn" accesskey="s">
 </div>
 
 </form>
@@ -161,5 +164,4 @@ function frmfaqmasterform_check(f)
 </script>
 
 <?php
-include_once (G5_ADMIN_PATH.'/admin.tail.php');
-?>
+include_once (G5_ADMIN_PATH.'/admin.tail.php');

adm/faqmasterformupdate.php

@@ -5,16 +5,26 @@ include_once('./_common.php');
 if ($w == "u" || $w == "d")
     check_demo();
 
-if ($W == 'd')
-    auth_check($auth[$sub_menu], "d");
+if ($w == 'd')
+    auth_check_menu($auth, $sub_menu, "d");
 else
-    auth_check($auth[$sub_menu], "w");
+    auth_check_menu($auth, $sub_menu, "w");
 
 check_admin_token();
 
 @mkdir(G5_DATA_PATH."/faq", G5_DIR_PERMISSION);
 @chmod(G5_DATA_PATH."/faq", G5_DIR_PERMISSION);
 
+$fm_id = isset($_REQUEST['fm_id']) ? (int) $_REQUEST['fm_id'] : 0;
+$fm_himg_del = isset($_POST['fm_himg_del']) ? (int) $_POST['fm_himg_del'] : 0;
+$fm_timg_del = isset($_POST['fm_timg_del']) ? (int) $_POST['fm_timg_del'] : 0;
+$fm_subject = isset($_POST['fm_subject']) ? strip_tags(clean_xss_attributes($_POST['fm_subject'])) : '';
+$fm_head_html = isset($_POST['fm_head_html']) ? $_POST['fm_head_html'] : '';
+$fm_tail_html = isset($_POST['fm_tail_html']) ? $_POST['fm_tail_html'] : '';
+$fm_mobile_head_html = isset($_POST['fm_mobile_head_html']) ? $_POST['fm_mobile_head_html'] : '';
+$fm_mobile_tail_html = isset($_POST['fm_mobile_tail_html']) ? $_POST['fm_mobile_tail_html'] : '';
+$fm_order = isset($_POST['fm_order']) ? (int) $_POST['fm_order'] : 0;
+
 if ($fm_himg_del)  @unlink(G5_DATA_PATH."/faq/{$fm_id}_h");
 if ($fm_timg_del)  @unlink(G5_DATA_PATH."/faq/{$fm_id}_t");
 
@@ -70,5 +80,4 @@ if ($w == "" || $w == "u")
     goto_url("./faqmasterform.php?w=u&fm_id=$fm_id");
 }
 else
-    goto_url("./faqmasterlist.php");
-?>
+    goto_url("./faqmasterlist.php");

adm/faqmasterlist.php

@@ -2,7 +2,7 @@
 $sub_menu = '300700';
 include_once('./_common.php');
 
-auth_check($auth[$sub_menu], "r");
+auth_check_menu($auth, $sub_menu, "r");
 
 //dbconfig파일에 $g5['faq_table'] , $g5['faq_master_table'] 배열변수가 있는지 체크
 if( !isset($g5['faq_table']) || !isset($g5['faq_master_table']) ){
@@ -65,7 +65,7 @@ $result = sql_query($sql);
 
 <div class="local_ov01 local_ov">
     <?php if ($page > 1) {?><a href="<?php echo $_SERVER['SCRIPT_NAME']; ?>">처음으로</a><?php } ?>
-    <span>전체 FAQ <?php echo $total_count; ?>건</span>
+    <span class="btn_ov01"><span class="ov_txt"> 전체 FAQ </span><span class="ov_num"> <?php echo $total_count; ?>건</span></span>
 </div>
 
 <div class="local_desc01 local_desc">
@@ -76,8 +76,8 @@ $result = sql_query($sql);
     </ol>
 </div>
 
-<div class="btn_add01 btn_add">
-    <a href="./faqmasterform.php">FAQ추가</a>
+<div class="btn_fixed_top">
+    <a href="./faqmasterform.php" class="btn_01 btn">FAQ추가</a>
 </div>
 
 <div class="tbl_head01 tbl_wrap">
@@ -101,13 +101,13 @@ $result = sql_query($sql);
     ?>
     <tr class="<?php echo $bg; ?>">
         <td class="td_num"><?php echo $row['fm_id']; ?></td>
-        <td><a href="./faqlist.php?fm_id=<?php echo $row['fm_id']; ?>&amp;fm_subject=<?php echo $row['fm_subject']; ?>"><?php echo stripslashes($row['fm_subject']); ?></a></td>
+        <td class="td_left"><a href="./faqlist.php?fm_id=<?php echo $row['fm_id']; ?>&amp;fm_subject=<?php echo $row['fm_subject']; ?>"><?php echo stripslashes($row['fm_subject']); ?></a></td>
         <td class="td_num"><?php echo $cnt; ?></td>
         <td class="td_num"><?php echo $row['fm_order']?></td>
-        <td class="td_mng">
-            <a href="./faqmasterform.php?w=u&amp;fm_id=<?php echo $row['fm_id']; ?>"><span class="sound_only"><?php echo stripslashes($row['fm_subject']); ?> </span>수정</a>
-            <a href="<?php echo G5_BBS_URL; ?>/faq.php?fm_id=<?php echo $row['fm_id']; ?>"><span class="sound_only"><?php echo stripslashes($row['fm_subject']); ?> </span>보기</a>
-            <a href="./faqmasterformupdate.php?w=d&amp;fm_id=<?php echo $row['fm_id']; ?>" onclick="return delete_confirm(this);"><span class="sound_only"><?php echo stripslashes($row['fm_subject']); ?> </span>삭제</a>
+        <td class="td_mng td_mng_l">
+            <a href="./faqmasterform.php?w=u&amp;fm_id=<?php echo $row['fm_id']; ?>" class="btn btn_03"><span class="sound_only"><?php echo stripslashes($row['fm_subject']); ?> </span>수정</a>
+            <a href="<?php echo G5_BBS_URL; ?>/faq.php?fm_id=<?php echo $row['fm_id']; ?>" class="btn btn_02"><span class="sound_only"><?php echo stripslashes($row['fm_subject']); ?> </span>보기</a>
+            <a href="./faqmasterformupdate.php?w=d&amp;fm_id=<?php echo $row['fm_id']; ?>" onclick="return delete_confirm(this);" class="btn btn_02"><span class="sound_only"><?php echo stripslashes($row['fm_subject']); ?> </span>삭제</a>
         </td>
     </tr>
     <?php
@@ -124,5 +124,4 @@ $result = sql_query($sql);
 <?php echo get_paging(G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, "{$_SERVER['SCRIPT_NAME']}?$qstr&amp;page="); ?>
 
 <?php
-include_once (G5_ADMIN_PATH.'/admin.tail.php');
-?>
+include_once (G5_ADMIN_PATH.'/admin.tail.php');

adm/index.php

@@ -1,6 +1,12 @@
 <?php
+$sub_menu = '100000';
 include_once('./_common.php');
 
+@include_once('./safe_check.php');
+if(function_exists('social_log_file_delete')){
+    social_log_file_delete(86400);      //소셜로그인 디버그 파일 24시간 지난것은 삭제
+}
+
 $g5['title'] = '관리자메인';
 include_once ('./admin.head.php');
 
@@ -94,11 +100,6 @@ $colspan = 12;
             $mb_nick = get_sideview($row['mb_id'], get_text($row['mb_nick']), $row['mb_email'], $row['mb_homepage']);
 
             $mb_id = $row['mb_id'];
-            if ($row['mb_leave_date'])
-                $mb_id = $mb_id;
-            else if ($row['mb_intercept_date'])
-                $mb_id = $mb_id;
-
         ?>
         <tr>
             <td class="td_mbid"><?php echo $mb_id ?></td>
@@ -132,7 +133,7 @@ $sql_common = " from {$g5['board_new_table']} a, {$g5['board_table']} b, {$g5['g
 
 if ($gr_id)
     $sql_common .= " and b.gr_id = '$gr_id' ";
-if ($view) {
+if (isset($view) && $view) {
     if ($view == 'w')
         $sql_common .= " and a.wr_id = a.wr_parent ";
     else if ($view == 'c')
@@ -206,8 +207,8 @@ $colspan = 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 G5_BBS_URL ?>/board.php?bo_table=<?php echo $row['bo_table'] ?>"><?php echo cut_str($row['bo_subject'],20) ?></a></td>
-            <td><a href="<?php echo G5_BBS_URL ?>/board.php?bo_table=<?php echo $row['bo_table'] ?>&amp;wr_id=<?php echo $row2['wr_id'] ?><?php echo $comment_link ?>"><?php echo $comment ?><?php echo conv_subject($row2['wr_subject'], 100) ?></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>
@@ -277,7 +278,7 @@ $colspan = 7;
             $link1 = $link2 = "";
             if (!preg_match("/^\@/", $row['po_rel_table']) && $row['po_rel_table'])
             {
-                $link1 = '<a href="'.G5_BBS_URL.'/board.php?bo_table='.$row['po_rel_table'].'&amp;wr_id='.$row['po_rel_id'].'" target="_blank">';
+                $link1 = '<a href="'.get_pretty_url($row['po_rel_table'], $row['po_rel_id']).'" target="_blank">';
                 $link2 = '</a>';
             }
         ?>
@@ -308,5 +309,4 @@ $colspan = 7;
 </section>
 
 <?php
-include_once ('./admin.tail.php');
-?>
+include_once ('./admin.tail.php');

adm/mail_delete.php

@@ -4,21 +4,20 @@ include_once('./_common.php');
 
 check_demo();
 
-auth_check($auth[$sub_menu], 'd');
+auth_check_menu($auth, $sub_menu, 'd');
 
 check_admin_token();
 
-$count = count($_POST['chk']);
+$post_count_chk = (isset($_POST['chk']) && is_array($_POST['chk'])) ? count($_POST['chk']) : 0;
 
 if(!$count)
     alert('삭제할 메일목록을 1개이상 선택해 주세요.');
 
 for($i=0; $i<$count; $i++) {
-    $ma_id = $_POST['chk'][$i];
+    $ma_id = isset($_POST['chk'][$i]) ? (int) $_POST['chk'][$i] : 0;
 
     $sql = " delete from {$g5['mail_table']} where ma_id = '$ma_id' ";
     sql_query($sql);
 }
 
-goto_url('./mail_list.php');
-?>
+goto_url('./mail_list.php');

adm/mail_form.php

@@ -3,10 +3,13 @@ $sub_menu = "200300";
 include_once('./_common.php');
 include_once(G5_EDITOR_LIB);
 
-auth_check($auth[$sub_menu], 'r');
+auth_check_menu($auth, $sub_menu, 'r');
 
 $html_title = '회원메일';
 
+$ma_id = isset($_GET['ma_id']) ? (int) $_GET['ma_id'] : 0;
+$ma = array('ma_id'=>0, 'ma_subject'=>'', 'ma_content'=>'');
+
 if ($w == 'u') {
     $html_title .= '수정';
     $readonly = ' readonly';
@@ -23,7 +26,7 @@ $g5['title'] = $html_title;
 include_once('./admin.head.php');
 ?>
 
-<p>메일 내용에 {이름} , {닉네임} , {회원아이디} , {이메일} 처럼 내용에 삽입하면 해당 내용에 맞게 변환하여 메일을 발송합니다.</p>
+<div class="local_desc"><p>메일 내용에 {이름} , {닉네임} , {회원아이디} , {이메일} 처럼 내용에 삽입하면 해당 내용에 맞게 변환하여 메일을 발송합니다.</p></div>
 
 <form name="fmailform" id="fmailform" action="./mail_update.php" onsubmit="return fmailform_check(this);" method="post">
 <input type="hidden" name="w" value="<?php echo $w ?>" id="w">
@@ -40,18 +43,18 @@ include_once('./admin.head.php');
     <tbody>
     <tr>
         <th scope="row"><label for="ma_subject">메일 제목<strong class="sound_only">필수</strong></label></th>
-        <td><input type="text" name="ma_subject" value="<?php echo $ma['ma_subject'] ?>" id="ma_subject" required class="required frm_input" size="100"></td>
+        <td><input type="text" name="ma_subject" value="<?php echo get_sanitize_input($ma['ma_subject']); ?>" id="ma_subject" required class="required frm_input" size="100"></td>
     </tr>
     <tr>
         <th scope="row"><label for="ma_content">메일 내용<strong class="sound_only">필수</strong></label></th>
-        <td><?php echo editor_html("ma_content", get_text($ma['ma_content'], 0)); ?></td>
+        <td><?php echo editor_html("ma_content", get_text(html_purifier($ma['ma_content']), 0)); ?></td>
     </tr>
     </tbody>
     </table>
 </div>
 
-<div class="btn_confirm01 btn_confirm">
-    <input type="submit" class="btn_submit" accesskey="s" value="확인">
+<div class="btn_fixed_top ">
+    <input type="submit" class="btn_submit btn" accesskey="s" value="확인">
 </div>
 </form>
 
@@ -80,5 +83,4 @@ document.fmailform.ma_subject.focus();
 </script>
 
 <?php
-include_once('./admin.tail.php');
-?>
+include_once('./admin.tail.php');

adm/mail_list.php

@@ -2,7 +2,7 @@
 $sub_menu = '200300';
 include_once('./_common.php');
 
-auth_check($auth[$sub_menu], 'r');
+auth_check_menu($auth, $sub_menu, 'r');
 
 $sql_common = " from {$g5['mail_table']} ";
 
@@ -30,9 +30,6 @@ $colspan = 7;
     </p>
 </div>
 
-<div class="btn_add01 btn_add">
-    <a href="./mail_form.php" id="mail_add">메일내용추가</a>
-</div>
 
 <form name="fmaillist" id="fmaillist" action="./mail_delete.php" method="post">
 <div class="tbl_head01 tbl_wrap">
@@ -52,7 +49,7 @@ $colspan = 7;
     <tbody>
     <?php
     for ($i=0; $row=sql_fetch_array($result); $i++) {
-        $s_vie = '<a href="./mail_preview.php?ma_id='.$row['ma_id'].'" target="_blank">미리보기</a>';
+        $s_vie = '<a href="./mail_preview.php?ma_id='.$row['ma_id'].'" target="_blank" class="btn btn_03">미리보기</a>';
 
         $num = number_format($total_count - ($page - 1) * $config['cf_page_rows'] - $i);
 
@@ -64,12 +61,12 @@ $colspan = 7;
             <label for="chk_<?php echo $i; ?>" class="sound_only"><?php echo $row['ma_subject']; ?> 메일</label>
             <input type="checkbox" id="chk_<?php echo $i ?>" name="chk[]" value="<?php echo $row['ma_id'] ?>">
         </td>
-        <td class="td_num"><?php echo $num ?></td>
-        <td><a href="./mail_form.php?w=u&amp;ma_id=<?php echo $row['ma_id'] ?>"><?php echo $row['ma_subject'] ?></a></td>
+        <td class="td_num_c"><?php echo $num ?></td>
+        <td class="td_left"><a href="./mail_form.php?w=u&amp;ma_id=<?php echo $row['ma_id'] ?>"><?php echo $row['ma_subject'] ?></a></td>
         <td class="td_datetime"><?php echo $row['ma_time'] ?></td>
         <td class="td_test"><a href="./mail_test.php?ma_id=<?php echo $row['ma_id'] ?>">테스트</a></td>
         <td class="td_send"><a href="./mail_select_form.php?ma_id=<?php echo $row['ma_id'] ?>">보내기</a></td>
-        <td class="td_mngsmall"><?php echo $s_vie ?></td>
+        <td class="td_mng"><?php echo $s_vie ?></td>
     </tr>
 
     <?php
@@ -80,9 +77,9 @@ $colspan = 7;
     </tbody>
     </table>
 </div>
-
-<div class="btn_list01 btn_list">
-    <input type="submit" value="선택삭제">
+<div class="btn_fixed_top">
+    <input type="submit" value="선택삭제" class="btn btn_02">
+    <a href="./mail_form.php" id="mail_add" class="btn btn_01">메일내용추가</a>
 </div>
 </form>
 
@@ -104,5 +101,4 @@ $(function() {
 </script>
 
 <?php
-include_once ('./admin.tail.php');
-?>
+include_once ('./admin.tail.php');

adm/mail_preview.php

@@ -3,7 +3,9 @@ $sub_menu = "200300";
 include_once('./_common.php');
 include_once(G5_LIB_PATH.'/mailer.lib.php');
 
-auth_check($auth[$sub_menu], 'r');
+auth_check_menu($auth, $sub_menu, 'r');
+
+$ma_id = isset($_REQUEST['ma_id']) ? (int) $_REQUEST['ma_id'] : 0;
 
 $se = sql_fetch("select ma_subject, ma_content from {$g5['mail_table']} where ma_id = '{$ma_id}' ");