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

2014-03-14 17:40:47 +09:00
parent b0a2e0ce33 052597513d
commit 6eec6985c2
62 changed files with 1581 additions and 438 deletions
--- a/adm/admin.head.php
+++ b/adm/admin.head.php
@ -24,8 +24,7 @@ function print_menu2($key, $no)
        if ($is_admin != 'super' && (!array_key_exists($menu[$key][$i][0],$auth) || !strstr($auth[$menu[$key][$i][0]], 'r')))
            continue;

-        if ($menu[$key][$i][4] == 1 && $gnb_grp_style == false) $gnb_grp_div = 'gnb_grp_div';
-        else if ($menu[$key][$i][4] != 1 && $gnb_grp_style == true) $gnb_grp_div = 'gnb_grp_div';
+        if (($menu[$key][$i][4] == 1 && $gnb_grp_style == false) || ($menu[$key][$i][4] != 1 && $gnb_grp_style == true)) $gnb_grp_div = 'gnb_grp_div';
        else $gnb_grp_div = '';

        if ($menu[$key][$i][4] == 1) $gnb_grp_style = 'gnb_grp_style';
@ -85,7 +84,6 @@ function imageview(id, w, h)

        <nav id="gnb">
            <h2>관리자 주메뉴</h2>
-            <script>$('#gnb').addClass('gnb_js');</script>
            <?php
            $gnb_str = "<ul id=\"gnb_1dul\">";
            foreach($amenu as $key=>$value) {
--- a/adm/admin.menu100.php
+++ b/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.'/menu_list.php',     'cf_menu', 1),
    array('100300', '메일 테스트', G5_ADMIN_URL.'/sendmail_test.php', 'cf_mailtest'),
    array('100310', '팝업레이어관리', G5_ADMIN_URL.'/newwinlist.php', 'scf_poplayer'),
    //array('100400', '버전정보', G5_ADMIN_URL.'/version.php', 'cf_version'),
--- a/adm/board_copy_update.php
+++ b/adm/board_copy_update.php
@ -88,7 +88,6 @@ $sql = " insert into {$g5['board_table']}
                bo_upload_size = '{$board[bo_upload_size]}',
                bo_reply_order = '{$board[bo_reply_order]}',
                bo_use_search = '{$board[bo_use_search]}',
-                bo_show_menu = '{$board[bo_show_menu]}',
                bo_order = '{$board[bo_order]}',
                bo_notice = '{$board['bo_notice']}',
                bo_upload_count = '{$board[bo_upload_count]}',
--- a/adm/board_form.php
+++ b/adm/board_form.php
@ -21,10 +21,6 @@ if (!isset($board['bo_device'])) {
    sql_query(" ALTER TABLE  `{$g5['board_table']}` ADD  `bo_device` ENUM(  'both',  'pc',  'mobile' ) NOT NULL DEFAULT  'both' AFTER  `bo_subject` ", false);
 }

-if (!isset($board['bo_show_menu'])) {
-    sql_query(" ALTER TABLE `{$g5['board_table']}` ADD `bo_show_menu` TINYINT NOT NULL DEFAULT '0' AFTER `bo_use_search`,  ADD `bo_order` INT NOT NULL DEFAULT '0' AFTER `bo_show_menu` ", false);
-}
-
 if (!isset($board['bo_mobile_skin'])) {
    sql_query(" ALTER TABLE `{$g5['board_table']}` ADD `bo_mobile_skin` VARCHAR(255) NOT NULL DEFAULT '' AFTER `bo_skin` ", false);
 }
@ -120,7 +116,6 @@ if ($w == '') {
    $board['bo_use_secret'] = 0;
    $board['bo_include_head'] = '_head.php';
    $board['bo_include_tail'] = '_tail.php';
-    $board['bo_show_menu'] = true;

 } else if ($w == 'u') {

@ -769,20 +764,6 @@ $frm_submit .= '</div>';
                <label for="chk_all_use_search">전체적용</label>
            </td>
        </tr>
-        <tr>
-            <th scope="row"><label for="bo_show_menu">메뉴보이기</label></th>
-            <td>
-                <?php echo help("사용에 체크하시면 게시판 제목을 메뉴에 출력합니다.") ?>
-                <input type="checkbox" name="bo_show_menu" value="1" id="bo_show_menu" <?php echo $board['bo_show_menu']?'checked':''; ?>>
-                사용
-            </td>
-            <td class="td_grpset">
-                <input type="checkbox" name="chk_grp_show_menu" value="1" id="chk_grp_show_menu">
-                <label for="chk_grp_show_menu">그룹적용</label>
-                <input type="checkbox" name="chk_all_show_menu" value="1" id="chk_all_show_menu">
-                <label for="chk_all_show_menu">전체적용</label>
-            </td>
-        </tr>
        <tr>
            <th scope="row"><label for="bo_order">출력 순서</label></th>
            <td>
--- a/adm/board_form_update.php
+++ b/adm/board_form_update.php
@ -107,7 +107,6 @@ $sql_common = " gr_id               = '{$_POST['gr_id']}',
                bo_reply_order      = '{$_POST['bo_reply_order']}',
                bo_use_search       = '{$_POST['bo_use_search']}',
                bo_order            = '{$_POST['bo_order']}',
-                bo_show_menu        = '{$_POST['bo_show_menu']}',
                bo_write_min        = '{$_POST['bo_write_min']}',
                bo_write_max        = '{$_POST['bo_write_max']}',
                bo_comment_min      = '{$_POST['bo_comment_min']}',
@ -290,7 +289,6 @@ if (is_checked('chk_grp_mobile_content_tail'))         $grp_fields .= " , bo_mob
 if (is_checked('chk_grp_insert_content'))       $grp_fields .= " , bo_insert_content = '{$bo_insert_content}' ";
 if (is_checked('chk_grp_use_search'))           $grp_fields .= " , bo_use_search = '{$bo_use_search}' ";
 if (is_checked('chk_grp_order'))                $grp_fields .= " , bo_order = '{$bo_order}' ";
-if (is_checked('chk_grp_show_menu'))            $grp_fields .= " , bo_show_menu = '{$bo_show_menu}' ";
 for ($i=1; $i<=10; $i++) {
    if (is_checked('chk_grp_'.$i)) {
        $grp_fields .= " , bo_{$i}_subj = '".$_POST['bo_'.$i.'_subj']."' ";
@ -374,7 +372,6 @@ if (is_checked('chk_all_mobile_content_tail'))         $all_fields .= " , bo_mob
 if (is_checked('chk_all_insert_content'))       $all_fields .= " , bo_insert_content = '{$bo_insert_content}' ";
 if (is_checked('chk_all_use_search'))           $all_fields .= " , bo_use_search = '{$bo_use_search}' ";
 if (is_checked('chk_all_order'))                $all_fields .= " , bo_order = '{$bo_order}' ";
-if (is_checked('chk_all_show_menu'))            $all_fields .= " , bo_show_menu = '{$bo_show_menu}' ";
 for ($i=1; $i<=10; $i++) {
    if (is_checked('chk_all_'.$i)) {
        $all_fields .= " , bo_{$i}_subj = '".$_POST['bo_'.$i.'_subj']."' ";
--- a/adm/board_list.php
+++ b/adm/board_list.php
@ -51,7 +51,7 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
 $g5['title'] = '게시판관리';
 include_once('./admin.head.php');

-$colspan = 16;
+$colspan = 15;
 ?>

 <div class="local_ov01 local_ov">
@ -107,7 +107,6 @@ $colspan = 16;
        <th scope="col">다운P<span class="sound_only">포인트</span></th>
        <th scope="col"><?php echo subject_sort_link('bo_use_sns') ?>SNS<br>사용</a></th>
        <th scope="col"><?php echo subject_sort_link('bo_use_search') ?>검색<br>사용</a></th>
-        <th scope="col"><?php echo subject_sort_link('bo_show_menu') ?>메뉴<br>보임</a></th>
        <th scope="col"><?php echo subject_sort_link('bo_order') ?>출력<br>순서</a></th>
        <th scope="col">접속기기</th>
        <th scope="col">관리</th>
@ -174,10 +173,6 @@ $colspan = 16;
            <label for="bo_use_search_<?php echo $i; ?>" class="sound_only">검색 사용</label>
            <input type="checkbox" name="bo_use_search[<?php echo $i ?>]" value="1" id="bo_use_search_<?php echo $i ?>" <?php echo $row['bo_use_search']?"checked":"" ?>>
        </td>
-        <td class="td_chk">
-            <label for="bo_show_menu_<?php echo $i; ?>" class="sound_only">메인메뉴 보이기</label>
-            <input type="checkbox" name="bo_show_menu[<?php echo $i ?>]" value="1" id="bo_show_menu_<?php echo $i ?>" <?php echo $row['bo_show_menu']?"checked":"" ?>>
-        </td>
        <td class="td_chk">
            <label for="bo_order_<?php echo $i; ?>" class="sound_only">출력 순서</label>
            <input type="text" name="bo_order[<?php echo $i ?>]" value="<?php echo $row['bo_order'] ?>" id="bo_order_<?php echo $i ?>" class="frm_input" size="2">
--- a/adm/board_list_update.php
+++ b/adm/board_list_update.php
@ -39,7 +39,6 @@ if ($_POST['act_button'] == "선택수정") {
                        bo_download_point   = '{$_POST['bo_download_point'][$k]}',
                        bo_use_search       = '{$_POST['bo_use_search'][$k]}',
                        bo_use_sns          = '{$_POST['bo_use_sns'][$k]}',
-                        bo_show_menu        = '{$_POST['bo_show_menu'][$k]}',
                        bo_order            = '{$_POST['bo_order'][$k]}'
                  where bo_table            = '{$_POST['board_table'][$k]}' ";
        sql_query($sql);
--- a/adm/boardgroup_form.php
+++ b/adm/boardgroup_form.php
@ -26,9 +26,6 @@ if (!isset($group['gr_device'])) {
    sql_query(" ALTER TABLE `{$g5['group_table']}` ADD `gr_device` ENUM('both','pc','mobile') NOT NULL DEFAULT 'both' AFTER `gr_subject` ", false);
 }

-if (!isset($group['gr_show_menu'])) {
-    sql_query(" ALTER TABLE `{$g5['group_table']}`  ADD `gr_show_menu` TINYINT NOT NULL DEFAULT '0' AFTER `gr_use_access`,  ADD `gr_order` INT NOT NULL DEFAULT '0' AFTER `gr_show_menu` ", false);
-}

 $g5['title'] = $html_title;
 include_once('./admin.head.php');
@ -52,11 +49,11 @@ include_once('./admin.head.php');
    <tbody>
    <tr>
        <th scope="row"><label for="gr_id">그룹 ID<?php echo $sound_only ?></label></th>
-        <td><input type="text" name="gr_id" value="<?php echo $group['gr_id'] ?>" id="gr_id" <?php echo $gr_id_attr; ?> class="<?php echo $gr_id_attr; ?> alnum_ frm_input" maxlength="10"> 
-            <?php 
+        <td><input type="text" name="gr_id" value="<?php echo $group['gr_id'] ?>" id="gr_id" <?php echo $gr_id_attr; ?> class="<?php echo $gr_id_attr; ?> alnum_ frm_input" maxlength="10">
+            <?php
            if ($w=='')
                echo '영문자, 숫자, _ 만 가능 (공백없이)';
-            else 
+            else
                echo '<a href="'.G5_BBS_URL.'/group.php?gr_id='.$group['gr_id'].'" class="btn_frmline">게시판그룹 바로가기</a>';
            ?>
        </td>
@ -112,14 +109,6 @@ include_once('./admin.head.php');
            ?>
        </td>
    </tr>
-    <tr>
-        <th scope="row"><label for="gr_show_menu">메뉴보이기</label></th>
-        <td>
-            <?php echo help("사용에 체크하시면 게시판그룹 제목을 메뉴에 출력합니다.") ?>
-            <input type="checkbox" name="gr_show_menu" value="1" id="gr_show_menu" <?php echo $gr['gr_show_menu']?'checked':''; ?>>
-            사용
-        </td>
-    </tr>
    <?php for ($i=1;$i<=10;$i++) { ?>
    <tr>
        <th scope="row">여분필드<?php echo $i ?></th>
--- a/adm/boardgroup_form_update.php
+++ b/adm/boardgroup_form_update.php
@ -17,7 +17,6 @@ if (!$gr_subject) alert('그룹 제목을 입력하세요.');
 $sql_common = " gr_subject = '{$_POST['gr_subject']}',
                gr_device = '{$_POST['gr_device']}',
                gr_admin  = '{$_POST['gr_admin']}',
-                gr_show_menu  = '{$_POST['gr_show_menu']}',
                gr_1_subj = '{$_POST['gr_1_subj']}',
                gr_2_subj = '{$_POST['gr_2_subj']}',
                gr_3_subj = '{$_POST['gr_3_subj']}',
@ -38,7 +37,7 @@ $sql_common = " gr_subject = '{$_POST['gr_subject']}',
                gr_8 = '{$_POST['gr_8']}',
                gr_9 = '{$_POST['gr_9']}',
                gr_10 = '{$_POST['gr_10']}' ";
-if (isset($_POST['gr_use_access'])) 
+if (isset($_POST['gr_use_access']))
    $sql_common .= ", gr_use_access = '{$_POST['gr_use_access']}' ";
 else
    $sql_common .= ", gr_use_access = '' ";
--- a/adm/boardgroup_list.php
+++ b/adm/boardgroup_list.php
@ -55,7 +55,7 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">처음</a>';
 $g5['title'] = '게시판그룹설정';
 include_once('./admin.head.php');

-$colspan = 11;
+$colspan = 10;
 ?>

 <div class="local_ov01 local_ov">
@ -105,7 +105,6 @@ $colspan = 11;
        <th scope="col">게시판</th>
        <th scope="col">접근<br>사용</th>
        <th scope="col">접근<br>회원수</th>
-        <th scope="col">메뉴<br>보임</th>
        <th scope="col"><?php echo subject_sort_link('gr_order') ?>출력<br>순서</a></th>
        <th scope="col">접속기기</th>
        <th scope="col">관리</th>
@ -153,10 +152,6 @@ $colspan = 11;
            <input type="checkbox" name="gr_use_access[<?php echo $i ?>]" <?php echo $row['gr_use_access']?'checked':'' ?> value="1" id="gr_use_access_<?php echo $i ?>">
        </td>
        <td class="td_numsmall"><a href="./boardgroupmember_list.php?gr_id=<?php echo $row['gr_id'] ?>"><?php echo $row1['cnt'] ?></a></td>
-        <td class="td_chk">
-            <label for="gr_show_menu_<?php echo $i; ?>" class="sound_only">메인메뉴에 보이기</label>
-            <input type="checkbox" name="gr_show_menu[<?php echo $i ?>]" <?php echo $row['gr_show_menu']?'checked':'' ?> value="1" id="gr_show_menu_<?php echo $i ?>">
-        </td>
        <td class="td_chk">
            <label for="gr_order_<?php echo $i; ?>" class="sound_only">메인메뉴 출력순서</label>
            <input type="text" name="gr_order[<?php echo $i ?>]" value="<?php echo $row['gr_order'] ?>" id="gr_order_<?php echo $i ?>" class="frm_input" size="2">
--- a/adm/boardgroup_list_update.php
+++ b/adm/boardgroup_list_update.php
@ -17,14 +17,13 @@ for ($i=0; $i<$count; $i++)
 {
    $k     = $_POST['chk'][$i];
    $gr_id = $_POST['group_id'][$k];
-    
+
    if($_POST['act_button'] == '선택수정') {
        $sql = " update {$g5['group_table']}
                    set gr_subject    = '{$_POST['gr_subject'][$k]}',
                        gr_device     = '{$_POST['gr_device'][$k]}',
                        gr_admin      = '{$_POST['gr_admin'][$k]}',
                        gr_use_access = '{$_POST['gr_use_access'][$k]}',
-                        gr_show_menu  = '{$_POST['gr_show_menu'][$k]}',
                        gr_order      = '{$_POST['gr_order'][$k]}'
                  where gr_id         = '{$gr_id}' ";
        if ($is_admin != 'super')
--- a/adm/config_form.php
+++ b/adm/config_form.php
@ -134,6 +134,15 @@ if(!isset($config['cf_sms_use'])) {
                    ADD `cf_icode_server_port` varchar(255) NOT NULL DEFAULT '' AFTER `cf_icode_server_ip` ", true);
 }

+if(!isset($config['cf_faq_skin'])) {
+    sql_query(" ALTER TABLE `{$g5['config_table']}`
+                    ADD `cf_faq_skin` varchar(255) NOT NULL DEFAULT '' AFTER `cf_connect_skin`,
+                    ADD `cf_mobile_faq_skin` varchar(255) NOT NULL DEFAULT '' AFTER `cf_mobile_connect_skin` ", true);
+}
+
+if(!$config['cf_faq_skin']) $config['cf_faq_skin'] = "basic";
+if(!$config['cf_mobile_faq_skin']) $config['cf_mobile_faq_skin'] = "basic";
+
 $g5['title'] = '환경설정';
 include_once ('./admin.head.php');

@ -360,6 +369,32 @@ if ($config['cf_icode_id'] && $config['cf_icode_pw']) {
                </select>
            </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>
+            </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>
+            </td>
+        </tr>
        <tr>
            <th scope="row"><label for="cf_editor">에디터 선택</label></th>
            <td colspan="3">
--- a/adm/config_form_update.php
+++ b/adm/config_form_update.php
@ -39,6 +39,7 @@ $sql = " update {$g5['config_table']}
                cf_new_rows = '{$_POST['cf_new_rows']}',
                cf_search_skin = '{$_POST['cf_search_skin']}',
                cf_connect_skin = '{$_POST['cf_connect_skin']}',
+                cf_faq_skin = '{$_POST['cf_faq_skin']}',
                cf_read_point = '{$_POST['cf_read_point']}',
                cf_write_point = '{$_POST['cf_write_point']}',
                cf_comment_point = '{$_POST['cf_comment_point']}',
@ -107,6 +108,7 @@ $sql = " update {$g5['config_table']}
                cf_mobile_new_skin = '{$_POST['cf_mobile_new_skin']}',
                cf_mobile_search_skin = '{$_POST['cf_mobile_search_skin']}',
                cf_mobile_connect_skin = '{$_POST['cf_mobile_connect_skin']}',
+                cf_mobile_faq_skin = '{$_POST['cf_mobile_faq_skin']}',
                cf_mobile_member_skin = '{$_POST['cf_mobile_member_skin']}',
                cf_captcha_mp3 = '{$_POST['cf_captcha_mp3']}',
                cf_editor = '{$_POST['cf_editor']}',
--- a/adm/css/admin.css
+++ b/adm/css/admin.css
@ -8,7 +8,7 @@ html, h1, h2, h3, h4, h5, h6, form, fieldset, img {margin:0;padding:0;border:0}
 h1, h2, h3, h4, h5, h6 {font-size:1em;font-family:dotum}
 article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section {display:block}
 header ul, nav ul, aside ul, footer ul {margin:0;padding:0;list-style:none}
-label, input, select, img {vertical-align:middle}
+label, input, button, select, img {vertical-align:middle}
 textarea, select {font-family:dotum;font-size:1em}
 input {margin:0;padding:0;border-radius:0;font-family:dotum}
 input[type=text], input[type=password], input[type=submit], input[type=image] {-webkit-appearance:none}
@ -25,7 +25,7 @@ h2 {margin:0 0 10px;padding:0 20px;font-size:1.2em}
 h2.h2_frm {padding-top:15px}

 /* 레이아웃 */
-#hd {z-index:10;min-width:1000px;background:url('../adm/img/hd_bg.jpg') #383b3f repeat-x}
+#hd {z-index:10;min-width:1000px;background:url('../img/hd_bg.jpg') #383b3f repeat-x}
 #hd h1, #hd h2 {position:absolute;border:0;font-size:0;line-height:0;overflow:hidden}
 #hd_wrap {z-index:11;position:relative;margin:0 auto}
 #logo {position:relative;height:70px}
@ -43,33 +43,25 @@ h2.h2_frm {padding-top:15px}
 #tnb span {position:absolute;bottom:10px;left:0;width:100%;text-align:center}

 /* gnb js off */
-#gnb {z-index:12;min-width:999px;background:#383a3f}
+#gnb {position:relative;z-index:12;min-width:999px;background:#383a3f}
 #gnb h2 {margin:0;padding:0;font-size:0;line-height:0;overflow:hidden}
-#gnb_1dul {margin:0 20px;padding:0;zoom:1}
+#gnb_1dul {position:relative;margin:0 20px;padding:0;zoom:1}
 #gnb_1dul:after {display:block;visibility:hidden;clear:both;content:""}
-.gnb_1dli {z-index:13;clear:both;zoom:1}
-.gnb_1dli:after {display:block;visibility:hidden;clear:both;content:""}
-.gnb_1dli a {display:block;float:left;width:120px;height:34px;color:#fff;font-weight:bold;text-decoration:none;line-height:2.8em}
-.gnb_1dli a:focus, .gnb_1dli a:hover {text-decoration:none}
-.gnb_2dul {float:left;width:auto}
-.gnb_2dli {float:left}
-.gnb_2dli a {color:#e0e0e0;font-weight:normal}
-/* gnb js on */
-.gnb_js {}
-.gnb_js #gnb_1dul {zoom:1}
-.gnb_js .gnb_1dli {clear:none;position:relative;float:left;margin:0 0 0 -1px;border:1px solid #333;border-top:0;border-bottom:0}
-.gnb_js .gnb_1dli a {text-align:center}
-.gnb_js .gnb_1dli_air a {float:none;background:#fff;color:#000}
-.gnb_js .gnb_1dli_on a {float:none;background:#282828;color:#fff}
-.gnb_js .gnb_2dul {display:none;position:absolute;top:34px;width:181px;border:1px solid #999;border-top:0;background:#fff}
-.gnb_js .gnb_2dli a {display:inline-block;float:none;padding:8px 10px;width:161px;height:auto;background:#fff;color:#000;text-align:left;line-height:1em}
-.gnb_js .gnb_2dli a:focus, .gnb_js .gnb_2dli a:hover {background:#484848;color:#fff}
+.gnb_1dli {z-index:13;position:relative;float:left;margin:0 0 0 -1px;border:1px solid #333;border-top:0;border-bottom:0}
+.gnb_1da {display:block;width:120px;height:34px;color:#fff;font-weight:bold;text-align:center;text-decoration:none;line-height:2.8em}
+.gnb_1da:focus, .gnb_1da:hover {text-decoration:none}
+.gnb_1dli_air .gnb_1da {background:#fff;color:#000}
+.gnb_1dli_on .gnb_1da {background:#282828;color:#fff}
+.gnb_2dul {display:none;position:absolute;top:34px;width:180px;border:1px solid #999;border-top:0;background:#fff}
+.gnb_2da {display:block;padding:8px 10px;background:#fff;color:#000;text-decoration:none}
+.gnb_grp_style {background:#f7f7f7 !important}
+.gnb_2da:focus, .gnb_2da:hover {background:#484848 !important;color:#fff !important;text-decoration:none}
+.gnb_1dli_air .gnb_2da {background:#fff;color:#000}
+.gnb_1dli_on .gnb_2da {background:#fff;color:#000}
 .gnb_1dli_over .gnb_2dul {display:block;left:-1px}
 .gnb_1dli_over2 .gnb_2dul {display:block;right:-1px}

-.gnb_js .gnb_grp_style {background:#f7f7f7 !important}
-.gnb_js .gnb_grp_style:focus, .gnb_js .gnb_grp_style:hover {background:#484848 !important}
-.gnb_js .gnb_grp_div {border-top:1px solid #eee}
+.gnb_grp_div {border-top:1px solid #eee}

 #lnb {margin:0;padding:15px;min-width:970px;border-bottom:1px solid #e9e9e9;list-style:none;zoom:1}
 #lnb:after {display:block;visibility:hidden;clear:both;content:""}
@ -124,12 +116,12 @@ h2.h2_frm {padding-top:15px}
 .btn_confirm {margin:0 20px 10px}

 .btn_confirm01 {clear:both;text-align:center}
-.btn_confirm01 button {padding:0 15px;height:30px;border:0;background:#617d46;color:#fff;line-height:2.2em;vertical-align:middle;cursor:pointer}
+.btn_confirm01 button {padding:0 15px;height:30px;border:0;background:#617d46;color:#fff}
 .btn_confirm01 a {display:inline-block;padding:0 15px;height:30px;background:#617d46;color:#fff;text-decoration:none;line-height:2.5em;vertical-align:middle}
 .btn_confirm01 a:focus {background:#555}

 .btn_confirm02 {clear:both;margin-top:10px;text-align:center}
-.btn_confirm02 button {padding:0 15px;height:30px;border:0;background:#617d46;color:#fff;line-height:2.2em;vertical-align:middle;cursor:pointer}
+.btn_confirm02 button {padding:0 15px;height:30px;border:0;background:#617d46;color:#fff}
 .btn_confirm02 a {display:inline-block;padding:0 15px;height:30px;background:#617d46;color:#fff;text-decoration:none;line-height:2.5em;vertical-align:middle}
 .btn_confirm02 a:focus {background:#555}

@ -143,9 +135,16 @@ a.btn_cancel {line-height:2.5em;vertical-align:middle}
 .btn_win {margin:0 20px 10px} /* 새창용 */

 .btn_win01 {clear:both;text-align:center}
-.btn_win01 a, .btn_win01 button {display:inline-block;padding:0 10px;height:22px;border:1px solid #ccc;background:#fafafa;line-height:2em;cursor:pointer}
+.btn_win01 a, .btn_win01 button {padding:0 10px;height:22px;border:1px solid #ccc;background:#fafafa}
+.btn_win01 a {display:inline-block;line-height:2em;cursor:pointer}
 .btn_win01 a:focus, .btn_win01 a:hover {text-decoration:none}

+.btn_win02 {clear:both;text-align:center}
+.btn_win02 a, .btn_win02 button {padding:0 15px;height:30px;border:0;background:#617d46;color:#fff}
+.btn_win02 a {display:inline-block;vertical-align:middle;cursor:pointer}
+.btn_win02 a:focus, .btn_win02 a:hover {text-decoration:none}
+.btn_win02 button.btn_submit {background:#ff3061;color:#fff}
+
 .btn_list {margin:0 20px 10px} /* 목록용 */

 .btn_list01 {}
@ -163,10 +162,12 @@ a.btn_cancel {line-height:2.5em;vertical-align:middle}
 .btn_add {margin:0 20px 10px} /* 목록용 추가 */

 .btn_add01 {text-align:right}
-.btn_add01 a {display:inline-block;padding:10px;border:1px solid #ccc;background:#f0f0f0;text-decoration:none;cursor:pointer}
+.btn_add01 a, .btn_add01 button {padding:10px;border:1px solid #ccc;background:#f0f0f0;text-decoration:none;cursor:pointer}
+.btn_add01 a {display:inline-block;vertical-align:middle}
+.btn_add01 button {margin:0}

 /* 필수입력 */
-.required {background:url('../img/wrest.gif') #f6f9fa top right no-repeat !important}
+.required {background:url('../../img/wrest.gif') #f6f9fa top right no-repeat !important}

 /* 외부서비스 사이트코드 */
 .sitecode {display:inline-block;font:bold 15px 'Verdana';vertical-align:middle}
@ -175,6 +176,7 @@ a.btn_cancel {line-height:2.5em;vertical-align:middle}
 textarea, .frm_input {border:1px solid #ced9de;background:#f6f9fa;vertical-align:middle}
 textarea {padding:2px;width:90%}
 .frm_input {height:22px;line-height:1.8em}
+.full_input {width:98%}
 select {border:1px solid #ced9de}
 legend {position:absolute;width:0;height:0;font-size:0;line-height:0;text-indent:-9999em;border:0;overflow:hidden}

@ -305,6 +307,11 @@ tfoot td {font-weight:bold;text-align:center}
 .bg1cancel {background:#fdebf3}
 .bg1cancel td {border-color:#f9d8e6}

+/* 메뉴설정 */
+#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}
+
 /* 회원관리 목록 */
 .mb_leave_msg {color:#b6b6b6}
 .mb_intercept_msg {color:#f59fe4}
@ -363,8 +370,7 @@ td.td_grpset {width:160px;border-left:1px solid #e9ecee;text-align:center}
 .td_mbstat {text-align:center}
 .td_mng {width:100px;font-size:0.95em;text-align:center;letter-spacing:-0.1em}
 .td_mngsmall {width:60px;font-size:0.95em;text-align:center;letter-spacing:-0.1em}
-.td_mng .mng_mod, .td_mngsmall .mng_mod {}
-.td_mng .mng_del, .td_mngsmall .mng_del {}
+.td_mng button, .td_mngsmall button {margin:0;padding:0;border:0;background:transparent}
 .td_num {width:60px;text-align:center}
 .td_numbig {width:100px;text-align:center}
 .td_numcancel {color:#999;text-decoration:line-through}
@ -437,7 +443,7 @@ td.td_grpset {width:160px;border-left:1px solid #e9ecee;text-align:center}
 #scf_sms:after {display:block;visibility:hidden;clear:both;content:""}
 .scf_sms_box {float:left;margin:0 8px 0 9px;width:163px;text-align:center}
 .scf_sms_box h4 {margin:0 0 5px}
-.scf_sms_img {margin:10px 0;width:163px;height:191px;background:url('../adm/shop_admin/img/sms_back.gif') no-repeat 0 0;text-align:center}
+.scf_sms_img {margin:10px 0;width:163px;height:191px;background:url('../shop_admin/img/sms_back.gif') no-repeat 0 0;text-align:center}
 .scf_sms_img textarea {margin:54px 0 0;width:115px;height:85px;border:0;background:transparent;font-size:0.95em;overflow:hidden}
 .scf_sms_img span {display:block}
 .scf_sms_cnt {display:block}
@ -507,7 +513,7 @@ strong.sodr_nonpay {display:block;padding:5px 0;text-align:right}
 #sodr_total th {width:125px}

 /* 분류관리 목록 */
-.cate_list_lbl {display:inline-block;width:13px;height:13px;background:url('../adm/shop_admin/img/icon_reply.gif') 0 0 no-repeat}
+.cate_list_lbl {display:inline-block;width:13px;height:13px;background:url('../shop_admin/img/icon_reply.gif') 0 0 no-repeat}

 /* 분류 추가/수정 */
 .frm_ca_id {display:inline-block;margin:0 10px 0 0;font-weight:bold}
@ -623,7 +629,7 @@ strong.sodr_nonpay {display:block;padding:5px 0;text-align:right}
 #sms_frm table {margin:0 0 30px}
 #sms_frm textarea {height:70px}

-#sms_sm {position:relative;float:left;width:229px;height:418px;background:url('../adm/shop_admin/img/mobilebg.jpg') no-repeat}
+#sms_sm {position:relative;float:left;width:229px;height:418px;background:url('../shop_admin/img/mobilebg.jpg') no-repeat}
 #sms_sm_text {position:absolute;top:75px;left:27px;width:180px;color:#fff;font-size:2em;word-break:break-all}
 #sms_sm p {position:absolute;bottom:-70px;left:0;font-size:0.95em;letter-spacing:-0.1em}

@ -643,8 +649,8 @@ strong.sodr_nonpay {display:block;padding:5px 0;text-align:right}
 .new_win_ul li {float:left;margin-left:-1px}

 .new_win_ul a {display:block;padding:10px 10px 8px;border-right:1px solid #595959;border-left:1px solid #595959;color:#fff;font-family:dotum;font-weight:bold;text-decoration:none}
-.new_win_desc {margin:0 auto;width:93%}
-.new_win .anchor {margin:0 auto 5px;width:93%}
+.new_win_desc {margin:0 20px}
+.new_win .anchor {margin:0 20px 5px}
 .new_win .tbl_wrap {margin:0 20px 20px;padding:0}

 .new_win .local_sch, .new_win .local_cmd, .new_win .local_desc01, .new_win .local_desc02, .new_win .local_ov {min-width:480px}
--- a/adm/faqmasterform.php
+++ b/adm/faqmasterform.php
@ -22,6 +22,13 @@ else
    $html_title .= ' 입력';
 }

+// 모바일 상하단 내용 필드추가
+if(!sql_query(" select fm_mobile_head_html from {$g5['faq_master_table']} limit 1 ", false)) {
+    sql_query(" ALTER TABLE `{$g5['faq_master_table']}`
+                    ADD `fm_mobile_head_html` text NOT NULL AFTER `fm_tail_html`,
+                    ADD `fm_mobile_tail_html` text NOT NULL AFTER `fm_mobile_head_html` ", true);
+}
+
 include_once (G5_ADMIN_PATH.'/admin.head.php');
 ?>

@ -37,6 +44,13 @@ include_once (G5_ADMIN_PATH.'/admin.head.php');
        <col>
    </colgroup>
    <tbody>
+    <tr>
+        <th scope="row"><label for="fm_order">출력순서</label></th>
+        <td>
+            <?php echo help('숫자가 작을수록 FAQ 분류에서 먼저 출력됩니다.'); ?>
+            <input type="text" name="fm_order" value="<?php echo $fm['fm_order']; ?>" id="fm_order" class="frm_input" maxlength="10" size="10">
+        </td>
+    </tr>
    <tr>
        <th scope="row"><label for="fm_subject">제목</label></th>
        <td>
@ -107,6 +121,18 @@ include_once (G5_ADMIN_PATH.'/admin.head.php');
            <?php echo editor_html('fm_tail_html', $fm['fm_tail_html']); ?>
        </td>
    </tr>
+    <tr>
+        <th scope="row">모바일상단 내용</th>
+        <td>
+            <?php echo editor_html('fm_mobile_head_html', $fm['fm_mobile_head_html']); ?>
+        </td>
+    </tr>
+    <tr>
+        <th scope="row">모바일하단 내용</th>
+        <td>
+            <?php echo editor_html('fm_mobile_tail_html', $fm['fm_mobile_tail_html']); ?>
+        </td>
+    </tr>
    </tbody>
    </table>
 </div>
@ -123,6 +149,8 @@ function frmfaqmasterform_check(f)
 {
    <?php echo get_editor_js('fm_head_html'); ?>
    <?php echo get_editor_js('fm_tail_html'); ?>
+    <?php echo get_editor_js('fm_mobile_head_html'); ?>
+    <?php echo get_editor_js('fm_mobile_tail_html'); ?>
 }

 // document.frmfaqmasterform.fm_subject.focus();
--- a/adm/faqmasterformupdate.php
+++ b/adm/faqmasterformupdate.php
@ -18,7 +18,10 @@ if ($fm_timg_del)  @unlink(G5_DATA_PATH."/faq/{$fm_id}_t");

 $sql_common = " set fm_subject = '$fm_subject',
                    fm_head_html = '$fm_head_html',
-                    fm_tail_html = '$fm_tail_html' ";
+                    fm_tail_html = '$fm_tail_html',
+                    fm_mobile_head_html = '$fm_mobile_head_html',
+                    fm_mobile_tail_html = '$fm_mobile_tail_html',
+                    fm_order = '$fm_order' ";

 if ($w == "")
 {
--- a/adm/faqmasterlist.php
+++ b/adm/faqmasterlist.php
@ -59,7 +59,7 @@ $total_page  = ceil($total_count / $rows);  // 전체 페이지 계산
 if ($page == "") { $page = 1; } // 페이지가 없으면 첫 페이지 (1 페이지)
 $from_record = ($page - 1) * $rows; // 시작 열을 구함

-$sql = "select * $sql_common order by fm_id desc limit $from_record, {$config['cf_page_rows']} ";
+$sql = "select * $sql_common order by fm_order, fm_id limit $from_record, {$config['cf_page_rows']} ";
 $result = sql_query($sql);
 ?>

@ -88,6 +88,7 @@ $result = sql_query($sql);
        <th scope="col">ID</th>
        <th scope="col">제목</th>
        <th scope="col">FAQ수</th>
+        <th scope="col">순서</th>
        <th scope="col">관리</th>
    </tr>
    </thead>
@ -102,6 +103,7 @@ $result = sql_query($sql);
        <td class="td_num"><?php echo $row['fm_id']; ?></td>
        <td><a href="./faqlist.php?fm_id=<?php echo $row['fm_id']; ?>&amp;fm_subject=<?php echo $row['fm_subject']; ?>"><?php echo stripslashes($row['fm_subject']); ?></a></td>
        <td class="td_num"><?php echo $cnt; ?></td>
+        <td class="td_num"><?php echo $row['fm_order']?></td>
        <td class="td_mng">
            <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="./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/adm/img/sub_menu_ico.gif
+++ b/adm/img/sub_menu_ico.gif
--- a/adm/menu_form.php
+++ b/adm/menu_form.php
@ -0,0 +1,144 @@
+<?php
+$sub_menu = "100290";
+include_once('./_common.php');
+
+if ($is_admin != 'super')
+    alert_close('최고관리자만 접근 가능합니다.');
+
+$g5['title'] = '메뉴 추가';
+include_once(G5_PATH.'/head.sub.php');
+
+// 코드
+if($new == 'new' || $code == 0) {
+    $code = base_convert(substr($code,0, 2), 36, 10);
+    $code += 36;
+    $code = base_convert($code, 10, 36);
+}
+?>
+
+<div id="menu_frm" class="new_win">
+    <h1><?php echo $g5['title']; ?></h1>
+
+    <form name="fmenuform" id="fmenuform">
+
+    <div class="new_win_desc">
+        <label for="me_type">대상선택</label>
+        <select name="me_type" id="me_type">
+            <option value="">직접입력</option>
+            <option value="group">게시판그룹</option>
+            <option value="board">게시판</option>
+            <option value="content">내용관리</option>
+        </select>
+    </div>
+
+    <div id="menu_result"></div>
+
+    </form>
+
+</div>
+
+<script>
+$(function() {
+    $("#menu_result").load(
+        "./menu_form_search.php"
+    );
+
+    $("#me_type").on("change", function() {
+        var type = $(this).val();
+
+        $("#menu_result").empty().load(
+            "./menu_form_search.php",
+            { type : type }
+        );
+    });
+
+    $("#add_manual").live("click", 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() {
+        var me_name = $.trim($(this).siblings("input[name='subject[]']").val());
+        var me_link = $.trim($(this).siblings("input[name='link[]']").val());
+
+        add_menu_list(me_name, me_link, "<?php echo $code; ?>");
+    });
+});
+
+function add_menu_list(name, link, code)
+{
+    var $menulist = $("#menulist", opener.document);
+    var ms = new Date().getTime();
+    var sub_menu_class = "";
+
+    var list = "<tr class=\"menu_list menu_group_<?php echo $code; ?>\">\n";
+    list += "<td"+sub_menu_class+">\n";
+    list += "<label for=\"me_name_"+ms+"\"  class=\"sound_only\">메뉴</label>\n";
+    list += "<input type=\"hidden\" name=\"code[]\" value=\"<?php echo $code; ?>\">\n";
+    list += "<input type=\"text\" name=\"me_name[]\" value=\""+name+"\" id=\"me_name_"+ms+"\" required class=\"required frm_input\">\n";
+    list += "</td>\n";
+    list += "<td>\n";
+    list += "<label for=\"me_link_"+ms+"\"  class=\"sound_only\">링크</label>\n";
+    list += "<input type=\"text\" name=\"me_link[]\" value=\""+link+"\" id=\"me_link_"+ms+"\" required class=\"required frm_input\">\n";
+    list += "</td>\n";
+    list += "<td>\n";
+    list += "<label for=\"me_target_"+ms+"\"  class=\"sound_only\">새창</label>\n";
+    list += "<select name=\"me_target[]\" id=\"me_target_"+ms+"\">\n";
+    list += "<option value=\"self\">사용안함</option>\n";
+    list += "<option value=\"blank\">사용함</option>\n";
+    list += "</select>\n";
+    list += "</td>\n";
+    list += "<td>\n";
+    list += "<label for=\"me_order_"+ms+"\"  class=\"sound_only\">순서</label>\n";
+    list += "<input type=\"text\" name=\"me_order[]\" value=\"0\" id=\"me_order_"+ms+"\" required class=\"required frm_input\" size=\"5\">\n";
+    list += "</td>\n";
+    list += "<td>\n";
+    list += "<label for=\"me_use_"+ms+"\"  class=\"sound_only\">PC사용</label>\n";
+    list += "<select name=\"me_use[]\" id=\"me_use_"+ms+"\">\n";
+    list += "<option value=\"1\">사용함</option>\n";
+    list += "<option value=\"0\">사용안함</option>\n";
+    list += "</select>\n";
+    list += "</td>\n";
+    list += "<td>\n";
+    list += "<label for=\"me_mobile_use_"+ms+"\"  class=\"sound_only\">모바일사용</label>\n";
+    list += "<select name=\"me_mobile_use[]\" id=\"me_mobile_use_"+ms+"\">\n";
+    list += "<option value=\"1\">사용함</option>\n";
+    list += "<option value=\"0\">사용안함</option>\n";
+    list += "</select>\n";
+    list += "</td>\n";
+    list += "<td>\n";
+    <?php if($new == 'new') { ?>
+    list += "<button type=\"button\" class=\"btn_add_submenu\">추가</button>\n";
+    <?php } ?>
+    list += "<button type=\"button\" class=\"btn_del_menu\">삭제</button>\n";
+    list += "</td>\n";
+    list += "</tr>\n";
+
+    var $menu_last = null;
+
+    if(code)
+        $menu_last = $menulist.find("tr.menu_group_"+code+":last");
+    else
+        $menu_last = $menulist.find("tr.menu_list:last");
+
+    if($menu_last.size() > 0) {
+        $menu_last.after(list);
+    } else {
+        $("#menulist", opener.document).find("#empty_menu_list").remove()
+            .end().find("table tbody").append(list);
+    }
+
+    $("#menulist", opener.document).find("tr.menu_list").each(function(index) {
+        $(this).removeClass("bg0 bg1")
+            .addClass("bg"+(index % 2));
+    });
+
+    window.close();
+}
+</script>
+
+<?php
+include_once(G5_PATH.'/tail.sub.php');
+?>
--- a/adm/menu_form_search.php
+++ b/adm/menu_form_search.php
@ -0,0 +1,111 @@
+<?php
+include_once('./_common.php');
+
+if ($is_admin != 'super')
+    die('최고관리자만 접근 가능합니다.');
+
+switch($type) {
+    case 'group':
+        $sql = " select gr_id as id, gr_subject as subject
+                    from {$g5['group_table']}
+                    order by gr_order, gr_id ";
+        break;
+    case 'board':
+        $sql = " select bo_table as id, bo_subject as subject
+                    from {$g5['board_table']}
+                    order by bo_order, bo_table ";
+        break;
+    case 'content':
+        $sql = " select co_id as id, co_subject as subject
+                    from {$g5['content_table']}
+                    order by co_id ";
+        break;
+    default:
+        $sql = '';
+        break;
+}
+?>
+
+<?php
+if($sql) {
+    $result = sql_query($sql);
+
+    for($i=0; $row=sql_fetch_array($result); $i++) {
+        if($i == 0) {
+?>
+
+<div class="tbl_head01 tbl_wrap">
+    <table>
+    <thead>
+    <tr>
+        <th scope="col">제목</th>
+        <th scope="col">선택</th>
+    </tr>
+    </thead>
+    <tbody>
+
+<?php }
+        switch($type) {
+            case 'group':
+                $link = G5_BBS_URL.'/group.php?gr_id='.$row['id'];
+                break;
+            case 'board':
+                $link = G5_BBS_URL.'/board.php?bo_table='.$row['id'];
+                break;
+            case 'content':
+                $link = G5_BBS_URL.'/content.php?co_id='.$row['id'];
+                break;
+            default:
+                $link = ''; 
+                break;
+        }
+?>
+
+    <tr>
+        <td><?php echo $row['subject']; ?></td>
+        <td class="td_mngsmall">
+            <input type="hidden" name="subject[]" value="<?php preg_replace('/[\'\"]/', '', $row['subject']); ?>">
+            <input type="hidden" name="link[]" value="<?php echo $link; ?>">
+            <button type="button" class="add_select"><span class="sound_only"><?php echo $row['subject']; ?> </span>선택</button>
+        </td>
+    </tr>
+
+<?php } ?>
+
+    </tbody>
+    </table>
+</div>
+
+<div class="btn_win02 btn_win">
+    <button type="button" class="btn_cancel" onclick="window.close();">창닫기</button>
+</div>
+
+<?php } else { ?>
+
+<div class="tbl_frm01 tbl_wrap">
+    <table>
+    <colgroup>
+        <col class="grid_2">
+        <col>
+    </colgroup>
+    <tbody>
+    <tr>
+        <th scope="row"><label for="me_name">메뉴</label></th>
+        <td><input type="text" name="me_name" id="me_name" required class="frm_input required"></td>
+    </tr>
+    <tr>
+        <th scope="row"><label for="me_link">링크</label></th>
+        <td>
+            <?php echo help('링크는 http://를 포함해서 입력해 주세요.'); ?>
+            <input type="text" name="me_link" id="me_link" required class="frm_input full_input required">
+        </td>
+    </tr>
+    </tbody>
+    </table>
+</div>
+
+<div class="btn_win02 btn_win">
+    <button type="button" id="add_manual" class="btn_submit">추가</button>
+    <button type="button" class="btn_cancel" onclick="window.close();">창닫기</button>
+</div>
+<?php } ?>
--- a/adm/menu_list.php
+++ b/adm/menu_list.php
@ -0,0 +1,204 @@
+<?php
+$sub_menu = "100290";
+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> 를 추가해 주세요.');
+}
+
+if(!sql_query(" DESCRIBE {$g5['menu_table']} ", false)) {
+    sql_query(" CREATE TABLE IF NOT EXISTS `{$g5['menu_table']}` (
+                  `me_id` int(11) NOT NULL AUTO_INCREMENT,
+                  `me_code` varchar(255) NOT NULL DEFAULT '',
+                  `me_name` varchar(255) NOT NULL DEFAULT '',
+                  `me_link` varchar(255) NOT NULL DEFAULT '',
+                  `me_target` varchar(255) NOT NULL DEFAULT '0',
+                  `me_order` int(11) NOT NULL DEFAULT '0',
+                  `me_use` tinyint(4) NOT NULL DEFAULT '0',
+                  `me_mobile_use` tinyint(4) NOT NULL DEFAULT '0',
+                  PRIMARY KEY (`me_id`)
+                ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ", true);
+}
+
+$sql = " select * from {$g5['menu_table']} order by me_id ";
+$result = sql_query($sql);
+
+$g5['title'] = "메뉴설정";
+include_once('./admin.head.php');
+
+$colspan = 7;
+?>
+
+<div class="local_desc01 local_desc">
+    <p><strong>주의!</strong> 메뉴설정 작업 후 반드시 <strong>확인</strong>을 누르셔야 저장됩니다.</p>
+</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 ?>">
+
+<div class="btn_add01 btn_add">
+    <button type="button" onclick="return add_menu();">메뉴추가<span class="sound_only"> 새창</span></button>
+</div>
+
+<div id="menulist" 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">PC사용</th>
+        <th scope="col">모바일사용</th>
+        <th scope="col">관리</th>
+    </tr>
+    </thead>
+    <tbody>
+    <?php
+    for ($i=0; $row=sql_fetch_array($result); $i++)
+    {
+        $bg = 'bg'.($i%2);
+        $sub_menu_class = '';
+        if(strlen($row['me_code']) == 4) {
+            $sub_menu_class = ' sub_menu_class';
+            $sub_menu_info = '<span class="sound_only">'.$row['me_name'].'의 서브</span>';
+            $sub_menu_ico = '<span class="sub_menu_ico"></span>';
+        }
+    ?>
+    <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; ?>메뉴</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">
+        </td>
+        <td>
+            <label for="me_link_<?php echo $i; ?>" class="sound_only">링크</label>
+            <input type="text" name="me_link[]" value="<?php echo $row['me_link'] ?>" id="me_link_<?php echo $i; ?>" required class="required frm_input full_input">
+        </td>
+        <td class="td_mng">
+            <label for="me_target_<?php echo $i; ?>" class="sound_only">새창</label>
+            <select name="me_target[]" id="me_target_<?php echo $i; ?>">
+                <option value="self"<?php echo get_selected($row['me_target'], 'self', true); ?>>사용안함</option>
+                <option value="blank"<?php echo get_selected($row['me_target'], 'blank', true); ?>>사용함</option>
+            </select>
+        </td>
+        <td class="td_num">
+            <label for="me_order_<?php echo $i; ?>" class="sound_only">순서</label>
+            <input type="text" name="me_order[]" value="<?php echo $row['me_order'] ?>" id="me_order_<?php echo $i; ?>" class="frm_input" size="5">
+        </td>
+        <td class="td_mng">
+            <label for="me_use_<?php echo $i; ?>" class="sound_only">PC사용</label>
+            <select name="me_use[]" id="me_use_<?php echo $i; ?>">
+                <option value="1"<?php echo get_selected($row['me_use'], '1', true); ?>>사용함</option>
+                <option value="0"<?php echo get_selected($row['me_use'], '0', true); ?>>사용안함</option>
+            </select>
+        </td>
+        <td class="td_mng">
+            <label for="me_mobile_use_<?php echo $i; ?>" class="sound_only">모바일사용</label>
+            <select name="me_mobile_use[]" id="me_mobile_use_<?php echo $i; ?>">
+                <option value="1"<?php echo get_selected($row['me_mobile_use'], '1', true); ?>>사용함</option>
+                <option value="0"<?php echo get_selected($row['me_mobile_use'], '0', true); ?>>사용안함</option>
+            </select>
+        </td>
+        <td class="td_mng">
+            <?php if(strlen($row['me_code']) == 2) { ?>
+            <button type="button" class="btn_add_submenu">추가</button>
+            <?php } ?>
+            <button type="button" class="btn_del_menu">삭제</button>
+        </td>
+    </tr>
+    <?php
+    }
+
+    if ($i==0)
+        echo '<tr id="empty_menu_list"><td colspan="'.$colspan.'" class="empty_table">자료가 없습니다.</td></tr>';
+    ?>
+    </tbody>
+    </table>
+</div>
+
+<div class="btn_confirm01 btn_confirm">
+    <input type="submit" name="act_button" value="확인" class="btn_submit">
+</div>
+
+</form>
+
+<script>
+$(function() {
+    $(".btn_add_submenu").live("click", function() {
+        var code = $(this).closest("tr").find("input[name='code[]']").val().substr(0, 2);
+        add_submenu(code);
+    });
+
+    $(".btn_del_menu").live("click", function() {
+        if(!confirm("메뉴를 삭제하시겠습니까?"))
+            return false;
+
+        var $tr = $(this).closest("tr");
+        if($tr.find("td.sub_menu_class").size() > 0) {
+            $tr.remove();
+        } else {
+            var code = $(this).closest("tr").find("input[name='code[]']").val().substr(0, 2);
+            $("tr.menu_group_"+code).remove();
+        }
+
+        if($("#menulist tr.menu_list").size() < 1) {
+            var list = "<tr id=\"empty_menu_list\"><td colspan=\"<?php echo $colspan; ?>\" class=\"empty_table\">자료가 없습니다.</td></tr>\n";
+            $("#menulist table tbody").append(list);
+        } else {
+            $("#menulist tr.menu_list").each(function(index) {
+                $(this).removeClass("bg0 bg1")
+                    .addClass("bg"+(index % 2));
+            });
+        }
+    });
+});
+
+function add_menu()
+{
+    var max_code = base_convert(0, 10, 36);
+    $("#menulist tr.menu_list").each(function() {
+        var me_code = $(this).find("input[name='code[]']").val().substr(0, 2);
+        if(max_code < me_code)
+            max_code = me_code;
+    });
+
+    var url = "./menu_form.php?code="+max_code+"&new=new";
+    window.open(url, "add_menu", "left=100,top=100,width=550,height=650");
+    return false;
+}
+
+function add_submenu(code)
+{
+    var url = "./menu_form.php?code="+code;
+    window.open(url, "add_menu", "left=100,top=100,width=550,height=650");
+    return false;
+}
+
+function base_convert(number, frombase, tobase) {
+  //  discuss at: http://phpjs.org/functions/base_convert/
+  // original by: Philippe Baumann
+  // improved by: Rafał Kukawski (http://blog.kukawski.pl)
+  //   example 1: base_convert('A37334', 16, 2);
+  //   returns 1: '101000110111001100110100'
+
+  return parseInt(number + '', frombase | 0)
+    .toString(tobase | 0);
+}
+
+function fmenulist_submit(f)
+{
+    return true;
+}
+</script>
+
+<?php
+include_once ('./admin.tail.php');
+?>
--- a/adm/menu_list_update.php
+++ b/adm/menu_list_update.php
@ -0,0 +1,70 @@
+<?php
+$sub_menu = "100290";
+include_once('./_common.php');
+
+check_demo();
+
+if ($is_admin != 'super')
+    alert('최고관리자만 접근 가능합니다.');
+
+check_token();
+
+// 이전 메뉴정보 삭제
+$sql = " delete from {$g5['menu_table']} ";
+sql_query($sql);
+
+$group_code = null;
+$primary_code = null;
+$count = count($_POST['code']);
+
+for ($i=0; $i<$count; $i++)
+{
+    $_POST = array_map_deep('trim', $_POST);
+
+    $code    = $_POST['code'][$i];
+    $me_name = $_POST['me_name'][$i];
+    $me_link = $_POST['me_link'][$i];
+
+    if(!$code || !$me_name || !$me_link)
+        continue;
+
+    $sub_code = '';
+    if($group_code == $code) {
+        $sql = " select MAX(SUBSTRING(me_code,3,2)) as max_me_code
+                    from {$g5['menu_table']}
+                    where SUBSTRING(me_code,1,2) = '$primary_code' ";
+        $row = sql_fetch($sql);
+
+        $sub_code = base_convert($row['max_me_code'], 36, 10);
+        $sub_code += 36;
+        $sub_code = base_convert($sub_code, 10, 36);
+
+        $me_code = $primary_code.$sub_code;
+    } else {
+        $sql = " select MAX(SUBSTRING(me_code,1,2)) as max_me_code
+                    from {$g5['menu_table']}
+                    where LENGTH(me_code) = '2' ";
+        $row = sql_fetch($sql);
+
+        $me_code = base_convert($row['max_me_code'], 36, 10);
+        $me_code += 36;
+        $me_code = base_convert($me_code, 10, 36);
+
+        $group_code = $code;
+        $primary_code = $me_code;
+    }
+
+    // 메뉴 등록
+    $sql = " insert into {$g5['menu_table']}
+                set me_code         = '$me_code',
+                    me_name         = '$me_name',
+                    me_link         = '$me_link',
+                    me_target       = '{$_POST['me_target'][$i]}',
+                    me_order        = '{$_POST['me_order'][$i]}',
+                    me_use          = '{$_POST['me_use'][$i]}',
+                    me_mobile_use   = '{$_POST['me_mobile_use'][$i]}' ";
+    sql_query($sql);
+}
+
+goto_url('./menu_list.php');
+?>
--- a/adm/qa_config.php
+++ b/adm/qa_config.php
@ -1,6 +1,7 @@
 <?php
 $sub_menu = "300500";
 include_once('./_common.php');
+include_once(G5_EDITOR_LIB);

 auth_check($auth[$sub_menu], 'r');

@ -31,6 +32,12 @@ if(!sql_query(" DESCRIBE `{$g5['qa_config_table']}` ", false)) {
                  `qa_image_width` int(11) NOT NULL DEFAULT '0',
                  `qa_upload_size` int(11) NOT NULL DEFAULT '0',
                  `qa_insert_content` text NOT NULL,
+                  `qa_include_head` varchar(255) NOT NULL DEFAULT '',
+                  `qa_include_tail` varchar(255) NOT NULL DEFAULT '',
+                  `qa_content_head` text NOT NULL,
+                  `qa_content_tail` text NOT NULL,
+                  `qa_mobile_content_head` text NOT NULL,
+                  `qa_mobile_content_tail` text NOT NULL,
                  `qa_1_subj` varchar(255) NOT NULL DEFAULT '',
                  `qa_2_subj` varchar(255) NOT NULL DEFAULT '',
                  `qa_3_subj` varchar(255) NOT NULL DEFAULT '',
@ -98,6 +105,17 @@ if(!isset($qaconfig['qa_admin_email'])) {
    sql_query(" ALTER TABLE `{$g5['qa_config_table']}`
                    ADD `qa_admin_email` varchar(255) NOT NULL DEFAULT '' AFTER `qa_admin_hp` ", true);
 }
+
+// 상단 하단 설정 필드 추가
+if(!isset($qaconfig['qa_include_head'])) {
+    sql_query(" ALTER TABLE `{$g5['qa_config_table']}`
+                    ADD `qa_include_head` varchar(255) NOT NULL DEFAULT '' AFTER `qa_insert_content`,
+                    ADD `qa_include_tail` varchar(255) NOT NULL DEFAULT '' AFTER `qa_include_head`,
+                    ADD `qa_content_head` text NOT NULL AFTER `qa_include_tail`,
+                    ADD `qa_content_tail` text NOT NULL AFTER `qa_content_head`,
+                    ADD `qa_mobile_content_head` text NOT NULL AFTER `qa_content_tail`,
+                    ADD `qa_mobile_content_tail` text NOT NULL AFTER `qa_mobile_content_head` ", true);
+}
 ?>

 <form name="fqaconfigform" id="fqaconfigform" method="post" onsubmit="return fqaconfigform_submit(this);" autocomplete="off">
@ -235,6 +253,42 @@ if(!isset($qaconfig['qa_admin_email'])) {
                업로드 파일 한개당 <input type="text" name="qa_upload_size" value="<?php echo $qaconfig['qa_upload_size'] ?>" id="qa_upload_size" required class="required numeric frm_input"  size="10"> bytes 이하
            </td>
        </tr>
+        <tr>
+            <th scope="row"><label for="qa_include_head">상단 파일 경로</label></th>
+            <td>
+                <input type="text" name="qa_include_head" value="<?php echo $qaconfig['qa_include_head'] ?>" id="qa_include_head" class="frm_input" size="50">
+            </td>
+        </tr>
+        <tr>
+            <th scope="row"><label for="qa_include_tail">하단 파일 경로</label></th>
+            <td>
+                <input type="text" name="qa_include_tail" value="<?php echo $qaconfig['qa_include_tail'] ?>" id="qa_include_tail" class="frm_input" size="50">
+            </td>
+        </tr>
+        <tr>
+            <th scope="row"><label for="qa_content_head">상단 내용</label></th>
+            <td>
+                <?php echo editor_html("qa_content_head", $qaconfig['qa_content_head']); ?>
+            </td>
+        </tr>
+        <tr>
+            <th scope="row"><label for="qa_content_tail">하단 내용</label></th>
+            <td>
+                <?php echo editor_html("qa_content_tail", $qaconfig['qa_content_tail']); ?>
+            </td>
+        </tr>
+        <tr>
+            <th scope="row"><label for="qa_mobile_content_head">모바일 상단 내용</label></th>
+            <td>
+                <?php echo editor_html("qa_mobile_content_head", $qaconfig['qa_mobile_content_head']); ?>
+            </td>
+        </tr>
+        <tr>
+            <th scope="row"><label for="qa_mobile_content_tail">모바일 하단 내용</label></th>
+            <td>
+                <?php echo editor_html("qa_mobile_content_tail", $qaconfig['qa_mobile_content_tail']); ?>
+            </td>
+        </tr>
        <tr>
            <th scope="row"><label for="qa_insert_content">글쓰기 기본 내용</label></th>
            <td>
@ -266,6 +320,11 @@ if(!isset($qaconfig['qa_admin_email'])) {
 <script>
 function fqaconfigform_submit(f)
 {
+    <?php echo get_editor_js("qa_content_head"); ?>
+    <?php echo get_editor_js("qa_content_tail"); ?>
+    <?php echo get_editor_js("qa_mobile_content_head"); ?>
+    <?php echo get_editor_js("qa_mobile_content_tail"); ?>
+
    f.action = "./qa_config_update.php";
    return true;
 }
--- a/adm/qa_config_update.php
+++ b/adm/qa_config_update.php
@ -29,6 +29,12 @@ $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_content_head         = '{$_POST['qa_content_head']}',
+                qa_content_tail         = '{$_POST['qa_content_tail']}',
+                qa_mobile_content_head  = '{$_POST['qa_mobile_content_head']}',
+                qa_mobile_content_tail  = '{$_POST['qa_mobile_content_tail']}',
                qa_1_subj               = '{$_POST['qa_1_subj']}',
                qa_2_subj               = '{$_POST['qa_2_subj']}',
                qa_3_subj               = '{$_POST['qa_3_subj']}',
--- a/bbs/board_tail.php
+++ b/bbs/board_tail.php
@ -6,7 +6,7 @@ if (G5_IS_MOBILE) {
    echo stripslashes($board['bo_mobile_content_tail']);
    // 모바일의 경우 설정을 따르지 않는다.
    include_once('./_tail.php');
-} else if ($board['bo_include_tail']) {
+} else {
    echo stripslashes($board['bo_content_tail']);
    @include ($board['bo_include_tail']);
 }
--- a/bbs/faq.php
+++ b/bbs/faq.php
@ -1,96 +1,104 @@
 <?php
 include_once('./_common.php');

-if (!$fm_id) $fm_id = 1;
-
 //dbconfig파일에 $g5['faq_table'] , $g5['faq_master_table'] 배열변수가 있는지 체크
 if( !isset($g5['faq_table']) || !isset($g5['faq_master_table']) ){
    die('<meta charset="utf-8">관리자 모드에서 게시판관리->FAQ관리를 먼저 확인해 주세요.');
 }

 // FAQ MASTER
-$sql = " select * from {$g5['faq_master_table']} where fm_id = '$fm_id' ";
-$fm = sql_fetch($sql);
+$faq_master_list = array();
+$sql = " select * from {$g5['faq_master_table']} order by fm_order,fm_id ";
+$result = sql_query($sql);
+while ($row=sql_fetch_array($result))
+{
+    $key = $row['fm_id'];
+    if (!$fm_id) $fm_id = $key;
+    $faq_master_list[$key] = $row;
+}
+
+if ($fm_id){
+    $qstr .= '&amp;fm_id=' . $fm_id; // 마스터faq key_id
+}
+
+$fm = $faq_master_list[$fm_id];
 if (!$fm['fm_id'])
    alert('등록된 내용이 없습니다.');

 $g5['title'] = $fm['fm_subject'];
+
+if(G5_IS_MOBILE){
+    $faq_skin = $config['cf_mobile_faq_skin'];
+} else {
+    $faq_skin = $config['cf_faq_skin'];
+}
+
+if(!$faq_skin) $faq_skin = 'basic';
+$faq_skin_path = (G5_IS_MOBILE ? G5_MOBILE_PATH : G5_PATH).'/'.G5_SKIN_DIR.'/faq/'.$faq_skin;
+$faq_skin_url = (G5_IS_MOBILE ? G5_MOBILE_URL : G5_URL).'/'.G5_SKIN_DIR.'/faq/'.$faq_skin;
+$skin_file = $faq_skin_path.'/list.skin.php';
+
 include_once('./_head.php');
-?>

-<?php
-if ($is_admin)
-    echo '<div class="faq_admin"><a href="'.G5_ADMIN_URL.'/faqmasterform.php?w=u&amp;fm_id='.$fm_id.'" class="btn_admin">FAQ 수정</a></div>';
-?>
+if(is_file($skin_file)) {
+    $admin_href = '';
+    $himg_src = '';
+    $timg_src = '';
+    if($is_admin)
+        $admin_href = G5_ADMIN_URL.'/faqmasterform.php?w=u&amp;fm_id='.$fm_id;

-<!-- FAQ 시작 { -->
-<?php
-$himg = G5_DATA_PATH.'/faq/'.$fm_id.'_h';
-if (file_exists($himg))
-    echo '<div id="faq_himg" class="faq_img"><img src="'.G5_DATA_URL.'/faq/'.$fm_id.'_h" alt=""></div>';
+    if(!G5_IS_MOBILE) {
+        $himg = G5_DATA_PATH.'/faq/'.$fm_id.'_h';
+        if (is_file($himg)){
+            $himg_src = G5_DATA_URL.'/faq/'.$fm_id.'_h';
+        }

-// 상단 HTML
-echo '<div id="faq_hhtml">'.stripslashes($fm['fm_head_html']).'</div>';
-?>
+        $timg = G5_DATA_PATH.'/faq/'.$fm_id.'_t';
+        if (is_file($timg)){
+            $timg_src = G5_DATA_URL.'/faq/'.$fm_id.'_t';
+        }
+    }

-<div id="faq_wrap" class="faq_<?php echo $fm_id; ?>">
-    <?php // FAQ 목차
-    $sql = " select * from {$g5['faq_table']}
-              where fm_id = '$fm_id'
-              order by fa_order , fa_id ";
+    $category_href = G5_BBS_URL.'/faq.php';
+    $category_stx = '';
+    $faq_list = array();
+
+    $stx = trim($stx);
+    $sql_search = '';
+
+    if($stx) {
+       $sql_search = " and ( INSTR(fa_subject, '$stx') > 0 or INSTR(fa_content, '$stx') > 0 ) ";
+       $category_stx = '&amp;stx='.$stx;
+    }
+
+    if ($page < 1) { $page = 1; } // 페이지가 없으면 첫 페이지 (1 페이지)
+
+    $page_rows = G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'];
+
+    $sql = " select count(*) as cnt
+                from {$g5['faq_table']}
+                where fm_id = '$fm_id'
+                  $sql_search ";
+    $total = sql_fetch($sql);
+    $total_count = $total['cnt'];
+
+    $total_page  = ceil($total_count / $page_rows);  // 전체 페이지 계산
+    $from_record = ($page - 1) * $page_rows; // 시작 열을 구함
+
+    $sql = " select *
+                from {$g5['faq_table']}
+                where fm_id = '$fm_id'
+                  $sql_search
+                order by fa_order , fa_id
+                limit $from_record, $page_rows ";
    $result = sql_query($sql);
-    for ($i=1; $row=sql_fetch_array($result); $i++)
-    {
-        if ($i == 1)
-        {
-    ?>
-    <section id="faq_list">
-        <h2><?php echo $g5['title']; ?> 목차</h2>
-        <ol>
-    <?php } ?>
-            <li><a href="#faq_<?php echo $fm_id.'_'.$i; ?>"><?php echo stripslashes($row['fa_subject']); ?></a></li>
-    <?php }
-    if ($i > 1) echo '</ol></section>';
-    ?>
-
-    <?php // FAQ 내용
-    $resultb = sql_query($sql);
-    for ($i=1; $row=sql_fetch_array($resultb); $i++)
-    {
-        if ($i == 1)
-        {
-    ?>
-    <section id="faq_con">
-        <h2><?php echo $g5['title']; ?> 내용</h2>
-        <ol>
-    <?php } ?>
-        <li id="faq_<?php echo $fm_id.'_'.$i; ?>">
-            <h3><?php echo stripslashes($row['fa_subject']); ?></h3>
-            <div id="con_inner">
-                <?php echo stripslashes($row['fa_content']); ?>
-            </div>
-            <div class="faq_tolist"><a href="#faq_list" class="btn01">FAQ 목차</a></div>
-        </li>
-    <?php }
-    if ($i > 1) echo '</ol></section>';
-
-    if ($i == 1) echo '<p>등록된 FAQ가 없습니다.<br><a href="'.G5_ADMIN_URL.'/faqmasterlist.php">FAQ를 새로 등록하시려면 FAQ관리</a> 메뉴를 이용하십시오.</p>';
-    ?>
-</div>
-
-<?php
-// 하단 HTML
-echo '<div id="faq_thtml">'.stripslashes($fm['fm_tail_html']).'</div>';
-
-$timg = G5_DATA_PATH.'/faq/'.$fm_id.'_t';
-if (file_exists($timg))
-    echo '<div id="faq_timg" class="faq_img"><img src="'.G5_DATA_URL.'/faq/'.$fm_id.'_t" alt=""></div>';
-?>
-<!-- } FAQ 끝 -->
-
-<?php
-if ($is_admin)
-    echo '<div class="faq_admin"><a href="'.G5_ADMIN_URL.'/faqmasterform.php?w=u&amp;fm_id='.$fm_id.'" class="btn_admin">FAQ 수정</a></div>';
+    while ($row=sql_fetch_array($result)){
+        $faq_list[] = $row;
+    }
+    include_once($skin_file);
+} else {
+    echo '<p>'.str_replace(G5_PATH.'/', '', $skin_file).'이 존재하지 않습니다.</p>';
+}

 include_once('./_tail.php');
 ?>
--- a/bbs/point.php
+++ b/bbs/point.php
@ -9,7 +9,7 @@ include_once(G5_PATH.'/head.sub.php');

 $list = array();

-$sql_common = " from {$g5['point_table']} where mb_id = '".mysql_escape_string($member['mb_id'])."' ";
+$sql_common = " from {$g5['point_table']} where mb_id = '".escape_trim($member['mb_id'])."' ";
 $sql_order = " order by po_id desc ";

 $sql = " select count(*) as cnt {$sql_common} ";
@ -18,92 +18,10 @@ $total_count = $row['cnt'];

 $rows = $config['cf_page_rows'];
 $total_page  = ceil($total_count / $rows);  // 전체 페이지 계산
-if (!$page) { $page = 1; } // 페이지가 없으면 첫 페이지 (1 페이지)
+if ($page < 1) { $page = 1; } // 페이지가 없으면 첫 페이지 (1 페이지)
 $from_record = ($page - 1) * $rows; // 시작 열을 구함
-?>

-<div id="point" class="new_win">
-    <h1 id="win_title"><?php echo $g5['title'] ?></h1>
+include_once($member_skin_path.'/point.skin.php');

-    <div class="tbl_head01 tbl_wrap">
-        <table>
-        <caption>포인트 사용내역 목록</caption>
-        <thead>
-        <tr>
-            <th scope="col">일시</th>
-            <th scope="col">내용</th>
-            <th scope="col">만료일</th>
-            <th scope="col">지급포인트</th>
-            <th scope="col">사용포인트</th>
-        </tr>
-        </thead>
-        <tbody>
-        <?php
-        $sum_point1 = $sum_point2 = $sum_point3 = 0;
-
-        $sql = " select *
-                    {$sql_common}
-                    {$sql_order}
-                    limit {$from_record}, {$rows} ";
-        $result = sql_query($sql);
-        for ($i=0; $row=sql_fetch_array($result); $i++) {
-            $point1 = $point2 = 0;
-            if ($row['po_point'] > 0) {
-                $point1 = '+' .number_format($row['po_point']);
-                $sum_point1 += $row['po_point'];
-            } else {
-                $point2 = number_format($row['po_point']);
-                $sum_point2 += $row['po_point'];
-            }
-
-            $po_content = $row['po_content'];
-
-            $expr = '';
-            if($row['po_expired'] == 1)
-                $expr = ' txt_expired';
-        ?>
-        <tr>
-            <td class="td_datetime"><?php echo $row['po_datetime']; ?></td>
-            <td><?php echo $po_content; ?></td>
-            <td class="td_date<?php echo $expr; ?>">
-                <?php if ($row['po_expired'] == 1) { ?>
-                만료<?php echo substr(str_replace('-', '', $row['po_expire_date']), 2); ?>
-                <?php } else echo $row['po_expire_date'] == '9999-12-31' ? '&nbsp;' : $row['po_expire_date']; ?>
-            </td>
-            <td class="td_numbig"><?php echo $point1; ?></td>
-            <td class="td_numbig"><?php echo $point2; ?></td>
-        </tr>
-        <?php
-        }
-
-        if ($i == 0)
-            echo '<tr><td colspan="5" class="empty_table">자료가 없습니다.</td></tr>';
-        else {
-            if ($sum_point1 > 0)
-                $sum_point1 = "+" . number_format($sum_point1);
-            $sum_point2 = number_format($sum_point2);
-        }
-        ?>
-        </tbody>
-        <tfoot>
-        <tr>
-            <th scope="row" colspan="3">소계</th>
-            <td><?php echo $sum_point1; ?></td>
-            <td><?php echo $sum_point2; ?></td>
-        </tr>
-        <tr>
-            <th scope="row" colspan="3">보유포인트</th>
-            <td colspan="2"><?php echo number_format($member['mb_point']); ?></td>
-        </tr>
-        </tfoot>
-        </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='); ?>
-
-    <div class="win_btn"><button type="button" onclick="javascript:window.close();">창닫기</button></div>
-</div>
-
-<?php
 include_once(G5_PATH.'/tail.sub.php');
 ?>
--- a/bbs/qahead.php
+++ b/bbs/qahead.php
@ -0,0 +1,18 @@
+<?php
+if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
+
+$qa_skin_path = (G5_IS_MOBILE ? G5_MOBILE_PATH : G5_PATH).'/'.G5_SKIN_DIR.'/qa/'.$qaconfig['qa_skin'];
+$qa_skin_url = (G5_IS_MOBILE ? G5_MOBILE_URL : G5_URL).'/'.G5_SKIN_DIR.'/qa/'.$qaconfig['qa_skin'];
+
+if (G5_IS_MOBILE) {
+    // 모바일의 경우 설정을 따르지 않는다.
+    include_once('./_head.php');
+    echo stripslashes($qaconfig['qa_mobile_content_head']);
+} else {
+    if($qaconfig['qa_include_head'])
+        @include ($qaconfig['qa_include_head']);
+    else
+        include ('./_head.php');
+    echo stripslashes($qaconfig['qa_content_head']);
+}
+?>
--- a/bbs/qalist.php
+++ b/bbs/qalist.php
@ -7,10 +7,8 @@ if($is_guest)
 $qaconfig = get_qa_config();

 $g5['title'] = $qaconfig['qa_title'];
-include_once('./_head.php');
+include_once('./qahead.php');

-$qa_skin_path = (G5_IS_MOBILE ? G5_MOBILE_PATH : G5_PATH).'/'.G5_SKIN_DIR.'/qa/'.$qaconfig['qa_skin'];
-$qa_skin_url = (G5_IS_MOBILE ? G5_MOBILE_URL : G5_URL).'/'.G5_SKIN_DIR.'/qa/'.$qaconfig['qa_skin'];
 $skin_file = $qa_skin_path.'/list.skin.php';

 $category_option = '';
@ -120,5 +118,5 @@ if(is_file($skin_file)) {
    echo '<div>'.str_replace(G5_PATH.'/', '', $skin_file).'이 존재하지 않습니다.</div>';
 }

-include_once('./_tail.php');
+include_once('./qatail.php');
 ?>
--- a/bbs/qatail.php
+++ b/bbs/qatail.php
@ -0,0 +1,15 @@
+<?php
+if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
+
+if (G5_IS_MOBILE) {
+    echo stripslashes($qaconfig['qa_mobile_content_tail']);
+    // 모바일의 경우 설정을 따르지 않는다.
+    include_once('./_tail.php');
+} else {
+    echo stripslashes($qaconfig['qa_mobile_content_tail']);
+    if($qaconfig['qa_include_tail'])
+        @include ($board['bo_include_tail']);
+    else
+        include ('./_tail.php');
+}
+?>
--- a/bbs/qaview.php
+++ b/bbs/qaview.php
@ -8,10 +8,8 @@ if($is_guest)
 $qaconfig = get_qa_config();

 $g5['title'] = $qaconfig['qa_title'];
-include_once('./_head.php');
+include_once('./qahead.php');

-$qa_skin_path = (G5_IS_MOBILE ? G5_MOBILE_PATH : G5_PATH).'/'.G5_SKIN_DIR.'/qa/'.$qaconfig['qa_skin'];
-$qa_skin_url = (G5_IS_MOBILE ? G5_MOBILE_URL : G5_URL).'/'.G5_SKIN_DIR.'/qa/'.$qaconfig['qa_skin'];
 $skin_file = $qa_skin_path.'/view.skin.php';

 if(is_file($skin_file)) {
@ -173,5 +171,5 @@ if(is_file($skin_file)) {
    echo '<div>'.str_replace(G5_PATH.'/', '', $skin_file).'이 존재하지 않습니다.</div>';
 }

-include_once('./_tail.php');
+include_once('./qatail.php');
 ?>
--- a/bbs/qawrite.php
+++ b/bbs/qawrite.php
@ -12,10 +12,8 @@ if($is_guest)
 $qaconfig = get_qa_config();

 $g5['title'] = $qaconfig['qa_title'];
-include_once('./_head.php');
+include_once('./qahead.php');

-$qa_skin_path = (G5_IS_MOBILE ? G5_MOBILE_PATH : G5_PATH).'/'.G5_SKIN_DIR.'/qa/'.$qaconfig['qa_skin'];
-$qa_skin_url = (G5_IS_MOBILE ? G5_MOBILE_URL : G5_URL).'/'.G5_SKIN_DIR.'/qa/'.$qaconfig['qa_skin'];
 $skin_file = $qa_skin_path.'/write.skin.php';

 if(is_file($skin_file)) {
@ -137,5 +135,5 @@ if(is_file($skin_file)) {
    echo '<div>'.str_replace(G5_PATH.'/', '', $skin_file).'이 존재하지 않습니다.</div>';
 }

-include_once('./_tail.php');
+include_once('./qatail.php');
 ?>
--- a/common.php
+++ b/common.php
@ -225,13 +225,14 @@ if (isset($_REQUEST['sfl']))  {
 if (isset($_REQUEST['stx']))  { // search text (검색어)
    $stx = trim($_REQUEST['stx']);
    if ($stx)
-        $qstr .= '&amp;stx=' . urlencode($stx);
+        $qstr .= '&amp;stx=' . urlencode(cut_str($stx, 20, ''));
 } else {
    $stx = '';
 }

 if (isset($_REQUEST['sst']))  {
    $sst = trim($_REQUEST['sst']);
+    $sst = preg_replace("/[\<\>\'\"\%\=\(\)\s]/", "", $sst);
    if ($sst)
        $qstr .= '&amp;sst=' . urlencode($sst); // search sort (검색 정렬 필드)
 } else {
--- a/config.php
+++ b/config.php
@ -153,6 +153,10 @@ define('G5_SMTP', '127.0.0.1');
    기타 상수
 ********************/

+// SQL 에러를 표시할 것인지 지정
+// 에러를 표시하지 않으려면 FALSE 로 변경
+define('G5_DISPLAY_SQL_ERROR', TRUE);
+
 // escape string 처리 함수 지정
 // POST 등에서 한글이 깨질 경우 addslashes 로 변경
 define('G5_ESCAPE_FUNCTION', 'mysql_real_escape_string');
--- a/css/default.css
+++ b/css/default.css
@ -68,20 +68,20 @@ a:hover, a:focus, a:active {color:#000;text-decoration:underline}
 /* 메인메뉴 */
 #gnb {position:relative;margin:-1px 0 0;border-top:1px dotted #dde4e9;border-bottom:1px solid #dde4e9;background:#ecf0f7}
 #gnb h2 {position:absolute;font-size:0;line-height:0;overflow:hidden}
-#gnb #gnb_1dul {margin:0 auto !important;padding:0;width:970px;zoom:1}
-#gnb #gnb_1dul:after {display:block;visibility:hidden;clear:both;content:""}
-.gnb_1dli {z-index:10;position:relative;float:left;zoom:1}
-.gnb_1dli:after {display:block;visibility:hidden;clear:both;content:""}
-.gnb_1da {display:block;float:left;padding:0 10px;width:80px;height:35px;background:url('../img/gnb_bg00.gif') center right no-repeat;font-weight:bold;line-height:2.95em;text-decoration:none}
+#gnb_1dul {margin:0 auto !important;padding:0;width:970px;zoom:1}
+#gnb_1dul:after {display:block;visibility:hidden;clear:both;content:""}
+.gnb_1dli {z-index:10;position:relative;float:left}
+.gnb_1da {display:inline-block;padding:0 40px 0 10px;height:35px;background:url('../img/gnb_bg00.gif') center right no-repeat;font-weight:bold;line-height:2.95em;text-decoration:none}
 .gnb_1da:focus, .gnb_1da:hover {background:url('../img/gnb_bg00.gif') #333 center right no-repeat;text-decoration:none}
-.gnb_1dli_air a {background-color:#333;color:#fff}
-.gnb_1dli_on a {background-color:#333;color:#fff}
-.gnb_2dul {display:none;position:absolute;top:35px}
-.gnb_2da {display:block;width:80px;}
-.gnb_2da {display:inline-block;padding:0 10px;width:161px;height:35px;text-align:left;text-decoration:none;line-height:2.95em}
-.gnb_2da:focus, .gnb_2da:hover {text-decoration:none}
-.gnb_1dli_over .gnb_2dul {display:block;left:0;width:180px;background:#fff}
-.gnb_1dli_over2 .gnb_2dul {display:block;right:1px;width:180px;background:#fff}
+.gnb_1dli_air .gnb_1da {background-color:#333;color:#fff}
+.gnb_1dli_on .gnb_1da {background-color:#333;color:#fff}
+.gnb_2dul {display:none;position:absolute;top:35px;width:180px}
+.gnb_2da {display:block;padding:13px 10px;text-align:left;text-decoration:none}
+.gnb_1dli_air .gnb_2da {background-color:#333;color:#fff}
+.gnb_1dli_on .gnb_2da {background-color:#333;color:#fff}
+.gnb_2da:focus, .gnb_2da:hover {background:#666;text-decoration:none}
+.gnb_1dli_over .gnb_2dul {display:block;left:0;background:#fff}
+.gnb_1dli_over2 .gnb_2dul {display:block;right:1px;background:#fff}

 .gnb_empty {width:100%;height:35px;text-align:center;line-height:2.95em}

--- a/css/mobile.css
+++ b/css/mobile.css
@ -112,7 +112,7 @@ a:hover, a:focus, a:active {color:#000;text-decoration:underline}
 #captcha audio {display:block;margin:0 0 5px;width:187px}
 #captcha #captcha_img {width:60px;height:30px;border:1px solid #e9e9e9}
 #captcha #captcha_reload {margin:0;padding:0 5px;height:32px;border:0;background:#e4eaec;vertical-align:middle;overflow:hidden;cursor:pointer}
-#captcha #captcha_key {margin:0 0 0 4px;padding:0 5px;width:50px;height:30px;border:1px solid #b8c9c2;background:#f7f7f7;font-size:1.333em;font-weight:bold;text-align:center;line-height:2.8em}
+#captcha #captcha_key {margin:0 0 0 4px;padding:0 5px;width:50px;height:30px;border:1px solid #b8c9c2;background:#f7f7f7;font-size:1.333em;font-weight:bold;text-align:center;line-height:2em}
 #captcha #captcha_info {display:block;margin:5px 0 0;font-size:0.95em;letter-spacing:-0.1em}

 /* 버튼 */
--- a/g4_import.php
+++ b/g4_import.php
@ -100,25 +100,7 @@ if($is_admin != 'super')
    <nav id="gnb">
        <h2>메인메뉴</h2>
        <ul id="gnb_1dul">
-            <?php
-            $sql = " select * from {$g5['group_table']} where gr_show_menu = '1' and gr_device <> 'mobile' order by gr_order ";
-            $result = sql_query($sql);
-            for ($gi=0; $row=sql_fetch_array($result); $gi++) { // gi 는 group index
-             ?>
-            <li class="gnb_1dli">
-                <a href="<?php echo G5_BBS_URL ?>/group.php?gr_id=<?php echo $row['gr_id'] ?>" class="gnb_1da"><?php echo $row['gr_subject'] ?></a>
-                <ul class="gnb_2dul">
-                    <?php
-                    $sql2 = " select * from {$g5['board_table']} where gr_id = '{$row['gr_id']}' and bo_show_menu = '1' and bo_device <> 'mobile' order by bo_order ";
-                    $result2 = sql_query($sql2);
-                    for ($bi=0; $row2=sql_fetch_array($result2); $bi++) { // bi 는 board index
-                     ?>
-                    <li class="gnb_2dli"><a href="<?php echo G5_BBS_URL ?>/board.php?bo_table=<?php echo $row2['bo_table'] ?>" class="gnb_2da"><?php echo $row2['bo_subject'] ?></a></li>
-                    <?php } ?>
-                </ul>
-            </li>
-            <?php } ?>
-            <?php if ($gi == 0) {  ?><li class="gnb_empty">생성된 메뉴가 없습니다.</li><?php }  ?>
+            <li class="gnb_empty">메뉴는 표시하지 않습니다.</li>
        </ul>
    </nav>
 </div>
--- a/g4_import_run.php
+++ b/g4_import_run.php
@ -141,25 +141,7 @@ document.onkeydown = noRefresh ;
    <nav id="gnb">
        <h2>메인메뉴</h2>
        <ul id="gnb_1dul">
-            <?php
-            $sql = " select * from {$g5['group_table']} where gr_show_menu = '1' and gr_device <> 'mobile' order by gr_order ";
-            $result = sql_query($sql);
-            for ($gi=0; $row=sql_fetch_array($result); $gi++) { // gi 는 group index
-             ?>
-            <li class="gnb_1dli">
-                <a href="<?php echo G5_BBS_URL ?>/group.php?gr_id=<?php echo $row['gr_id'] ?>" class="gnb_1da"><?php echo $row['gr_subject'] ?></a>
-                <ul class="gnb_2dul">
-                    <?php
-                    $sql2 = " select * from {$g5['board_table']} where gr_id = '{$row['gr_id']}' and bo_show_menu = '1' and bo_device <> 'mobile' order by bo_order ";
-                    $result2 = sql_query($sql2);
-                    for ($bi=0; $row2=sql_fetch_array($result2); $bi++) { // bi 는 board index
-                     ?>
-                    <li class="gnb_2dli"><a href="<?php echo G5_BBS_URL ?>/board.php?bo_table=<?php echo $row2['bo_table'] ?>" class="gnb_2da"><?php echo $row2['bo_subject'] ?></a></li>
-                    <?php } ?>
-                </ul>
-            </li>
-            <?php } ?>
-            <?php if ($gi == 0) {  ?><li class="gnb_empty">생성된 메뉴가 없습니다.</li><?php }  ?>
+            <li class="gnb_empty">메뉴는 표시하지 않습니다.</li>
        </ul>
    </nav>
 </div>
--- a/head.php
+++ b/head.php
@ -112,26 +112,44 @@ if (G5_IS_MOBILE) {
        <h2>메인메뉴</h2>
        <ul id="gnb_1dul">
            <?php
-            $sql = " select * from {$g5['group_table']} where gr_show_menu = '1' and gr_device <> 'mobile' order by gr_order ";
+            $sql = " select *
+                        from {$g5['menu_table']}
+                        where me_use = '1'
+                          and length(me_code) = '2'
+                        order by me_order, me_id ";
            $result = sql_query($sql);
            $gnb_zindex = 999; // gnb_1dli z-index 값 설정용
-            for ($gi=0; $row=sql_fetch_array($result); $gi++) { // gi 는 group index
-                $gnb_zindex -= 1; // html 구조에서 앞선 gnb_1dli 에 더 높은 z-index 값 부여
-             ?>
-            <li class="gnb_1dli" style="z-index:<?php echo $gnb_zindex; ?>">
-                <a href="<?php echo G5_BBS_URL ?>/group.php?gr_id=<?php echo $row['gr_id'] ?>" class="gnb_1da"><?php echo $row['gr_subject'] ?></a>
-                <ul class="gnb_2dul">
-                    <?php
-                    $sql2 = " select * from {$g5['board_table']} where gr_id = '{$row['gr_id']}' and bo_show_menu = '1' and bo_device <> 'mobile' order by bo_order ";
-                    $result2 = sql_query($sql2);
-                    for ($bi=0; $row2=sql_fetch_array($result2); $bi++) { // bi 는 board index
-                     ?>
-                    <li class="gnb_2dli"><a href="<?php echo G5_BBS_URL ?>/board.php?bo_table=<?php echo $row2['bo_table'] ?>" class="gnb_2da"><?php echo $row2['bo_subject'] ?></a></li>
-                    <?php } ?>
-                </ul>
+
+            for ($i=0; $row=sql_fetch_array($result); $i++) {
+            ?>
+            <li class="gnb_1dli" style="z-index:<?php echo $gnb_zindex--; ?>">
+                <a href="<?php echo $row['me_link']; ?>" target="_<?php echo $row['me_target']; ?>" class="gnb_1da"><?php echo $row['me_name'] ?></a>
+                <?php
+                $sql2 = " select *
+                            from {$g5['menu_table']}
+                            where me_use = '1'
+                              and length(me_code) = '4'
+                              and substring(me_code, 1, 2) = '{$row['me_code']}'
+                            order by me_order, me_id ";
+                $result2 = sql_query($sql2);
+
+                for ($k=0; $row2=sql_fetch_array($result2); $k++) {
+                    if($k == 0)
+                        echo '<ul class="gnb_2dul">'.PHP_EOL;
+                ?>
+                    <li class="gnb_2dli"><a href="<?php echo $row2['me_link']; ?>" target="_<?php echo $row2['me_target']; ?>" class="gnb_2da"><?php echo $row2['me_name'] ?></a></li>
+                <?php
+                }
+
+                if($k > 0)
+                    echo '</ul>'.PHP_EOL;
+                ?>
            </li>
-            <?php } ?>
-            <?php if ($gi == 0) {  ?><li class="gnb_empty">생성된 메뉴가 없습니다.</li><?php }  ?>
+            <?php
+            }
+
+            if ($i == 0) {  ?><li class="gnb_empty">생성된 메뉴가 없습니다.</li><?php }
+            ?>
        </ul>
    </nav>
 </div>
--- a/head.sub.php
+++ b/head.sub.php
@ -48,7 +48,7 @@ if($config['cf_add_meta'])
 <title><?php echo $g5_head_title; ?></title>
 <?php
 if (defined('G5_IS_ADMIN')) {
-    echo '<link rel="stylesheet" href="'.G5_CSS_URL.'/admin.css">'.PHP_EOL;
+    echo '<link rel="stylesheet" href="'.G5_ADMIN_URL.'/css/admin.css">'.PHP_EOL;
 } else {
    echo '<link rel="stylesheet" href="'.G5_CSS_URL.'/'.(G5_IS_MOBILE?'mobile':'default').'.css">'.PHP_EOL;
    // canonical 지정
--- a/install/gnuboard5.sql
+++ b/install/gnuboard5.sql
@ -84,7 +84,6 @@ CREATE TABLE IF NOT EXISTS `g5_board` (
  `bo_upload_size` int(11) NOT NULL DEFAULT '0',
  `bo_reply_order` tinyint(4) NOT NULL DEFAULT '0',
  `bo_use_search` tinyint(4) NOT NULL DEFAULT '0',
-  `bo_show_menu` tinyint(4) NOT NULL DEFAULT '0',
  `bo_order` int(11) NOT NULL DEFAULT '0',
  `bo_count_write` int(11) NOT NULL DEFAULT '0',
  `bo_count_comment` int(11) NOT NULL DEFAULT '0',
@ -352,7 +351,6 @@ CREATE TABLE IF NOT EXISTS `g5_group` (
  `gr_device` ENUM('both','pc','mobile') NOT NULL DEFAULT 'both',
  `gr_admin` varchar(255) NOT NULL default '',
  `gr_use_access` tinyint(4) NOT NULL default '0',
-  `gr_show_menu` tinyint(4) NOT NULL default '0',
  `gr_order` int(11) NOT NULL default '0',
  `gr_1_subj` varchar(255) NOT NULL default '',
  `gr_2_subj` varchar(255) NOT NULL default '',
@ -732,6 +730,12 @@ CREATE TABLE IF NOT EXISTS `g5_qa_config` (
  `qa_image_width` int(11) NOT NULL DEFAULT '0',
  `qa_upload_size` int(11) NOT NULL DEFAULT '0',
  `qa_insert_content` text NOT NULL,
+  `qa_include_head` varchar(255) NOT NULL DEFAULT '',
+  `qa_include_tail` varchar(255) NOT NULL DEFAULT '',
+  `qa_content_head` text NOT NULL,
+  `qa_content_tail` text NOT NULL,
+  `qa_mobile_content_head` text NOT NULL,
+  `qa_mobile_content_tail` text NOT NULL,
  `qa_1_subj` varchar(255) NOT NULL DEFAULT '',
  `qa_2_subj` varchar(255) NOT NULL DEFAULT '',
  `qa_3_subj` varchar(255) NOT NULL DEFAULT '',
@ -830,6 +834,8 @@ CREATE TABLE IF NOT EXISTS `g5_faq_master` (
  `fm_subject` varchar(255) NOT NULL DEFAULT '',
  `fm_head_html` text NOT NULL,
  `fm_tail_html` text NOT NULL,
+  `fm_mobile_head_html` text NOT NULL,
+  `fm_mobile_tail_html` text NOT NULL,
  `fm_order` int(11) NOT NULL DEFAULT '0',
  PRIMARY KEY (`fm_id`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
@ -858,3 +864,20 @@ CREATE TABLE IF NOT EXISTS `g5_new_win` (
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;

 -- --------------------------------------------------------
+
+--
+-- Table structure for table `g5_menu`
+--
+
+DROP TABLE IF EXISTS `g5_menu`;
+CREATE TABLE IF NOT EXISTS `g5_menu` (
+  `me_id` int(11) NOT NULL AUTO_INCREMENT,
+  `me_code` varchar(255) NOT NULL DEFAULT '',
+  `me_name` varchar(255) NOT NULL DEFAULT '',
+  `me_link` varchar(255) NOT NULL DEFAULT '',
+  `me_target` varchar(255) NOT NULL DEFAULT '',
+  `me_order` int(11) NOT NULL DEFAULT '0',
+  `me_use` tinyint(4) NOT NULL DEFAULT '0',
+  `me_mobile_use` tinyint(4) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`me_id`)
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
--- a/install/install_db.php
+++ b/install/install_db.php
@ -122,6 +122,7 @@ $sql = " insert into `{$table_prefix}config`
                cf_mobile_search_skin = 'basic',
                cf_mobile_connect_skin = 'basic',
                cf_mobile_member_skin = 'basic',
+                cf_editor = 'ckeditor4',
                cf_captcha_mp3 = 'basic',
                cf_register_level = '2',
                cf_register_point = '1000',
@ -254,6 +255,7 @@ fwrite($f, "\$g5['content_table'] = G5_TABLE_PREFIX.'content'; // 내용(컨텐
 fwrite($f, "\$g5['faq_table'] = G5_TABLE_PREFIX.'faq'; // 자주하시는 질문 테이블\n");
 fwrite($f, "\$g5['faq_master_table'] = G5_TABLE_PREFIX.'faq_master'; // 자주하시는 질문 마스터 테이블\n");
 fwrite($f, "\$g5['new_win_table'] = G5_TABLE_PREFIX.'new_win'; // 새창 테이블\n");
+fwrite($f, "\$g5['menu_table'] = G5_TABLE_PREFIX.'menu'; // 메뉴관리 테이블\n");
 fwrite($f, "?>");

 fclose($f);
--- a/js/common.js
+++ b/js/common.js
@ -70,6 +70,11 @@ function number_format(data)
    var comma = ',';
    var i;

+    var sign = data.match(/^[\+\-]/);
+    if(sign) {
+        data = data.replace(/^[\+\-]/, "");
+    }
+
    len = data.length;
    mod = (len % cutlen);
    k = cutlen - mod;
@ -88,6 +93,9 @@ function number_format(data)
        }
    }

+    if(sign != null)
+        number = sign+number;
+
    return number;
 }

--- a/js/viewimageresize.js
+++ b/js/viewimageresize.js
@ -47,4 +47,47 @@
            image_resize();
        });
    }
+
+    $.fn.viewimageresize2 = function(selector)
+    {
+        var cfg = {
+                selector: "img"
+            };
+
+        if(typeof selector == "object") {
+            cfg = $.extend(cfg, selector);
+        } else {
+            if(selector) {
+                cfg = $.extend({ selector: selector });
+            }
+        }
+
+        var $img = this.find(cfg.selector);
+        var $this = this;
+
+        function image_resize()
+        {
+            var width = $this.width();
+
+            $img.each(function() {
+                $(this).removeAttr("width")
+                       .removeAttr("height")
+                       .css("width","")
+                       .css("height", "");
+
+                if($(this).data("width") == undefined)
+                    $(this).data("width", $(this).width());
+
+                if($(this).data("width") > width) {
+                    $(this).css("width", "100%");
+                }
+            });
+        }
+
+        $(window).on("resize", function() {
+            image_resize();
+        });
+
+        image_resize();
+    }
 }(jQuery));
--- a/lib/common.lib.php
+++ b/lib/common.lib.php
@ -33,7 +33,7 @@ function get_microtime()
 }


-// 현재페이지, 총페이지수, 한페이지에 보여줄 행, URL
+// 한페이지에 보여줄 행, 현재페이지, 총페이지수, URL
 function get_paging($write_pages, $cur_page, $total_page, $url, $add="")
 {
    $url = preg_replace('#&amp;page=[0-9]*(&amp;page=)$#', '$1', $url);
@ -1433,7 +1433,7 @@ function sql_select_db($db, $connect)


 // mysql_query 와 mysql_error 를 한꺼번에 처리
-function sql_query($sql, $error=TRUE)
+function sql_query($sql, $error=G5_DISPLAY_SQL_ERROR)
 {
    if ($error)
        $result = @mysql_query($sql) or die("<p>$sql<p>" . mysql_errno() . " : " .  mysql_error() . "<p>error file : {$_SERVER['PHP_SELF']}");
@ -1444,7 +1444,7 @@ function sql_query($sql, $error=TRUE)


 // 쿼리를 실행한 후 결과값에서 한행을 얻는다.
-function sql_fetch($sql, $error=TRUE)
+function sql_fetch($sql, $error=G5_DISPLAY_SQL_ERROR)
 {
    $result = sql_query($sql, $error);
    //$row = @sql_fetch_array($result) or die("<p>$sql<p>" . mysql_errno() . " : " .  mysql_error() . "<p>error file : $_SERVER['PHP_SELF']");
@ -2604,4 +2604,15 @@ function htmlspecialchars2($str)
    $str = strtr($str, $trans);
    return $str;
 }
+
+// date 형식 변환
+function conv_date_format($format, $date, $add='')
+{
+    if($add)
+        $timestamp = strtotime($add, strtotime($date));
+    else
+        $timestamp = strtotime($date);
+
+    return date($format, $timestamp);
+}
 ?>
--- a/lib/visit.lib.php
+++ b/lib/visit.lib.php
@ -13,10 +13,10 @@ function visit($skin_dir='basic')
    // $visit[4] = 전체
    // 숫자가 들어감
    preg_match("/오늘:(.*),어제:(.*),최대:(.*),전체:(.*)/", $config['cf_visit'], $visit);
-    settype($visit[0], "integer");
    settype($visit[1], "integer");
    settype($visit[2], "integer");
    settype($visit[3], "integer");
+    settype($visit[4], "integer");

    ob_start();
    if(G5_IS_MOBILE) {
--- a/mobile/head.php
+++ b/mobile/head.php
@ -29,6 +29,84 @@ include_once(G5_LIB_PATH.'/popular.lib.php');
            <a href="<?php echo G5_URL ?>"><img src="<?php echo G5_IMG_URL ?>/logo.jpg" alt="<?php echo $config['cf_title']; ?>"></a>
        </div>

+        <button type="button" id="hd_menu_open">메뉴<span class="sound_only"> 열기</span></button>
+
+        <div id="menu_wrap">
+            <ul>
+            <?php
+            $sql = " select *
+                        from {$g5['menu_table']}
+                        where me_mobile_use = '1'
+                          and length(me_code) = '2'
+                        order by me_order, me_id ";
+            $result = sql_query($sql);
+
+            for($i=0; $row=sql_fetch_array($result); $i++) {
+            ?>
+                <li>
+                    <a href="<?php echo $row['me_link']; ?>" target="_<?php echo $row['me_target']; ?>" class="gnb_1da"><?php echo $row['me_name'] ?></a>
+                    <?php
+                    $sql2 = " select *
+                                from {$g5['menu_table']}
+                                where me_mobile_use = '1'
+                                  and length(me_code) = '4'
+                                  and substring(me_code, 1, 2) = '{$row['me_code']}'
+                                order by me_order, me_id ";
+                    $result2 = sql_query($sql2);
+
+                    for ($k=0; $row2=sql_fetch_array($result2); $k++) {
+                        if($k == 0)
+                            echo '<ul class="gnb_2dul">'.PHP_EOL;
+                    ?>
+                        <li class="gnb_2dli"><a href="<?php echo $row2['me_link']; ?>" target="_<?php echo $row2['me_target']; ?>" class="gnb_2da"><?php echo $row2['me_name'] ?></a></li>
+                    <?php
+                    }
+
+                    if($k > 0)
+                        echo '</ul>'.PHP_EOL;
+                    ?>
+                </li>
+            <?php
+            }
+
+            if ($i == 0) {  ?><li class="gnb_empty">생성된 메뉴가 없습니다.</li><?php }
+            ?>
+            </ul>
+            <button type="button" id="hd_menu_close">닫기</button>
+        </div>
+        <script>
+        $(function() {
+            $("#hd_menu_open").click(function() {
+                var $menu = $("#menu_wrap");
+                var w = $menu.width();
+                var sw = $(window).width();
+
+                $menu
+                    .css({
+                        display: "none",
+                        left: sw+"px"
+                    })
+                    .css("display", "block")
+                    .animate(
+                        { left: "-="+w+"px" }, 1500
+                    );
+            });
+
+            $("#hd_menu_close").click(function() {
+                var $menu = $("#menu_wrap");
+                var w = $menu.width();
+                var sw = $(window).width();
+
+                $menu.animate(
+                        { left: "+="+w+"px" }, 1500,
+                        function() {
+                            $menu.css("display", "none");
+                        }
+                    );
+            });
+        });
+        </script>
+
        <button type="button" id="hd_sch_open">검색<span class="sound_only"> 열기</span></button>

        <aside id="hd_sch">
@ -85,6 +163,7 @@ include_once(G5_LIB_PATH.'/popular.lib.php');

        <ul id="hd_nb">
            <li><a href="<?php echo G5_BBS_URL ?>/qalist.php" id="snb_new">1:1문의</a></li>
+            <li><a href="<?php echo G5_BBS_URL ?>/faq.php" id="snb_faq">FAQ</a></li>
            <li><a href="<?php echo G5_BBS_URL ?>/current_connect.php" id="snb_cnt">접속자 <?php echo connect(); // 현재 접속자수 ?></a></li>
            <li><a href="<?php echo G5_BBS_URL ?>/new.php" id="snb_new">새글</a></li>
            <?php if ($is_member) { ?>
@ -104,26 +183,6 @@ include_once(G5_LIB_PATH.'/popular.lib.php');

 <hr>

-<div id="lnb">
-    <ul>
-        <?php
-        $sql2 = " select * from {$g5['board_table']} where bo_show_menu = 1 and bo_device <> 'pc' ";
-        if ($gr_id) $sql2 .= " and gr_id = '$gr_id' ";
-        $sql2 .= " order by bo_order ";
-        $result2 = sql_query($sql2);
-        for ($bi=0; $row2=sql_fetch_array($result2); $bi++) { // bi 는 board index
-            $bo_subject = $row2['bo_subject'];
-            if (G5_IS_MOBILE && $row2['bo_mobile_subject']) {
-                $bo_subject = $row2['bo_mobile_subject'];
-            }
-        ?>
-        <li><a href="<?php echo G5_BBS_URL ?>/board.php?bo_table=<?php echo $row2['bo_table'] ?>"><?php echo $bo_subject; ?></a></li>
-        <?php } ?>
-    </ul>
-</div>
-
-<hr>
-
 <div id="wrapper">
    <div id="aside">
        <?php echo outlogin('basic'); // 외부 로그인 ?>
--- a/mobile/skin/faq/basic/list.skin.php
+++ b/mobile/skin/faq/basic/list.skin.php
@ -0,0 +1,118 @@
+<?php
+if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
+
+// add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨
+add_stylesheet('<link rel="stylesheet" href="'.$faq_skin_url.'/style.css">', 0);
+?>
+
+<!-- FAQ 시작 { -->
+<?php
+// 상단 HTML
+echo '<div id="faq_hhtml">'.stripslashes($fm['fm_mobile_head_html']).'</div>';
+?>
+
+<form name="faq_search_form" method="get">
+<input type="hidden" name="fm_id" value="<?php echo $fm_id;?>">
+<label for="stx" class="sound_only">검색어<strong class="sound_only"> 필수</strong></label>
+<input type="text" name="stx" value="<?php echo $stx;?>" required id="stx" class="frm_input required" size="15" maxlength="15">
+<input type="submit" value="검색" class="btn_submit">
+</form>
+
+<?php
+if( count($faq_master_list) ){
+?>
+<nav id="bo_cate">
+    <h2>자주하시는질문 분류</h2>
+    <ul id="bo_cate_ul">
+        <?php
+        foreach( $faq_master_list as $v ){
+            $category_msg = '';
+            $category_option = '';
+            if($v['fm_id'] == $fm_id){ // 현재 선택된 카테고리라면
+                $category_option = ' id="bo_cate_on"';
+                $category_msg = '<span class="sound_only">열린 분류 </span>';
+            }
+        ?>
+        <li><a href="<?php echo $category_href;?>?fm_id=<?php echo $v['fm_id'].$category_stx;?>" <?php echo $category_option;?> ><?php echo $category_msg.$v['fm_subject'];?></a></li>
+        <?php
+        }
+        ?>
+    </ul>
+</nav>
+<?php } ?>
+
+<div id="faq_wrap" class="faq_<?php echo $fm_id; ?>">
+    <?php // FAQ 내용
+    if( count($faq_list) ){
+    ?>
+    <section id="faq_con">
+        <h2><?php echo $g5['title']; ?> 목록</h2>
+        <ol>
+            <?php
+            foreach($faq_list as $key=>$v){
+                if(empty($v))
+                    continue;
+            ?>
+            <li>
+                <h3><a href="#none" onclick="return faq_open(this);"><?php echo conv_content($v['fa_subject'], 1); ?></a></h3>
+                <div class="con_inner">
+                    <?php echo conv_content($v['fa_content'], 1); ?>
+                    <button type="button" class="btn_faq_close">닫기</button>
+                </div>
+            </li>
+            <?php
+            }
+            ?>
+        </ol>
+    </section>
+    <?php
+
+    } else {
+        if($stx){
+            echo '<p>검색된 게시물이 없습니다.</p>';
+        } else {
+            echo '<p>등록된 FAQ가 없습니다.';
+            if($is_admin)
+                echo '<br><a href="'.G5_ADMIN_URL.'/faqmasterlist.php">FAQ를 새로 등록하시려면 FAQ관리</a> 메뉴를 이용하십시오.';
+            echo '</p>';
+        }
+    }
+    ?>
+</div>
+
+<?php echo get_paging($page_rows, $page, $total_page, $_SERVER['PHP_SELF'].'?'.$qstr.'&amp;page='); ?>
+
+<?php
+// 하단 HTML
+echo '<div id="faq_thtml">'.stripslashes($fm['fm_tail_html']).'</div>';
+?>
+<!-- } FAQ 끝 -->
+
+<script src="<?php echo G5_JS_URL; ?>/viewimageresize.js"></script>
+<script>
+$(function() {
+    $(".btn_faq_close").on("click", function() {
+        $(this).closest(".con_inner").slideToggle();
+    });
+});
+
+function faq_open(el)
+{
+    var $con = $(el).closest("li").find(".con_inner");
+
+    if($con.is(":visible")) {
+        $con.slideUp();
+    } else {
+        $("#faq_con .con_inner:visible").css("display", "none");
+
+        $con.slideDown(
+            function() {
+                // 이미지 리사이즈
+                $con.viewimageresize2();
+            }
+        );
+    }
+
+    return false;
+}
+</script>
--- a/mobile/skin/faq/basic/style.css
+++ b/mobile/skin/faq/basic/style.css
@ -0,0 +1,10 @@
+@charset "utf-8";
+
+#bo_cate h2 {position:absolute;font-size:0;line-height:0;overflow:hidden}
+#bo_cate ul {margin-bottom:10px;padding-left:1px;width:728px;zoom:1}
+#bo_cate ul:after {display:block;visibility:hidden;clear:both;content:""}
+#bo_cate li {float:left;margin-bottom:-1px}
+#bo_cate a {display:block;position:relative;margin-left:-1px;padding:6px 0 5px;width:90px;border:1px solid #ddd;background:#f7f7f7;color:#888;text-align:center;letter-spacing:-0.1em;line-height:1.2em;cursor:pointer}
+#bo_cate a:focus, #bo_cate a:hover, #bo_cate a:active {text-decoration:none}
+#bo_cate #bo_cate_on {z-index:2;border:1px solid #565e60;background:#fff;color:#565e60;font-weight:bold}
+
--- a/mobile/skin/member/basic/memo.skin.php
+++ b/mobile/skin/member/basic/memo.skin.php
@ -14,33 +14,22 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
        <li><a href="./memo_form.php">쪽지쓰기</a></li>
    </ul>

-    <div class="tbl_head01 tbl_wrap">
-        <table>
-        <caption>
-            전체 <?php echo $kind_title ?>쪽지 <?php echo $total_count ?>통<br>
-        </caption>
-        <thead>
-        <tr>
-            <th scope="col"><?php echo  ($kind == "recv") ? "보낸사람" : "받는사람"; ?></th>
-            <th scope="col">보낸시간</th>
-            <th scope="col">읽은시간</th>
-            <th scope="col">관리</th>
-        </tr>
-        </thead>
-        <tbody>
-        <?php for ($i=0; $i<count($list); $i++) { ?>
-        <tr>
-            <td><?php echo $list[$i]['name'] ?></td>
-            <td class="td_datetime"><a href="<?php echo $list[$i]['view_href'] ?>"><?php echo $list[$i]['send_datetime'] ?></font></td>
-            <td class="td_datetime"><a href="<?php echo $list[$i]['view_href'] ?>"><?php echo $list[$i]['read_datetime'] ?></font></td>
-            <td class="td_mng"><a href="<?php echo $list[$i]['del_href'] ?>" onclick="del(this.href); return false;">삭제</a></td>
-        </tr>
-        <?php } ?>
-        <?php if ($i==0) { echo "<tr><td colspan=\"4\" class=\"empty_table\">자료가 없습니다.</td></tr>"; } ?>
-        </tbody>
-        </table>
+    <div class="win_desc">
+        전체 <?php echo $kind_title ?>쪽지 <?php echo $total_count ?>통<br>
    </div>

+    <ul id="memo_list_ul">
+        <?php for ($i=0; $i<count($list); $i++) { ?>
+        <li>
+            <a href="<?php echo $list[$i]['view_href'] ?>" class="memo_link"><?php echo $list[$i]['send_datetime'] ?> 에 받은 쪽지</a>
+            <span class="memo_read"><?php echo $list[$i]['read_datetime'] ?></span>
+            <span class="memo_send"><?php echo $list[$i]['name'] ?></span>
+            <a href="<?php echo $list[$i]['del_href'] ?>" onclick="del(this.href); return false;" class="memo_del">삭제</a>
+        </li>
+        <?php } ?>
+        <?php if ($i==0) { echo "<li class=\"empty_list\">자료가 없습니다.</li>"; } ?>
+    </ul>
+
    <p class="win_desc">
        쪽지 보관일수는 최장 <strong><?php echo $config['cf_memo_del'] ?></strong>일 입니다.
    </p>
--- a/mobile/skin/member/basic/memo_view.skin.php
+++ b/mobile/skin/member/basic/memo_view.skin.php
@ -22,8 +22,11 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
        <li><a href="./memo.php?kind=send">보낸쪽지</a></li>
        <li><a href="./memo_form.php">쪽지쓰기</a></li>
    </ul>
-    <section>
-        <h2>쪽지 내용</h2>
+
+    <article id="memo_view_contents">
+        <header>
+            <h1>쪽지 내용</h1>
+        </header>
        <ul id="memo_view_ul">
            <li class="memo_view_li">
                <span class="memo_view_subj"><?php echo $kind_str ?>사람</span>
@ -37,7 +40,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
        <p>
            <?php echo conv_content($memo['me_memo'], 0) ?>
        </p>
-    </section>
+    </article>
+
    <div class="win_btn">
        <?php if($prev_link) { ?>
        <a href="<?php echo $prev_link ?>">이전쪽지</a>
--- a/mobile/skin/member/basic/point.skin.php
+++ b/mobile/skin/member/basic/point.skin.php
@ -0,0 +1,81 @@
+<?php
+if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
+
+// add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨
+add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">', 0);
+?>
+
+<div id="point" class="new_win">
+    <h1 id="win_title"><?php echo $g5['title'] ?></h1>
+
+    <ul id="point_ul">
+        <?php
+        $sum_point1 = $sum_point2 = $sum_point3 = 0;
+
+        $sql = " select *
+                    {$sql_common}
+                    {$sql_order}
+                    limit {$from_record}, {$rows} ";
+        $result = sql_query($sql);
+        for ($i=0; $row=sql_fetch_array($result); $i++) {
+            $point1 = $point2 = 0;
+            if ($row['po_point'] > 0) {
+                $point1 = '+' .number_format($row['po_point']);
+                $sum_point1 += $row['po_point'];
+            } else {
+                $point2 = number_format($row['po_point']);
+                $sum_point2 += $row['po_point'];
+            }
+
+            $po_content = $row['po_content'];
+
+            $expr = '';
+//            if($row['po_expired'] == 1)
+                $expr = ' txt_expired';
+        ?>
+        <li>
+            <div class="point_wrap01">
+                <span class="point_date"><?php echo conv_date_format('y-m-d H시', $row['po_datetime']); ?></span>
+                <span class="point_log"><?php echo $po_content; ?></span>
+            </div>
+            <div class="point_wrap02">
+                <span class="point_expdate<?php echo $expr; ?>">
+                    <?php if ($row['po_expired'] == 1) { ?>
+                    만료<?php echo substr(str_replace('-', '', $row['po_expire_date']), 2); ?>
+                    <?php } else echo $row['po_expire_date'] == '9999-12-31' ? '&nbsp;' : $row['po_expire_date']; ?>
+                </span>
+                <span class="point_inout"><?php if ($point1) echo $point1; else echo $point2; ?></span>
+            </div>
+        </li>
+        <?php
+        }
+
+        if ($i == 0)
+            echo '<li class="empty_list">자료가 없습니다.</li>';
+        else {
+            if ($sum_point1 > 0)
+                $sum_point1 = "+" . number_format($sum_point1);
+            $sum_point2 = number_format($sum_point2);
+        }
+        ?>
+    </ul>
+
+    <div id="point_sum">
+        <div class="sum_row">
+            <span class="sum_tit">지급</span>
+            <b class="sum_val"><?php echo $sum_point1; ?></b>
+        </div>
+        <div class="sum_row">
+            <span class="sum_tit">사용</span>
+            <b class="sum_val"><?php echo $sum_point2; ?></b>
+        </div>
+        <div class="sum_row">
+            <span class="sum_tit">보유</span>
+            <b class="sum_val"><?php echo number_format($member['mb_point']); ?></b>
+        </div>
+    </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='); ?>
+
+    <div class="win_btn"><button type="button" onclick="javascript:window.close();">창닫기</button></div>
+</div>
--- a/mobile/skin/member/basic/scrap.skin.php
+++ b/mobile/skin/member/basic/scrap.skin.php
@ -8,29 +8,16 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
 <div id="scrap" class="new_win mbskin">
    <h1 id="win_title"><?php echo $g5['title'] ?></h1>

-    <div class="tbl_head01 tbl_wrap">
-        <table>
-        <caption>스크랩 목록</caption>
-        <thead>
-        <tr>
-            <th scope="col">게시판</th>
-            <th scope="col">제목</th>
-            <th scope="col">삭제</th>
-        </tr>
-        </thead>
-        <tbody>
+    <ul id="scrap_ul">
        <?php for ($i=0; $i<count($list); $i++) { ?>
-        <tr>
-            <td class="td_board"><a href="<?php echo $list[$i]['opener_href'] ?>" target="_blank" onclick="opener.document.location.href='<?php echo $list[$i]['opener_href'] ?>'; return false;"><?php echo $list[$i]['bo_subject'] ?></a></td>
-            <td><a href="<?php echo $list[$i]['opener_href_wr_id'] ?>" target="_blank" onclick="opener.document.location.href='<?php echo $list[$i]['opener_href_wr_id'] ?>'; return false;"><?php echo $list[$i]['subject'] ?></a></td>
-            <td class="td_mng"><a href="<?php echo $list[$i]['del_href']; ?>" onclick="del(this.href); return false;">삭제</a></td>
-        </tr>
+        <li>
+            <a href="<?php echo $list[$i]['opener_href'] ?>" target="_blank" class="scrap_board" onclick="opener.document.location.href='<?php echo $list[$i]['opener_href'] ?>'; return false;"><?php echo $list[$i]['bo_subject'] ?></a>
+            <a href="<?php echo $list[$i]['opener_href_wr_id'] ?>" target="_blank" class="scrap_link" onclick="opener.document.location.href='<?php echo $list[$i]['opener_href_wr_id'] ?>'; return false;"><?php echo $list[$i]['subject'] ?></a>
+            <a href="<?php echo $list[$i]['del_href']; ?>" class="scrap_del" onclick="del(this.href); return false;">삭제</a>
+        </li>
        <?php } ?>
-
-        <?php if ($i == 0) echo "<tr><td colspan=\"5\" class=\"empty_table\">자료가 없습니다.</td></tr>"; ?>
-        </tbody>
-        </table>
-    </div>
+        <?php if ($i == 0) echo "<li class=\"empty_list\">자료가 없습니다.</li>"; ?>
+    </ul>

    <?php echo get_paging($config['cf_mobile_pages'], $page, $total_page, "?$qstr&amp;page="); ?>

--- a/mobile/skin/member/basic/style.css
+++ b/mobile/skin/member/basic/style.css
@ -121,24 +121,47 @@
 #mb_login section div {text-align:right}

 /* 쪽지 */
-#memo_view section {padding:10px}
-#memo_view section h2 {width:0;height:0;font-size:0;line-height:0;overflow:hidden}
+#memo_view_contents {margin:0 auto 20px;width:90%}
+#memo_view_contents h1 {position:absolute;font-size:0;line-height:0;overflow:hidden}
 #memo_view_ul {margin:0;padding:0 0 10px;border-bottom:1px solid #eee;list-style:none}
 .memo_view_li {position:relative;padding:5px 0}
 .memo_view_subj {display:inline-block;width:65px}
 #memo_view_ul a {}
-#memo_view section p {min-height:150px;height:auto !important;height:150px}
+#memo_view p {padding:10px 0;min-height:150px;height:auto !important;height:150px;line-height:1.8em}
+
+#memo_list_ul {margin:0 20px;padding:0;border-top:1px solid #e9e9e9;list-style:none}
+#memo_list_ul li {position:relative;padding:10px 0;border-bottom:1px solid #e9e9e9}
+#memo_list_ul .memo_link {}
+#memo_list_ul .memo_send {position:absolute;top:10px;right:30px}
+#memo_list_ul .memo_read {font-size:0.95em;color:#666}
+#memo_list_ul .memo_del {position:absolute;top:10px;right:0}

 #memo_write #me_recv_mb_id {width:98%}
 #memo_write textarea {width:99%;height:100px}

 /* 스크랩 */
-#scrap td:nth-of-type(1) {width:150px}
-#scrap td:nth-last-of-type(1) {width:50px;text-align:center}
+#scrap_ul {margin:0 20px;padding:0;border-top:1px solid #e9e9e9;list-style:none}
+#scrap_ul li {position:relative;padding:10px 35px 10px 0;border-bottom:1px solid #e9e9e9}
+#scrap_ul .scrap_board {display:inline-block;margin:0 10px 0 0;font-weight:bold}
+#scrap_ul .scrap_del {position:absolute;top:10px;right:0}

 #scrap_do table {margin:0 0 10px;width:100%}
 #scrap_do textarea {width:99%;height:100px}

+/* 포인트 */
+#point_ul {margin:0 20px;padding:0;border-top:1px solid #e9e9e9;list-style:none}
+#point_ul li {position:relative;padding:10px 0;border-bottom:1px solid #e9e9e9}
+#point_ul .point_wrap01 {position:relative;padding:0 0 0 90px}
+#point_ul .point_wrap02 {margin:7px 0 0;text-align:right}
+#point_ul .point_date {position:absolute;top:0;left:0}
+
+#point_sum {margin:0 20px}
+#point_sum .sum_row {margin:0 0 1px;background:#f2f5f9}
+#point_sum .sum_row:after {display:block;visibility:hidden;clear:both;content:''}
+#point_sum .sum_tit, #point_sum .sum_val {display:block;margin:0 0 1px;padding:10px}
+#point_sum .sum_tit {clear:both;float:left;width:100px}
+#point_sum .sum_val {float:right}
+
 /* 회원 비밀번호 확인 */
 #mb_confirm {margin:30px 0}
 #mb_confirm h1 {margin:0 0 15px;padding:0 10px;font-size:1.3em}
--- a/mobile/tail.php
+++ b/mobile/tail.php
@ -6,23 +6,6 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가

 <hr>

-<nav id="gnb">
-    <script>$('#gnb').addClass('gnb_js');</script>
-    <h2>메인메뉴</h2>
-    <ul>
-        <?php
-        $sql = " select * from {$g5['group_table']} where gr_show_menu = 1 and gr_device <> 'pc' order by gr_order ";
-        $result = sql_query($sql);
-        for ($gi=0; $row=sql_fetch_array($result); $gi++) { // gi 는 group index
-        ?>
-        <li><a href="<?php echo G5_BBS_URL ?>/group.php?gr_id=<?php echo $row['gr_id'] ?>"><?php echo $row['gr_subject'] ?></a></li>
-        <?php } ?>
-        <?php if ($gi == 0) { ?><li class="gnb_empty">생성된 메뉴가 없습니다.</a><?php } ?>
-    </ul>
-</nav>
-
-<hr>
-
 <?php echo poll('basic'); // 설문조사 ?>

 <hr>
--- a/plugin/okname/hpcert2.php
+++ b/plugin/okname/hpcert2.php
@ -26,11 +26,15 @@ if($resultCd != 'B000') {
 * 모듈 호출    ; 생년월일 본인 확인서비스 결과 데이터를 복호화한다.
 **************************************************************************/
 $encInfo = $_POST['encInfo'];
+if(preg_match('~[^0-9a-zA-Z+/=]~', $encInfo, $match)) {echo "입력 값 확인이 필요합니다"; exit;}

 //KCB서버 공개키
 $WEBPUBKEY = trim($_POST['WEBPUBKEY']);
+if(preg_match('~[^0-9a-zA-Z+/=]~', $WEBPUBKEY, $match)) {echo "입력 값 확인이 필요합니다"; exit;}
+
 //KCB서버 서명값
 $WEBSIGNATURE = trim($_POST['WEBSIGNATURE']);
+if(preg_match('~[^0-9a-zA-Z+/=]~', $WEBSIGNATURE, $match)) {echo "입력 값 확인이 필요합니다"; exit;}

 // ########################################################################
 // # 암호화키 파일 설정 (절대경로) - 파일은 주어진 파일명으로 자동 생성 됨
--- a/plugin/okname/ipin2.php
+++ b/plugin/okname/ipin2.php
@ -4,11 +4,15 @@ include_once('./ipin.config.php');

 //아이핀팝업에서 조회한 PERSONALINFO이다.
@$encPsnlInfo = $_POST["encPsnlInfo"];
+if(preg_match('~[^0-9a-zA-Z+/=]~', $encPsnlInfo, $match)) {echo "입력 값 확인이 필요합니다"; exit;}

 //KCB서버 공개키
@$WEBPUBKEY = trim($_POST["WEBPUBKEY"]);
+if(preg_match('~[^0-9a-zA-Z+/=]~', $WEBPUBKEY, $match)) {echo "입력 값 확인이 필요합니다"; exit;}
+
 //KCB서버 서명값
@$WEBSIGNATURE = trim($_POST["WEBSIGNATURE"]);
+if(preg_match('~[^0-9a-zA-Z+/=]~', $WEBSIGNATURE, $match)) {echo "입력 값 확인이 필요합니다"; exit;}

 //아이핀 서버와 통신을 위한 키파일 생성
 // 파라미터 정의
--- a/skin/faq/basic/list.skin.php
+++ b/skin/faq/basic/list.skin.php
@ -0,0 +1,132 @@
+<?php
+if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
+
+// add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨
+add_stylesheet('<link rel="stylesheet" href="'.$faq_skin_url.'/style.css">', 0);
+
+if ($admin_href)
+    echo '<div class="faq_admin"><a href="'.$admin_href.'" class="btn_admin">FAQ 수정</a></div>';
+?>
+
+<!-- FAQ 시작 { -->
+<?php
+if ($himg_src)
+    echo '<div id="faq_himg" class="faq_img"><img src="'.$himg_src.'" alt=""></div>';
+
+// 상단 HTML
+echo '<div id="faq_hhtml">'.stripslashes($fm['fm_head_html']).'</div>';
+?>
+
+<form name="faq_search_form" method="get">
+<input type="hidden" name="fm_id" value="<?php echo $fm_id;?>">
+<label for="stx" class="sound_only">검색어<strong class="sound_only"> 필수</strong></label>
+<input type="text" name="stx" value="<?php echo $stx;?>" required id="stx" class="frm_input required" size="15" maxlength="15">
+<input type="submit" value="검색" class="btn_submit">
+</form>
+
+<?php
+if( count($faq_master_list) ){
+?>
+<nav id="bo_cate">
+    <h2>자주하시는질문 분류</h2>
+    <ul id="bo_cate_ul">
+        <?php
+        foreach( $faq_master_list as $v ){
+            $category_msg = '';
+            $category_option = '';
+            if($v['fm_id'] == $fm_id){ // 현재 선택된 카테고리라면
+                $category_option = ' id="bo_cate_on"';
+                $category_msg = '<span class="sound_only">열린 분류 </span>';
+            }
+        ?>
+        <li><a href="<?php echo $category_href;?>?fm_id=<?php echo $v['fm_id'].$category_stx;?>" <?php echo $category_option;?> ><?php echo $category_msg.$v['fm_subject'];?></a></li>
+        <?php
+        }
+        ?>
+    </ul>
+</nav>
+<?php } ?>
+
+<div id="faq_wrap" class="faq_<?php echo $fm_id; ?>">
+    <?php // FAQ 내용
+    if( count($faq_list) ){
+    ?>
+    <section id="faq_con">
+        <h2><?php echo $g5['title']; ?> 목록</h2>
+        <ol>
+            <?php
+            foreach($faq_list as $key=>$v){
+                if(empty($v))
+                    continue;
+            ?>
+            <li>
+                <h3><a href="#none" onclick="return faq_open(this);"><?php echo conv_content($v['fa_subject'], 1); ?></a></h3>
+                <div class="con_inner">
+                    <?php echo conv_content($v['fa_content'], 1); ?>
+                    <button type="button" class="btn_faq_close">닫기</button>
+                </div>
+            </li>
+            <?php
+            }
+            ?>
+        </ol>
+    </section>
+    <?php
+
+    } else {
+        if($stx){
+            echo '<p>검색된 게시물이 없습니다.</p>';
+        } else {
+            echo '<p>등록된 FAQ가 없습니다.';
+            if($is_admin)
+                echo '<br><a href="'.G5_ADMIN_URL.'/faqmasterlist.php">FAQ를 새로 등록하시려면 FAQ관리</a> 메뉴를 이용하십시오.';
+            echo '</p>';
+        }
+    }
+    ?>
+</div>
+
+<?php echo get_paging($page_rows, $page, $total_page, $_SERVER['PHP_SELF'].'?'.$qstr.'&amp;page='); ?>
+
+<?php
+// 하단 HTML
+echo '<div id="faq_thtml">'.stripslashes($fm['fm_tail_html']).'</div>';
+
+if ($timg_src)
+    echo '<div id="faq_timg" class="faq_img"><img src="'.$timg_src.'" alt=""></div>';
+?>
+<!-- } FAQ 끝 -->
+
+<?php
+if ($admin_href)
+    echo '<div class="faq_admin"><a href="'.$admin_href.'" class="btn_admin">FAQ 수정</a></div>';
+?>
+
+<script src="<?php echo G5_JS_URL; ?>/viewimageresize.js"></script>
+<script>
+$(function() {
+    $(".btn_faq_close").on("click", function() {
+        $(this).closest(".con_inner").slideToggle();
+    });
+});
+
+function faq_open(el)
+{
+    var $con = $(el).closest("li").find(".con_inner");
+
+    if($con.is(":visible")) {
+        $con.slideUp();
+    } else {
+        $("#faq_con .con_inner:visible").css("display", "none");
+
+        $con.slideDown(
+            function() {
+                // 이미지 리사이즈
+                $con.viewimageresize2();
+            }
+        );
+    }
+
+    return false;
+}
+</script>
--- a/skin/faq/basic/style.css
+++ b/skin/faq/basic/style.css
@ -0,0 +1,10 @@
+@charset "utf-8";
+
+#bo_cate h2 {position:absolute;font-size:0;line-height:0;overflow:hidden}
+#bo_cate ul {margin-bottom:10px;padding-left:1px;width:728px;zoom:1}
+#bo_cate ul:after {display:block;visibility:hidden;clear:both;content:""}
+#bo_cate li {float:left;margin-bottom:-1px}
+#bo_cate a {display:block;position:relative;margin-left:-1px;padding:6px 0 5px;width:90px;border:1px solid #ddd;background:#f7f7f7;color:#888;text-align:center;letter-spacing:-0.1em;line-height:1.2em;cursor:pointer}
+#bo_cate a:focus, #bo_cate a:hover, #bo_cate a:active {text-decoration:none}
+#bo_cate #bo_cate_on {z-index:2;border:1px solid #565e60;background:#fff;color:#565e60;font-weight:bold}
+
--- a/skin/member/basic/memo.skin.php
+++ b/skin/member/basic/memo.skin.php
@ -32,8 +32,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
        <?php for ($i=0; $i<count($list); $i++) {  ?>
        <tr>
            <td><?php echo $list[$i]['name'] ?></td>
-            <td class="td_datetime"><a href="<?php echo $list[$i]['view_href'] ?>"><?php echo $list[$i]['send_datetime'] ?></font></td>
-            <td class="td_datetime"><a href="<?php echo $list[$i]['view_href'] ?>"><?php echo $list[$i]['read_datetime'] ?></font></td>
+            <td class="td_datetime"><a href="<?php echo $list[$i]['view_href'] ?>"><?php echo $list[$i]['send_datetime'] ?></a></td>
+            <td class="td_datetime"><a href="<?php echo $list[$i]['view_href'] ?>"><?php echo $list[$i]['read_datetime'] ?></a></td>
            <td class="td_mng"><a href="<?php echo $list[$i]['del_href'] ?>" onclick="del(this.href); return false;">삭제</a></td>
        </tr>
        <?php }  ?>
--- a/skin/member/basic/point.skin.php
+++ b/skin/member/basic/point.skin.php
@ -0,0 +1,88 @@
+<?php
+if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
+
+// add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨
+add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">', 0);
+?>
+
+<div id="point" class="new_win">
+    <h1 id="win_title"><?php echo $g5['title'] ?></h1>
+
+    <div class="tbl_head01 tbl_wrap">
+        <table>
+        <caption>포인트 사용내역 목록</caption>
+        <thead>
+        <tr>
+            <th scope="col">일시</th>
+            <th scope="col">내용</th>
+            <th scope="col">만료일</th>
+            <th scope="col">지급포인트</th>
+            <th scope="col">사용포인트</th>
+        </tr>
+        </thead>
+        <tbody>
+        <?php
+        $sum_point1 = $sum_point2 = $sum_point3 = 0;
+
+        $sql = " select *
+                    {$sql_common}
+                    {$sql_order}
+                    limit {$from_record}, {$rows} ";
+        $result = sql_query($sql);
+        for ($i=0; $row=sql_fetch_array($result); $i++) {
+            $point1 = $point2 = 0;
+            if ($row['po_point'] > 0) {
+                $point1 = '+' .number_format($row['po_point']);
+                $sum_point1 += $row['po_point'];
+            } else {
+                $point2 = number_format($row['po_point']);
+                $sum_point2 += $row['po_point'];
+            }
+
+            $po_content = $row['po_content'];
+
+            $expr = '';
+            if($row['po_expired'] == 1)
+                $expr = ' txt_expired';
+        ?>
+        <tr>
+            <td class="td_datetime"><?php echo $row['po_datetime']; ?></td>
+            <td><?php echo $po_content; ?></td>
+            <td class="td_date<?php echo $expr; ?>">
+                <?php if ($row['po_expired'] == 1) { ?>
+                만료<?php echo substr(str_replace('-', '', $row['po_expire_date']), 2); ?>
+                <?php } else echo $row['po_expire_date'] == '9999-12-31' ? '&nbsp;' : $row['po_expire_date']; ?>
+            </td>
+            <td class="td_numbig"><?php echo $point1; ?></td>
+            <td class="td_numbig"><?php echo $point2; ?></td>
+        </tr>
+        <?php
+        }
+
+        if ($i == 0)
+            echo '<tr><td colspan="5" class="empty_table">자료가 없습니다.</td></tr>';
+        else {
+            if ($sum_point1 > 0)
+                $sum_point1 = "+" . number_format($sum_point1);
+            $sum_point2 = number_format($sum_point2);
+        }
+        ?>
+        </tbody>
+        <tfoot>
+        <tr>
+            <th scope="row" colspan="3">소계</th>
+            <td><?php echo $sum_point1; ?></td>
+            <td><?php echo $sum_point2; ?></td>
+        </tr>
+        <tr>
+            <th scope="row" colspan="3">보유포인트</th>
+            <td colspan="2"><?php echo number_format($member['mb_point']); ?></td>
+        </tr>
+        </tfoot>
+        </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='); ?>
+
+    <div class="win_btn"><button type="button" onclick="javascript:window.close();">창닫기</button></div>
+</div>
--- a/skin/member/basic/style.css
+++ b/skin/member/basic/style.css
@ -133,8 +133,10 @@
 /* 쪽지 */
 #memo_view_contents {margin:0 auto 20px;width:90%}
 #memo_view_contents h1 {position:absolute;font-size:0;line-height:0;overflow:hidden}
+#memo_view_ul {margin:0;padding:0 0 10px;border-bottom:1px solid #eee;list-style:none}
+.memo_view_li {position:relative;padding:5px 0}
 .memo_view_subj {display:inline-block;width:65px}
-#memo_view section p {padding:10px;min-height:150px;height:auto !important;height:150px;background:#fff}
+#memo_view p {padding:10px 0;min-height:150px;height:auto !important;height:150px;background:#fff;line-height:1.8em}

 #memo_write textarea {height:100px}