5.2.9 버전 변경

.gitignore

@@ -6,7 +6,7 @@ sirgle/
 test.php
 *.key
 *.sh
-cheditor*/
+cheditor5.*/
 ckeditor*/
 log/
 g5_tree/

LICENSE.txt

@@ -2,7 +2,7 @@
 
 프로그램 명칭 : 그누보드5 ( GNU Board 5 )
 
-저작자 : (주)에스아이알소프트 http://sir.co.kr
+저작자 : (주)에스아이알소프트 http://sir.kr
 
 라이센스 (License)
 

adm/_common.php

@@ -2,4 +2,8 @@
 define('G5_IS_ADMIN', true);
 include_once ('../common.php');
 include_once(G5_ADMIN_PATH.'/admin.lib.php');
+
+if( isset($token) ){
+    $token = @htmlspecialchars(strip_tags($token), ENT_QUOTES);
+}
 ?>

adm/admin.js

@@ -57,12 +57,20 @@ function is_checked(elements_name)
     return checked;
 }
 
-function delete_confirm()
+function delete_confirm(el)
 {
-    if(confirm("한번 삭제한 자료는 복구할 방법이 없습니다.\n\n정말 삭제하시겠습니까?"))
+    if(confirm("한번 삭제한 자료는 복구할 방법이 없습니다.\n\n정말 삭제하시겠습니까?")) {
+        var token = get_ajax_token();
+        var href = el.href.replace(/&token=.+$/g, "");
+        if(!token) {
+            alert("토큰 정보가 올바르지 않습니다.");
+            return false;
+        }
+        el.href = href+"&token="+token;
         return true;
-    else
+    } else {
         return false;
+    }
 }
 
 function delete_confirm2(msg)
@@ -71,4 +79,51 @@ function delete_confirm2(msg)
         return true;
     else
         return false;
-}
+}
+
+function get_ajax_token()
+{
+    var token = "";
+
+    $.ajax({
+        type: "POST",
+        url: g5_admin_url+"/ajax.token.php",
+        cache: false,
+        async: false,
+        dataType: "json",
+        success: function(data) {
+            if(data.error) {
+                alert(data.error);
+                if(data.url)
+                    document.location.href = data.url;
+
+                return false;
+            }
+
+            token = data.token;
+        }
+    });
+
+    return token;
+}
+
+$(function() {
+    $(document).on("click", "form input:submit", function() {
+        var f = this.form;
+        var token = get_ajax_token();
+
+        if(!token) {
+            alert("토큰 정보가 올바르지 않습니다.");
+            return false;
+        }
+
+        var $f = $(f);
+
+        if(typeof f.token === "undefined")
+            $f.prepend('<input type="hidden" name="token" value="">');
+
+        $f.find("input[name=token]").val(token);
+
+        return true;
+    });
+});

adm/admin.lib.php

@@ -346,6 +346,54 @@ function order_select($fld, $sel='')
     return $s;
 }
 
+// 불법접근을 막도록 토큰을 생성하면서 토큰값을 리턴
+function get_admin_token()
+{
+    $token = md5(uniqid(rand(), true));
+    set_session('ss_admin_token', $token);
+
+    return $token;
+}
+
+
+// POST로 넘어온 토큰과 세션에 저장된 토큰 비교
+function check_admin_token()
+{
+    $token = get_session('ss_admin_token');
+    set_session('ss_admin_token', '');
+
+    if(!$token || !$_REQUEST['token'] || $token != $_REQUEST['token'])
+        alert('올바른 방법으로 이용해 주십시오.', G5_URL);
+
+    return true;
+}
+
+// 관리자 페이지 referer 체크
+function admin_referer_check($return=false)
+{
+    $referer = trim($_SERVER['HTTP_REFERER']);
+    if(!$referer) {
+        $msg = '정보가 올바르지 않습니다.';
+
+        if($return)
+            return $msg;
+        else
+            alert($msg, G5_URL);
+    }
+
+    $p = @parse_url($referer);
+    $host = preg_replace('/:[0-9]+$/', '', $_SERVER['HTTP_HOST']);
+
+    if($host != $p['host']) {
+        $msg = '올바른 방법으로 이용해 주십시오.';
+
+        if($return)
+            return $msg;
+        else
+            alert($msg, G5_URL);
+    }
+}
+
 // 접근 권한 검사
 if (!$member['mb_id'])
 {

adm/admin.tail.php

@@ -21,7 +21,7 @@ if (!defined('_GNUBOARD_')) exit;
 
 <!-- <p>실행시간 : <?php echo get_microtime() - $begin_time; ?> -->
 
-<script src="<?php echo G5_ADMIN_URL ?>/admin.js"></script>
+<script src="<?php echo G5_ADMIN_URL ?>/admin.js?ver=<?php echo G5_JS_VER; ?>"></script>
 <script>
 $(function(){
     var hide_menu = false;

adm/ajax.token.php

@@ -0,0 +1,14 @@
+<?php
+include_once('./_common.php');
+include_once(G5_LIB_PATH.'/json.lib.php');
+
+set_session('ss_admin_token', '');
+
+$error = admin_referer_check(true);
+if($error)
+    die(json_encode(array('error'=>$error, 'url'=>G5_URL)));
+
+$token = get_admin_token();
+
+die(json_encode(array('error'=>'', 'token'=>$token, 'url'=>'')));
+?>

adm/auth_list.php

@@ -5,8 +5,6 @@ include_once('./_common.php');
 if ($is_admin != 'super')
     alert('최고관리자만 접근 가능합니다.');
 
-$token = get_token();
-
 $sql_common = " from {$g5['auth_table']} a left join {$g5['member_table']} b on (a.mb_id=b.mb_id) ";
 
 $sql_search = " where (1) ";
@@ -73,7 +71,7 @@ $colspan = 5;
 <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="">
 
 <div class="tbl_head01 tbl_wrap">
     <table>
@@ -168,7 +166,7 @@ echo $pagelist;
 <input type="hidden" name="sst" value="<?php echo $sst ?>">
 <input type="hidden" name="sod" value="<?php echo $sod ?>">
 <input type="hidden" name="page" value="<?php echo $page ?>">
-<input type="hidden" name="token" value="<?php echo $token ?>">
+<input type="hidden" name="token" value="">
 
 <section id="add_admin">
     <h2 class="h2_frm">관리권한 추가</h2>

adm/auth_list_delete.php

@@ -7,7 +7,7 @@ check_demo();
 if ($is_admin != 'super')
     alert('최고관리자만 접근 가능합니다.');
 
-check_token();
+check_admin_token();
 
 $count = count($_POST['chk']);
 

adm/auth_update.php

@@ -9,7 +9,7 @@ $mb = get_member($mb_id);
 if (!$mb['mb_id'])
     alert('존재하는 회원아이디가 아닙니다.');
 
-check_token();
+check_admin_token();
 
 $sql = " insert into {$g5['auth_table']}
             set mb_id   = '{$_POST['mb_id']}',

adm/board_copy.php

@@ -8,11 +8,14 @@ $g5['title'] = '게시판 복사';
 include_once(G5_PATH.'/head.sub.php');
 ?>
 
+<script src="<?php echo G5_ADMIN_URL ?>/admin.js?ver=<?php echo G5_JS_VER; ?>"></script>
+
 <div class="new_win">
     <h1><?php echo $g5['title']; ?></h1>
 
     <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>

adm/board_copy_update.php

@@ -2,8 +2,12 @@
 $sub_menu = '300100';
 include_once('./_common.php');
 
+check_demo();
+
 auth_check($auth[$sub_menu], 'w');
 
+check_admin_token();
+
 $target_table   = trim($_POST['target_table']);
 $target_subject = trim($_POST['target_subject']);
 

adm/board_form.php

@@ -166,6 +166,7 @@ $frm_submit .= '</div>';
 <input type="hidden" name="sst" value="<?php echo $sst ?>">
 <input type="hidden" name="sod" value="<?php echo $sod ?>">
 <input type="hidden" name="page" value="<?php echo $page ?>">
+<input type="hidden" name="token" value="">
 
 <section id="anc_bo_basic">
     <h2 class="h2_frm">게시판 기본 설정</h2>

adm/board_form_update.php

@@ -7,6 +7,8 @@ if ($w == 'u')
 
 auth_check($auth[$sub_menu], 'w');
 
+check_admin_token();
+
 if (!$_POST['gr_id']) { alert('그룹 ID는 반드시 선택하세요.'); }
 if (!$bo_table) { alert('게시판 TABLE명은 반드시 입력하세요.'); }
 if (!preg_match("/^([A-Za-z0-9_]{1,20})$/", $bo_table)) { alert('게시판 TABLE명은 공백없이 영문자, 숫자, _ 만 사용 가능합니다. (20자 이내)'); }
@@ -33,6 +35,14 @@ if ($file = $_POST['bo_include_tail']) {
     $_POST['bo_include_tail'] = $file;
 }
 
+if(!is_include_path_check($_POST['bo_include_head'])) {
+    alert('/data/file/ 또는 /data/editor/ 포함된 문자를 상단 파일 경로에 포함시킬수 없습니다.');
+}
+
+if(!is_include_path_check($_POST['bo_include_tail'])) {
+    alert('/data/file/ 또는 /data/editor/ 포함된 문자를 하단 파일 경로에 포함시킬수 없습니다.');
+}
+
 $board_path = G5_DATA_PATH.'/file/'.$bo_table;
 
 // 게시판 디렉토리 생성
@@ -182,7 +192,7 @@ if ($w == '') {
     // 글수 조정
     /*
         엔피씨님의 팁으로 교체합니다. 130308
-        http://sir.co.kr/bbs/board.php?bo_table=g5_tiptech&wr_id=27207
+        http://sir.kr/g5_tiptech/27207
     */
     if (isset($_POST['proc_count'])) {
         // 원글을 얻습니다.

adm/board_list.php

@@ -63,7 +63,7 @@ $colspan = 15;
 
 <label for="sfl" class="sound_only">검색대상</label>
 <select name="sfl" id="sfl">
-    <option value="bo_table"<?php echo get_selected($_GET['sfl'], "bo_subject", true); ?>>TABLE</option>
+    <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>
 </select>

adm/board_list_update.php

@@ -51,7 +51,7 @@ if ($_POST['act_button'] == "선택수정") {
 
     auth_check($auth[$sub_menu], 'd');
 
-    check_token();
+    check_admin_token();
 
     // _BOARD_DELETE_ 상수를 선언해야 board_delete.inc.php 가 정상 작동함
     define('_BOARD_DELETE_', true);

adm/boardgroup_form.php

@@ -38,6 +38,7 @@ include_once('./admin.head.php');
 <input type="hidden" name="sst" value="<?php echo $sst ?>">
 <input type="hidden" name="sod" value="<?php echo $sod ?>">
 <input type="hidden" name="page" value="<?php echo $page ?>">
+<input type="hidden" name="token" value="">
 
 <div class="tbl_frm01 tbl_wrap">
     <table>

adm/boardgroup_form_update.php

@@ -9,6 +9,8 @@ auth_check($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']))
     alert('그룹 ID는 공백없이 영문자, 숫자, _ 만 사용 가능합니다. (10자 이내)');
 

adm/boardgroup_list.php

@@ -88,7 +88,7 @@ $colspan = 10;
 <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="">
 
 <div class="tbl_head01 tbl_wrap">
     <table>

adm/boardgroup_list_update.php

@@ -8,6 +8,8 @@ check_demo();
 
 auth_check($auth[$sub_menu], 'w');
 
+check_admin_token();
+
 $count = count($_POST['chk']);
 
 if(!$count)

adm/boardgroupmember_form.php

@@ -4,8 +4,6 @@ include_once('./_common.php');
 
 auth_check($auth[$sub_menu], 'w');
 
-$token = get_token();
-
 $mb = get_member($mb_id);
 if (!$mb['mb_id'])
     alert('존재하지 않는 회원입니다.');
@@ -18,7 +16,7 @@ $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="<?php echo $token ?>" id="token">
+<input type="hidden" name="token" value="" id="token">
 <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>

adm/boardgroupmember_update.php

@@ -28,7 +28,7 @@ if ($w == '')
     }
     else
     {
-        check_token();
+        check_admin_token();
 
         $sql = " insert into {$g5['group_member_table']}
                     set gr_id = '{$_POST['gr_id']}',
@@ -45,7 +45,7 @@ else if ($w == 'd' || $w == 'ld')
     if(!$count)
         alert('삭제할 목록을 하나이상 선택해 주세요.');
 
-    check_token();
+    check_admin_token();
 
     for($i=0; $i<$count; $i++) {
         $gm_id = $_POST['chk'][$i];

adm/config_form.php

@@ -4,8 +4,6 @@ include_once('./_common.php');
 
 auth_check($auth[$sub_menu], 'r');
 
-$token = get_token();
-
 if ($is_admin != 'super')
     alert('최고관리자만 접근 가능합니다.');
 
@@ -229,7 +227,7 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
 ?>
 
 <form name="fconfigform" id="fconfigform" method="post" onsubmit="return fconfigform_submit(this);">
-<input type="hidden" name="token" value="<?php echo $token ?>" id="token">
+<input type="hidden" name="token" value="" id="token">
 
 <section id="anc_cf_basic">
     <h2 class="h2_frm">홈페이지 기본환경 설정</h2>
@@ -738,7 +736,7 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
                 <select name="cf_cert_hp" id="cf_cert_hp">
                     <?php echo option_selected("",    $config['cf_cert_hp'], "사용안함"); ?>
                     <?php echo option_selected("kcb", $config['cf_cert_hp'], "코리아크레딧뷰로(KCB) 휴대폰 본인확인"); ?>
-                    <?php echo option_selected("kcp", $config['cf_cert_hp'], "한국사이버결제(KCP) 휴대폰 본인확인"); ?>
+                    <?php echo option_selected("kcp", $config['cf_cert_hp'], "NHN KCP 휴대폰 본인확인"); ?>
                     <?php echo option_selected("lg",  $config['cf_cert_hp'], "LG유플러스 휴대폰 본인확인"); ?>
                 </select>
             </td>
@@ -747,16 +745,16 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
             <th scope="row" class="cf_cert_service"><label for="cf_cert_kcb_cd">코리아크레딧뷰로<br>KCB 회원사ID</label></th>
             <td class="cf_cert_service">
                 <?php echo help('KCB 회원사ID를 입력해 주십시오.<br>서비스에 가입되어 있지 않다면, KCB와 계약체결 후 회원사ID를 발급 받으실 수 있습니다.<br>이용하시려는 서비스에 대한 계약을 아이핀, 휴대폰 본인확인 각각 체결해주셔야 합니다.<br>아이핀 본인확인 테스트의 경우에는 KCB 회원사ID가 필요 없으나,<br>휴대폰 본인확인 테스트의 경우 KCB 에서 따로 발급 받으셔야 합니다.') ?>
-                <input type="text" name="cf_cert_kcb_cd" value="<?php echo $config['cf_cert_kcb_cd'] ?>" id="cf_cert_kcb_cd" class="frm_input" size="20"> <a href="http://sir.co.kr/main/service/b_ipin.php" target="_blank" class="btn_frmline">KCB 아이핀 서비스 신청페이지</a>
-                <a href="http://sir.co.kr/main/service/b_cert.php" target="_blank" class="btn_frmline">KCB 휴대폰 본인확인 서비스 신청페이지</a>
+                <input type="text" name="cf_cert_kcb_cd" value="<?php echo $config['cf_cert_kcb_cd'] ?>" id="cf_cert_kcb_cd" class="frm_input" size="20"> <a href="http://sir.kr/main/service/b_ipin.php" target="_blank" class="btn_frmline">KCB 아이핀 서비스 신청페이지</a>
+                <a href="http://sir.kr/main/service/b_cert.php" target="_blank" class="btn_frmline">KCB 휴대폰 본인확인 서비스 신청페이지</a>
             </td>
         </tr>
         <tr>
-            <th scope="row" class="cf_cert_service"><label for="cf_cert_kcp_cd">한국사이버결제<br>KCP 사이트코드</label></th>
+            <th scope="row" class="cf_cert_service"><label for="cf_cert_kcp_cd">NHN KCP 사이트코드</label></th>
             <td class="cf_cert_service">
                 <?php echo help('SM으로 시작하는 5자리 사이트 코드중 뒤의 3자리만 입력해 주십시오.<br>서비스에 가입되어 있지 않다면, 본인확인 서비스 신청페이지에서 서비스 신청 후 사이트코드를 발급 받으실 수 있습니다.') ?>
                 <span class="sitecode">SM</span>
-                <input type="text" name="cf_cert_kcp_cd" value="<?php echo $config['cf_cert_kcp_cd'] ?>" id="cf_cert_kcp_cd" class="frm_input" size="3"> <a href="http://sir.co.kr/main/service/p_cert.php" target="_blank" class="btn_frmline">KCP 휴대폰 본인확인 서비스 신청페이지</a>
+                <input type="text" name="cf_cert_kcp_cd" value="<?php echo $config['cf_cert_kcp_cd'] ?>" id="cf_cert_kcp_cd" class="frm_input" size="3"> <a href="http://sir.kr/main/service/p_cert.php" target="_blank" class="btn_frmline">NHN KCP 휴대폰 본인확인 서비스 신청페이지</a>
             </td>
         </tr>
         <tr>
@@ -764,7 +762,7 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
             <td class="cf_cert_service">
                 <?php echo help('LG유플러스 상점아이디 중 si_를 제외한 나머지 아이디만 입력해 주십시오.<br>서비스에 가입되어 있지 않다면, 본인확인 서비스 신청페이지에서 서비스 신청 후 상점아이디를 발급 받으실 수 있습니다.<br><strong>LG유플러스 휴대폰본인확인은 ActiveX 설치가 필요하므로 Internet Explorer 에서만 사용할 수 있습니다.</strong>') ?>
                 <span class="sitecode">si_</span>
-                <input type="text" name="cf_lg_mid" value="<?php echo $config['cf_lg_mid'] ?>" id="cf_lg_mid" class="frm_input" size="20"> <a href="http://sir.co.kr/main/service/lg_cert.php" target="_blank" class="btn_frmline">LG유플러스 본인확인 서비스 신청페이지</a>
+                <input type="text" name="cf_lg_mid" value="<?php echo $config['cf_lg_mid'] ?>" id="cf_lg_mid" class="frm_input" size="20"> <a href="http://sir.kr/main/service/lg_cert.php" target="_blank" class="btn_frmline">LG유플러스 본인확인 서비스 신청페이지</a>
             </td>
         </tr>
         <tr>

adm/config_form_update.php

@@ -13,7 +13,7 @@ $mb = get_member($cf_admin);
 if (!$mb['mb_id'])
     alert('최고관리자 회원아이디가 존재하지 않습니다.');
 
-check_token();
+check_admin_token();
 
 // 본인확인을 사용할 경우 아이핀, 휴대폰인증 중 하나는 선택되어야 함
 if($_POST['cf_cert_use'] && !$_POST['cf_cert_ipin'] && !$_POST['cf_cert_hp'])

adm/contentform.php

@@ -60,6 +60,7 @@ include_once (G5_ADMIN_PATH.'/admin.head.php');
 <form name="frmcontentform" action="./contentformupdate.php" onsubmit="return frmcontentform_check(this);" method="post" enctype="MULTIPART/FORM-DATA" >
 <input type="hidden" name="w" value="<?php echo $w; ?>">
 <input type="hidden" name="co_html" value="1">
+<input type="hidden" name="token" value="">
 
 <div class="tbl_frm01 tbl_wrap">
     <table>

adm/contentformupdate.php

@@ -10,12 +10,26 @@ if ($w == 'd')
 else
     auth_check($auth[$sub_menu], "w");
 
+check_admin_token();
+
 @mkdir(G5_DATA_PATH."/content", G5_DIR_PERMISSION);
 @chmod(G5_DATA_PATH."/content", G5_DIR_PERMISSION);
 
 if ($co_himg_del)  @unlink(G5_DATA_PATH."/content/{$co_id}_h");
 if ($co_timg_del)  @unlink(G5_DATA_PATH."/content/{$co_id}_t");
 
+$error_msg = '';
+
+if( $co_include_head && ! is_include_path_check($co_include_head) ){
+    $co_include_head = '';
+    $error_msg = '/data/file/ 또는 /data/editor/ 포함된 문자를 상단 파일 경로에 포함시킬수 없습니다.';
+}
+
+if( $co_include_tail && ! is_include_path_check($co_include_tail) ){
+    $co_include_tail = '';
+    $error_msg = '/data/file/ 또는 /data/editor/ 포함된 문자를 하단 파일 경로에 포함시킬수 없습니다.';
+}
+
 $sql_common = " co_include_head     = '$co_include_head',
                 co_include_tail     = '$co_include_tail',
                 co_html             = '$co_html',
@@ -72,7 +86,11 @@ if ($w == "" || $w == "u")
         @chmod($dest_path, G5_FILE_PERMISSION);
     }
 
-    goto_url("./contentform.php?w=u&co_id=$co_id");
+    if( $error_msg ){
+        alert($error_msg, "./contentform.php?w=u&co_id=$co_id");
+    } else {
+        goto_url("./contentform.php?w=u&co_id=$co_id");
+    }
 }
 else
 {

adm/contentlist.php

@@ -78,7 +78,7 @@ $result = sql_query($sql);
         <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();"><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>
     </tr>
     <?php

adm/css/admin.css

@@ -311,6 +311,7 @@ tfoot td {font-weight:bold;text-align:center}
 #menu_frm #menu_result {margin:20px 0}
 
 #menulist .sub_menu_class {padding-left:25px;background:url('../img/sub_menu_ico.gif') 5px 15px no-repeat}
+.exist_menu_link {font-weight:bold;color:red}
 
 /* 회원관리 목록 */
 .mb_leave_msg {color:#b6b6b6}

adm/faqform.php

@@ -31,6 +31,7 @@ include_once (G5_ADMIN_PATH.'/admin.head.php');
 <input type="hidden" name="w" value="<?php echo $w; ?>">
 <input type="hidden" name="fm_id" value="<?php echo $fm_id; ?>">
 <input type="hidden" name="fa_id" value="<?php echo $fa_id; ?>">
+<input type="hidden" name="token" value="">
 
 <div class="tbl_frm01 tbl_wrap">
     <table>

adm/faqformupdate.php

@@ -10,6 +10,8 @@ if ($W == 'd')
 else
     auth_check($auth[$sub_menu], "w");
 
+check_admin_token();
+
 $sql_common = " fa_subject = '$fa_subject',
                 fa_content = '$fa_content',
                 fa_order = '$fa_order' ";

adm/faqlist.php

@@ -69,7 +69,7 @@ $result = sql_query($sql);
         <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="javascript:del('./faqformupdate.php?w=d&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>
     </tr>
 

adm/faqmasterform.php

@@ -7,6 +7,8 @@ auth_check($auth[$sub_menu], "w");
 
 $html_title = 'FAQ';
 
+$fm_id = preg_replace('/[^0-9]/', '', $fm_id);
+
 if ($w == "u")
 {
     $html_title .= ' 수정';
@@ -36,6 +38,7 @@ include_once (G5_ADMIN_PATH.'/admin.head.php');
 <form name="frmfaqmasterform" action="./faqmasterformupdate.php" onsubmit="return frmfaqmasterform_check(this);" method="post" enctype="MULTIPART/FORM-DATA">
 <input type="hidden" name="w" value="<?php echo $w; ?>">
 <input type="hidden" name="fm_id" value="<?php echo $fm_id; ?>">
+<input type="hidden" name="token" value="">
 
 <div class="tbl_frm01 tbl_wrap">
     <table>

adm/faqmasterformupdate.php

@@ -10,6 +10,8 @@ if ($W == 'd')
 else
     auth_check($auth[$sub_menu], "w");
 
+check_admin_token();
+
 @mkdir(G5_DATA_PATH."/faq", G5_DIR_PERMISSION);
 @chmod(G5_DATA_PATH."/faq", G5_DIR_PERMISSION);
 

adm/faqmasterlist.php

@@ -107,7 +107,7 @@ $result = sql_query($sql);
         <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();"><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>
     </tr>
     <?php

adm/index.php

@@ -84,7 +84,7 @@ $colspan = 12;
             else
             {
                 $s_mod = '<a href="./member_form.php?$qstr&amp;w=u&amp;mb_id='.$row['mb_id'].'">수정</a>';
-                $s_del = '<a href="javascript:del(\'./member_delete.php?'.$qstr.'&amp;w=d&amp;mb_id='.$row['mb_id'].'&amp;url='.$_SERVER['SCRIPT_NAME'].'\');">삭제</a>';
+                $s_del = '<a href="./member_delete.php?'.$qstr.'&amp;w=d&amp;mb_id='.$row['mb_id'].'&amp;url='.$_SERVER['SCRIPT_NAME'].'" onclick="return delete_confirm(this);">삭제</a>';
             }
             $s_grp = '<a href="./boardgroupmember_form.php?mb_id='.$row['mb_id'].'">그룹</a>';
 

adm/mail_delete.php

@@ -6,7 +6,7 @@ check_demo();
 
 auth_check($auth[$sub_menu], 'd');
 
-check_token();
+check_admin_token();
 
 $count = count($_POST['chk']);
 

adm/mail_form.php

@@ -5,8 +5,6 @@ include_once(G5_EDITOR_LIB);
 
 auth_check($auth[$sub_menu], 'r');
 
-$token = get_token();
-
 $html_title = '회원메일';
 
 if ($w == 'u') {
@@ -30,7 +28,7 @@ include_once('./admin.head.php');
 <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">
 <input type="hidden" name="ma_id" value="<?php echo $ma['ma_id'] ?>" id="ma_id">
-<input type="hidden" name="token" value="<?php echo $token ?>" id="token">
+<input type="hidden" name="token" value="" id="token">
 
 <div class="tbl_frm01 tbl_wrap">
     <table>

adm/mail_list.php

@@ -82,7 +82,7 @@ $colspan = 7;
 </div>
 
 <div class="btn_list01 btn_list">
-    <button type="submit">선택삭제</button>
+    <input type="submit" value="선택삭제">
 </div>
 </form>
 

adm/mail_select_list.php

@@ -4,8 +4,6 @@ include_once('./_common.php');
 
 auth_check($auth[$sub_menu], 'r');
 
-$token = get_token();
-
 $ma_last_option = "";
 
 $sql_common = " from {$g5['member_table']} ";
@@ -69,7 +67,7 @@ include_once('./admin.head.php');
 ?>
 
 <form name="fmailselectlist" id="fmailselectlist" method="post" action="./mail_select_update.php">
-<input type="hidden" name="token" value="<?php echo $token ?>">
+<input type="hidden" name="token" value="">
 <input type="hidden" name="ma_id" value="<?php echo $ma_id ?>">
 
 <div class="tbl_head01 tbl_wrap">

adm/mail_select_update.php

@@ -8,7 +8,7 @@ $html_title = '회원메일 발송';
 
 check_demo();
 
-check_token();
+check_admin_token();
 
 include_once('./admin.head.php');
 include_once(G5_LIB_PATH.'/mailer.lib.php');

adm/mail_update.php

@@ -7,7 +7,7 @@ if ($w == 'u' || $w == 'd')
 
 auth_check($auth[$sub_menu], 'w');
 
-check_token();
+check_admin_token();
 
 if ($w == '')
 {

adm/member_delete.php

@@ -1,4 +1,4 @@
-<?
+<?php
 $sub_menu = "200100";
 include_once("./_common.php");
 
@@ -17,7 +17,7 @@ else if (is_admin($mb['mb_id']) == "super")
 else if ($mb['mb_level'] >= $member['mb_level'])
     alert("자신보다 권한이 높거나 같은 회원은 삭제할 수 없습니다.");
 
-check_token();
+check_admin_token();
 
 // 회원자료 삭제
 member_delete($mb['mb_id']);

adm/member_form.php

@@ -4,8 +4,6 @@ include_once('./_common.php');
 
 auth_check($auth[$sub_menu], 'w');
 
-$token = get_token();
-
 if ($w == '')
 {
     $required_mb_id = 'required';
@@ -128,6 +126,11 @@ if(!isset($mb['mb_dupinfo'])) {
     sql_query(" ALTER TABLE {$g5['member_table']} ADD `mb_dupinfo` varchar(255) NOT NULL DEFAULT '' AFTER `mb_adult` ", false);
 }
 
+// 이메일인증 체크 필드추가
+if(!isset($mb['mb_email_certify2'])) {
+    sql_query(" ALTER TABLE {$g5['member_table']} ADD `mb_email_certify2` varchar(255) NOT NULL DEFAULT '' AFTER `mb_email_certify` ", false);
+}
+
 if ($mb['mb_intercept_date']) $g5['title'] = "차단된 ";
 else $g5['title'] .= "";
 $g5['title'] .= '회원 '.$html_title;
@@ -144,7 +147,7 @@ add_javascript(G5_POSTCODE_JS, 0);    //다음 주소 js
 <input type="hidden" name="sst" value="<?php echo $sst ?>">
 <input type="hidden" name="sod" value="<?php echo $sod ?>">
 <input type="hidden" name="page" value="<?php echo $page ?>">
-<input type="hidden" name="token" value="<?php echo $token ?>">
+<input type="hidden" name="token" value="">
 
 <div class="tbl_frm01 tbl_wrap">
     <table>
@@ -215,7 +218,7 @@ add_javascript(G5_POSTCODE_JS, 0);    //다음 주소 js
         </td>
     </tr>
     <tr>
-        <th scope="row"><label for="mb_zip1">주소</label></th>
+        <th scope="row">주소</th>
         <td colspan="3" class="td_addr_line">
             <label for="mb_zip" class="sound_only">우편번호</label>
             <input type="text" name="mb_zip" value="<?php echo $mb['mb_zip1'].$mb['mb_zip2']; ?>" id="mb_zip" class="frm_input readonly" size="5" maxlength="6">

adm/member_form_update.php

@@ -8,7 +8,7 @@ if ($w == 'u')
 
 auth_check($auth[$sub_menu], 'w');
 
-check_token();
+check_admin_token();
 
 $mb_id = trim($_POST['mb_id']);
 

adm/member_list.php

@@ -114,6 +114,7 @@ $colspan = 16;
 <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="">
 
 <div class="tbl_head02 tbl_wrap">
     <table>

adm/member_list_delete.php

@@ -1,4 +1,4 @@
-<?
+<?php
 $sub_menu = "200100";
 include_once("./_common.php");
 
@@ -6,7 +6,7 @@ check_demo();
 
 auth_check($auth[$sub_menu], "d");
 
-check_token();
+check_admin_token();
 
 $msg = "";
 for ($i=0; $i<count($chk); $i++)

adm/menu_form.php

@@ -43,13 +43,57 @@ $(function() {
         "./menu_form_search.php"
     );
 
-    $("#me_type").on("change", function() {
-        var type = $(this).val();
+    function link_checks_all_chage(){
+
+        var $links = $(opener.document).find("#menulist input[name='me_link[]']"),
+            $o_link = $(".td_mngsmall input[name='link[]']"),
+            hrefs = [],
+            menu_exist = false;
+           
+        if( $links.length ){
+            $links.each(function( index ) {
+                hrefs.push( $(this).val() );
+            });
+
+            $o_link.each(function( index ) {
+                if( $.inArray( $(this).val(), hrefs ) != -1 ){
+                    $(this).closest("tr").find("td:eq( 0 )").addClass("exist_menu_link");
+                    menu_exist = true;
+                }
+            });
+        }
+
+        if( menu_exist ){
+            $(".menu_exists_tip").show();
+        } else {
+            $(".menu_exists_tip").hide();
+        }
+    }
+
+    function menu_result_change( type ){
+        
+        var dfd = new $.Deferred();
 
         $("#menu_result").empty().load(
             "./menu_form_search.php",
-            { type : type }
+            { type : type },
+            function(){
+                dfd.resolve('Finished');
+            }
         );
+
+        return dfd.promise();
+    }
+
+    $("#me_type").on("change", function() {
+        var type = $(this).val();
+
+        var promise = menu_result_change( type );
+
+        promise.done(function(message) {
+            link_checks_all_chage(type);
+        });
+
     });
 
     $(document).on("click", "#add_manual", function() {

adm/menu_form_search.php

@@ -11,7 +11,7 @@ switch($type) {
                     order by gr_order, gr_id ";
         break;
     case 'board':
-        $sql = " select bo_table as id, bo_subject as subject
+        $sql = " select bo_table as id, bo_subject as subject, gr_id
                     from {$g5['board_table']}
                     order by bo_order, bo_table ";
         break;
@@ -32,13 +32,18 @@ if($sql) {
 
     for($i=0; $row=sql_fetch_array($result); $i++) {
         if($i == 0) {
+
+    $bbs_subject_title = ($type == 'board') ? '게시판제목' : '제목';
 ?>
 
 <div class="tbl_head01 tbl_wrap">
     <table>
     <thead>
     <tr>
-        <th scope="col">제목</th>
+        <th scope="col"><?php echo $bbs_subject_title; ?></th>
+        <?php if($type == 'board'){ ?>
+            <th scope="col">게시판 그룹</th>
+        <?php } ?>
         <th scope="col">선택</th>
     </tr>
     </thead>
@@ -63,6 +68,12 @@ if($sql) {
 
     <tr>
         <td><?php echo $row['subject']; ?></td>
+        <?php
+        if($type == 'board'){
+        $group = get_call_func_cache('get_group', array($row['gr_id']));
+        ?>
+        <td><?php echo $group['gr_subject']; ?></td>
+        <?php } ?>
         <td class="td_mngsmall">
             <input type="hidden" name="subject[]" value="<?php echo preg_replace('/[\'\"]/', '', $row['subject']); ?>">
             <input type="hidden" name="link[]" value="<?php echo $link; ?>">
@@ -76,6 +87,10 @@ if($sql) {
     </table>
 </div>
 
+<div class="local_desc01 menu_exists_tip" style="display:none">
+    <p>* <strong>빨간색</strong>의 제목은 이미 메뉴에 연결되어 경우 표시됩니다.</p>
+</div>
+
 <div class="btn_win02 btn_win">
     <button type="button" class="btn_cancel" onclick="window.close();">창닫기</button>
 </div>

adm/menu_list.php

@@ -5,8 +5,6 @@ include_once('./_common.php');
 if ($is_admin != 'super')
     alert('최고관리자만 접근 가능합니다.');
 
-$token = get_token();
-
 // 메뉴테이블 생성
 if( !isset($g5['menu_table']) ){
     die('<meta charset="utf-8">dbconfig.php 파일에 <strong>$g5[\'menu_table\'] = G5_TABLE_PREFIX.\'menu\';</strong> 를 추가해 주세요.');
@@ -40,7 +38,7 @@ $colspan = 7;
 </div>
 
 <form name="fmenulist" id="fmenulist" method="post" action="./menu_list_update.php" onsubmit="return fmenulist_submit(this);">
-<input type="hidden" name="token" value="<?php echo $token ?>">
+<input type="hidden" name="token" value="">
 
 <div class="btn_add01 btn_add">
     <button type="button" onclick="return add_menu();">메뉴추가<span class="sound_only"> 새창</span></button>

adm/menu_list_update.php

@@ -7,7 +7,7 @@ check_demo();
 if ($is_admin != 'super')
     alert('최고관리자만 접근 가능합니다.');
 
-check_token();
+check_admin_token();
 
 // 이전 메뉴정보 삭제
 $sql = " delete from {$g5['menu_table']} ";

adm/newwinform.php

@@ -5,6 +5,8 @@ include_once(G5_EDITOR_LIB);
 
 auth_check($auth[$sub_menu], "w");
 
+$nw_id = preg_replace('/[^0-9]/', '', $nw_id);
+
 $html_title = "팝업레이어";
 if ($w == "u")
 {
@@ -32,6 +34,7 @@ include_once (G5_ADMIN_PATH.'/admin.head.php');
 <form name="frmnewwin" action="./newwinformupdate.php" onsubmit="return frmnewwin_check(this);" method="post">
 <input type="hidden" name="w" value="<?php echo $w; ?>">
 <input type="hidden" name="nw_id" value="<?php echo $nw_id; ?>">
+<input type="hidden" name="token" value="">
 
 <div class="local_desc01 local_desc">
     <p>초기화면 접속 시 자동으로 뜰 팝업레이어를 설정합니다.</p>

adm/newwinformupdate.php

@@ -10,6 +10,8 @@ if ($w == 'd')
 else
     auth_check($auth[$sub_menu], "w");
 
+check_admin_token();
+
 $sql_common = " nw_device = '{$_POST['nw_device']}',
                 nw_begin_time = '{$_POST['nw_begin_time']}',
                 nw_end_time = '{$_POST['nw_end_time']}',

adm/newwinlist.php

@@ -98,7 +98,7 @@ $result = sql_query($sql);
         <td class="td_num"><?php echo $row['nw_height']; ?>px</td>
         <td class="td_mngsmall">
             <a href="./newwinform.php?w=u&amp;nw_id=<?php echo $row['nw_id']; ?>"><span class="sound_only"><?php echo $row['nw_subject']; ?> </span>수정</a>
-            <a href="./newwinformupdate.php?w=d&amp;nw_id=<?php echo $row['nw_id']; ?>" onclick="return delete_confirm();"><span class="sound_only"><?php echo $row['nw_subject']; ?> </span>삭제</a>
+            <a href="./newwinformupdate.php?w=d&amp;nw_id=<?php echo $row['nw_id']; ?>" onclick="return delete_confirm(this);"><span class="sound_only"><?php echo $row['nw_subject']; ?> </span>삭제</a>
         </td>
     </tr>
     <?php

adm/point_list.php

@@ -4,8 +4,6 @@ include_once('./_common.php');
 
 auth_check($auth[$sub_menu], 'r');
 
-$token = get_token();
-
 $sql_common = " from {$g5['point_table']} ";
 
 $sql_search = " where (1) ";
@@ -100,7 +98,7 @@ else
 <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="">
 
 <div class="tbl_head01 tbl_wrap">
     <table>

adm/point_list_delete.php

@@ -6,7 +6,7 @@ check_demo();
 
 auth_check($auth[$sub_menu], 'd');
 
-check_token();
+check_admin_token();
 
 $count = count($_POST['chk']);
 if(!$count)

adm/point_update.php

@@ -4,7 +4,7 @@ include_once('./_common.php');
 
 auth_check($auth[$sub_menu], 'w');
 
-check_token();
+check_admin_token();
 
 $mb_id = $_POST['mb_id'];
 $po_point = $_POST['po_point'];

adm/poll_delete.php

@@ -6,7 +6,7 @@ check_demo();
 
 auth_check($auth[$sub_menu], 'd');
 
-check_token();
+check_admin_token();
 
 $count = count($_POST['chk']);
 

adm/poll_form.php

@@ -4,8 +4,6 @@ include_once('./_common.php');
 
 auth_check($auth[$sub_menu], 'w');
 
-$token = get_token();
-
 $html_title = '투표';
 if ($w == '')
     $html_title .= ' 생성';
@@ -28,7 +26,7 @@ include_once('./admin.head.php');
 <input type="hidden" name="sst" value="<?php echo $sst ?>">
 <input type="hidden" name="sod" value="<?php echo $sod ?>">
 <input type="hidden" name="page" value="<?php echo $page ?>">
-<input type="hidden" name="token" value="<?php echo $token ?>">
+<input type="hidden" name="token" value="">
 
 <div class="tbl_frm01 tbl_wrap">
 

adm/poll_form_update.php

@@ -8,7 +8,7 @@ if ($w == 'u' || $w == 'd')
 
 auth_check($auth[$sub_menu], 'w');
 
-check_token();
+check_admin_token();
 
 if ($w == '')
 {

adm/poll_list.php

@@ -4,8 +4,6 @@ include_once('./_common.php');
 
 auth_check($auth[$sub_menu], 'r');
 
-$token = get_token();
-
 $sql_common = " from {$g5['poll_table']} ";
 
 $sql_search = " where (1) ";
@@ -79,7 +77,7 @@ $colspan = 7;
 <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="">
 
 <div class="tbl_head01 tbl_wrap">
     <table>
@@ -134,7 +132,7 @@ $colspan = 7;
 </div>
 
 <div class="btn_list01 btn_list">
-    <button type="submit">선택삭제</button>
+    <input type="submit" value="선택삭제">
 </div>
 </form>
 

adm/popular_rank.php

@@ -4,8 +4,8 @@ include_once('./_common.php');
 
 auth_check($auth[$sub_menu], 'r');
 
-if (empty($fr_date)) $fr_date = G5_TIME_YMD;
-if (empty($to_date)) $to_date = G5_TIME_YMD;
+if (empty($fr_date) || ! preg_match("/^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])$/", $fr_date) ) $fr_date = G5_TIME_YMD;
+if (empty($to_date) || ! preg_match("/^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])$/", $to_date) ) $to_date = G5_TIME_YMD;
 
 $qstr = "fr_date={$fr_date}{&to_date}={$to_date}";
 

adm/qa_config.php

@@ -5,8 +5,6 @@ include_once(G5_EDITOR_LIB);
 
 auth_check($auth[$sub_menu], 'r');
 
-$token = get_token();
-
 $g5['title'] = '1:1문의 설정';
 include_once ('./admin.head.php');
 
@@ -119,7 +117,7 @@ if(!isset($qaconfig['qa_include_head'])) {
 ?>
 
 <form name="fqaconfigform" id="fqaconfigform" method="post" onsubmit="return fqaconfigform_submit(this);" autocomplete="off">
-<input type="hidden" name="token" value="<?php echo $token ?>" id="token">
+<input type="hidden" name="token" value="" id="token">
 
 <section id="anc_cf_qa_config">
     <h2 class="h2_frm">1:1문의 설정</h2>

adm/qa_config_update.php

@@ -6,7 +6,19 @@ check_demo();
 
 auth_check($auth[$sub_menu], 'w');
 
-check_token();
+check_admin_token();
+
+$error_msg = '';
+
+if( $qa_include_head && ! is_include_path_check($qa_include_head) ){
+    $qa_include_head = '';
+    $error_msg = '/data/file/ 또는 /data/editor/ 포함된 문자를 상단 파일 경로에 포함시킬수 없습니다.';
+}
+
+if( $qa_include_tail && ! is_include_path_check($qa_include_tail) ){
+    $qa_include_tail = '';
+    $error_msg = '/data/file/ 또는 /data/editor/ 포함된 문자를 하단 파일 경로에 포함시킬수 없습니다.';
+}
 
 $sql = " update {$g5['qa_config_table']}
             set qa_title                = '{$_POST['qa_title']}',
@@ -29,8 +41,8 @@ $sql = " update {$g5['qa_config_table']}
                 qa_image_width          = '{$_POST['qa_image_width']}',
                 qa_upload_size          = '{$_POST['qa_upload_size']}',
                 qa_insert_content       = '{$_POST['qa_insert_content']}',
-                qa_include_head         = '{$_POST['qa_include_head']}',
-                qa_include_tail         = '{$_POST['qa_include_tail']}',
+                qa_include_head         = '{$qa_include_head}',
+                qa_include_tail         = '{$qa_include_tail}',
                 qa_content_head         = '{$_POST['qa_content_head']}',
                 qa_content_tail         = '{$_POST['qa_content_tail']}',
                 qa_mobile_content_head  = '{$_POST['qa_mobile_content_head']}',
@@ -47,5 +59,9 @@ $sql = " update {$g5['qa_config_table']}
                 qa_5                    = '{$_POST['qa_5']}' ";
 sql_query($sql);
 
-goto_url('./qa_config.php');
+if($error_msg){
+    alert($error_msg, './qa_config.php');
+} else {
+    goto_url('./qa_config.php');
+}
 ?>

adm/service.php

@@ -19,9 +19,9 @@ include_once('./admin.head.php');
         <p>정보통신망법 23조 2항(주민등록번호의 사용제한)에 따라 기존 주민등록번호 기반의 인증서비스 이용이 불가합니다. 주민등록번호 대체수단으로 최소한의 정보(생년월일, 휴대폰번호, 성별)를 입력받아 본인임을 확인하는 인증수단 입니다</p>
 
         <ul>
-            <li><a href="http://sir.co.kr/main/service/p_cert.php" target="_blank"><img src="<?php echo G5_ADMIN_URL ?>/img/svc_btn_01.jpg" alt="KCP 휴대폰 본인확인 신청하기"></a></li>
-            <li><a href="http://sir.co.kr/main/service/lg_cert.php" target="_blank"><img src="<?php echo G5_ADMIN_URL ?>/img/svc_btn_02.jpg" alt="LG유플러스 휴대폰대체인증 신청하기"></a></li>
-            <li class="last"><a href="http://sir.co.kr/main/service/b_cert.php" target="_blank"><img src="<?php echo G5_ADMIN_URL ?>/img/svc_btn_03.jpg" alt="OKname 휴대폰 본인확인 신청하기"></a></li>
+            <li><a href="http://sir.kr/main/service/p_cert.php" target="_blank"><img src="<?php echo G5_ADMIN_URL ?>/img/svc_btn_01.jpg" alt="KCP 휴대폰 본인확인 신청하기"></a></li>
+            <li><a href="http://sir.kr/main/service/lg_cert.php" target="_blank"><img src="<?php echo G5_ADMIN_URL ?>/img/svc_btn_02.jpg" alt="LG유플러스 휴대폰대체인증 신청하기"></a></li>
+            <li class="last"><a href="http://sir.kr/main/service/b_cert.php" target="_blank"><img src="<?php echo G5_ADMIN_URL ?>/img/svc_btn_03.jpg" alt="OKname 휴대폰 본인확인 신청하기"></a></li>
         </ul>
     </div>
     <div class="sevice_1">
@@ -30,7 +30,7 @@ include_once('./admin.head.php');
         <p>정부가 주관하는 주민등록번호 대체 수단으로 본인의 개인정보를 아이핀 사이트에 한번만 발급해 놓고, 이후부터는 아이디와 패스워드 만으로
         본인임을 확인하는 인증수단 입니다.</p>
 
-       <h4><a href="http://sir.co.kr/main/service/b_ipin.php" target="_blank"><img src="<?php echo G5_ADMIN_URL ?>/img/svc_btn_04.jpg" alt="OKname 아이핀 본인확인 신청하기"></a></h4>
+       <h4><a href="http://sir.kr/main/service/b_ipin.php" target="_blank"><img src="<?php echo G5_ADMIN_URL ?>/img/svc_btn_04.jpg" alt="OKname 아이핀 본인확인 신청하기"></a></h4>
     </div>
     <div class="sevice_2">
             <div class="svc_sms">
@@ -40,7 +40,7 @@ include_once('./admin.head.php');
                 </div>
                 <div class="svc_btn"><a href="http://icodekorea.com/res/join_company_fix_a.php?sellid=sir2" target="_blank"><img src="<?php echo G5_ADMIN_URL ?>/img/svc_btn_05.jpg" alt="아이코드 SMS 서비스 신청하기"></a></div>
             </div>
-            
+
     </div>
 </div>
 

adm/sms_admin/_common.php

@@ -12,5 +12,11 @@ if (!strstr($_SERVER['SCRIPT_NAME'], 'install.php')) {
     //$sms5 = sql_fetch("select * from ".$g5['sms5_config_table'] );
 }
 
+$sv = isset($_REQUEST['sv']) ? get_search_string($_REQUEST['sv']) : '';
+
+if( isset($token) ){
+    $token = @htmlspecialchars(strip_tags($token), ENT_QUOTES);
+}
+
 add_stylesheet('<link rel="stylesheet" href="'.G5_SMS5_ADMIN_URL.'/css/sms5.css">', 0);
 ?>

adm/sms_admin/config_update.php

@@ -6,6 +6,8 @@ auth_check($auth[$sub_menu], "w");
 
 check_demo();
 
+check_admin_token();
+
 $g5['title'] = "SMS 기본설정";
 
 // 회신번호 체크

adm/sms_admin/form_list.php

@@ -18,6 +18,9 @@ if (is_numeric($fg_no))
 else
     $sql_group = "";
 
+$st = clean_xss_tags($st);
+$sv = clean_xss_tags($sv);
+
 if ($st == 'all') {
     $sql_search = "and (fo_name like '%{$sv}%' or fo_content like '%{$sv}%')";
 } else if ($st == 'name') {
@@ -60,7 +63,7 @@ function book_all_checked(chk)
 function book_del(fo_no)
 {
     if (confirm("한번 삭제한 자료는 복구할 방법이 없습니다.\n\n그래도 삭제하시겠습니까?"))
-        location.href = "./form_update.php?w=d&fo_no=" + fo_no + "&page=<?php echo $page?>&fg_no=<?php echo $fg_no?>&st=<?php echo $st?>&sv=<?php echo $sv?>";
+        location.href = "./form_update.php?w=d&fo_no=" + fo_no + "&page=<?php echo $page?>&fg_no=<?php echo $fg_no?>&st=<?php echo get_text($st); ?>&sv=<?php echo get_text($sv); ?>";
 }
 
 function multi_update(sel)
@@ -127,7 +130,7 @@ function multi_update(sel)
         <option value="content"<?php echo get_selected('content', $st); ?>>이모티콘</option>
     </select>
     <label for="sv" class="sound_only">검색어<strong class="sound_only"> 필수</strong></label>
-    <input type="text" name="sv" value="<?php echo $sv;?>" id="sv" required class="frm_input required" >
+    <input type="text" name="sv" value="<?php echo get_text($sv) ;?>" id="sv" required class="frm_input required" >
     <input type="submit" value="검색" class="btn_submit">
     </form>
 </div>
@@ -181,7 +184,7 @@ function multi_update(sel)
             <span class="sound_only">등록 </span><?php echo date('Y-m-d', strtotime($res['fo_datetime']))?>
         </div>
         <div class="li_cmd">
-            <a href="./form_write.php?w=u&amp;fo_no=<?php echo $res['fo_no']?>&amp;page=<?php echo $page;?>&amp;fg_no=<?php echo $fg_no;?>&amp;st=<?php echo $st;?>&amp;sv=<?php echo $sv;?>">수정</a>
+            <a href="./form_write.php?w=u&amp;fo_no=<?php echo $res['fo_no']?>&amp;page=<?php echo $page;?>&amp;fg_no=<?php echo $fg_no;?>&amp;st=<?php echo get_text($st);?>&amp;sv=<?php echo get_text($sv);?>">수정</a>
             <a href="javascript:void(book_del('<?php echo $res['fo_no']?>'));">삭제</a>
             <a href="./sms_write.php?fo_no=<?php echo $res['fo_no']?>">보내기</a>
         </div>

adm/sms_admin/sms_write_send.php

@@ -4,6 +4,8 @@ include_once("./_common.php");
 
 auth_check($auth[$sub_menu], "w");
 
+check_admin_token();
+
 $g5['title'] = "문자전송중";
 
 $wr_reply   = preg_replace('#[^0-9\-]#', '', trim($wr_reply));

adm/theme_update.php

@@ -5,6 +5,8 @@ include_once('./_common.php');
 if ($is_admin != 'super')
     die('최고관리자만 접근 가능합니다.');
 
+admin_referer_check();
+
 $theme = trim($_POST['theme']);
 $theme_dir = get_theme_dir();
 

adm/visit.sub.php

@@ -5,8 +5,8 @@ include_once(G5_LIB_PATH.'/visit.lib.php');
 include_once('./admin.head.php');
 include_once(G5_PLUGIN_PATH.'/jquery-ui/datepicker.php');
 
-if (empty($fr_date)) $fr_date = G5_TIME_YMD;
-if (empty($to_date)) $to_date = G5_TIME_YMD;
+if (empty($fr_date) || ! preg_match("/^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])$/", $fr_date) ) $fr_date = G5_TIME_YMD;
+if (empty($to_date) || ! preg_match("/^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])$/", $to_date) ) $to_date = G5_TIME_YMD;
 
 $qstr = "fr_date=".$fr_date."&to_date=".$to_date;
 $query_string = $qstr ? '?'.$qstr : '';

adm/visit_date.php

@@ -71,6 +71,7 @@ for ($i=0; $row=sql_fetch_array($result); $i++) {
     </tr>
 
     <?php
+        $i++;
         }
     } else {
         echo '<tr><td colspan="'.$colspan.'" class="empty_table">자료가 없습니다.</td></tr>';

adm/visit_month.php

@@ -72,6 +72,7 @@ for ($i=0; $row=sql_fetch_array($result); $i++) {
     </tr>
 
     <?php
+        $i++;
         }
 
 

adm/visit_search.php

@@ -44,7 +44,7 @@ $listall = '<a href="'.$_SERVER['SCRIPT_NAME'].'">처음</a>'; //페이지 처
     <?php
     $sql_common = " from {$g5['visit_table']} ";
     if ($sfl) {
-        if($sst=='vi_ip' || $sst=='vi_date'){
+        if($sfl=='vi_ip' || $sfl=='vi_date'){
             $sql_search = " where $sfl like '$stx%' ";
         }else{
             $sql_search = " where $sfl like '%$stx%' ";

adm/write_count.php

@@ -14,7 +14,7 @@ add_javascript('<script src="'.G5_PLUGIN_URL.'/jqplot/plugins/jqplot.categoryAxi
 add_javascript('<script src="'.G5_PLUGIN_URL.'/jqplot/plugins/jqplot.pointLabels.min.js"></script>', 0);
 add_javascript('<!--[if lt IE 9]><script src="'.G5_PLUGIN_URL.'/jqplot/excanvas.js"></script><![endif]-->', 0);
 
-if (!($graph == 'line' || $graph == 'bar')) 
+if (!($graph == 'line' || $graph == 'bar'))
     $graph = 'line';
 
 if ($graph == 'bar') {
@@ -49,7 +49,7 @@ foreach($period_array as $key=>$value) {
         break;
     }
 }
-if (!$is_period) 
+if (!$is_period)
     $period = '오늘';
 
 $day = $period_array[$period][0];
@@ -64,15 +64,15 @@ if ($period == '오늘') {
     $from = $yesterday;
     $to = $from;
 } else if ($period == '내일') {
-    $from = date('Y-m-d', G5_SERVER_TIME + (86400 * 2)); 
+    $from = date('Y-m-d', G5_SERVER_TIME + (86400 * 2));
     $to = $from;
 } else {
-    $from = date('Y-m-d', G5_SERVER_TIME - (86400 * $period_array[$period][1])); 
+    $from = date('Y-m-d', G5_SERVER_TIME - (86400 * $period_array[$period][1]));
     $to = $yesterday;
 }
 
 $sql_bo_table = '';
-if ($bo_table) 
+if ($bo_table)
     $sql_bo_table = "and bo_table = '$bo_table'";
 
 switch ($day) {
@@ -130,7 +130,7 @@ switch ($day) {
     <form>
     <select name="bo_table">
     <option value="">전체게시판</a>
-    <?php 
+    <?php
     $sql = " select bo_table, bo_subject from {$g5['board_table']} order by bo_count_write desc ";
     $result = sql_query($sql);
     for($i=0; $row=sql_fetch_array($result); $i++) {
@@ -179,7 +179,7 @@ $(document).ready(function(){
     var line1 = [<?php echo implode($line1, ','); ?>];
     var line2 = [<?php echo implode($line2, ','); ?>];
     var plot1 = $.jqplot ('chart1', [line1, line2], {
-            seriesDefaults: { 
+            seriesDefaults: {
                 <?php if ($graph == 'bar') { ?>
                 renderer:$.jqplot.BarRenderer,
                 <?php } ?>
@@ -205,6 +205,6 @@ $(document).ready(function(){
 }
 ?>
 
-<?
+<?php
 include_once ('./admin.tail.php');
 ?>

bbs/ajax.comment_token.php

@@ -0,0 +1,14 @@
+<?php
+include_once('./_common.php');
+include_once(G5_LIB_PATH.'/json.lib.php');
+
+$ss_name = 'ss_comment_token';
+
+set_session($ss_name, '');
+
+$token = _token();
+
+set_session($ss_name, $token);
+
+die(json_encode(array('token'=>$token)));
+?>

bbs/ajax.mb_email.php

@@ -5,8 +5,12 @@ include_once(G5_LIB_PATH.'/register.lib.php');
 $mb_email = trim($_POST['reg_mb_email']);
 $mb_id    = trim($_POST['reg_mb_id']);
 
+set_session('ss_check_mb_email', '');
+
 if ($msg = empty_mb_email($mb_email)) die($msg);
 if ($msg = valid_mb_email($mb_email)) die($msg);
 if ($msg = prohibit_mb_email($mb_email)) die($msg);
 if ($msg = exist_mb_email($mb_email, $mb_id)) die($msg);
+
+set_session('ss_check_mb_email', $mb_email);
 ?>

bbs/ajax.mb_id.php

@@ -4,9 +4,13 @@ include_once(G5_LIB_PATH.'/register.lib.php');
 
 $mb_id = trim($_POST['reg_mb_id']);
 
+set_session('ss_check_mb_id', '');
+
 if ($msg = empty_mb_id($mb_id))     die($msg);
 if ($msg = valid_mb_id($mb_id))     die($msg);
 if ($msg = count_mb_id($mb_id))     die($msg);
 if ($msg = exist_mb_id($mb_id))     die($msg);
 if ($msg = reserve_mb_id($mb_id))   die($msg);
+
+set_session('ss_check_mb_id', $mb_id);
 ?>

bbs/ajax.mb_nick.php

@@ -5,9 +5,13 @@ include_once(G5_LIB_PATH.'/register.lib.php');
 $mb_nick = trim($_POST['reg_mb_nick']);
 $mb_id   = trim($_POST['reg_mb_id']);
 
+set_session('ss_check_mb_nick', '');
+
 if ($msg = empty_mb_nick($mb_nick)) die($msg);
 if ($msg = valid_mb_nick($mb_nick)) die($msg);
 if ($msg = count_mb_nick($mb_nick)) die($msg);
 if ($msg = exist_mb_nick($mb_nick, $mb_id)) die($msg);
 if ($msg = reserve_mb_nick($mb_nick)) die($msg);
+
+set_session('ss_check_mb_nick', $mb_nick);
 ?>

bbs/alert.php

@@ -33,6 +33,8 @@ $msg2 = str_replace("\\n", "<br>", $msg);
 $url = clean_xss_tags($url);
 if (!$url) $url = clean_xss_tags($_SERVER['HTTP_REFERER']);
 
+$url = preg_replace("/[\<\>\'\"\\\'\\\"\(\)]/", "", $url);
+
 // url 체크
 check_url_host($url);
 

bbs/board.php

@@ -130,13 +130,13 @@ if (isset($wr_id) && $wr_id) {
             if ($config['cf_use_point'] && $board['bo_read_point'] && $member['mb_point'] + $board['bo_read_point'] < 0)
                 alert('보유하신 포인트('.number_format($member['mb_point']).')가 없거나 모자라서 글읽기('.number_format($board['bo_read_point']).')가 불가합니다.\\n\\n포인트를 모으신 후 다시 글읽기 해 주십시오.');
 
-            insert_point($member['mb_id'], $board['bo_read_point'], "{$board['bo_subject']} {$wr_id} 글읽기", $bo_table, $wr_id, '읽기');
+            insert_point($member['mb_id'], $board['bo_read_point'], ((G5_IS_MOBILE && $board['bo_mobile_subject']) ? $board['bo_mobile_subject'] : $board['bo_subject']).' '.$wr_id.' 글읽기', $bo_table, $wr_id, '읽기');
         }
 
         set_session($ss_name, TRUE);
     }
 
-    $g5['title'] = strip_tags(conv_subject($write['wr_subject'], 255))." > ".$board['bo_subject'];
+    $g5['title'] = strip_tags(conv_subject($write['wr_subject'], 255))." > ".((G5_IS_MOBILE && $board['bo_mobile_subject']) ? $board['bo_mobile_subject'] : $board['bo_subject']);
 } else {
     if ($member['mb_level'] < $board['bo_list_level']) {
         if ($member['mb_id'])
@@ -171,7 +171,7 @@ if (isset($wr_id) && $wr_id) {
 
     if (!isset($page) || (isset($page) && $page == 0)) $page = 1;
 
-    $g5['title'] = $board['bo_subject']." ".$page." 페이지";
+    $g5['title'] = ((G5_IS_MOBILE && $board['bo_mobile_subject']) ? $board['bo_mobile_subject'] : $board['bo_subject']).' '.$page.' 페이지';
 }
 
 include_once(G5_PATH.'/head.sub.php');

bbs/board_head.php

@@ -7,7 +7,11 @@ if (G5_IS_MOBILE) {
     include_once(G5_BBS_PATH.'/_head.php');
     echo stripslashes($board['bo_mobile_content_head']);
 } else {
-    @include ($board['bo_include_head']);
+    if(is_include_path_check($board['bo_include_head'])) {  //파일경로 체크
+        @include ($board['bo_include_head']);
+    } else {    //파일경로가 올바르지 않으면 기본파일을 가져옴
+        include_once(G5_BBS_PATH.'/_head.php');
+    }
     echo stripslashes($board['bo_content_head']);
 }
 ?>

bbs/board_tail.php

@@ -8,6 +8,10 @@ if (G5_IS_MOBILE) {
     include_once(G5_BBS_PATH.'/_tail.php');
 } else {
     echo stripslashes($board['bo_content_tail']);
-    @include ($board['bo_include_tail']);
+    if(is_include_path_check($board['bo_include_tail'])) {  //파일경로 체크
+        @include ($board['bo_include_tail']);
+    } else {    //파일경로가 올바르지 않으면 기본파일을 가져옴
+        include_once(G5_BBS_PATH.'/_tail.php');
+    }
 }
 ?>

bbs/content.php

@@ -19,7 +19,7 @@ if (!$co['co_id'])
 
 $g5['title'] = $co['co_subject'];
 
-if ($co['co_include_head'])
+if (is_include_path_check($co['co_include_head']))
     @include_once($co['co_include_head']);
 else
     include_once('./_head.php');
@@ -85,7 +85,7 @@ if(is_file($skin_file)) {
     echo '<p>'.str_replace(G5_PATH.'/', '', $skin_file).'이 존재하지 않습니다.</p>';
 }
 
-if ($co['co_include_tail'])
+if (is_include_path_check($co['co_include_tail']))
     @include_once($co['co_include_tail']);
 else
     include_once('./_tail.php');

bbs/delete.php

@@ -1,11 +1,11 @@
 <?php
 include_once('./_common.php');
 
-if ($is_admin)
-{
-    if (!($token && get_session('ss_delete_token') == $token))
-        alert('토큰 에러로 삭제 불가합니다.');
-}
+$delete_token = get_session('ss_delete_token');
+set_session('ss_delete_token', '');
+
+if (!($token && $delete_token == $token))
+    alert('토큰 에러로 삭제 불가합니다.');
 
 //$wr = sql_fetch(" select * from $write_table where wr_id = '$wr_id' ");
 
@@ -134,5 +134,5 @@ if ($count_write > 0 || $count_comment > 0)
 
 delete_cache_latest($bo_table);
 
-goto_url('./board.php?bo_table='.$bo_table.'&amp;page='.$page.$qstr);
+goto_url(G5_HTTP_BBS_URL.'/board.php?bo_table='.$bo_table.'&amp;page='.$page.$qstr);
 ?>

bbs/delete_all.php

@@ -156,5 +156,5 @@ if ($count_write > 0 || $count_comment > 0)
 
 delete_cache_latest($bo_table);
 
-goto_url('./board.php?bo_table='.$bo_table.'&page='.$page.$qstr);
+goto_url(G5_HTTP_BBS_URL.'/board.php?bo_table='.$bo_table.'&page='.$page.$qstr);
 ?>

bbs/delete_comment.php

@@ -2,11 +2,11 @@
 // 코멘트 삭제
 include_once('./_common.php');
 
-if ($is_admin)
-{
-    if (!($token && get_session("ss_delete_token") == $token))
-        alert('토큰 에러로 삭제 불가합니다.');
-}
+$delete_comment_token = get_session('ss_delete_comment_'.$comment_id.'_token');
+set_session('ss_delete_comment_'.$comment_id.'_token', '');
+
+if (!($token && $delete_comment_token == $token))
+    alert('토큰 에러로 삭제 불가합니다.');
 
 // 4.1
 @include_once($board_skin_path.'/delete_comment.head.skin.php');
@@ -84,5 +84,5 @@ sql_query(" delete from {$g5['board_new_table']} where bo_table = '{$bo_table}'
 
 delete_cache_latest($bo_table);
 
-goto_url('./board.php?bo_table='.$bo_table.'&wr_id='.$write['wr_parent'].'&page='.$page. $qstr);
+goto_url(G5_HTTP_BBS_URL.'/board.php?bo_table='.$bo_table.'&wr_id='.$write['wr_parent'].'&page='.$page. $qstr);
 ?>

bbs/email_certify.php

@@ -1,20 +1,29 @@
 <?php
 include_once('./_common.php');
 
-$sql = " select mb_id, mb_email, mb_datetime from {$g5['member_table']} where mb_id = '{$mb_id}' ";
+$mb_id  = trim($_GET['mb_id']);
+$mb_md5 = trim($_GET['mb_md5']);
+
+$sql = " select mb_id, mb_email_certify2 from {$g5['member_table']} where mb_id = '{$mb_id}' ";
 $row = sql_fetch($sql);
 if (!$row['mb_id'])
     alert('존재하는 회원이 아닙니다.', G5_URL);
 
+// 인증 링크는 한번만 처리가 되게 한다.
+sql_query(" update {$g5['member_table']} set mb_email_certify2 = '' where mb_id = '$mb_id' ");
+
 if ($mb_md5)
 {
-    $tmp_md5 = md5($row['mb_id'].$row['mb_email'].$row['mb_datetime']);
-    if ($mb_md5 == $tmp_md5)
+    if ($mb_md5 == $row['mb_email_certify2'])
     {
         sql_query(" update {$g5['member_table']} set mb_email_certify = '".G5_TIME_YMDHIS."' where mb_id = '{$mb_id}' ");
 
         alert("메일인증 처리를 완료 하였습니다.\\n\\n지금부터 {$mb_id} 아이디로 로그인 가능합니다.", G5_URL);
     }
+    else
+    {
+        alert('메일인증 요청 정보가 올바르지 않습니다.', G5_URL);
+    }
 }
 
 alert('제대로 된 값이 넘어오지 않았습니다.', G5_URL);

bbs/formmail.php

@@ -28,8 +28,17 @@ if ($sendmail_count > 3)
 $g5['title'] = '메일 쓰기';
 include_once(G5_PATH.'/head.sub.php');
 
+$email_enc = new str_encrypt();
+$email_dec = $email_enc->decrypt($email);
+
+$email = get_email_address($email_dec);
+if(!$email)
+    alert_close('이메일이 올바르지 않습니다.');
+
+$email = $email_enc->encrypt($email);
+
 if (!$name)
-    $name = base64_decode($email);
+    $name = $email;
 else
     $name = get_text(stripslashes($name), true);
 

bbs/formmail_send.php

@@ -9,7 +9,8 @@ if (!$config['cf_email_use'])
 if (!$is_member && $config['cf_formmail_is_member'])
     alert_close('회원만 이용하실 수 있습니다.');
 
-$to = base64_decode($to);
+$email_enc = new str_encrypt();
+$to = $email_enc->decrypt($to);
 
 if (substr_count($to, "@") > 1)
     alert_close('한번에 한사람에게만 메일을 발송할 수 있습니다.');

bbs/list.php

@@ -46,7 +46,7 @@ if ($sca || $stx) {
     $sql_search .= " and (wr_num between {$spt} and ({$spt} + {$config['cf_search_part']})) ";
 
     // 원글만 얻는다. (코멘트의 내용도 검색하기 위함)
-    // 라엘님 제안 코드로 대체 http://sir.co.kr/bbs/board.php?bo_table=g5_bug&wr_id=2922
+    // 라엘님 제안 코드로 대체 http://sir.kr/g5_bug/2922
     $sql = " SELECT COUNT(DISTINCT `wr_parent`) AS `cnt` FROM {$write_table} WHERE {$sql_search} ";
     $row = sql_fetch($sql);
     $total_count = $row['cnt'];

bbs/login_check.php

@@ -31,7 +31,8 @@ if ($mb['mb_leave_date'] && $mb['mb_leave_date'] <= date("Ymd", G5_SERVER_TIME))
 }
 
 if ($config['cf_use_email_certify'] && !preg_match("/[1-9]/", $mb['mb_email_certify'])) {
-    confirm("{$mb['mb_email']} 메일로 메일인증을 받으셔야 로그인 가능합니다. 다른 메일주소로 변경하여 인증하시려면 취소를 클릭하시기 바랍니다.", G5_URL, G5_BBS_URL.'/register_email.php?mb_id='.$mb_id);
+    $ckey = md5($mb['mb_ip'].$mb['mb_datetime']);
+    confirm("{$mb['mb_email']} 메일로 메일인증을 받으셔야 로그인 가능합니다. 다른 메일주소로 변경하여 인증하시려면 취소를 클릭하시기 바랍니다.", G5_URL, G5_BBS_URL.'/register_email.php?mb_id='.$mb_id.'&ckey='.$ckey);
 }
 
 @include_once($member_skin_path.'/login_check.skin.php');

bbs/member_confirm.php

@@ -19,6 +19,8 @@ $url = clean_xss_tags($_GET['url']);
 // url 체크
 check_url_host($url);
 
+$url = get_text($url);
+
 include_once($member_skin_path.'/member_confirm.skin.php');
 
 include_once('./_tail.sub.php');

bbs/move_update.php

@@ -19,6 +19,8 @@ $save_count_write = 0;
 $save_count_comment = 0;
 $cnt = 0;
 
+$wr_id_list = preg_replace('/[^0-9\,]/', '', $_POST['wr_id_list']);
+
 $sql = " select distinct wr_num from $write_table where wr_id in ({$wr_id_list}) order by wr_id ";
 $result = sql_query($sql);
 while ($row = sql_fetch_array($result))

bbs/new.php

@@ -6,7 +6,7 @@ include_once('./_head.php');
 
 $sql_common = " from {$g5['board_new_table']} a, {$g5['board_table']} b, {$g5['group_table']} c where a.bo_table = b.bo_table and b.gr_id = c.gr_id and b.bo_use_search = 1 ";
 
-$gr_id = isset($_GET['gr_id']) ? $_GET['gr_id'] : "";
+$gr_id = isset($_GET['gr_id']) ? substr(preg_replace('#[^a-z0-9_]#i', '', $_GET['gr_id']), 0, 10) : '';
 if ($gr_id) {
     $sql_common .= " and b.gr_id = '$gr_id' ";
 }
@@ -46,7 +46,7 @@ for ($i=0; $row=sql_fetch_array($result); $i++) {
 $group_select .= '</select>';
 
 $list = array();
-$sql = " select a.*, b.bo_subject, c.gr_subject, c.gr_id {$sql_common} {$sql_order} limit {$from_record}, {$rows} ";
+$sql = " select a.*, b.bo_subject, b.bo_mobile_subject, c.gr_subject, c.gr_id {$sql_common} {$sql_order} limit {$from_record}, {$rows} ";
 $result = sql_query($sql);
 for ($i=0; $row=sql_fetch_array($result); $i++) {
     $tmp_write_table = $g5['write_prefix'].$row['bo_table'];
@@ -104,7 +104,7 @@ for ($i=0; $row=sql_fetch_array($result); $i++) {
     $list[$i]['datetime2'] = $datetime2;
 
     $list[$i]['gr_subject'] = $row['gr_subject'];
-    $list[$i]['bo_subject'] = $row['bo_subject'];
+    $list[$i]['bo_subject'] = ((G5_IS_MOBILE && $row['bo_mobile_subject']) ? $row['bo_mobile_subject'] : $row['bo_subject']);
     $list[$i]['wr_subject'] = $row2['wr_subject'];
 }
 

bbs/password.php

@@ -5,34 +5,36 @@ $g5['title'] = '비밀번호 입력';
 
 switch ($w) {
     case 'u' :
-        $action = './write.php';
-        $return_url = './board.php?bo_table='.$bo_table.'&wr_id='.$wr_id;
+        $action = G5_HTTP_BBS_URL.'/write.php';
+        $return_url = G5_HTTP_BBS_URL.'/board.php?bo_table='.$bo_table.'&wr_id='.$wr_id;
         break;
     case 'd' :
-        $action = './delete.php';
-        $return_url = './board.php?bo_table='.$bo_table.'&wr_id='.$wr_id;
+        set_session('ss_delete_token', $token = uniqid(time()));
+        $action = https_url(G5_BBS_DIR).'/delete.php?token='.$token;
+        $return_url = G5_HTTP_BBS_URL.'/board.php?bo_table='.$bo_table.'&wr_id='.$wr_id;
         break;
     case 'x' :
-        $action = './delete_comment.php';
+        set_session('ss_delete_comment_'.$comment_id.'_token', $token = uniqid(time()));
+        $action = https_url(G5_BBS_DIR).'/delete_comment.php?token='.$token;
         $row = sql_fetch(" select wr_parent from $write_table where wr_id = '$comment_id' ");
-        $return_url = './board.php?bo_table='.$bo_table.'&wr_id='.$row['wr_parent'];
+        $return_url = G5_HTTP_BBS_URL.'/board.php?bo_table='.$bo_table.'&wr_id='.$row['wr_parent'];
         break;
     case 's' :
         // 비밀번호 창에서 로그인 하는 경우 관리자 또는 자신의 글이면 바로 글보기로 감
         if ($is_admin || ($member['mb_id'] == $write['mb_id'] && $write['mb_id']))
-            goto_url('./board.php?bo_table='.$bo_table.'&wr_id='.$wr_id);
+            goto_url(G5_HTTP_BBS_URL.'/board.php?bo_table='.$bo_table.'&wr_id='.$wr_id);
         else {
-            $action = './password_check.php';
-            $return_url = './board.php?bo_table='.$bo_table;
+            $action = https_url(G5_BBS_DIR).'/password_check.php';
+            $return_url = G5_HTTP_BBS_URL.'/board.php?bo_table='.$bo_table;
         }
         break;
     case 'sc' :
         // 비밀번호 창에서 로그인 하는 경우 관리자 또는 자신의 글이면 바로 글보기로 감
         if ($is_admin || ($member['mb_id'] == $write['mb_id'] && $write['mb_id']))
-            goto_url('./board.php?bo_table='.$bo_table.'&wr_id='.$wr_id);
+            goto_url(G5_HTTP_BBS_URL.'/board.php?bo_table='.$bo_table.'&wr_id='.$wr_id);
         else {
-            $action = './password_check.php';
-            $return_url = './board.php?bo_table='.$bo_table.'&wr_id='.$wr_id;
+            $action = https_url(G5_BBS_DIR).'/password_check.php';
+            $return_url = G5_HTTP_BBS_URL.'/board.php?bo_table='.$bo_table.'&wr_id='.$wr_id;
         }
         break;
     default :

bbs/qadelete.php

@@ -29,6 +29,10 @@ for($i=0; $i<$count; $i++) {
     if($is_admin != 'super' && $row['mb_id'] != $member['mb_id'])
         continue;
 
+    // 답변이 달린 글은 삭제못함
+    if($is_admin != 'super' && !$row['qa_type'] && $row['qa_status'])
+        continue;
+
     // 첨부파일 삭제
     for($k=1; $k<=2; $k++) {
         @unlink(G5_DATA_PATH.'/qa/'.$row['qa_file'.$k]);

bbs/qahead.php

@@ -9,7 +9,7 @@ if (G5_IS_MOBILE) {
     include_once('./_head.php');
     echo conv_content($qaconfig['qa_mobile_content_head'], 1);
 } else {
-    if($qaconfig['qa_include_head'])
+    if(is_include_path_check($qaconfig['qa_include_head']))
         @include ($qaconfig['qa_include_head']);
     else
         include ('./_head.php');

bbs/qalist.php

@@ -110,7 +110,7 @@ if(is_file($skin_file)) {
     $list_href = G5_BBS_URL.'/qalist.php';
     $write_href = G5_BBS_URL.'/qawrite.php';
 
-    $list_pages = preg_replace('/(\.php)(&|&)/i', '$1?', get_paging(G5_IS_MOBILE ? $qaconfig['qa_mobile_page_rows'] : $qaconfig['qa_page_rows'], $page, $total_page, './qalist.php'.$qstr.'&page='));
+    $list_pages = preg_replace('/(\.php)(&|&)/i', '$1?', get_paging(G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, './qalist.php'.$qstr.'&page='));
 
     $stx = get_text(stripslashes($stx));
     include_once($skin_file);

bbs/qatail.php

@@ -7,7 +7,7 @@ if (G5_IS_MOBILE) {
     include_once('./_tail.php');
 } else {
     echo conv_content($qaconfig['qa_content_tail'], 1);
-    if($qaconfig['qa_include_tail'])
+    if(is_include_path_check($qaconfig['qa_include_tail']))
         @include ($qaconfig['qa_include_tail']);
     else
         include ('./_tail.php');