From 2e8c7a9acd13216494fab8e37179ec2c8cc7a726 Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 14 Mar 2014 11:52:12 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B7=B8=EB=A3=B9=20=EA=B2=8C=EC=8B=9C?= =?UTF-8?q?=ED=8C=90=20=EB=A9=94=EB=89=B4=EB=B3=B4=EC=9D=B4=EA=B8=B0=20?= =?UTF-8?q?=ED=95=84=EB=93=9C=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/board_copy_update.php | 1 - adm/board_form.php | 19 ------------------- adm/board_form_update.php | 3 --- adm/board_list.php | 7 +------ adm/board_list_update.php | 1 - adm/boardgroup_form.php | 17 +++-------------- adm/boardgroup_form_update.php | 3 +-- adm/boardgroup_list.php | 7 +------ adm/boardgroup_list_update.php | 3 +-- install/gnuboard5.sql | 19 +++++++++++++++++-- install/install_db.php | 1 + 11 files changed, 25 insertions(+), 56 deletions(-) diff --git a/adm/board_copy_update.php b/adm/board_copy_update.php index 5636b1cae..b17a19b91 100644 --- 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]}', diff --git a/adm/board_form.php b/adm/board_form.php index 6e9d2a54c..ecbea30f1 100644 --- 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 .= ''; - - - - - > - 사용 - - - - - - - - diff --git a/adm/board_form_update.php b/adm/board_form_update.php index 99ff23265..e7c374d0e 100644 --- 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']."' "; diff --git a/adm/board_list.php b/adm/board_list.php index 96de20f05..7a9639926 100644 --- a/adm/board_list.php +++ b/adm/board_list.php @@ -51,7 +51,7 @@ $listall = '전체목록
@@ -107,7 +107,6 @@ $colspan = 16; 다운P포인트 SNS
사용 검색
사용 - 메뉴
보임 출력
순서 접속기기 관리 @@ -174,10 +173,6 @@ $colspan = 16; > - - - > - diff --git a/adm/board_list_update.php b/adm/board_list_update.php index 0cf509bd7..9d8850660 100644 --- 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); diff --git a/adm/boardgroup_form.php b/adm/boardgroup_form.php index 57b71054f..755c26c3c 100644 --- 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'); - class=" alnum_ frm_input" maxlength="10"> - class=" alnum_ frm_input" maxlength="10"> + 게시판그룹 바로가기'; ?> @@ -112,14 +109,6 @@ include_once('./admin.head.php'); ?> - - - - - > - 사용 - - 여분필드 diff --git a/adm/boardgroup_form_update.php b/adm/boardgroup_form_update.php index 5f55247c5..75af99927 100644 --- 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 = '' "; diff --git a/adm/boardgroup_list.php b/adm/boardgroup_list.php index ff14489dd..c3280883d 100644 --- a/adm/boardgroup_list.php +++ b/adm/boardgroup_list.php @@ -55,7 +55,7 @@ $listall = '처음'; $g5['title'] = '게시판그룹설정'; include_once('./admin.head.php'); -$colspan = 11; +$colspan = 10; ?>
@@ -105,7 +105,6 @@ $colspan = 11; 게시판 접근
사용 접근
회원수 - 메뉴
보임 출력
순서 접속기기 관리 @@ -153,10 +152,6 @@ $colspan = 11; value="1" id="gr_use_access_"> - - - value="1" id="gr_show_menu_"> - diff --git a/adm/boardgroup_list_update.php b/adm/boardgroup_list_update.php index 32c1e5aea..e7f9816eb 100644 --- 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') diff --git a/install/gnuboard5.sql b/install/gnuboard5.sql index 4d80e68ad..19f858b38 100644 --- 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 '', @@ -864,3 +862,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; diff --git a/install/install_db.php b/install/install_db.php index 7032bb7b1..19aab665d 100644 --- 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',