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.

.gitattributes

@@ -0,0 +1,2 @@
+.gitattributes export-ignore
+.gitignore export-ignore

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

@@ -74,6 +74,7 @@ function imageview(id, w, h)
         <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>
@@ -120,7 +121,12 @@ foreach($menu['menu'.$menu_key] as $key=>$value) {
         if ($is_admin != 'super' && (!array_key_exists($value[0],$auth) || !strstr($auth[$value[0]], 'r')))
             continue;
 
-        echo $nl.'<li><a href="'.$value[2].'">'.$value[1].'</a></li>';
+        if($value[3] == 'cf_service')
+            $svc_class = ' class="lnb_svc"';
+        else
+            $svc_class = '';
+
+        echo $nl.'<li><a href="'.$value[2].'"'.$svc_class.'>'.$value[1].'</a></li>';
         $nl = PHP_EOL;
     }
 }

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

@@ -12,11 +12,30 @@ if (!get_session('ss_admin')) {
 // 스킨디렉토리를 SELECT 형식으로 얻음
 function get_skin_select($skin_gubun, $id, $name, $selected='', $event='')
 {
-    $skins = get_skin_dir($skin_gubun);
+    global $config;
+
+    $skins = array();
+
+    if(defined('G5_THEME_PATH') && $config['cf_theme']) {
+        $dirs = get_skin_dir($skin_gubun, G5_THEME_PATH.'/'.G5_SKIN_DIR);
+        if(!empty($dirs)) {
+            foreach($dirs as $dir) {
+                $skins[] = 'theme/'.$dir;
+            }
+        }
+    }
+
+    $skins = array_merge($skins, get_skin_dir($skin_gubun));
+
     $str = "<select id=\"$id\" name=\"$name\" $event>\n";
     for ($i=0; $i<count($skins); $i++) {
         if ($i == 0) $str .= "<option value=\"\">선택</option>";
-        $str .= option_selected($skins[$i], $selected);
+        if(preg_match('#^theme/(.+)$#', $skins[$i], $match))
+            $text = '(테마) '.$match[1];
+        else
+            $text = $skins[$i];
+
+        $str .= option_selected($skins[$i], $selected, $text);
     }
     $str .= "</select>";
     return $str;
@@ -25,11 +44,30 @@ function get_skin_select($skin_gubun, $id, $name, $selected='', $event='')
 // 모바일 스킨디렉토리를 SELECT 형식으로 얻음
 function get_mobile_skin_select($skin_gubun, $id, $name, $selected='', $event='')
 {
-    $skins = get_skin_dir($skin_gubun, G5_MOBILE_PATH.'/'.G5_SKIN_DIR);
+    global $config;
+
+    $skins = array();
+
+    if(defined('G5_THEME_PATH') && $config['cf_theme']) {
+        $dirs = get_skin_dir($skin_gubun, G5_THEME_MOBILE_PATH.'/'.G5_SKIN_DIR);
+        if(!empty($dirs)) {
+            foreach($dirs as $dir) {
+                $skins[] = 'theme/'.$dir;
+            }
+        }
+    }
+
+    $skins = array_merge($skins, get_skin_dir($skin_gubun, G5_MOBILE_PATH.'/'.G5_SKIN_DIR));
+
     $str = "<select id=\"$id\" name=\"$name\" $event>\n";
     for ($i=0; $i<count($skins); $i++) {
         if ($i == 0) $str .= "<option value=\"\">선택</option>";
-        $str .= option_selected($skins[$i], $selected);
+        if(preg_match('#^theme/(.+)$#', $skins[$i], $match))
+            $text = '(테마) '.$match[1];
+        else
+            $text = $skins[$i];
+
+        $str .= option_selected($skins[$i], $selected, $text);
     }
     $str .= "</select>";
     return $str;
@@ -44,6 +82,9 @@ function get_skin_dir($skin, $skin_path=G5_SKIN_PATH)
     $result_array = array();
 
     $dirname = $skin_path.'/'.$skin.'/';
+    if(!is_dir($dirname))
+        return;
+
     $handle = opendir($dirname);
     while ($file = readdir($handle)) {
         if($file == '.'||$file == '..') continue;
@@ -57,6 +98,101 @@ function get_skin_dir($skin, $skin_path=G5_SKIN_PATH)
 }
 
 
+// 테마
+function get_theme_dir()
+{
+    $result_array = array();
+
+    $dirname = G5_PATH.'/'.G5_THEME_DIR.'/';
+    $handle = opendir($dirname);
+    while ($file = readdir($handle)) {
+        if($file == '.'||$file == '..') continue;
+
+        if (is_dir($dirname.$file)) {
+            $theme_path = $dirname.$file;
+            if(is_file($theme_path.'/index.php') && is_file($theme_path.'/head.php') && is_file($theme_path.'/tail.php'))
+                $result_array[] = $file;
+        }
+    }
+    closedir($handle);
+    natsort($result_array);
+
+    return $result_array;
+}
+
+
+// 테마정보
+function get_theme_info($dir)
+{
+    $info = array();
+    $path = G5_PATH.'/'.G5_THEME_DIR.'/'.$dir;
+
+    if(is_dir($path)) {
+        $screenshot = $path.'/screenshot.png';
+        if(is_file($screenshot)) {
+            $size = @getimagesize($screenshot);
+
+            if($size[2] == 3)
+                $screenshot_url = str_replace(G5_PATH, G5_URL, $screenshot);
+        }
+
+        $info['screenshot'] = $screenshot_url;
+
+        $text = $path.'/readme.txt';
+        if(is_file($text)) {
+            $content = file($text, false);
+            $content = array_map('trim', $content);
+
+            preg_match('#^Theme Name:(.+)$#i', $content[0], $m0);
+            preg_match('#^Theme URI:(.+)$#i', $content[1], $m1);
+            preg_match('#^Maker:(.+)$#i', $content[2], $m2);
+            preg_match('#^Maker URI:(.+)$#i', $content[3], $m3);
+            preg_match('#^Version:(.+)$#i', $content[4], $m4);
+            preg_match('#^Detail:(.+)$#i', $content[5], $m5);
+            preg_match('#^License:(.+)$#i', $content[6], $m6);
+            preg_match('#^License URI:(.+)$#i', $content[7], $m7);
+
+            $info['theme_name'] = trim($m0[1]);
+            $info['theme_uri'] = trim($m1[1]);
+            $info['maker'] = trim($m2[1]);
+            $info['maker_uri'] = trim($m3[1]);
+            $info['version'] = trim($m4[1]);
+            $info['detail'] = trim($m5[1]);
+            $info['license'] = trim($m6[1]);
+            $info['license_uri'] = trim($m7[1]);
+        }
+
+        if(!$info['theme_name'])
+            $info['theme_name'] = $dir;
+    }
+
+    return $info;
+}
+
+
+// 테마설정 정보
+function get_theme_config_value($dir, $key='*')
+{
+    $tconfig = array();
+
+    $theme_config_file = G5_PATH.'/'.G5_THEME_DIR.'/'.$dir.'/theme.config.php';
+    if(is_file) {
+        include($theme_config_file);
+
+        if($key == '*') {
+            $tconfig = $theme_config;
+        } else {
+            $keys = array_map('trim', explode(',', $key));
+            foreach($keys as $v) {
+                $tconfig[$v] = trim($theme_config[$v]);
+            }
+        }
+    }
+
+    return $tconfig;
+}
+
+
 // 회원권한을 SELECT 형식으로 얻음
 function get_member_level_select($name, $start_id=0, $end_id=10, $selected="", $event="")
 {
@@ -95,26 +231,48 @@ function get_member_id_select($name, $level, $selected="", $event="")
 }
 
 // 권한 검사
-function auth_check($auth, $attr)
+function auth_check($auth, $attr, $return=false)
 {
     global $is_admin;
 
     if ($is_admin == 'super') return;
 
-    if (!trim($auth))
-        alert('이 메뉴에는 접근 권한이 없습니다.\\n\\n접근 권한은 최고관리자만 부여할 수 있습니다.');
+    if (!trim($auth)) {
+        $msg = '이 메뉴에는 접근 권한이 없습니다.\\n\\n접근 권한은 최고관리자만 부여할 수 있습니다.';
+        if($return)
+            return $msg;
+        else
+            alert($msg);
+    }
 
     $attr = strtolower($attr);
 
     if (!strstr($auth, $attr)) {
-        if ($attr == 'r')
-            alert('읽을 권한이 없습니다.');
-        else if ($attr == 'w')
-            alert('입력, 추가, 생성, 수정 권한이 없습니다.');
-        else if ($attr == 'd')
-            alert('삭제 권한이 없습니다.');
-        else
-            alert('속성이 잘못 되었습니다.');
+        if ($attr == 'r') {
+            $msg = '읽을 권한이 없습니다.';
+            if($return)
+                return $msg;
+            else
+                alert($msg);
+        } else if ($attr == 'w') {
+            $msg = '입력, 추가, 생성, 수정 권한이 없습니다.';
+            if($return)
+                return $msg;
+            else
+                alert($msg);
+        } else if ($attr == 'd') {
+            $msg = '삭제 권한이 없습니다.';
+            if($return)
+                return $msg;
+            else
+                alert($msg);
+        } else {
+            $msg = '속성이 잘못 되었습니다.';
+            if($return)
+                return $msg;
+            else
+                alert($msg);
+        }
     }
 }
 
@@ -188,10 +346,66 @@ 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']);
+    $msg = '';
+
+    if($host != $p['host']) {
+        $msg = '올바른 방법으로 이용해 주십시오.';
+    }
+
+    if( $p['path'] && ! preg_match( '/\/'.preg_quote(G5_ADMIN_DIR).'\//i', $p['path'] ) ){
+        $msg = '올바른 방법으로 이용해 주십시오';
+    }
+
+    if( $msg ){
+        if($return) {
+            return $msg;
+        } else {
+            alert($msg, G5_URL);
+        }
+    }
+}
+
 // 접근 권한 검사
 if (!$member['mb_id'])
 {
-    //alert('로그인 하십시오.', '$g5['bbs_path']/login.php?url=' . urlencode('$_SERVER['PHP_SELF']?w=$w&mb_id=$mb_id'));
     alert('로그인 하십시오.', G5_BBS_URL.'/login.php?url=' . urlencode(G5_ADMIN_URL));
 }
 else if ($is_admin != 'super')

adm/admin.menu100.php

@@ -3,6 +3,7 @@ $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('100300', '메일 테스트', G5_ADMIN_URL.'/sendmail_test.php', 'cf_mailtest'),
     array('100310', '팝업레이어관리', G5_ADMIN_URL.'/newwinlist.php', 'scf_poplayer'),
@@ -12,4 +13,11 @@ $menu['menu100'] = array (
     array('100920', '썸네일파일 일괄삭제',G5_ADMIN_URL.'/thumbnail_file_delete.php',   'cf_thumbnail', 1),
     array('100500', 'phpinfo()',        G5_ADMIN_URL.'/phpinfo.php',       'cf_phpinfo')
 );
+
+if(version_compare(phpversion(), '5.3.0', '>=') && defined('G5_BROWSCAP_USE') && G5_BROWSCAP_USE) {
+    $menu['menu100'][] = array('100510', 'Browscap 업데이트', G5_ADMIN_URL.'/browscap.php', 'cf_browscap');
+    $menu['menu100'][] = array('100520', '접속로그 변환', G5_ADMIN_URL.'/browscap_convert.php', 'cf_visit_cnvrt');
+}
+
+$menu['menu100'][] = array('100400', '부가서비스', G5_ADMIN_URL.'/service.php', 'cf_service');
 ?>

adm/admin.menu300.php

@@ -8,5 +8,6 @@ $menu['menu300'] = array (
     array('300500', '1:1문의설정', ''.G5_ADMIN_URL.'/qa_config.php', 'qa'),
     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

@@ -6,7 +6,6 @@ $menu["menu900"] = array (
     array('900300', '문자 보내기', ''.G5_SMS5_ADMIN_URL.'/sms_write.php', 'sms_write'),
     array('900400', '전송내역-건별', ''.G5_SMS5_ADMIN_URL.'/history_list.php', 'sms_history' , 1),
     array('900410', '전송내역-번호별', ''.G5_SMS5_ADMIN_URL.'/history_num.php', 'sms_history_num' , 1),
-    array('900450', '전송내역-회원', ''.G5_SMS5_ADMIN_URL.'/history_member.php', 'sms_history_mb' , 1),
     array('900500', '이모티콘 그룹', ''.G5_SMS5_ADMIN_URL.'/form_group.php' , 'emoticon_group'),
     array('900600', '이모티콘 관리', ''.G5_SMS5_ADMIN_URL.'/form_list.php', 'emoticon_list'),
     array('900700', '휴대폰번호 그룹', ''.G5_SMS5_ADMIN_URL.'/num_group.php' , 'hp_group', 1),

adm/admin.tail.php

@@ -1,5 +1,7 @@
 <?php
 if (!defined('_GNUBOARD_')) exit;
+
+$print_version = defined('G5_YOUNGCART_VER') ? 'YoungCart Version '.G5_YOUNGCART_VER : 'Version '.G5_GNUBOARD_VER;
 ?>
 
         <noscript>
@@ -14,14 +16,14 @@ if (!defined('_GNUBOARD_')) exit;
 
 <footer id="ft">
     <p>
-        Copyright &copy; <?php echo $_SERVER['HTTP_HOST']; ?>. All rights reserved.<br>
+        Copyright &copy; <?php echo $_SERVER['HTTP_HOST']; ?>. All rights reserved. <?php echo $print_version; ?><br>
         <a href="#">상단으로</a>
     </p>
 </footer>
 
 <!-- <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) ";
@@ -45,7 +43,7 @@ $sql = " select *
             limit {$from_record}, {$rows} ";
 $result = sql_query($sql);
 
-$listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</a>';
+$listall = '<a href="'.$_SERVER['SCRIPT_NAME'].'" class="ov_listall">전체목록</a>';
 
 $g5['title'] = "관리권한설정";
 include_once('./admin.head.php');
@@ -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>
@@ -158,7 +156,7 @@ else
 </form>
 
 <?php
-$pagelist = get_paging(G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, $_SERVER['PHP_SELF'].'?'.$qstr.'&amp;page=');
+$pagelist = get_paging(G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, $_SERVER['SCRIPT_NAME'].'?'.$qstr.'&amp;page=');
 echo $pagelist;
 ?>
 
@@ -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']);
 
@@ -58,6 +62,7 @@ $sql = " insert into {$g5['board_table']}
                 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']}',
@@ -94,26 +99,26 @@ $sql = " insert into {$g5['board_table']}
                 bo_use_cert = '{$board[bo_use_cert]}',
                 bo_use_sns = '{$board[bo_use_sns]}',
                 bo_sort_field = '{$board['bo_sort_field']}',
-                bo_1_subj = '{$board['bo_1_subj']}',
-                bo_2_subj = '{$board['bo_2_subj']}',
-                bo_3_subj = '{$board['bo_3_subj']}',
-                bo_4_subj = '{$board['bo_4_subj']}',
-                bo_5_subj = '{$board['bo_5_subj']}',
-                bo_6_subj = '{$board['bo_6_subj']}',
-                bo_7_subj = '{$board['bo_7_subj']}',
-                bo_8_subj = '{$board['bo_8_subj']}',
-                bo_9_subj = '{$board['bo_9_subj']}',
-                bo_10_subj = '{$board['bo_10_subj']}',
-                bo_1 = '{$board['bo_1']}',
-                bo_2 = '{$board['bo_2']}',
-                bo_3 = '{$board['bo_3']}',
-                bo_4 = '{$board['bo_4']}',
-                bo_5 = '{$board['bo_5']}',
-                bo_6 = '{$board['bo_6']}',
-                bo_7 = '{$board['bo_7']}',
-                bo_8 = '{$board['bo_8']}',
-                bo_9 = '{$board['bo_9']}',
-                bo_10 = '{$board['bo_10']}' ";
+                bo_1_subj = '".addslashes($board['bo_1_subj'])."',
+                bo_2_subj = '".addslashes($board['bo_2_subj'])."',
+                bo_3_subj = '".addslashes($board['bo_3_subj'])."',
+                bo_4_subj = '".addslashes($board['bo_4_subj'])."',
+                bo_5_subj = '".addslashes($board['bo_5_subj'])."',
+                bo_6_subj = '".addslashes($board['bo_6_subj'])."',
+                bo_7_subj = '".addslashes($board['bo_7_subj'])."',
+                bo_8_subj = '".addslashes($board['bo_8_subj'])."',
+                bo_9_subj = '".addslashes($board['bo_9_subj'])."',
+                bo_10_subj = '".addslashes($board['bo_10_subj'])."',
+                bo_1 = '".addslashes($board['bo_1'])."',
+                bo_2 = '".addslashes($board['bo_2'])."',
+                bo_3 = '".addslashes($board['bo_3'])."',
+                bo_4 = '".addslashes($board['bo_4'])."',
+                bo_5 = '".addslashes($board['bo_5'])."',
+                bo_6 = '".addslashes($board['bo_6'])."',
+                bo_7 = '".addslashes($board['bo_7'])."',
+                bo_8 = '".addslashes($board['bo_8'])."',
+                bo_9 = '".addslashes($board['bo_9'])."',
+                bo_10 = '".addslashes($board['bo_10'])."' ";
 sql_query($sql, false);
 
 // 게시판 폴더 생성
@@ -179,10 +184,10 @@ if (count($file_copy)) {
                     set bo_table = '$target_table',
                          wr_id = '{$file_copy[$i]['wr_id']}',
                          bf_no = '{$file_copy[$i]['bf_no']}',
-                         bf_source = '{$file_copy[$i]['bf_source']}',
+                         bf_source = '".addslashes($file_copy[$i]['bf_source'])."',
                          bf_file = '{$file_copy[$i]['bf_file']}',
                          bf_download = '{$file_copy[$i]['bf_download']}',
-                         bf_content = '{$file_copy[$i]['bf_content']}',
+                         bf_content = '".addslashes($file_copy[$i]['bf_content'])."',
                          bf_filesize = '{$file_copy[$i]['bf_filesize']}',
                          bf_width = '{$file_copy[$i]['bf_width']}',
                          bf_height = '{$file_copy[$i]['bf_height']}',

adm/board_form.php

@@ -153,10 +153,9 @@ $pg_anchor = '<ul class="anchor">
 $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>
+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;
+    <a href="./board_thumbnail_delete.php?bo_table='.$board['bo_table'].'&amp;'.$qstr.'" onclick="return delete_confirm2(\'게시판 썸네일 파일을 삭제하시겠습니까?\');">게시판 썸네일 삭제</a>'.PHP_EOL;
 $frm_submit .= '</div>';
 ?>
 
@@ -167,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>
@@ -1099,12 +1099,12 @@ $frm_submit .= '</div>';
                     <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>
+                    <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>
                 </select>
             </td>
             <td class="td_grpset">
@@ -1118,7 +1118,7 @@ $frm_submit .= '</div>';
     </div>
 </section>
 
-<?php echo $frm_submit; ?>
+<?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>
@@ -1240,6 +1240,37 @@ $(function(){
         window.open(this.href, "win_board_copy", "left=10,top=10,width=500,height=400");
         return false;
     });
+
+    $(".get_theme_galc").on("click", function() {
+        if(!confirm("현재 테마의 게시판 이미지 설정을 적용하시겠습니까?"))
+            return false;
+
+        $.ajax({
+            type: "POST",
+            url: "./theme_config_load.php",
+            cache: false,
+            async: false,
+            data: { type: "board" },
+            dataType: "json",
+            success: function(data) {
+                if(data.error) {
+                    alert(data.error);
+                    return false;
+                }
+
+                var field = Array('bo_gallery_cols', 'bo_gallery_width', 'bo_gallery_height', 'bo_mobile_gallery_width', 'bo_mobile_gallery_height', 'bo_image_width');
+                var count = field.length;
+                var key;
+
+                for(i=0; i<count; i++) {
+                    key = field[i];
+
+                    if(data[key] != undefined && data[key] != "")
+                        $("input[name="+key+"]").val(data[key]);
+                }
+            }
+        });
+    });
 });
 
 function board_copy(bo_table) {

adm/board_form_update.php

@@ -7,21 +7,40 @@ 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자 이내)'); }
 if (!$_POST['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']) {
+    $purl = parse_url($file);
+    $file = $purl['path'];
     if (!preg_match("/\.(php|htm['l']?)$/i", $file)) {
-        alert('상단 파일 경로가 php, html 파일이 아닙니다.');
+        alert('상단 파일 경로의 확장자는 php, html 만 허용합니다.');
     }
+    $_POST['bo_include_head'] = $file;
 }
 
 if ($file = $_POST['bo_include_tail']) {
+    $purl = parse_url($file);
+    $file = $purl['path'];
     if (!preg_match("/\.(php|htm['l']?)$/i", $file)) {
-        alert('하단 파일 경로가 php, html 파일이 아닙니다.');
+        alert('하단 파일 경로의 확장자는 php, html 만 허용합니다.');
     }
+    $_POST['bo_include_tail'] = $file;
+}
+
+if(!is_include_path_check($_POST['bo_include_head'], 1)) {
+    alert('/data/file/ 또는 /data/editor/ 포함된 문자를 상단 파일 경로에 포함시킬수 없습니다.');
+}
+
+if(!is_include_path_check($_POST['bo_include_tail'], 1)) {
+    alert('/data/file/ 또는 /data/editor/ 포함된 문자를 하단 파일 경로에 포함시킬수 없습니다.');
 }
 
 $board_path = G5_DATA_PATH.'/file/'.$bo_table;
@@ -173,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

@@ -46,7 +46,7 @@ $from_record = ($page - 1) * $rows; // 시작 열을 구함
 $sql = " select * {$sql_common} {$sql_search} {$sql_order} limit {$from_record}, {$rows} ";
 $result = sql_query($sql);
 
-$listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</a>';
+$listall = '<a href="'.$_SERVER['SCRIPT_NAME'].'" class="ov_listall">전체목록</a>';
 
 $g5['title'] = '게시판관리';
 include_once('./admin.head.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>
@@ -208,7 +208,7 @@ $colspan = 15;
 
 </form>
 
-<?php echo get_paging(G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, $_SERVER['PHP_SELF'].'?'.$qstr.'&amp;page='); ?>
+<?php echo get_paging(G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, $_SERVER['SCRIPT_NAME'].'?'.$qstr.'&amp;page='); ?>
 
 <script>
 function fboardlist_submit(f)

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);
@@ -62,7 +62,10 @@ if ($_POST['act_button'] == "선택수정") {
 
         // include 전에 $bo_table 값을 반드시 넘겨야 함
         $tmp_bo_table = trim($_POST['board_table'][$k]);
-        include ('./board_delete.inc.php');
+
+        if( preg_match("/^[A-Za-z0-9_]+$/", $tmp_bo_table) ){
+            include ('./board_delete.inc.php');
+        }
     }
 
 

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

@@ -50,7 +50,7 @@ $from_record = ($page - 1) * $rows; // 시작 열을 구함
 $sql = " select * {$sql_common} {$sql_search} {$sql_order} limit {$from_record}, {$rows} ";
 $result = sql_query($sql);
 
-$listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">처음</a>';
+$listall = '<a href="'.$_SERVER['SCRIPT_NAME'].'" class="ov_listall">처음</a>';
 
 $g5['title'] = '게시판그룹설정';
 include_once('./admin.head.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>
@@ -190,7 +190,7 @@ $colspan = 10;
 </div>
 
 <?php
-$pagelist = get_paging(G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, $_SERVER['PHP_SELF'].'?'.$qstr.'&amp;page=');
+$pagelist = get_paging(G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, $_SERVER['SCRIPT_NAME'].'?'.$qstr.'&amp;page=');
 echo $pagelist;
 ?>
 

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>
@@ -76,7 +74,6 @@ $colspan = 4;
     $sql .= " order by a.gr_id desc ";
     $result = sql_query($sql);
     for ($i=0; $row=sql_fetch_array($result); $i++) {
-        $s_del = '<a href="javascript:post_delete(\'boardgroupmember_update.php\', \''.$row['gm_id'].'\');">삭제</a>';
     ?>
     <tr>
         <td class="td_chk">

adm/boardgroupmember_list.php

@@ -104,8 +104,6 @@ $colspan = 7;
         if ($row2['cnt'])
             $group = '<a href="./boardgroupmember_form.php?mb_id='.$row['mb_id'].'">'.$row2['cnt'].'</a>';
 
-        //$s_del = '<a href="javascript:post_delete(\'boardgroupmember_update.php\', \''.$row['gm_id'].'\');">삭제</a>';
-
         $mb_nick = get_sideview($row['mb_id'], $row['mb_nick'], $row['mb_email'], $row['mb_homepage']);
 
         $bg = 'bg'.($i%2);
@@ -139,7 +137,7 @@ $colspan = 7;
 </div>
 </form>
 
-<?php echo get_paging(G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, "{$_SERVER['PHP_SELF']}?$qstr&amp;gr_id=$gr_id&page="); ?>
+<?php echo get_paging(G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, "{$_SERVER['SCRIPT_NAME']}?$qstr&amp;gr_id=$gr_id&page="); ?>
 
 <script>
 function fboardgroupmember_submit(f)

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

@@ -0,0 +1,45 @@
+<?php
+$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);
+
+if ($is_admin != 'super')
+    alert('최고관리자만 접근 가능합니다.');
+
+$g5['title'] = 'Browscap 업데이트';
+include_once('./admin.head.php');
+?>
+
+<div id="processing">
+    <p>Browscap 정보를 업데이트하시려면 아래 업데이트 버튼을 클릭해 주세요.</p>
+    <button type="button" id="run_update">업데이트</button>
+</div>
+
+<script>
+$(function() {
+    $("#run_update").on("click", function() {
+        $("#processing").html('<div class="update_processing"></div><p>Browscap 정보를 업데이트 중입니다.</p>');
+
+        $.ajax({
+            url: "./browscap_update.php",
+            async: true,
+            cache: false,
+            dataType: "html",
+            success: function(data) {
+                if(data != "") {
+                    alert(data);
+                    return false;
+                }
+
+                $("#processing").html("<div class='check_processing'></div><p>Browscap 정보를 업데이트 했습니다.</p>");
+            }
+        });
+    });
+});
+</script>
+
+<?php
+include_once('./admin.tail.php');
+?>

adm/browscap_convert.php

@@ -0,0 +1,46 @@
+<?php
+$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);
+
+if ($is_admin != 'super')
+    alert('최고관리자만 접근 가능합니다.');
+
+$rows = preg_replace('#[^0-9]#', '', $_GET['rows']);
+if(!$rows)
+    $rows = 100;
+
+$g5['title'] = '접속로그 변환';
+include_once('./admin.head.php');
+?>
+
+<div id="processing">
+    <p>접속로그 정보를 Browscap 정보로 변환하시려면 아래 업데이트 버튼을 클릭해 주세요.</p>
+    <button type="button" id="run_update">업데이트</button>
+</div>
+
+<script>
+$(function() {
+    $(document).on("click", "#run_update", function() {
+        $("#processing").html('<div class="update_processing"></div><p>Browscap 정보로 변환 중입니다.</p>');
+
+        $.ajax({
+            method: "GET",
+            url: "./browscap_converter.php",
+            data: { rows: "<?php echo $rows; ?>" },
+            async: true,
+            cache: false,
+            dataType: "html",
+            success: function(data) {
+                $("#processing").html(data);
+            }
+        });
+    });
+});
+</script>
+
+<?php
+include_once('./admin.tail.php');
+?>

adm/browscap_converter.php

@@ -0,0 +1,75 @@
+<?php
+ini_set('memory_limit', '-1');
+include_once('./_common.php');
+
+// clean the output buffer
+ob_end_clean();
+
+if(!(version_compare(phpversion(), '5.3.0', '>=') && defined('G5_BROWSCAP_USE') && G5_BROWSCAP_USE))
+    die('사용할 수 없는 기능입니다.');
+
+if($is_admin != 'super')
+    die('최고관리자로 로그인 후 실행해 주세요.');
+
+// browscap cache 파일 체크
+if(!is_file(G5_DATA_PATH.'/cache/browscap_cache.php')) {
+    echo '<p>Browscap 정보가 없습니다. 아래 링크로 이동해 Browscap 정보를 업데이트 하세요.</p>'.PHP_EOL;
+    echo '<p><a href="'.G5_ADMIN_URL.'/browscap.php">Browscap 업데이트</a></p>'.PHP_EOL;
+    exit;
+}
+
+include_once(G5_PLUGIN_PATH.'/browscap/Browscap.php');
+$browscap = new phpbrowscap\Browscap(G5_DATA_PATH.'/cache');
+$browscap->doAutoUpdate = false;
+$browscap->cacheFilename = 'browscap_cache.php';
+
+// 데이터 변환
+$rows = preg_replace('#[^0-9]#', '', $_GET['rows']);
+if(!$rows)
+    $rows = 100;
+
+$sql_common = " from {$g5['visit_table']} where vi_agent <> '' and ( vi_browser = '' or vi_os = '' or vi_device = '' ) ";
+$sql_order  = " order by vi_id desc ";
+$sql_limit  = " limit 0, $rows ";
+
+$sql = " select count(vi_id) as cnt $sql_common ";
+$row = sql_fetch($sql);
+$total_count = $row['cnt'];
+
+$sql = " select vi_id, vi_agent, vi_browser, vi_os, vi_device
+            $sql_common
+            $sql_order
+            $sql_limit ";
+$result = sql_query($sql);
+
+$cnt = 0;
+for($i=0; $row=sql_fetch_array($result); $i++) {
+    $info = $browscap->getBrowser($row['vi_agent']);
+
+    $brow = $row['vi_browser'];
+    if(!$brow)
+        $brow = $info->Comment;
+
+    $os = $row['vi_os'];
+    if(!$os)
+        $os = $info->Platform;
+
+    $device = $row['vi_device'];
+    if(!$device)
+        $device = $info->Device_Type;
+
+    $sql2 = " update {$g5['visit_table']}
+                set vi_browser  = '$brow',
+                    vi_os       = '$os',
+                    vi_device   = '$device'
+                where vi_id = '{$row['vi_id']}' ";
+    sql_query($sql2);
+
+    $cnt++;
+}
+
+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>';
+?>

adm/browscap_update.php

@@ -0,0 +1,24 @@
+<?php
+ini_set('memory_limit', '-1');
+
+$sub_menu = "100510";
+include_once('./_common.php');
+
+// clean the output buffer
+ob_end_clean();
+
+if(!(version_compare(phpversion(), '5.3.0', '>=') && defined('G5_BROWSCAP_USE') && G5_BROWSCAP_USE))
+    die('사용할 수 없는 기능입니다.');
+
+if ($is_admin != 'super')
+    die('최고관리자만 접근 가능합니다.');
+
+include_once(G5_PLUGIN_PATH.'/browscap/Browscap.php');
+
+$browscap = new phpbrowscap\Browscap(G5_DATA_PATH.'/cache');
+$browscap->updateMethod = 'cURL';
+$browscap->cacheFilename = 'browscap_cache.php';
+$browscap->updateCache();
+
+die('');
+?>

adm/config_form.php

@@ -4,17 +4,12 @@ include_once('./_common.php');
 
 auth_check($auth[$sub_menu], 'r');
 
-$token = get_token();
-
 if ($is_admin != 'super')
     alert('최고관리자만 접근 가능합니다.');
 
-if (!isset($config['cf_include_index'])) {
+if (!isset($config['cf_add_script'])) {
     sql_query(" ALTER TABLE `{$g5['config_table']}`
-                    ADD `cf_include_index` VARCHAR(255) NOT NULL AFTER `cf_admin`,
-                    ADD `cf_include_head` VARCHAR(255) NOT NULL AFTER `cf_include_index`,
-                    ADD `cf_include_tail` VARCHAR(255) NOT NULL AFTER `cf_include_head`,
-                    ADD `cf_add_script` TEXT NOT NULL AFTER `cf_include_tail` ", true);
+                    ADD `cf_add_script` TEXT NOT NULL AFTER `cf_admin_email_name` ", true);
 }
 
 if (!isset($config['cf_mobile_new_skin'])) {
@@ -183,6 +178,20 @@ if(!isset($config['cf_kakao_js_apikey'])) {
                     ADD `cf_kakao_js_apikey` varchar(255) NOT NULL DEFAULT '' AFTER `cf_googl_shorturl_apikey` ", true);
 }
 
+// SMS 전송유형 필드 추가
+if(!isset($config['cf_sms_type'])) {
+    sql_query(" ALTER TABLE `{$g5['config_table']}`
+                    ADD `cf_sms_type` varchar(10) NOT NULL DEFAULT '' AFTER `cf_sms_use` ", true);
+}
+
+// 접속자 정보 필드 추가
+if(!sql_query(" select vi_browser from {$g5['visit_table']} limit 1 ")) {
+    sql_query(" ALTER TABLE `{$g5['visit_table']}`
+                    ADD `vi_browser` varchar(255) NOT NULL DEFAULT '' AFTER `vi_agent`,
+                    ADD `vi_os` varchar(255) NOT NULL DEFAULT '' AFTER `vi_browser`,
+                    ADD `vi_device` varchar(255) NOT NULL DEFAULT '' AFTER `vi_os` ", true);
+}
+
 if(!$config['cf_faq_skin']) $config['cf_faq_skin'] = "basic";
 if(!$config['cf_mobile_faq_skin']) $config['cf_mobile_faq_skin'] = "basic";
 
@@ -212,13 +221,13 @@ $frm_submit = '<div class="btn_confirm01 btn_confirm">
 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';
 
-if ($config['cf_icode_id'] && $config['cf_icode_pw']) {
+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']);
 }
 ?>
 
 <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>
@@ -264,72 +273,72 @@ if ($config['cf_icode_id'] && $config['cf_icode_pw']) {
             <th scope="row"><label for="cf_login_point">로그인시 포인트<strong class="sound_only">필수</strong></label></th>
             <td>
                 <?php echo help('회원이 로그인시 하루에 한번만 적립') ?>
-                <input type="text" name="cf_login_point" value="<?php echo $config['cf_login_point'] ?>" id="cf_login_point" required class="required frm_input" size="2"> 점
+                <input type="text" name="cf_login_point" value="<?php echo $config['cf_login_point'] ?>" id="cf_login_point" required class="required frm_input" size="5"> 점
             </td>
             <th scope="row"><label for="cf_memo_send_point">쪽지보낼시 차감 포인트<strong class="sound_only">필수</strong></label></th>
             <td>
                  <?php echo help('양수로 입력하십시오. 0점은 쪽지 보낼시 포인트를 차감하지 않습니다.') ?>
-                <input type="text" name="cf_memo_send_point" value="<?php echo $config['cf_memo_send_point'] ?>" id="cf_memo_send_point" required class="required frm_input" size="2"> 점
+                <input type="text" name="cf_memo_send_point" value="<?php echo $config['cf_memo_send_point'] ?>" id="cf_memo_send_point" required class="required frm_input" size="5"> 점
             </td>
         </tr>
         <tr>
             <th scope="row"><label for="cf_cut_name">이름(닉네임) 표시</label></th>
             <td colspan="3">
-                <input type="text" name="cf_cut_name" value="<?php echo $config['cf_cut_name'] ?>" id="cf_cut_name" class="frm_input" size="2"> 자리만 표시
+                <input type="text" name="cf_cut_name" value="<?php echo $config['cf_cut_name'] ?>" id="cf_cut_name" class="frm_input" size="5"> 자리만 표시
             </td>
         </tr>
         <tr>
             <th scope="row"><label for="cf_nick_modify">닉네임 수정</label></th>
-            <td>수정하면 <input type="text" name="cf_nick_modify" value="<?php echo $config['cf_nick_modify'] ?>" id="cf_nick_modify" class="frm_input" size="1"> 일 동안 바꿀 수 없음</td>
+            <td>수정하면 <input type="text" name="cf_nick_modify" value="<?php echo $config['cf_nick_modify'] ?>" id="cf_nick_modify" class="frm_input" size="3"> 일 동안 바꿀 수 없음</td>
             <th scope="row"><label for="cf_open_modify">정보공개 수정</label></th>
-            <td>수정하면 <input type="text" name="cf_open_modify" value="<?php echo $config['cf_open_modify'] ?>" id="cf_open_modify" class="frm_input" size="1"> 일 동안 바꿀 수 없음</td>
+            <td>수정하면 <input type="text" name="cf_open_modify" value="<?php echo $config['cf_open_modify'] ?>" id="cf_open_modify" class="frm_input" size="3"> 일 동안 바꿀 수 없음</td>
         </tr>
         <tr>
             <th scope="row"><label for="cf_new_del">최근게시물 삭제</label></th>
             <td>
                 <?php echo help('설정일이 지난 최근게시물 자동 삭제') ?>
-                <input type="text" name="cf_new_del" value="<?php echo $config['cf_new_del'] ?>" id="cf_new_del" class="frm_input" size="2"> 일
+                <input type="text" name="cf_new_del" value="<?php echo $config['cf_new_del'] ?>" id="cf_new_del" class="frm_input" size="5"> 일
             </td>
             <th scope="row"><label for="cf_memo_del">쪽지 삭제</label></th>
             <td>
                 <?php echo help('설정일이 지난 쪽지 자동 삭제') ?>
-                <input type="text" name="cf_memo_del" value="<?php echo $config['cf_memo_del'] ?>" id="cf_memo_del" class="frm_input" size="2"> 일
+                <input type="text" name="cf_memo_del" value="<?php echo $config['cf_memo_del'] ?>" id="cf_memo_del" class="frm_input" size="5"> 일
             </td>
         </tr>
         <tr>
             <th scope="row"><label for="cf_visit_del">접속자로그 삭제</label></th>
             <td>
                 <?php echo help('설정일이 지난 접속자 로그 자동 삭제') ?>
-                <input type="text" name="cf_visit_del" value="<?php echo $config['cf_visit_del'] ?>" id="cf_visit_del" class="frm_input" size="2"> 일
+                <input type="text" name="cf_visit_del" value="<?php echo $config['cf_visit_del'] ?>" id="cf_visit_del" class="frm_input" size="5"> 일
             </td>
             <th scope="row"><label for="cf_popular_del">인기검색어 삭제</label></th>
             <td>
                 <?php echo help('설정일이 지난 인기검색어 자동 삭제') ?>
-                <input type="text" name="cf_popular_del" value="<?php echo $config['cf_popular_del'] ?>" id="cf_popular_del" class="frm_input" size="2"> 일
+                <input type="text" name="cf_popular_del" value="<?php echo $config['cf_popular_del'] ?>" id="cf_popular_del" class="frm_input" size="5"> 일
             </td>
         </tr>
         <tr>
             <th scope="row"><label for="cf_login_minutes">현재 접속자</label></th>
             <td>
                 <?php echo help('설정값 이내의 접속자를 현재 접속자로 인정') ?>
-                <input type="text" name="cf_login_minutes" value="<?php echo $config['cf_login_minutes'] ?>" id="cf_login_minutes" class="frm_input" size="2"> 분
+                <input type="text" name="cf_login_minutes" value="<?php echo $config['cf_login_minutes'] ?>" id="cf_login_minutes" class="frm_input" size="3"> 분
             </td>
             <th scope="row"><label for="cf_new_rows">최근게시물 라인수</label></th>
             <td>
                 <?php echo help('목록 한페이지당 라인수') ?>
-                <input type="text" name="cf_new_rows" value="<?php echo $config['cf_new_rows'] ?>" id="cf_new_rows" class="frm_input" size="2"> 라인
+                <input type="text" name="cf_new_rows" value="<?php echo $config['cf_new_rows'] ?>" id="cf_new_rows" class="frm_input" size="3"> 라인
             </td>
         </tr>
         <tr>
             <th scope="row"><label for="cf_page_rows">한페이지당 라인수</label></th>
             <td>
                 <?php echo help('목록(리스트) 한페이지당 라인수') ?>
-                <input type="text" name="cf_page_rows" value="<?php echo $config['cf_page_rows'] ?>" id="cf_page_rows" class="frm_input" size="2"> 라인
+                <input type="text" name="cf_page_rows" value="<?php echo $config['cf_page_rows'] ?>" id="cf_page_rows" class="frm_input" size="3"> 라인
             </td>
             <th scope="row"><label for="cf_mobile_page_rows">모바일 한페이지당 라인수</label></th>
             <td>
                 <?php echo help('모바일 목록 한페이지당 라인수') ?>
-                <input type="text" name="cf_mobile_page_rows" value="<?php echo $config['cf_mobile_page_rows'] ?>" id="cf_mobile_page_rows" class="frm_input" size="2"> 라인
+                <input type="text" name="cf_mobile_page_rows" value="<?php echo $config['cf_mobile_page_rows'] ?>" id="cf_mobile_page_rows" class="frm_input" size="3"> 라인
             </td>
         </tr>
         <tr>
@@ -341,105 +350,41 @@ if ($config['cf_icode_id'] && $config['cf_icode_pw']) {
         <tr>
             <th scope="row"><label for="cf_new_skin">최근게시물 스킨<strong class="sound_only">필수</strong></label></th>
             <td>
-                <select name="cf_new_skin" id="cf_new_skin" required class="required">
-                <?php
-                $arr = get_skin_dir('new');
-                for ($i=0; $i<count($arr); $i++) {
-                    if ($i == 0) echo "<option value=\"\">선택</option>";
-                    echo "<option value=\"".$arr[$i]."\"".get_selected($config['cf_new_skin'], $arr[$i]).">".$arr[$i]."</option>\n";
-                }
-                ?>
-                </select>
+                <?php echo get_skin_select('new', 'cf_new_skin', 'cf_new_skin', $config['cf_new_skin'], 'required'); ?>
             </td>
             <th scope="row"><label for="cf_mobile_new_skin">모바일<br>최근게시물 스킨<strong class="sound_only">필수</strong></label></th>
             <td>
-                <select name="cf_mobile_new_skin" id="cf_mobile_new_skin" required class="required">
-                <?php
-                $arr = get_skin_dir('new', G5_MOBILE_PATH.'/'.G5_SKIN_DIR);
-                for ($i=0; $i<count($arr); $i++) {
-                    if ($i == 0) echo "<option value=\"\">선택</option>";
-                    echo "<option value=\"".$arr[$i]."\"".get_selected($config['cf_mobile_new_skin'], $arr[$i]).">".$arr[$i]."</option>\n";
-                }
-                ?>
-                </select>
+                <?php echo get_mobile_skin_select('new', 'cf_mobile_new_skin', 'cf_mobile_new_skin', $config['cf_mobile_new_skin'], 'required'); ?>
             </td>
         </tr>
         <tr>
             <th scope="row"><label for="cf_search_skin">검색 스킨<strong class="sound_only">필수</strong></label></th>
             <td>
-                <select name="cf_search_skin" id="cf_search_skin" required class="required">
-                <?php
-                $arr = get_skin_dir('search');
-                for ($i=0; $i<count($arr); $i++) {
-                    if ($i == 0) echo "<option value=\"\">선택</option>";
-                    echo "<option value=\"".$arr[$i]."\"".get_selected($config['cf_search_skin'], $arr[$i]).">".$arr[$i]."</option>\n";
-                }
-                ?>
-                </select>
+                <?php echo get_skin_select('search', 'cf_search_skin', 'cf_search_skin', $config['cf_search_skin'], 'required'); ?>
             </td>
             <th scope="row"><label for="cf_mobile_search_skin">모바일 검색 스킨<strong class="sound_only">필수</strong></label></th>
             <td>
-                <select name="cf_mobile_search_skin" id="cf_mobile_search_skin" required class="required">
-                <?php
-                $arr = get_skin_dir('search', G5_MOBILE_PATH.'/'.G5_SKIN_DIR);
-                for ($i=0; $i<count($arr); $i++) {
-                    if ($i == 0) echo "<option value=\"\">선택</option>";
-                    echo "<option value=\"".$arr[$i]."\"".get_selected($config['cf_mobile_search_skin'], $arr[$i]).">".$arr[$i]."</option>\n";
-                }
-                ?>
-                </select>
+                <?php echo get_mobile_skin_select('search', 'cf_mobile_search_skin', 'cf_mobile_search_skin', $config['cf_mobile_search_skin'], 'required'); ?>
             </td>
         </tr>
         <tr>
             <th scope="row"><label for="cf_connect_skin">접속자 스킨<strong class="sound_only">필수</strong></label></th>
             <td>
-                <select name="cf_connect_skin" id="cf_connect_skin" required class="required">
-                <?php
-                $arr = get_skin_dir('connect');
-                for ($i=0; $i<count($arr); $i++) {
-                    if ($i == 0) echo "<option value=\"\">선택</option>";
-                    echo "<option value=\"".$arr[$i]."\"".get_selected($config['cf_connect_skin'], $arr[$i]).">".$arr[$i]."</option>\n";
-                }
-                ?>
-                </select>
+                <?php echo get_skin_select('connect', 'cf_connect_skin', 'cf_connect_skin', $config['cf_connect_skin'], 'required'); ?>
             </td>
             <th scope="row"><label for="cf_mobile_connect_skin">모바일 접속자 스킨<strong class="sound_only">필수</strong></label></th>
             <td>
-                <select name="cf_mobile_connect_skin" id="cf_mobile_connect_skin" required class="required">
-                <?php
-                $arr = get_skin_dir('connect', G5_MOBILE_PATH.'/'.G5_SKIN_DIR);
-                for ($i=0; $i<count($arr); $i++) {
-                    if ($i == 0) echo "<option value=\"\">선택</option>";
-                    echo "<option value=\"".$arr[$i]."\"".get_selected($config['cf_mobile_connect_skin'], $arr[$i]).">".$arr[$i]."</option>\n";
-                }
-                ?>
-                </select>
+                <?php echo get_mobile_skin_select('connect', 'cf_mobile_connect_skin', 'cf_mobile_connect_skin', $config['cf_mobile_connect_skin'], 'required'); ?>
             </td>
         </tr>
         <tr>
             <th scope="row"><label for="cf_faq_skin">FAQ 스킨<strong class="sound_only">필수</strong></label></th>
             <td>
-                <select name="cf_faq_skin" id="cf_faq_skin" required class="required">
-                <?php
-                $arr = get_skin_dir('faq');
-                for ($i=0; $i<count($arr); $i++) {
-                    if ($i == 0) echo "<option value=\"\">선택</option>";
-                    echo "<option value=\"".$arr[$i]."\"".get_selected($config['cf_faq_skin'], $arr[$i]).">".$arr[$i]."</option>\n";
-                }
-                ?>
-                </select>
+                <?php echo get_skin_select('faq', 'cf_faq_skin', 'cf_faq_skin', $config['cf_faq_skin'], 'required'); ?>
             </td>
             <th scope="row"><label for="cf_mobile_faq_skin">모바일 FAQ 스킨<strong class="sound_only">필수</strong></label></th>
             <td>
-                <select name="cf_mobile_faq_skin" id="cf_mobile_faq_skin" required class="required">
-                <?php
-                $arr = get_skin_dir('faq', G5_MOBILE_PATH.'/'.G5_SKIN_DIR);
-                for ($i=0; $i<count($arr); $i++) {
-                    if ($i == 0) echo "<option value=\"\">선택</option>";
-                    echo "<option value=\"".$arr[$i]."\"".get_selected($config['cf_mobile_faq_skin'], $arr[$i]).">".$arr[$i]."</option>\n";
-                }
-                ?>
-                </select>
+                <?php echo get_mobile_skin_select('faq', 'cf_mobile_faq_skin', 'cf_mobile_faq_skin', $config['cf_mobile_faq_skin'], 'required'); ?>
             </td>
         </tr>
         <tr>
@@ -532,7 +477,7 @@ if ($config['cf_icode_id'] && $config['cf_icode_pw']) {
     </div>
 </section>
 
-<?php echo $frm_submit; ?>
+<?php echo preg_replace('#</div>$#i', '<button type="button" class="get_theme_confc" data-type="conf_skin">테마 스킨설정 가져오기</button></div>', $frm_submit); ?>
 
 <section id="anc_cf_board">
     <h2 class="h2_frm">게시판 기본 설정</h2>
@@ -636,27 +581,11 @@ if ($config['cf_icode_id'] && $config['cf_icode_pw']) {
         <tr>
             <th scope="row"><label for="cf_member_skin">회원 스킨<strong class="sound_only">필수</strong></label></th>
             <td>
-                <select name="cf_member_skin" id="cf_member_skin" required class="required">
-                <?php
-                $arr = get_skin_dir('member');
-                for ($i=0; $i<count($arr); $i++) {
-                    if ($i == 0) echo "<option value=\"\">선택</option>";
-                    echo '<option value="'.$arr[$i].'"'.get_selected($config['cf_member_skin'], $arr[$i]).'>'.$arr[$i].'</option>'."\n";
-                }
-                ?>
-                </select>
+                <?php echo get_skin_select('member', 'cf_member_skin', 'cf_member_skin', $config['cf_member_skin'], 'required'); ?>
             </td>
             <th scope="row"><label for="cf_mobile_member_skin">모바일<br>회원 스킨<strong class="sound_only">필수</strong></label></th>
             <td>
-                <select name="cf_mobile_member_skin" id="cf_mobile_member_skin" required class="required">
-                <?php
-                $arr = get_skin_dir('member', G5_MOBILE_PATH.'/'.G5_SKIN_DIR);
-                for ($i=0; $i<count($arr); $i++) {
-                    if ($i == 0) echo "<option value=\"\">선택</option>";
-                    echo '<option value="'.$arr[$i].'"'.get_selected($config['cf_mobile_member_skin'], $arr[$i]).'>'.$arr[$i].'</option>'."\n";
-                }
-                ?>
-                </select>
+                <?php echo get_mobile_skin_select('member', 'cf_mobile_member_skin', 'cf_mobile_member_skin', $config['cf_mobile_member_skin'], 'required'); ?>
             </td>
         </tr>
         <tr>
@@ -761,7 +690,7 @@ if ($config['cf_icode_id'] && $config['cf_icode_pw']) {
     </div>
 </section>
 
-<?php echo $frm_submit; ?>
+<?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>
@@ -807,7 +736,7 @@ if ($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>
@@ -816,16 +745,16 @@ if ($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/provider/b_ipin.php" target="_blank" class="btn_frmline">KCB 아이핀 서비스 신청페이지</a>
-                <a href="http://sir.co.kr/main/provider/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/provider/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>
@@ -833,7 +762,7 @@ if ($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/provider/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>
@@ -1082,27 +1011,6 @@ if ($config['cf_icode_id'] && $config['cf_icode_pw']) {
             <col>
         </colgroup>
         <tbody>
-        <tr>
-            <th scope="row"><label for="cf_include_index">초기화면 파일 경로</label></th>
-            <td>
-                <?php echo help('입력이 없으면 index.php가 초기화면 파일의 기본 경로로 설정됩니다.') ?>
-                <input type="text" name="cf_include_index" value="<?php echo $config['cf_include_index'] ?>" id="cf_include_index" class="frm_input" size="50">
-            </td>
-        </tr>
-        <tr>
-            <th scope="row"><label for="cf_include_head">상단 파일 경로</label></th>
-            <td>
-                <?php echo help('입력이 없으면 head.php가 상단 파일의 기본 경로로 설정됩니다.') ?>
-                <input type="text" name="cf_include_head" value="<?php echo $config['cf_include_head'] ?>" id="cf_include_head" class="frm_input" size="50">
-            </td>
-        </tr>
-        <tr>
-            <th scope="row"><label for="cf_include_tail">하단 파일 경로</label></th>
-            <td>
-                <?php echo help('입력이 없으면 tail.php가 하단 파일의 기본 경로로 설정됩니다.') ?>
-                <input type="text" name="cf_include_tail" value="<?php echo $config['cf_include_tail'] ?>" id="cf_include_tail" class="frm_input" size="50">
-            </td>
-        </tr>
         <tr>
             <th scope="row"><label for="cf_add_script">추가 script, css</label></th>
             <td>
@@ -1138,6 +1046,16 @@ if ($config['cf_icode_id'] && $config['cf_icode_pw']) {
                 </select>
             </td>
         </tr>
+        <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원입니다."); ?>
+                <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>
             <td>
@@ -1173,7 +1091,6 @@ if ($config['cf_icode_id'] && $config['cf_icode_pw']) {
         <tr>
             <th scope="row">아이코드 SMS 신청<br>회원가입</th>
             <td>
-                <?php echo help("아래 링크에서 회원가입 하시면 문자 건당 16원에 제공 받을 수 있습니다."); ?>
                 <a href="http://icodekorea.com/res/join_company_fix_a.php?sellid=sir2" target="_blank" class="btn_frmline">아이코드 회원가입</a>
             </td>
         </tr>
@@ -1182,13 +1099,7 @@ if ($config['cf_icode_id'] && $config['cf_icode_pw']) {
             <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" onclick="window.open(this.href,'icode_payment', 'scrollbars=1,resizable=1'); return false;">충전하기</a>
-            </td>
-        </tr>
-        <tr>
-            <th scope="row">건수별 금액</th>
-            <td colspan="3">
-                <?php echo number_format($userinfo['gpay']); ?> 원.
+                <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 } ?>
@@ -1250,6 +1161,42 @@ $(function(){
                 break;
         }
     });
+
+    $(".get_theme_confc").on("click", function() {
+        var type = $(this).data("type");
+        var msg = "기본환경 스킨 설정";
+        if(type == "conf_member")
+            msg = "기본환경 회원스킨 설정";
+
+        if(!confirm("현재 테마의 "+msg+"을 적용하시겠습니까?"))
+            return false;
+
+        $.ajax({
+            type: "POST",
+            url: "./theme_config_load.php",
+            cache: false,
+            async: false,
+            data: { type: type },
+            dataType: "json",
+            success: function(data) {
+                if(data.error) {
+                    alert(data.error);
+                    return false;
+                }
+
+                var field = Array('cf_member_skin', 'cf_mobile_member_skin', 'cf_new_skin', 'cf_mobile_new_skin', 'cf_search_skin', 'cf_mobile_search_skin', 'cf_connect_skin', 'cf_mobile_connect_skin', 'cf_faq_skin', 'cf_mobile_faq_skin');
+                var count = field.length;
+                var key;
+
+                for(i=0; i<count; i++) {
+                    key = field[i];
+
+                    if(data[key] != undefined && data[key] != "")
+                        $("select[name="+key+"]").val(data[key]);
+                }
+            }
+        });
+    });
 });
 
 function fconfigform_submit(f)

adm/config_form_update.php

@@ -13,20 +13,22 @@ $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'])
     alert('본인확인을 위해 아이핀 또는 휴대폰 본인학인 서비스를 하나이상 선택해 주십시오');
 
+if(!$_POST['cf_cert_use']) {
+    $_POST['cf_cert_ipin'] = '';
+    $_POST['cf_cert_hp'] = '';
+}
+
 $sql = " update {$g5['config_table']}
             set cf_title = '{$_POST['cf_title']}',
                 cf_admin = '{$_POST['cf_admin']}',
                 cf_admin_email = '{$_POST['cf_admin_email']}',
                 cf_admin_email_name = '{$_POST['cf_admin_email_name']}',
-                cf_include_index = '{$_POST['cf_include_index']}',
-                cf_include_head = '{$_POST['cf_include_head']}',
-                cf_include_tail = '{$_POST['cf_include_tail']}',
                 cf_add_script = '{$_POST['cf_add_script']}',
                 cf_use_point = '{$_POST['cf_use_point']}',
                 cf_point_term = '{$_POST['cf_point_term']}',
@@ -122,6 +124,7 @@ $sql = " update {$g5['config_table']}
                 cf_cert_limit = '{$_POST['cf_cert_limit']}',
                 cf_cert_req = '{$_POST['cf_cert_req']}',
                 cf_sms_use = '{$_POST['cf_sms_use']}',
+                cf_sms_type = '{$_POST['cf_sms_type']}',
                 cf_icode_id = '{$_POST['cf_icode_id']}',
                 cf_icode_pw = '{$_POST['cf_icode_pw']}',
                 cf_icode_server_ip = '{$_POST['cf_icode_server_ip']}',

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,42 @@ 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 ){
+    $purl = parse_url($co_include_head);
+    $file = $purl['path'];
+    if (!preg_match("/\.(php|htm['l']?)$/i", $file)) {
+        alert('상단 파일 경로의 확장자는 php, 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 만 허용합니다.');
+    }
+}
+
+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 +102,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

@@ -50,7 +50,7 @@ $result = sql_query($sql);
 ?>
 
 <div class="local_ov01 local_ov">
-    <?php if ($page > 1) {?><a href="<?php echo $_SERVER['PHP_SELF']; ?>">처음으로</a><?php } ?>
+    <?php if ($page > 1) {?><a href="<?php echo $_SERVER['SCRIPT_NAME']; ?>">처음으로</a><?php } ?>
     <span>전체 내용 <?php echo $total_count; ?>건</span>
 </div>
 
@@ -69,7 +69,7 @@ $result = sql_query($sql);
     </tr>
     </thead>
     <tbody>
-    <?php for ($i=0; $row=mysql_fetch_array($result); $i++) {
+    <?php for ($i=0; $row=sql_fetch_array($result); $i++) {
         $bg = 'bg'.($i%2);
     ?>
     <tr class="<?php echo $bg; ?>">
@@ -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
@@ -91,7 +91,7 @@ $result = sql_query($sql);
     </table>
 </div>
 
-<?php echo get_paging(G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, "{$_SERVER['PHP_SELF']}?$qstr&amp;page="); ?>
+<?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');

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}
@@ -395,6 +396,9 @@ td.td_grpset {width:160px;border-left:1px solid #e9ecee;text-align:center}
 .td_tdiv {border-bottom:1px solid #c9c9c9 !important}
 .td_tel {width:80px;text-align:center}
 .td_test {width:50px;text-align:center}
+.td_category1{width:130px;text-align:center}
+.td_category2{width:100px;text-align:center}
+.td_category3{width:80px;text-align:center}
 
 .txt_true {color:#e8180c}
 .txt_false {color:#ccc}
@@ -687,3 +691,87 @@ strong.sodr_nonpay {display:block;padding:5px 0;text-align:right}
 .pg_start, .pg_prev {/* 이전 */}
 .pg_end, .pg_next {/* 다음 */}
 .pg_current {display:inline-block;margin:0 4px 0 0;background:#333;color:#fff;font-weight:normal}
+
+/*부가서비스*/
+.lnb_svc{color:#ff3061;font-weight:bold}
+.service_wrap{width:960px; margin:0 20px 10px;overflow:hidden}
+.sevice_1{border:1px solid #ebe8e8;width:330px;float:left;border-radius:5px;text-align:center;margin-right:6px;}
+.sevice_1 .svc_img{padding:30px 0 0;}
+.sevice_1 h3{font-size:16px;margin:15px 0;color:#525252}
+.sevice_1 p{padding:20px;background:#f8f8f8;height:90px;font-size:12px;text-align:left;  color:#898989;line-height:18px}
+.sevice_1 ul {width:100%;padding:0; margin:0;border-top:1px solid #ebe8e8;}
+.sevice_1 ul li{list-style:none;float:left;border-right:1px solid #ebe8e8;width:33%;}
+.sevice_1 ul li a{display:inline-block;height:76px;width:100%}
+.sevice_1 ul li img{padding:10px 0 0;}
+.sevice_1 ul li.last{border:0}
+.sevice_1 h4{width:100%;padding:0; margin:0;border-top:1px solid #ebe8e8;}
+.sevice_1 h4 a{display:inline-block;height:66px;padding:10px 0 0;width:100%}
+
+.sevice_2{border:1px solid #ebe8e8;float:left;width:282px;}
+.sevice_2 .svc_a{padding:33px 0 0;}
+.sevice_2 .svc_a h3{font-size:14px;letter-spacing:-1px;color:#525252;margin-bottom:5px;padding:0 20px 0}
+.sevice_2 .svc_a p{color:#898989;line-height:18px;letter-spacing:-1px;padding:5px 20px 0;}
+.sevice_2 .svc_btn{text-align:center;position:absolute;bottom:0;left:0;width:282px;}
+.sevice_2 .svc_btn a{display:inline-block; background:#ff3061;text-align:center;color:#fff;padding:10px 20px;}
+.sevice_2 .svc_btn a:hover{text-decoration:none;}
+.sevice_2 .svc_sms{overflow:hidden; height:212px;position:relative}
+.sevice_2 .svc_sms .svc_btn a{display:inline-block; background:#f8f8f8;width:100%;text-align:center;margin:0;padding:10px 0 0 }
+.sevice_2 .svc_design{overflow:hidden;height:210px;position:relative}
+.sevice_2 .svc_design .svc_btn a{margin:0 0 20px}
+
+/*테마*/
+.theme_p{padding:0 20px}
+#theme_list{padding:0;margin:0 10px;list-style:none;  width: 1000px;position:relative}
+#theme_list:after{display:block;visibility:hidden;clear:both;content:""}
+#theme_list li{padding:10px;margin:0;float:left;width:302px}
+#theme_list li:after{display:block;visibility:hidden;clear:both;content:""}
+#theme_list li .tmli_if{border: 1px solid #d1dee2;width:300px;}
+#theme_list li .tmli_if>img{width:300px;height:225px;}
+#theme_list li .tmli_if:hover>img{-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";filter: alpha(opacity=50);-moz-opacity:0.5;-khtml-opacity: 0.5;opacity: 0.5;}
+#theme_list li .tmli_tit{position:relative; border-top: 1px solid #d1dee2; background: #e5ecef;}
+#theme_list li .tmli_tit p{height:40px;line-height:40px;padding:0 10px 0;font-weight:bold;text-overflow: ellipsis;  overflow: hidden;  white-space: nowrap;}
+#theme_list li .tmli_tit button.tmli_dt{position:absolute;top:8px;right:10px;padding:5px;background:#111;color:#fff;display:none;border:none}
+#theme_list li .tmli_if:hover button.tmli_dt{display:block}
+#theme_list li .theme_sl{float:left;border:none;margin-top:5px;padding:0 5px;height:26px;background:#999;color:#fff}
+#theme_list li .theme_sl:hover{background:#ff3061}
+#theme_list li .theme_deactive{margin-left:4px}
+#theme_list li .theme_sl_use{background:#ff3061;line-height:26px}
+#theme_list li .theme_pr{float:right;margin-top:5px;padding:0 5px;height:24px;line-height:24px;  border: 1px solid #ccc;  background: #fafafa; }
+#theme_list li .theme_preview{  float: right;  margin-top: 5px; padding:0 5px;height:26px; border: 1px solid #ccc;  background: #fafafa; margin-right:3px}
+
+#theme_detail{position:fixed;_position:absolute;top:50%;left:20px;_top:300px;width:950px;height:490px;margin-top:-245px;background:#fff;border:1px solid #000;z-index:99999;}
+#theme_detail .thdt_img{padding:20px 0 20px 20px;float:left;}
+#theme_detail .thdt_img img{width:600px;height:450px;}
+#theme_detail .thdt_if{float:right;width:290px;padding:40px 20px 0 0;position:relative}
+#theme_detail .thdt_if h2{padding:0 ;margin:0}
+#theme_detail .thdt_if p{font-weight:normal;padding:10px;background:#f5f5f5;height:250px;overflow-y:auto;}
+#theme_detail .thdt_if a{vertical-align:middle;}
+#theme_detail .thdt_if .thdt_home{background:url(../img/link_icon.gif) no-repeat bottom right;padding-right:13px;}
+#theme_detail .close_btn{position:absolute;top:10px;right:10px;background:url(../img/close.gif) no-repeat 50% 50%;border:none;width:30px;height:30px;overflow:hidden;text-indent:-9999px;}
+#theme_detail table{border-collapse:collapse;margin:5px 0 10px}
+#theme_detail table th{padding: 5px 0;  border: 1px solid #d1dee2; background: #e5ecef;width:50px;padding:10px;text-align:left}
+#theme_detail table td{ border: 1px solid #ececec;padding:10px}
+.no_theme{text-align:center;padding:100px 0;color:#555}
+
+/*글,댓글현황*/
+#wr_cont{position:relative;margin:10px 20px}
+#wr_cont input[type="submit"]{background:#ff3061;border:none;color:#fff;padding: 0 5px;height: 24px;}
+#wr_cont select{height: 24px;}
+#grp_color{border:2px solid #ddd;position:absolute;top:0;right:0;list-style:none;padding: 5px 5px; margin:0;}
+#grp_color li{padding:5px 10px;}
+#grp_color li span{width:10px;height:10px; display:inline-block;background:rgb(75, 178, 197);margin-right:5px;}
+#grp_color li.color2 span{background:rgb(234, 162, 40);}
+#chart_wr h5{text-align:center;border:1px solid #eee;padding:30px 0}
+#chart_wr{margin:20px }
+
+/*전송실패 문자 재전송 내역*/
+.sms_table{padding:0 20px 40px;}
+.sms_table table th{border:1px solid #ddd;padding:9px 0}
+.sms_table table td{border:1px solid #ddd;text-align:center;width:16%;padding:9px 0}
+
+/* Browscap */
+.update_processing{width:300px;height:300px;margin:0 auto;background:url(../img/ajax_loader.gif) no-repeat 0 0}
+#processing{margin: 0 auto;padding: 70px 0;max-width: 800px;border: 1px solid #eee;background: #f9f9f9;text-align:center;}
+#processing p{font-size:1.2em}
+.check_processing {width:300px;height:300px;margin:0 auto;background:url(../img/check.png) no-repeat 50% 50% }
+#processing button{background:#ff3061;border:none;color:#fff;padding: 15px;width:150px;margin-top:15px}

adm/css/theme.css

@@ -0,0 +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 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/faqform.php

@@ -8,7 +8,7 @@ auth_check($auth[$sub_menu], "w");
 $sql = " select * from {$g5['faq_master_table']} where fm_id = '$fm_id' ";
 $fm = sql_fetch($sql);
 
-$html_title = 'FAQ '.$fm['fm_subject'];;
+$html_title = 'FAQ '.$fm['fm_subject'];
 
 if ($w == "u")
 {
@@ -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' ";
@@ -21,7 +23,7 @@ if ($w == "")
                     $sql_common ";
     sql_query($sql);
 
-    $fa_id = mysql_insert_id();
+    $fa_id = sql_insert_id();
 }
 else if ($w == "u")
 {

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);
 
@@ -31,7 +33,7 @@ if ($w == "")
     $sql = " insert {$g5['faq_master_table']} $sql_common ";
     sql_query($sql);
 
-    $fm_id = mysql_insert_id();
+    $fm_id = sql_insert_id();
 }
 else if ($w == "u")
 {

adm/faqmasterlist.php

@@ -64,7 +64,7 @@ $result = sql_query($sql);
 ?>
 
 <div class="local_ov01 local_ov">
-    <?php if ($page > 1) {?><a href="<?php echo $_SERVER['PHP_SELF']; ?>">처음으로</a><?php } ?>
+    <?php if ($page > 1) {?><a href="<?php echo $_SERVER['SCRIPT_NAME']; ?>">처음으로</a><?php } ?>
     <span>전체 FAQ <?php echo $total_count; ?>건</span>
 </div>
 
@@ -93,7 +93,7 @@ $result = sql_query($sql);
     </tr>
     </thead>
     <tbody>
-    <?php for ($i=0; $row=mysql_fetch_array($result); $i++) {
+    <?php for ($i=0; $row=sql_fetch_array($result); $i++) {
         $sql1 = " select COUNT(*) as cnt from {$g5['faq_table']} where fm_id = '{$row['fm_id']}' ";
         $row1 = sql_fetch($sql1);
         $cnt = $row1['cnt'];
@@ -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
@@ -121,7 +121,7 @@ $result = sql_query($sql);
     </table>
 </div>
 
-<?php echo get_paging(G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, "{$_SERVER['PHP_SELF']}?$qstr&amp;page="); ?>
+<?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');

adm/index.php

@@ -84,14 +84,14 @@ $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['PHP_SELF'].'\');">삭제</a>';
+                $s_del = '<a href="./member_delete.php?'.$qstr.'&amp;w=d&amp;mb_id='.$row['mb_id'].'&amp;url='.$_SERVER['SCRIPT_NAME'].'" onclick="return delete_confirm(this);">삭제</a>';
             }
             $s_grp = '<a href="./boardgroupmember_form.php?mb_id='.$row['mb_id'].'">그룹</a>';
 
             $leave_date = $row['mb_leave_date'] ? $row['mb_leave_date'] : date("Ymd", G5_SERVER_TIME);
             $intercept_date = $row['mb_intercept_date'] ? $row['mb_intercept_date'] : date("Ymd", G5_SERVER_TIME);
 
-            $mb_nick = get_sideview($row['mb_id'], $row['mb_nick'], $row['mb_email'], $row['mb_homepage']);
+            $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'])

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

@@ -51,8 +51,7 @@ $colspan = 7;
     </thead>
     <tbody>
     <?php
-    for ($i=0; $row=mysql_fetch_array($result); $i++) {
-        //$s_del = '<a href="javascript:post_delete(\'mail_update.php\', '.$row['ma_id'].');">삭제</a>';
+    for ($i=0; $row=sql_fetch_array($result); $i++) {
         $s_vie = '<a href="./mail_preview.php?ma_id='.$row['ma_id'].'" target="_blank">미리보기</a>';
 
         $num = number_format($total_count - ($page - 1) * $config['cf_page_rows'] - $i);
@@ -83,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';
@@ -31,6 +29,8 @@ else if ($w == 'u')
     $required_mb_password = '';
     $html_title = '수정';
 
+    $mb['mb_name'] = get_text($mb['mb_name']);
+    $mb['mb_nick'] = get_text($mb['mb_nick']);
     $mb['mb_email'] = get_text($mb['mb_email']);
     $mb['mb_homepage'] = get_text($mb['mb_homepage']);
     $mb['mb_birth'] = get_text($mb['mb_birth']);
@@ -38,6 +38,7 @@ else if ($w == 'u')
     $mb['mb_hp'] = get_text($mb['mb_hp']);
     $mb['mb_addr1'] = get_text($mb['mb_addr1']);
     $mb['mb_addr2'] = get_text($mb['mb_addr2']);
+    $mb['mb_addr3'] = get_text($mb['mb_addr3']);
     $mb['mb_signature'] = get_text($mb['mb_signature']);
     $mb['mb_recommend'] = get_text($mb['mb_recommend']);
     $mb['mb_profile'] = get_text($mb['mb_profile']);
@@ -125,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;
@@ -141,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>
@@ -212,13 +218,11 @@ 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_zip1" class="sound_only">우편번호 앞자리</label>
-            <input type="text" name="mb_zip1" value="<?php echo $mb['mb_zip1'] ?>" id="mb_zip1" class="frm_input readonly" size="3" maxlength="3"> -
-            <label for="mb_zip2" class="sound_only">우편번호 뒷자리</label>
-            <input type="text" name="mb_zip2" value="<?php echo $mb['mb_zip2'] ?>" id="mb_zip2" class="frm_input readonly" size="3" maxlength="3">
-            <button type="button" class="btn_frmline" onclick="win_zip('fmember', 'mb_zip1', 'mb_zip2', 'mb_addr1', 'mb_addr2', 'mb_addr3', 'mb_addr_jibeon');">주소 검색</button><br>
+            <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">
+            <button type="button" class="btn_frmline" onclick="win_zip('fmember', 'mb_zip', 'mb_addr1', 'mb_addr2', 'mb_addr3', 'mb_addr_jibeon');">주소 검색</button><br>
             <input type="text" name="mb_addr1" value="<?php echo $mb['mb_addr1'] ?>" id="mb_addr1" class="frm_input readonly" size="60">
             <label for="mb_addr1">기본주소</label><br>
             <input type="text" name="mb_addr2" value="<?php echo $mb['mb_addr2'] ?>" id="mb_addr2" class="frm_input" size="60">

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']);
 
@@ -29,6 +29,9 @@ if($_POST['mb_certify_case'] && $_POST['mb_certify']) {
     $mb_adult = 0;
 }
 
+$mb_zip1 = substr($_POST['mb_zip'], 0, 3);
+$mb_zip2 = substr($_POST['mb_zip'], 3);
+
 $sql_common = "  mb_name = '{$_POST['mb_name']}',
                  mb_nick = '{$_POST['mb_nick']}',
                  mb_email = '{$_POST['mb_email']}',
@@ -37,8 +40,8 @@ $sql_common = "  mb_name = '{$_POST['mb_name']}',
                  mb_hp = '{$mb_hp}',
                  mb_certify = '{$mb_certify}',
                  mb_adult = '{$mb_adult}',
-                 mb_zip1 = '{$_POST['mb_zip1']}',
-                 mb_zip2 = '{$_POST['mb_zip2']}',
+                 mb_zip1 = '$mb_zip1',
+                 mb_zip2 = '$mb_zip2',
                  mb_addr1 = '{$_POST['mb_addr1']}',
                  mb_addr2 = '{$_POST['mb_addr2']}',
                  mb_addr3 = '{$_POST['mb_addr3']}',
@@ -81,7 +84,7 @@ if ($w == '')
     if ($row['mb_id'])
         alert('이미 존재하는 이메일입니다.\\nＩＤ : '.$row['mb_id'].'\\n이름 : '.$row['mb_name'].'\\n닉네임 : '.$row['mb_nick'].'\\n메일 : '.$row['mb_email']);
 
-    sql_query(" insert into {$g5['member_table']} set mb_id = '{$mb_id}', mb_password = '".sql_password($mb_password)."', mb_datetime = '".G5_TIME_YMDHIS."', mb_ip = '{$_SERVER['REMOTE_ADDR']}', mb_email_certify = '".G5_TIME_YMDHIS."', {$sql_common} ");
+    sql_query(" insert into {$g5['member_table']} set mb_id = '{$mb_id}', mb_password = '".get_encrypt_string($mb_password)."', mb_datetime = '".G5_TIME_YMDHIS."', mb_ip = '{$_SERVER['REMOTE_ADDR']}', mb_email_certify = '".G5_TIME_YMDHIS."', {$sql_common} ");
 }
 else if ($w == 'u')
 {
@@ -92,6 +95,10 @@ else if ($w == 'u')
     if ($is_admin != 'super' && $mb['mb_level'] >= $member['mb_level'])
         alert('자신보다 권한이 높거나 같은 회원은 수정할 수 없습니다.');
 
+    if ($is_admin !== 'super' && is_admin($mb['mb_id']) === 'super' ) {
+        alert('최고관리자의 비밀번호를 수정할수 없습니다.');
+    }
+
     if ($_POST['mb_id'] == $member['mb_id'] && $_POST['mb_level'] != $mb['mb_level'])
         alert($mb['mb_id'].' : 로그인 중인 관리자 레벨은 수정 할 수 없습니다.');
 
@@ -139,7 +146,7 @@ else if ($w == 'u')
     }
 
     if ($mb_password)
-        $sql_password = " , mb_password = '".sql_password($mb_password)."' ";
+        $sql_password = " , mb_password = '".get_encrypt_string($mb_password)."' ";
     else
         $sql_password = "";
 

adm/member_list.php

@@ -56,7 +56,7 @@ $sql = " select count(*) as cnt {$sql_common} {$sql_search} and mb_intercept_dat
 $row = sql_fetch($sql);
 $intercept_count = $row['cnt'];
 
-$listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</a>';
+$listall = '<a href="'.$_SERVER['SCRIPT_NAME'].'" class="ov_listall">전체목록</a>';
 
 $g5['title'] = '회원관리';
 include_once('./admin.head.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>
@@ -158,17 +159,15 @@ $colspan = 16;
 
         if ($is_admin == 'group') {
             $s_mod = '';
-            $s_del = '';
         } else {
             $s_mod = '<a href="./member_form.php?'.$qstr.'&amp;w=u&amp;mb_id='.$row['mb_id'].'">수정</a>';
-            //$s_del = '<a href="javascript:post_delete(\'member_delete.php\', \''.$row['mb_id'].'\');">삭제</a>';
         }
         $s_grp = '<a href="./boardgroupmember_form.php?mb_id='.$row['mb_id'].'">그룹</a>';
 
         $leave_date = $row['mb_leave_date'] ? $row['mb_leave_date'] : date('Ymd', G5_SERVER_TIME);
         $intercept_date = $row['mb_intercept_date'] ? $row['mb_intercept_date'] : date('Ymd', G5_SERVER_TIME);
 
-        $mb_nick = get_sideview($row['mb_id'], $row['mb_nick'], $row['mb_email'], $row['mb_homepage']);
+        $mb_nick = get_sideview($row['mb_id'], get_text($row['mb_nick']), $row['mb_email'], $row['mb_homepage']);
 
         $mb_id = $row['mb_id'];
         $leave_msg = '';
@@ -213,7 +212,7 @@ $colspan = 16;
     <tr class="<?php echo $bg; ?>">
         <td headers="mb_list_chk" class="td_chk" rowspan="2">
             <input type="hidden" name="mb_id[<?php echo $i ?>]" value="<?php echo $row['mb_id'] ?>" id="mb_id_<?php echo $i ?>">
-            <label for="chk_<?php echo $i; ?>" class="sound_only"><?php echo get_text($row['mb_name']); ?> <?php echo $row['mb_nick']; ?>님</label>
+            <label for="chk_<?php echo $i; ?>" class="sound_only"><?php echo get_text($row['mb_name']); ?> <?php echo get_text($row['mb_nick']); ?>님</label>
             <input type="checkbox" name="chk[]" value="<?php echo $i ?>" id="chk_<?php echo $i ?>">
         </td>
         <td headers="mb_list_id" rowspan="2" class="td_name sv_use"><?php echo $mb_id ?></td>
@@ -224,7 +223,7 @@ $colspan = 16;
             <input type="radio" name="mb_certify[<?php echo $i; ?>]" value="hp" id="mb_certify_hp_<?php echo $i; ?>" <?php echo $row['mb_certify']=='hp'?'checked':''; ?>>
             <label for="mb_certify_hp_<?php echo $i; ?>">휴대폰</label>
         </td>
-        <td headers="mb_list_mobile" class="td_tel"><?php echo $row['mb_hp']; ?></td>
+        <td headers="mb_list_mobile" class="td_tel"><?php echo get_text($row['mb_hp']); ?></td>
         <td headers="mb_list_auth" class="td_mbstat">
             <?php
             if ($leave_msg || $intercept_msg) echo $leave_msg.' '.$intercept_msg;
@@ -261,7 +260,7 @@ $colspan = 16;
             <label for="mb_intercept_date_<?php echo $i; ?>" class="sound_only">접근차단</label>
             <?php } ?>
         </td>
-        <td headers="mb_list_tel" class="td_tel"><?php echo $row['mb_tel']; ?></td>
+        <td headers="mb_list_tel" class="td_tel"><?php echo get_text($row['mb_tel']); ?></td>
         <td headers="mb_list_point" class="td_num"><a href="point_list.php?sfl=mb_id&amp;stx=<?php echo $row['mb_id'] ?>"><?php echo number_format($row['mb_point']) ?></a></td>
         <td headers="mb_list_join" class="td_date"><?php echo substr($row['mb_datetime'],2,8); ?></td>
     </tr>

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,23 +43,67 @@ $(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);
+        });
+
     });
 
-    $("#add_manual").live("click", function() {
+    $(document).on("click", "#add_manual", function() {
         var me_name = $.trim($("#me_name").val());
         var me_link = $.trim($("#me_link").val());
 
         add_menu_list(me_name, me_link, "<?php echo $code; ?>");
     });
 
-    $(".add_select").live("click", function() {
+    $(document).on("click", ".add_select", function() {
         var me_name = $.trim($(this).siblings("input[name='subject[]']").val());
         var me_link = $.trim($(this).siblings("input[name='link[]']").val());
 

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>
@@ -71,12 +69,16 @@ $colspan = 7;
             $sub_menu_info = '<span class="sound_only">'.$row['me_name'].'의 서브</span>';
             $sub_menu_ico = '<span class="sub_menu_ico"></span>';
         }
+
+        $search  = array('"', "'");
+        $replace = array('&#034;', '&#039;');
+        $me_name = str_replace($search, $replace, $row['me_name']);
     ?>
     <tr class="<?php echo $bg; ?> menu_list menu_group_<?php echo substr($row['me_code'], 0, 2); ?>">
         <td class="td_category<?php echo $sub_menu_class; ?>">
             <input type="hidden" name="code[]" value="<?php echo substr($row['me_code'], 0, 2) ?>">
             <label for="me_name_<?php echo $i; ?>" class="sound_only"><?php echo $sub_menu_info; ?> 메뉴<strong class="sound_only"> 필수</strong></label>
-            <input type="text" name="me_name[]" value="<?php echo $row['me_name'] ?>" id="me_name_<?php echo $i; ?>" required class="required frm_input full_input">
+            <input type="text" name="me_name[]" value="<?php echo $me_name; ?>" id="me_name_<?php echo $i; ?>" required class="required frm_input full_input">
         </td>
         <td>
             <label for="me_link_<?php echo $i; ?>" class="sound_only">링크<strong class="sound_only"> 필수</strong></label>
@@ -132,12 +134,12 @@ $colspan = 7;
 
 <script>
 $(function() {
-    $(".btn_add_submenu").live("click", function() {
+    $(document).on("click", ".btn_add_submenu", function() {
         var code = $(this).closest("tr").find("input[name='code[]']").val().substr(0, 2);
         add_submenu(code);
     });
 
-    $(".btn_del_menu").live("click", function() {
+    $(document).on("click", ".btn_del_menu", function() {
         if(!confirm("메뉴를 삭제하시겠습니까?"))
             return false;
 

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

@@ -5,29 +5,31 @@ include_once('./_common.php');
 if ($w == "u" || $w == "d")
     check_demo();
 
-if ($W == 'd')
+if ($w == 'd')
     auth_check($auth[$sub_menu], "d");
 else
     auth_check($auth[$sub_menu], "w");
 
-$sql_common = " nw_device = '$nw_device',
-                nw_begin_time = '$nw_begin_time',
-                nw_end_time = '$nw_end_time',
-                nw_disable_hours = '$nw_disable_hours',
-                nw_left = '$nw_left',
-                nw_top = '$nw_top',
-                nw_height = '$nw_height',
-                nw_width = '$nw_width',
-                nw_subject = '$nw_subject',
-                nw_content = '$nw_content',
-                nw_content_html = '$nw_content_html' ";
+check_admin_token();
+
+$sql_common = " nw_device = '{$_POST['nw_device']}',
+                nw_begin_time = '{$_POST['nw_begin_time']}',
+                nw_end_time = '{$_POST['nw_end_time']}',
+                nw_disable_hours = '{$_POST['nw_disable_hours']}',
+                nw_left = '{$_POST['nw_left']}',
+                nw_top = '{$_POST['nw_top']}',
+                nw_height = '{$_POST['nw_height']}',
+                nw_width = '{$_POST['nw_width']}',
+                nw_subject = '{$_POST['nw_subject']}',
+                nw_content = '{$_POST['nw_content']}',
+                nw_content_html = '{$_POST['nw_content_html']}' ";
 
 if($w == "")
 {
     $sql = " insert {$g5['new_win_table']} set $sql_common ";
     sql_query($sql);
 
-    $nw_id = mysql_insert_id();
+    $nw_id = sql_insert_id();
 }
 else if ($w == "u")
 {

adm/newwinlist.php

@@ -70,7 +70,7 @@ $result = sql_query($sql);
     </thead>
     <tbody>
     <?php
-    for ($i=0; $row=mysql_fetch_array($result); $i++) {
+    for ($i=0; $row=sql_fetch_array($result); $i++) {
         $bg = 'bg'.($i%2);
 
         switch($row['nw_device']) {
@@ -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_clear.php

@@ -1,64 +0,0 @@
-<?php
-$sub_menu = "200200";
-include_once('./_common.php');
-
-check_demo();
-
-if (!$ok)
-    alert();
-
-if ($is_admin != 'super')
-    alert('포인트 정리는 최고관리자만 가능합니다.');
-
-$g5['title'] = '포인트 정리';
-include_once('./admin.head.php');
-echo '<span id="ct"></span>';
-include_once('./admin.tail.php');
-flush();
-
-echo '<script>document.getElementById(\'ct\').innerHTML += \'<p>포인트 정리중...</p>\';</script>'."\n";
-flush();
-
-$max_count = 50;
-
-// 테이블 락을 걸고
-$sql = " LOCK TABLES {$g5['member_table']} WRITE, {$g5['point_table']} WRITE ";
-sql_query($sql);
-
-$sql = " select mb_id, count(po_point) as cnt
-            from {$g5['point_table']}
-            group by mb_id
-            having cnt > {$max_count}+1
-            order by cnt ";
-$result = sql_query($sql);
-for ($i=0; $row=sql_fetch_array($result); $i++)
-{
-    $count = 0;
-    $total = 0;
-    $sql2 = " select po_id, po_point
-                  from {$g5['point_table']}
-                  where mb_id = '{$row['mb_id']}'
-                  order by po_id desc
-                  limit {$max_count}, {$row['cnt']} ";
-    $result2 = sql_query($sql2);
-    for ($k=0; $row2=sql_fetch_array($result2); $k++)
-    {
-        $count++;
-        $total += $row2['po_point'];
-
-        sql_query(" delete from {$g5['point_table']} where po_id = '{$row2['po_id']}' ");
-    }
-
-    insert_point($row['mb_id'], $total, '포인트 {$count}건 정리', '@clear', $row['mb_id'], G5_TIME_YMD."-".uniqid(""));
-
-    $str = $row['mb_id']."님 포인트 내역 ".number_format($count)."건 ".number_format($total)."점 정리<br>";
-    echo '<script>document.getElementById(\'ct\').innerHTML += \''.$str.'\';</script>'."\n";
-    flush();
-}
-
-// 테이블 락을 풀고
-$sql = " UNLOCK TABLES ";
-sql_query($sql);
-
-echo '<script>document.getElementById(\'ct\').innerHTML += \'<p>총 '.$i.'건의 회원포인트 내역이 정리 되었습니다.</p>\';</script>'."\n";
-?>

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) ";
@@ -48,7 +46,7 @@ $sql = " select *
             limit {$from_record}, {$rows} ";
 $result = sql_query($sql);
 
-$listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</a>';
+$listall = '<a href="'.$_SERVER['SCRIPT_NAME'].'" class="ov_listall">전체목록</a>';
 
 $mb = array();
 if ($sfl == 'mb_id' && $stx)
@@ -70,16 +68,6 @@ else
     $mb_id = "";
 ?>
 
-<script>
-function point_clear()
-{
-    if (confirm('포인트 정리를 하시면 최근 50건 이전의 포인트 부여 내역을 삭제하므로 포인트 부여 내역을 필요로 할때 찾지 못할 수도 있습니다. 그래도 진행하시겠습니까?'))
-    {
-        document.location.href = "./point_clear.php?ok=1";
-    }
-}
-</script>
-
 <div class="local_ov01 local_ov">
     <?php echo $listall ?>
     전체 <?php echo number_format($total_count) ?> 건
@@ -91,7 +79,6 @@ function point_clear()
         echo '&nbsp;(전체 합계 '.number_format($row2['sum_point']).'점)';
     }
     ?>
-    <?php if ($is_admin == 'super') { ?><!-- <a href="javascript:point_clear();">포인트정리</a> --><?php } ?>
 </div>
 
 <form name="fsearch" id="fsearch" class="local_sch01 local_sch" method="get">
@@ -111,7 +98,7 @@ function point_clear()
 <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>
@@ -192,7 +179,7 @@ function point_clear()
 
 </form>
 
-<?php echo get_paging(G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, "{$_SERVER['PHP_SELF']}?$qstr&amp;page="); ?>
+<?php echo get_paging(G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, "{$_SERVER['SCRIPT_NAME']}?$qstr&amp;page="); ?>
 
 <section id="point_mng">
     <h2 class="h2_frm">개별회원 포인트 증감 설정</h2>

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">
 
@@ -86,8 +84,8 @@ include_once('./admin.head.php');
 
     <?php if ($w == 'u') { ?>
     <tr>
-        <th scope="row"><label for="po_date">투표시작일</label></th>
-        <td><input type="text" name="po_date" value="<?php echo $po['po_date'] ?>" id="po_date" class="frm_input" maxlength="10"></td>
+        <th scope="row">투표등록일</th>
+        <td><?php echo $po['po_date']; ?></td>
     </tr>
     <tr>
         <th scope="row"><label for="po_ips">투표참가 IP</label></th>

adm/poll_form_update.php

@@ -8,16 +8,16 @@ if ($w == 'u' || $w == 'd')
 
 auth_check($auth[$sub_menu], 'w');
 
-check_token();
+check_admin_token();
 
 if ($w == '')
 {
     $sql = " insert {$g5['poll_table']}
                     ( po_subject, po_poll1, po_poll2, po_poll3, po_poll4, po_poll5, po_poll6, po_poll7, po_poll8, po_poll9, po_cnt1, po_cnt2, po_cnt3, po_cnt4, po_cnt5, po_cnt6, po_cnt7, po_cnt8, po_cnt9, po_etc, po_level, po_point, po_date )
-             values ( '{$_POST['po_subject']}', '{$_POST['po_poll1']}', '{$_POST['po_poll2']}', '{$_POST['po_poll3']}', '{$_POST['po_poll4']}', '{$_POST['po_poll5']}', '{$_POST['po_poll6']}', '{$_POST['po_poll7']}', '{$_POST['po_poll8']}', '{$_POST['po_poll9']}', '{$_POST['po_cnt1']}', '{$_POST['po_cnt2']}', '{$_POST['po_cnt3']}', '{$_POST['po_cnt4']}', '{$_POST['po_cnt5']}', '{$_POST['po_cnt6']}', '{$_POST['po_cnt7']}', '{$_POST['po_cnt8']}', '{$_POST['po_cnt9']}', '{$_POST['po_etc']}', '{$_POST['po_level']}', '{$_POST['po_point']}', '".G5_TIME_YMDHIS."' ) ";
+             values ( '{$_POST['po_subject']}', '{$_POST['po_poll1']}', '{$_POST['po_poll2']}', '{$_POST['po_poll3']}', '{$_POST['po_poll4']}', '{$_POST['po_poll5']}', '{$_POST['po_poll6']}', '{$_POST['po_poll7']}', '{$_POST['po_poll8']}', '{$_POST['po_poll9']}', '{$_POST['po_cnt1']}', '{$_POST['po_cnt2']}', '{$_POST['po_cnt3']}', '{$_POST['po_cnt4']}', '{$_POST['po_cnt5']}', '{$_POST['po_cnt6']}', '{$_POST['po_cnt7']}', '{$_POST['po_cnt8']}', '{$_POST['po_cnt9']}', '{$_POST['po_etc']}', '{$_POST['po_level']}', '{$_POST['po_point']}', '".G5_TIME_YMD."' ) ";
     sql_query($sql);
 
-    $po_id = mysql_insert_id();
+    $po_id = sql_insert_id();
 }
 else if ($w == 'u')
 {
@@ -43,8 +43,7 @@ else if ($w == 'u')
                      po_cnt9 = '{$_POST['po_cnt9']}',
                      po_etc = '{$_POST['po_etc']}',
                      po_level = '{$_POST['po_level']}',
-                     po_point = '{$_POST['po_point']}',
-                     po_date = '{$_POST['po_date']}'
+                     po_point = '{$_POST['po_point']}'
                 where po_id = '{$_POST['po_id']}' ";
     sql_query($sql);
 }

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) ";
@@ -44,7 +42,7 @@ $sql = " select *
             limit {$from_record}, {$rows} ";
 $result = sql_query($sql);
 
-$listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</a>';
+$listall = '<a href="'.$_SERVER['SCRIPT_NAME'].'" class="ov_listall">전체목록</a>';
 
 $g5['title'] = '투표관리';
 include_once('./admin.head.php');
@@ -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>
@@ -106,7 +104,6 @@ $colspan = 7;
         $po_etc = ($row['po_etc']) ? "사용" : "미사용";
 
         $s_mod = '<a href="./poll_form.php?'.$qstr.'&amp;w=u&amp;po_id='.$row['po_id'].'">수정</a>';
-        //$s_del = '<a href="javascript:post_delete(\'poll_form_update.php\', \''.$row['po_id'].'\');">삭제</a>';
 
         $bg = 'bg'.($i%2);
     ?>
@@ -135,11 +132,11 @@ $colspan = 7;
 </div>
 
 <div class="btn_list01 btn_list">
-    <button type="submit">선택삭제</button>
+    <input type="submit" value="선택삭제">
 </div>
 </form>
 
-<?php echo get_paging(G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, "{$_SERVER['PHP_SELF']}?$qstr&amp;page="); ?>
+<?php echo get_paging(G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, "{$_SERVER['SCRIPT_NAME']}?$qstr&amp;page="); ?>
 
 <script>
 $(function() {

adm/popular_list.php

@@ -57,7 +57,7 @@ $sql = " select *
             limit {$from_record}, {$rows} ";
 $result = sql_query($sql);
 
-$listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</a>';
+$listall = '<a href="'.$_SERVER['SCRIPT_NAME'].'" class="ov_listall">전체목록</a>';
 
 $g5['title'] = '인기검색어관리';
 include_once('./admin.head.php');
@@ -123,7 +123,7 @@ var list_delete_php = 'popular_list.php';
             <label for="chk_<?php echo $i; ?>" class="sound_only"><?php echo $word ?></label>
             <input type="checkbox" name="chk[]" value="<?php echo $row['pp_id'] ?>" id="chk_<?php echo $i ?>">
         </td>
-        <td><a href="<?php echo $_SERVER['PHP_SELF'] ?>?sfl=pp_word&amp;stx=<?php echo $word ?>"><?php echo $word ?></a></td>
+        <td><a href="<?php echo $_SERVER['SCRIPT_NAME'] ?>?sfl=pp_word&amp;stx=<?php echo $word ?>"><?php echo $word ?></a></td>
         <td><?php echo $row['pp_date'] ?></td>
         <td><?php echo $row['pp_ip'] ?></td>
     </tr>
@@ -147,7 +147,7 @@ var list_delete_php = 'popular_list.php';
 
 </form>
 
-<?php echo get_paging(G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, "{$_SERVER['PHP_SELF']}?$qstr&amp;page="); ?>
+<?php echo get_paging(G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, "{$_SERVER['SCRIPT_NAME']}?$qstr&amp;page="); ?>
 
 <script>
 $(function() {

adm/popular_rank.php

@@ -4,10 +4,10 @@ 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}";
+$qstr = "fr_date={$fr_date}&to_date={$to_date}";
 
 $sql_common = " from {$g5['popular_table']} a ";
 $sql_search = " where trim(pp_word) <> '' and pp_date between '{$fr_date}' and '{$to_date}' ";
@@ -16,7 +16,7 @@ $sql_order = " order by cnt desc ";
 
 $sql = " select pp_word {$sql_common} {$sql_search} {$sql_group} ";
 $result = sql_query($sql);
-$total_count = mysql_num_rows($result);
+$total_count = sql_num_rows($result);
 
 $rows = $config['cf_page_rows'];
 $total_page  = ceil($total_count / $rows);  // 전체 페이지 계산
@@ -26,7 +26,7 @@ $from_record = ($page - 1) * $rows; // 시작 열을 구함
 $sql = " select pp_word, count(*) as cnt {$sql_common} {$sql_search} {$sql_group} {$sql_order} limit {$from_record}, {$rows} ";
 $result = sql_query($sql);
 
-$listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</a>';
+$listall = '<a href="'.$_SERVER['SCRIPT_NAME'].'" class="ov_listall">전체목록</a>';
 
 $g5['title'] = '인기검색어순위';
 include_once('./admin.head.php');
@@ -104,7 +104,7 @@ $(function(){
 </form>
 
 <?php
-echo get_paging(G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, "{$_SERVER['PHP_SELF']}?$qstr&amp;page=");
+echo get_paging(G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, "{$_SERVER['SCRIPT_NAME']}?$qstr&amp;page=");
 ?>
 
 <?php

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,35 @@ check_demo();
 
 auth_check($auth[$sub_menu], 'w');
 
-check_token();
+check_admin_token();
+
+$error_msg = '';
+
+if( $qa_include_head ){
+    $purl = parse_url($qa_include_head);
+    $file = $purl['path'];
+    if (!preg_match("/\.(php|htm['l']?)$/i", $file)) {
+        alert('상단 파일 경로의 확장자는 php, html 만 허용합니다.');
+    }
+}
+
+if( $qa_include_tail ){
+    $purl = parse_url($qa_include_tail);
+    $file = $purl['path'];
+    if (!preg_match("/\.(php|htm['l']?)$/i", $file)) {
+        alert('하단 파일 경로의 확장자는 php, html 만 허용합니다.');
+    }
+}
+
+if( $qa_include_head && ! is_include_path_check($qa_include_head, 1) ){
+    $qa_include_head = '';
+    $error_msg = '/data/file/ 또는 /data/editor/ 포함된 문자를 상단 파일 경로에 포함시킬수 없습니다.';
+}
+
+if( $qa_include_tail && ! is_include_path_check($qa_include_tail, 1) ){
+    $qa_include_tail = '';
+    $error_msg = '/data/file/ 또는 /data/editor/ 포함된 문자를 하단 파일 경로에 포함시킬수 없습니다.';
+}
 
 $sql = " update {$g5['qa_config_table']}
             set qa_title                = '{$_POST['qa_title']}',
@@ -29,8 +57,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 +75,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

@@ -0,0 +1,49 @@
+<?php
+$sub_menu = '100400';
+include_once('./_common.php');
+
+auth_check($auth[$sub_menu], 'r');
+
+$g5['title'] = '부가서비스';
+include_once('./admin.head.php');
+?>
+
+<div class="local_desc02 local_desc">
+    <p>아래의 서비스들은 그누보드에서 이미 지원하는 기능으로 별도의 개발이 필요 없으며 서비스 신청후 바로 사용 할수 있습니다.</p>
+</div>
+
+<div class="service_wrap">
+    <div class="sevice_1">
+        <img src="<?php echo G5_ADMIN_URL ?>/img/service_img1.jpg" alt="휴대폰 본인확인 서비스" class="svc_img">
+        <h3>휴대폰 본인확인 서비스</h3>
+        <p>정보통신망법 23조 2항(주민등록번호의 사용제한)에 따라 기존 주민등록번호 기반의 인증서비스 이용이 불가합니다. 주민등록번호 대체수단으로 최소한의 정보(생년월일, 휴대폰번호, 성별)를 입력받아 본인임을 확인하는 인증수단 입니다</p>
+
+        <ul>
+            <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">
+        <img src="<?php echo G5_ADMIN_URL ?>/img/service_img2.jpg" alt="아이핀 본인확인 서비스" class="svc_img">
+        <h3>아이핀 본인확인 서비스</h3>
+        <p>정부가 주관하는 주민등록번호 대체 수단으로 본인의 개인정보를 아이핀 사이트에 한번만 발급해 놓고, 이후부터는 아이디와 패스워드 만으로
+        본인임을 확인하는 인증수단 입니다.</p>
+
+       <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">
+                <div class="svc_a">
+                    <h3>SMS 문자 서비스</h3>
+                    <p>사이트 관리자 또는 회원이 다른 회원의 <br>휴대폰으로 단문메세지(최대 한글 40자, 영문 80자)를 발송할 수 있습니다.</p>
+                </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>
+
+<?php
+include_once('./admin.tail.php');
+?>

adm/sms_admin/_common.php

@@ -2,14 +2,21 @@
 define('G5_IS_ADMIN', true);
 include_once ('../../common.php');
 include_once(G5_ADMIN_PATH.'/admin.lib.php');
+include_once(G5_SMS5_PATH.'/sms5.lib.php');
 
-if (!strstr($_SERVER['PHP_SELF'], 'install.php')) {
-    if(!mysql_num_rows(mysql_query(" show tables like '{$g5['sms5_config_table']}' ")))
+if (!strstr($_SERVER['SCRIPT_NAME'], 'install.php')) {
+    if(!sql_num_rows(sql_query(" show tables like '{$g5['sms5_config_table']}' ")))
         goto_url('install.php');
 
     // SMS 설정값 배열변수
     //$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/ajax.sms_write_person.php

@@ -131,10 +131,9 @@ while ($res = sql_fetch_array($qry)) array_push($group, $res);
     <span class="pg" id="person_pg"></span>
 </nav>
 
-<form name="search_form" id="sms_person_form" method="get" action="<?php echo $_SERVER['PHP_SELF']?>">
+<form name="search_form" id="sms_person_form" method="get" action="<?php echo $_SERVER['SCRIPT_NAME']?>">
 <input type="hidden" name="total_pg" value="<?php echo $total_page?>">
 <input type="hidden" name="page" value="<?php echo $page?>">
-<input type="hidden" name="bg_no" value="<?php echo $bg_no?>">
 
 <label for="bg_no" class="sound_only">그룹</label>
 <select name="bg_no" id="bg_no">

adm/sms_admin/config.php

@@ -9,7 +9,7 @@ $g5['title'] = "SMS 기본설정";
 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';
 
-if ($config['cf_icode_id'] && $config['cf_icode_pw'])
+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']);
 }
@@ -83,60 +83,17 @@ if ($config['cf_sms_use'] == 'icode') { // 아이코드 사용
         <th scope="row">충전 잔액</th>
         <td>
             <?php echo number_format($userinfo['coin'])?> 원
-            <input type="button" value="충전하기" class="btn_frmline" onclick="window.open('http://icodekorea.com/company/credit_card_input.php?icode_id=<?php echo $config['cf_icode_id']?>&icode_passwd=<?php echo $config['cf_icode_pw']?>','icode_payment','width=650,height=500')">
+            <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>
-    <tr>
-        <th scope="row">건별 금액</th>
-        <td><?php echo number_format($userinfo['gpay'])?> 원</td>
-    </tr>
     <?php } ?>
     <tr>
         <th scope="row"><label for="cf_phone">회신번호<strong class="sound_only"> 필수</strong></label></th>
         <td>
-            <?php echo help("회신받을 휴대폰 번호를 입력하세요. '-' 를 꼭 입력하세요.<br>예) 010-123-4567"); ?>
+            <?php echo help("회신받을 휴대폰 번호를 입력하세요. 회신번호는 발신번호로 사전등록된 번호와 동일해야 합니다.<br>예) 010-123-4567"); ?>
             <input type="text" name="cf_phone" value="<?php echo $sms5['cf_phone']; ?>" id="cf_phone" required class="frm_input required" size="12">
         </td>
     </tr>
-    <tr>
-        <th scope="row"><label for="cf_member">회원간 문자전송</label></th>
-        <td>
-            <?php echo help("허용에 체크하면 회원끼리 문자전송이 가능합니다.");?>
-            <input type="checkbox" name="cf_member" value="1" id="cf_member" <?php echo get_checked(1, $sms5['cf_member']); ?>> <label for="cf_member">허용</label>
-        </td>
-    </tr>
-    <tr>
-        <th scope="row"><label for="cf_level">문자전송가능 레벨</label></th>
-        <td>
-            <?php echo help("문자전송을 허용할 회원레벨을 선택해주세요.");?>
-            <select name="cf_level" id="cf_level">
-                <?php for ($i=1; $i<=10; $i++) { ?>
-                <option value="<?php echo $i?>"<?php echo get_selected($i, $sms5['cf_level']);?>> <?php echo $i?> </option>
-                <?php } ?>
-            </select>
-            레벨 이상
-        </td>
-    </tr>
-    <tr>
-        <th scope="row"><label for="cf_point">문자전송 차감 포인트<strong class="sound_only"> 필수</strong></label></th>
-        <td>
-            <?php echo help("회원이 문자를 전송할시에 차감할 포인트를 입력해주세요. 0이면 포인트를 차감하지 않습니다.");?>
-            <input type="text" name="cf_point" value="<?php echo $sms5['cf_point']; ?>" id="cf_point" required class="frm_input required" size="5">
-        </td>
-    </tr>
-    <tr>
-        <th scope="row"><label for="cf_day_count">문자전송 하루제한 갯수<strong class="sound_only"> 필수</strong></label></th>
-        <td>
-            <?php echo help("회원이 하루에 보낼수 있는 문자 갯수를 입력해주세요. 0이면 제한하지 않습니다.");?>
-            <input type="text" name="cf_day_count" value="<?php echo $sms5['cf_day_count']; ?>" id="cf_day_count" required class="frm_input required" size="5">
-        </td>
-    </tr>
-    <tr>
-        <th scope="row"><label for="cf_skin">스킨 디렉토리<strong class="sound_only">필수</strong></label></th>
-        <td>
-            <?php echo get_sms5_skin_select('skin', 'cf_skin', 'cf_skin', $sms5['cf_skin'], 'required'); ?>
-        </td>
-    </tr>
     </tbody>
     </table>
 </div>

adm/sms_admin/config_update.php

@@ -6,18 +6,19 @@ auth_check($auth[$sub_menu], "w");
 
 check_demo();
 
+check_admin_token();
+
 $g5['title'] = "SMS 기본설정";
 
+// 회신번호 체크
+if(!check_vaild_callback($cf_phone))
+    alert('회신번호가 올바르지 않습니다.');
+
 $userinfo = get_icode_userinfo($cf_icode_id, $cf_icode_pw);
 
 if ($userinfo['code'] == '202')
     alert('아이코드 아이디와 패스워드가 맞지 않습니다.');
 
-if ($cf_member == '1')
-    $cf_member = 1;
-else
-    $cf_member = 0;
-
 $res = sql_fetch("select * from ".$g5['sms5_config_table']." limit 1");
 
 if (!$res)
@@ -25,7 +26,7 @@ if (!$res)
 else
     $sql = "update ";
 
-$sql .= $g5['sms5_config_table']." set cf_phone='$cf_phone', cf_member='$cf_member', cf_level='$cf_level', cf_point='$cf_point', cf_day_count='$cf_day_count', cf_skin = '$cf_skin' ";
+$sql .= $g5['sms5_config_table']." set cf_phone='$cf_phone' ";
 
 sql_query($sql);
 

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)
@@ -109,7 +112,7 @@ function multi_update(sel)
 <div class="local_sch01 local_sch sms_preset_sch">
     <form>
     <label for="fg_no" class="sound_only">그룹명</label>
-    <select name="fg_no" onchange="location.href='<?php echo $_SERVER['PHP_SELF']?>?fg_no='+this.value;">
+    <select name="fg_no" onchange="location.href='<?php echo $_SERVER['SCRIPT_NAME']?>?fg_no='+this.value;">
         <option value="" <?php echo $fg_no?'':'selected'?>> 전체 </option>
         <option value="0" <?php echo $fg_no=='0'?'selected':''?>> 미분류 (<?php echo number_format($no_count)?>) </option>
         <?php for($i=0; $i<count($group); $i++) {?>
@@ -118,7 +121,7 @@ function multi_update(sel)
     </select>
     </form>
 
-    <form name="search_form" method="get" action="<?php echo $_SERVER['PHP_SELF']?>">
+    <form name="search_form" method="get" action="<?php echo $_SERVER['SCRIPT_NAME']?>">
     <input type="hidden" name="fg_no" value="<?php echo $fg_no;?>">
     <label for="st" class="sound_only">검색대상</label>
     <select name="st" id="st">
@@ -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>
@@ -231,7 +234,7 @@ function select_copy(sw, f) {
 }
 </script>
 
-<?php echo get_paging(G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, $_SERVER['PHP_SELF']."?fg_no=$fg_no&amp;st=$st&amp;sv=$sv&amp;page="); ?>
+<?php echo get_paging(G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, $_SERVER['SCRIPT_NAME']."?fg_no=$fg_no&amp;st=$st&amp;sv=$sv&amp;page="); ?>
 
 <?php
 include_once(G5_ADMIN_PATH.'/admin.tail.php');

adm/sms_admin/form_write.php

@@ -145,7 +145,7 @@ include_once(G5_ADMIN_PATH.'/admin.head.php');
     </div>
     <div class="btn_confirm01 btn_confirm">
         <input type="submit" value="확인" class="btn_submit" accesskey="s">
-        <a href="./form_list.php?<?php echo $_SERVER['QUERY_STRING']?>">목록</a>
+        <a href="./form_list.php?<?php echo clean_query_string($_SERVER['QUERY_STRING']); ?>">목록</a>
     </div>
 </form>
 

adm/sms_admin/history_list.php

@@ -27,7 +27,7 @@ $vnum = $total_count - (($page-1) * $page_size);
 include_once(G5_ADMIN_PATH.'/admin.head.php');
 ?>
 
-<form name="search_form" id="search_form" action=<?php echo $_SERVER['PHP_SELF'];?> class="local_sch01 local_sch" method="get">
+<form name="search_form" id="search_form" action=<?php echo $_SERVER['SCRIPT_NAME'];?> class="local_sch01 local_sch" method="get">
 
 <label for="st" class="sound_only">검색대상</label>
 <input type="hidden" name="st" id="st" value="wr_message" >
@@ -91,7 +91,7 @@ include_once(G5_ADMIN_PATH.'/admin.head.php');
     </table>
 </div>
 
-<?php echo get_paging(G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, $_SERVER['PHP_SELF']."?st=$st&amp;sv=$sv&amp;page="); ?>
+<?php echo get_paging(G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, $_SERVER['SCRIPT_NAME']."?st=$st&amp;sv=$sv&amp;page="); ?>
 
 <?php
 include_once(G5_ADMIN_PATH.'/admin.tail.php');

adm/sms_admin/history_member.php

@@ -1,90 +0,0 @@
-<?php
-$sub_menu = "900410";
-include_once("./_common.php");
-
-$page_size = 20;
-$colspan = 7;
-
-auth_check($auth[$sub_menu], "r");
-
-$g5['title'] = "문자전송 내역 (회원)";
-
-if ($page < 1) $page = 1;
-
-if ($st && trim($sv))
-    $sql_search = " and $st like '%$sv%' ";
-else
-    $sql_search = "";
-
-$total_res = sql_fetch("select count(*) as cnt from {$g5['sms5_member_history_table']} where 1 $sql_search");
-$total_count = $total_res['cnt'];
-
-$total_page = (int)($total_count/$page_size) + ($total_count%$page_size==0 ? 0 : 1);
-$page_start = $page_size * ( $page - 1 );
-
-$vnum = $total_count - (($page-1) * $page_size);
-
-include_once(G5_ADMIN_PATH.'/admin.head.php');
-?>
-
-<form name="search_form" method="get" action="<?php echo $_SEVER['PHP_SELF']?>" class="local_sch01 local_sch">
-<label for="st" class="sound_only">검색대상</label>
-<select name="st" id="st">
-    <option value="mb_id"<?php echo get_selected('mh_name', $st); ?>>아이디</option>
-    <option value="mh_hp"<?php echo get_selected('mh_hp', $st); ?>>받는번호</option>
-    <option value="mh_reply"<?php echo get_selected('mh_reply', $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="required frm_input">
-<input type="submit" value="검색" class="btn_submit">
-</form>
-
-<div class="tbl_head01 tbl_wrap">
-    <table>
-    <caption><?php echo $g5['title']; ?> 목록</caption>
-    <thead>
-    <tr>
-        <th scope="col">번호</th>
-        <th scope="col">회원</th>
-        <th scope="col">보내는번호</th>
-        <th scope="col">받는번호</th>
-        <th scope="col">전송일시</th>
-        <th scope="col">예약</th>
-        <th scope="col">Log</th>
-     </tr>
-     </thead>
-     <tbody>
-     <?php if (!$total_count) { ?>
-    <tr>
-        <td colspan="<?php echo $colspan?>" class="empty_table" >
-            데이터가 없습니다.
-        </td>
-    </tr>
-    <?php
-    }
-    $qry = sql_query("select * from {$g5['sms5_member_history_table']} where 1 $sql_search order by mh_no desc limit $page_start, $page_size");
-    while($row = sql_fetch_array($qry)) {
-        $bg = 'bg'.($line++%2);
-
-        $mb = get_member($row['mb_id']);
-        $mb_id = get_sideview($row['mb_id'], $mb['mb_nick']);
-    ?>
-    <tr class="<?php echo $bg; ?>">
-        <td class="td_num"><?php echo $vnum--?></td>
-        <td class="td_mbid"><?php echo $mb_id?></td>
-        <td class="td_numbig"><?php echo $row['mh_reply']?></td>
-        <td class="td_numbig"><?php echo $row['mh_hp']?></td>
-        <td class="td_datetime"><?php echo $row['mh_datetime']?></td>
-        <td class="td_boolean"><?php echo $row['mh_booking']!='0000-00-00 00:00:00'?"<span title='{$row['mh_booking']}'>예약</span>":'';?></td>
-        <td><?php echo $row['mh_log']?></td>
-    </tr>
-    <?php } ?>
-    </tbody>
-    </table>
-</div>
-
-<?php echo get_paging(G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, $_SERVER['PHP_SELF']."?st=$st&amp;sv=$sv&amp;page="); ?>
-
-<?php
-include_once(G5_ADMIN_PATH.'/admin.tail.php');
-?>

adm/sms_admin/history_num.php

@@ -27,7 +27,7 @@ $vnum = $total_count - (($page-1) * $page_size);
 include_once(G5_ADMIN_PATH.'/admin.head.php');
 ?>
 
-<form name="search_form" method="get" action="<?echo $_SERVER['PHP_SELF']?>" class="local_sch01 local_sch" >
+<form name="search_form" method="get" action="<?echo $_SERVER['SCRIPT_NAME']?>" class="local_sch01 local_sch" >
 <label for="st" class="sound_only">검색대상</label>
 <select name="st" id="st">
     <option value="hs_name"<?php echo get_selected('hs_name', $st); ?>>이름</option>
@@ -100,7 +100,7 @@ include_once(G5_ADMIN_PATH.'/admin.head.php');
     </table>
 </div>
 
-<?php echo get_paging(G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, $_SERVER['PHP_SELF']."?st=$st&amp;sv=$sv&amp;page="); ?>
+<?php echo get_paging(G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, $_SERVER['SCRIPT_NAME']."?st=$st&amp;sv=$sv&amp;page="); ?>
 
 <?php
 include_once(G5_ADMIN_PATH.'/admin.tail.php');

adm/sms_admin/history_send.php

@@ -39,7 +39,8 @@ if (!$res['cnt']) {
 $sql = sql_query("select * from {$g5['sms5_history_table']} where wr_no='$wr_no' $sql_renum $sql_flag");
 while ($res = sql_fetch_array($sql))
 {
-    $res['bk_hp'] = get_hp($res['bk_hp'], 0);
+    $res['bk_hp']   = get_hp($res['hs_hp'], 0);
+    $res['bk_name'] = $res['hs_name'];
 
     if ($g5['sms5_demo'])
         $res['bk_hp'] = '0100000000';
@@ -48,6 +49,7 @@ while ($res = sql_fetch_array($sql))
 }
 
 $wr_total = count($list);
+$reply = str_replace('-', '', trim($write['wr_reply']));
 
 if ($config['cf_sms_use'] != 'icode') {
     alert('기본환경설정에서 icode sms 사용이 비활성화 되어 있습니다.');
@@ -55,79 +57,170 @@ if ($config['cf_sms_use'] != 'icode') {
 include_once(G5_ADMIN_PATH.'/admin.head.php');
 
 $SMS = new SMS5;
-$SMS->SMS_con($config['cf_icode_server_ip'], $config['cf_icode_id'], $config['cf_icode_pw'], $config['cf_icode_server_port']);
 
-$reply = str_replace('-', '', trim($write['wr_reply']));
+if($config['cf_sms_type'] == 'LMS') {
+    $port_setting = get_icode_port_type($config['cf_icode_id'], $config['cf_icode_pw']);
 
-$result = $SMS->Add($list, $reply, '', '', $write['wr_message'], '', $wr_total);
-
-if ($result)
-{
-    $result = $SMS->Send();
-
-    if ($result) //SMS 서버에 접속했습니다.
-    {
-        sql_query("insert into {$g5['sms5_write_table']} set wr_no='$wr_no', wr_renum='$new_wr_renum', wr_reply='{$write['wr_reply']}', wr_message='{$write['wr_message']}', wr_total='$wr_total', wr_datetime='".G5_TIME_YMDHIS."'");
+    if($port_setting !== false) {
+        $SMS->SMS_con($config['cf_icode_server_ip'], $config['cf_icode_id'], $config['cf_icode_pw'], $port_setting);
 
         $wr_success = 0;
         $wr_failure = 0;
         $count      = 0;
 
-        foreach ($SMS->Result as $result)
-        {
-            list($phone, $code) = explode(":", $result);
+        for($i=0; $i<$wr_total; $i++) {
+            $strDest = array();
+            $strDest[]   = $list[$i]['bk_hp'];
+            $strCallBack = $reply;
+            $strCaller   = $config['cf_title'];
+            $strSubject  = '';
+            $strURL      = '';
+            $strData     = $write['wr_message'];
+            if( !empty($list[$i]['bk_name']) ){
+                $strData    = str_replace("{이름}", $list[$i]['bk_name'], $strData);
+            }
+            $strDate = $booking;
+            $nCount = 1;
 
-            if (substr($code,0,5) == "Error")
-            {
-                $hs_code = substr($code,6,2);
+            $result = $SMS->Add($strDest, $strCallBack, $strCaller, $strSubject, $strURL, $strData, $strDate, $nCount);
 
-                switch ($hs_code) {
-                    case '02':	 // "02:형식오류"
-                        $hs_memo = "형식이 잘못되어 전송이 실패하였습니다.";
-                        break;
-                    case '23':	 // "23:인증실패,데이터오류,전송날짜오류"
-                        $hs_memo = "데이터를 다시 확인해 주시기바랍니다.";
-                        break;
-                    case '97':	 // "97:잔여코인부족"
-                        $hs_memo = "잔여코인이 부족합니다.";
-                        break;
-                    case '98':	 // "98:사용기간만료"
-                        $hs_memo = "사용기간이 만료되었습니다.";
-                        break;
-                    case '99':	 // "99:인증실패"
-                        $hs_memo = "인증 받지 못하였습니다. 계정을 다시 확인해 주세요.";
-                        break;
-                    default:	 // "미 확인 오류"
-                        $hs_memo = "알 수 없는 오류로 전송이 실패하었습니다.";
-                        break;
+            if($result) {
+                $result = $SMS->Send();
+
+                if ($result) //SMS 서버에 접속했습니다.
+                {
+                    foreach ($SMS->Result as $result)
+                    {
+                        list($phone, $code) = explode(":", $result);
+
+                        if (substr($code,0,5) == "Error")
+                        {
+                            $hs_code = substr($code,6,2);
+
+                            switch ($hs_code) {
+                                case '02':	 // "02:형식오류"
+                                    $hs_memo = "형식이 잘못되어 전송이 실패하였습니다.";
+                                    break;
+                                case '23':	 // "23:인증실패,데이터오류,전송날짜오류"
+                                    $hs_memo = "데이터를 다시 확인해 주시기바랍니다.";
+                                    break;
+                                case '97':	 // "97:잔여코인부족"
+                                    $hs_memo = "잔여코인이 부족합니다.";
+                                    break;
+                                case '98':	 // "98:사용기간만료"
+                                    $hs_memo = "사용기간이 만료되었습니다.";
+                                    break;
+                                case '99':	 // "99:인증실패"
+                                    $hs_memo = "인증 받지 못하였습니다. 계정을 다시 확인해 주세요.";
+                                    break;
+                                default:	 // "미 확인 오류"
+                                    $hs_memo = "알 수 없는 오류로 전송이 실패하였습니다.";
+                                    break;
+                            }
+                            $wr_failure++;
+                            $hs_flag = 0;
+                        }
+                        else
+                        {
+                            $hs_code = $code;
+                            $hs_memo = get_hp($phone, 1)."로 전송했습니다.";
+                            $wr_success++;
+                            $hs_flag = 1;
+                        }
+
+                        $row = $list[$i];
+                        $row['bk_hp'] = get_hp($row['bk_hp'], 1);
+
+                        $log = array_shift($SMS->Log);
+                        $log = @iconv('euc-kr', 'utf-8', $log);
+
+                        sql_query("insert into {$g5['sms5_history_table']} set wr_no='$wr_no', wr_renum='$new_wr_renum', bg_no='{$row['bg_no']}', mb_id='{$row['mb_id']}', bk_no='{$row['bk_no']}', hs_name='".addslashes($row['bk_name'])."', hs_hp='{$row['bk_hp']}', hs_datetime='".G5_TIME_YMDHIS."', hs_flag='$hs_flag', hs_code='$hs_code', hs_memo='".addslashes($hs_memo)."', hs_log='".addslashes($log)."'", false);
+                    }
+
+                    $SMS->Init(); // 보관하고 있던 결과값을 지웁니다.
                 }
-                $wr_failure++;
-                $hs_flag = 0;
             }
-            else
-            {
-                $hs_code = $code;
-                $hs_memo = get_hp($phone, 1)."로 전송했습니다.";
-                $wr_success++;
-                $hs_flag = 1;
-            }
-
-            $row = array_shift($list);
-            $row['bk_hp'] = get_hp($row['bk_hp'], 1);
-
-            $log = array_shift($SMS->Log);
-            $log = @iconv('UTF-8', 'UTF-8//IGNORE', $log);
-
-            sql_query("insert into {$g5['sms5_history_table']} set wr_no='$wr_no', wr_renum='$new_wr_renum', bg_no='{$row['bg_no']}', mb_id='{$row['mb_id']}', bk_no='{$row['bk_no']}', hs_name='{$row['hs_name']}', hs_hp='{$row['hs_hp']}', hs_datetime='".G5_TIME_YMDHIS."', hs_flag='$hs_flag', hs_code='$hs_code', hs_memo='".addslashes($hs_memo)."', hs_log='".addslashes($log)."'", false);
         }
-        $SMS->Init(); // 보관하고 있던 결과값을 지웁니다.
 
-        sql_query("update {$g5['sms5_write_table']} set wr_success='$wr_success', wr_failure='$wr_failure' where wr_no='$wr_no' and wr_renum='$new_wr_renum'");
+        sql_query("insert into {$g5['sms5_write_table']} set wr_no='$wr_no', wr_renum='$new_wr_renum', wr_reply='".addslashes($write['wr_reply'])."', wr_message='".addslashes($write['wr_message'])."', wr_success='$wr_success', wr_failure='$wr_failure', wr_total='$wr_total', wr_datetime='".G5_TIME_YMDHIS."'");
+
         sql_query("update {$g5['sms5_write_table']} set wr_re_total=wr_re_total+1 where wr_no='$wr_no' and wr_renum=0");
     }
-    else alert("에러: SMS 서버와 통신이 불안정합니다.");
+} else {
+    $SMS->SMS_con($config['cf_icode_server_ip'], $config['cf_icode_id'], $config['cf_icode_pw'], $config['cf_icode_server_port']);
+
+    $reply = str_replace('-', '', trim($write['wr_reply']));
+
+    $result = $SMS->Add($list, $reply, '', '', $write['wr_message'], '', $wr_total);
+
+    if ($result)
+    {
+        $result = $SMS->Send();
+
+        if ($result) //SMS 서버에 접속했습니다.
+        {
+            sql_query("insert into {$g5['sms5_write_table']} set wr_no='$wr_no', wr_renum='$new_wr_renum', wr_reply='".addslashes($write['wr_reply'])."', wr_message='".addslashes($write['wr_message'])."', wr_total='$wr_total', wr_datetime='".G5_TIME_YMDHIS."'");
+
+            $wr_success = 0;
+            $wr_failure = 0;
+            $count      = 0;
+
+            foreach ($SMS->Result as $result)
+            {
+                list($phone, $code) = explode(":", $result);
+
+                if (substr($code,0,5) == "Error")
+                {
+                    $hs_code = substr($code,6,2);
+
+                    switch ($hs_code) {
+                        case '02':	 // "02:형식오류"
+                            $hs_memo = "형식이 잘못되어 전송이 실패하였습니다.";
+                            break;
+                        case '23':	 // "23:인증실패,데이터오류,전송날짜오류"
+                            $hs_memo = "데이터를 다시 확인해 주시기바랍니다.";
+                            break;
+                        case '97':	 // "97:잔여코인부족"
+                            $hs_memo = "잔여코인이 부족합니다.";
+                            break;
+                        case '98':	 // "98:사용기간만료"
+                            $hs_memo = "사용기간이 만료되었습니다.";
+                            break;
+                        case '99':	 // "99:인증실패"
+                            $hs_memo = "인증 받지 못하였습니다. 계정을 다시 확인해 주세요.";
+                            break;
+                        default:	 // "미 확인 오류"
+                            $hs_memo = "알 수 없는 오류로 전송이 실패하었습니다.";
+                            break;
+                    }
+                    $wr_failure++;
+                    $hs_flag = 0;
+                }
+                else
+                {
+                    $hs_code = $code;
+                    $hs_memo = get_hp($phone, 1)."로 전송했습니다.";
+                    $wr_success++;
+                    $hs_flag = 1;
+                }
+
+                $row = array_shift($list);
+                $row['bk_hp'] = get_hp($row['bk_hp'], 1);
+
+                $log = array_shift($SMS->Log);
+                $log = @iconv('euc-kr', 'utf-8', $log);
+
+                sql_query("insert into {$g5['sms5_history_table']} set wr_no='$wr_no', wr_renum='$new_wr_renum', bg_no='{$row['bg_no']}', mb_id='{$row['mb_id']}', bk_no='{$row['bk_no']}', hs_name='{$row['hs_name']}', hs_hp='{$row['hs_hp']}', hs_datetime='".G5_TIME_YMDHIS."', hs_flag='$hs_flag', hs_code='$hs_code', hs_memo='".addslashes($hs_memo)."', hs_log='".addslashes($log)."'", false);
+            }
+            $SMS->Init(); // 보관하고 있던 결과값을 지웁니다.
+
+            sql_query("update {$g5['sms5_write_table']} set wr_success='$wr_success', wr_failure='$wr_failure' where wr_no='$wr_no' and wr_renum='$new_wr_renum'");
+            sql_query("update {$g5['sms5_write_table']} set wr_re_total=wr_re_total+1 where wr_no='$wr_no' and wr_renum=0");
+        }
+        else alert("에러: SMS 서버와 통신이 불안정합니다.");
+    }
+    else alert("에러: SMS 데이터 입력도중 에러가 발생하였습니다.");
 }
-else alert("에러: SMS 데이터 입력도중 에러가 발생하였습니다.");
 
 ?>
 <script>

adm/sms_admin/history_view.php

@@ -63,7 +63,7 @@ function all_send()
 }
 </script>
 
-<form name="search_form" method="get" action="<?php echo $_SERVER['PHP_SELF']?>" class="local_sch01 local_sch">
+<form name="search_form" method="get" action="<?php echo $_SERVER['SCRIPT_NAME']?>" class="local_sch01 local_sch">
 <input type="hidden" name="wr_no" value="<?php echo $wr_no?>">
 <input type="hidden" name="wr_renum" value="<?php echo $wr_renum?>">
 <input type="hidden" name="page" value="<?php echo $page?>">
@@ -98,6 +98,7 @@ function all_send()
 
     <?php if ($write['wr_re_total'] && !$wr_renum) { ?>
     <h2>전송실패 문자 재전송 내역</h2>
+    <div  class="sms_table">
     <table>
     <thead>
     <tr>
@@ -138,6 +139,7 @@ function all_send()
     </tbody>
     </table>
     <?php } ?>
+    </div>
 
     <?php
     if( $write['wr_memo'] ){
@@ -244,7 +246,7 @@ function all_send()
     </div>
 </div>
 
-<?php echo sms5_sub_paging(G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $spage, $total_spage, $_SERVER['PHP_SELF']."?wr_no=$wr_no&amp;wr_renum=$wr_renum&amp;page=$page&amp;st=$st&amp;sv=$sv&amp;sst=$sst&amp;ssv=$ssv", "", "spage"); ?>
+<?php echo sms5_sub_paging(G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $spage, $total_spage, $_SERVER['SCRIPT_NAME']."?wr_no=$wr_no&amp;wr_renum=$wr_renum&amp;page=$page&amp;st=$st&amp;sv=$sv&amp;sst=$sst&amp;ssv=$ssv", "", "spage"); ?>
 
 <?php
 include_once(G5_ADMIN_PATH.'/admin.tail.php');