From ad5bd259856ba4b0ed9d1b04790903270bf96d1c Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 15 Feb 2013 17:19:27 +0900 Subject: [PATCH 1/6] =?UTF-8?q?=EC=8A=A4=ED=81=AC=EB=A6=BD=ED=8A=B8?= =?UTF-8?q?=EC=97=86=EC=9D=B4=20=ED=8F=BC=EC=B2=98=EB=A6=AC=ED=95=98?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/point_list.php | 10 +--------- adm/poll_form.php | 12 ++---------- 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/adm/point_list.php b/adm/point_list.php index ac163ec8a..6233f12b5 100644 --- a/adm/point_list.php +++ b/adm/point_list.php @@ -184,7 +184,7 @@ function point_clear() -
+ @@ -206,14 +206,6 @@ function point_clear()
- - diff --git a/adm/poll_form.php b/adm/poll_form.php index 96d5e773a..7ffe55d27 100644 --- a/adm/poll_form.php +++ b/adm/poll_form.php @@ -21,7 +21,7 @@ include_once('./admin.head.php'); ?>
-
+ @@ -97,19 +97,11 @@ include_once('./admin.head.php');
- + 목록
- - From 7c02b024301ec2ec7de835eaf9e46c4b6c551aa8 Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 15 Feb 2013 17:39:56 +0900 Subject: [PATCH 2/6] =?UTF-8?q?=ED=88=AC=ED=91=9C=EB=AA=A9=EB=A1=9D=20?= =?UTF-8?q?=EC=84=A0=ED=83=9D=EC=82=AD=EC=A0=9C=EA=B8=B0=EB=8A=A5=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/poll_delete.php | 27 ++++++++++++++++++++++++++ adm/poll_list.php | 47 ++++++++++++++++++++++----------------------- 2 files changed, 50 insertions(+), 24 deletions(-) create mode 100644 adm/poll_delete.php diff --git a/adm/poll_delete.php b/adm/poll_delete.php new file mode 100644 index 000000000..1252e4329 --- /dev/null +++ b/adm/poll_delete.php @@ -0,0 +1,27 @@ + \ No newline at end of file diff --git a/adm/poll_list.php b/adm/poll_list.php index 6dadeaf79..3677bb457 100644 --- a/adm/poll_list.php +++ b/adm/poll_list.php @@ -76,6 +76,13 @@ $colspan = 6;

투표목록

+
+ + + + + + @@ -101,8 +108,7 @@ $colspan = 6; @@ -123,8 +129,8 @@ $colspan = 6;
-
+ @@ -135,30 +141,23 @@ if (isset($stx)) ?> - - - - - - - - - - - \ No newline at end of file From 4a24af57db781fb33897f12d2f7cc777a82220e7 Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 15 Feb 2013 17:49:43 +0900 Subject: [PATCH 3/6] =?UTF-8?q?=EB=A9=94=EC=9D=BC=EB=AA=A9=EB=A1=9D=20?= =?UTF-8?q?=EC=84=A0=ED=83=9D=EC=82=AD=EC=A0=9C=20=EA=B8=B0=EB=8A=A5=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/mail_delete.php | 24 ++++++++++++++++++++++++ adm/mail_list.php | 40 +++++++++++++++++----------------------- 2 files changed, 41 insertions(+), 23 deletions(-) create mode 100644 adm/mail_delete.php diff --git a/adm/mail_delete.php b/adm/mail_delete.php new file mode 100644 index 000000000..cc8ce6b30 --- /dev/null +++ b/adm/mail_delete.php @@ -0,0 +1,24 @@ + \ No newline at end of file diff --git a/adm/mail_list.php b/adm/mail_list.php index 4984b6d91..96658ebc5 100644 --- a/adm/mail_list.php +++ b/adm/mail_list.php @@ -33,6 +33,7 @@ $colspan = 6; 현재 등록된 메일은 총 건입니다.

+
- - +
@@ -57,8 +58,7 @@ $colspan = 6; @@ -78,34 +78,28 @@ $colspan = 6;
-
+ - - - - - - - - - - \ No newline at end of file From a16adcb7b3cc72163a83a893cf2f82b2c8724b76 Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 15 Feb 2013 17:58:31 +0900 Subject: [PATCH 4/6] =?UTF-8?q?=EC=9D=B8=EA=B8=B0=EA=B2=80=EC=83=89?= =?UTF-8?q?=EC=96=B4=20=EC=84=A0=ED=83=9D=EC=82=AD=EC=A0=9C=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/popular_list.php | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/adm/popular_list.php b/adm/popular_list.php index 486617e63..25b5f365b 100644 --- a/adm/popular_list.php +++ b/adm/popular_list.php @@ -6,11 +6,10 @@ auth_check($auth[$sub_menu], 'r'); // 체크된 자료 삭제 if (isset($_POST['chk']) && is_array($_POST['chk'])) { - for ($i=0; $i @@ -137,7 +135,6 @@ var list_delete_php = 'popular_list.php';
-
@@ -151,6 +148,24 @@ if (isset($stx)) echo ''; ?> + + From e34a2128db3eda33b08894b10218aacf17482502 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Fri, 15 Feb 2013 18:16:11 +0900 Subject: [PATCH 5/6] =?UTF-8?q?bo=5Fuse=20=EB=A5=BC=20bo=5Fpc=5Fmobile=20?= =?UTF-8?q?=EB=A1=9C=20=EB=AA=85=ED=99=95=ED=95=98=EA=B2=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/board_form.php | 13 ++++++------- adm/board_form_update.php | 2 +- adm/board_list.php | 19 +++++++++---------- adm/board_list_update.php | 2 +- bbs/board.php | 4 +++- bbs/write.php | 3 ++- install/gnuboard4s.sql | 1 + lib/common.lib.php | 15 +++++++++++++++ 8 files changed, 38 insertions(+), 21 deletions(-) diff --git a/adm/board_form.php b/adm/board_form.php index bfb257ed5..85bb5bd7f 100644 --- a/adm/board_form.php +++ b/adm/board_form.php @@ -119,14 +119,13 @@ $pg_anchor = "
 - + - - - + + + @@ -156,11 +156,10 @@ var list_delete_php = 'board_list_delete.php'; diff --git a/adm/board_list_update.php b/adm/board_list_update.php index e9a456e79..ea2670004 100644 --- a/adm/board_list_update.php +++ b/adm/board_list_update.php @@ -30,7 +30,7 @@ if ($_POST['btn_submit'] == "선택수정") { $sql = " update {$g4['board_table']} set gr_id = '{$_POST['gr_id'][$k]}', bo_subject = '{$_POST['bo_subject'][$k]}', - bo_use = '{$_POST['bo_use'][$k]}', + bo_pc_mobile = '{$_POST['bo_pc_mobile'][$k]}', bo_skin = '{$_POST['bo_skin'][$k]}', bo_read_point = '{$_POST['bo_read_point'][$k]}', bo_write_point = '{$_POST['bo_write_point'][$k]}', diff --git a/bbs/board.php b/bbs/board.php index 5b7c31973..e29d067be 100644 --- a/bbs/board.php +++ b/bbs/board.php @@ -2,9 +2,11 @@ include_once('./_common.php'); if (!$board['bo_table']) { - alert('존재하지 않는 게시판입니다.', G4_PATH); + alert('존재하지 않는 게시판입니다.', G4_URL); } +check_pc_mobile($board['bo_pc_mobile']); + if (isset($write['wr_is_comment']) && $write['wr_is_comment']) { goto_url('./board.php?bo_table='.$bo_table.'&wr_id='.$write['wr_parent'].'#c_'.$wr_id); } diff --git a/bbs/write.php b/bbs/write.php index 3341aa8f3..ca9304d5f 100644 --- a/bbs/write.php +++ b/bbs/write.php @@ -6,7 +6,6 @@ include_once(G4_GCAPTCHA_PATH.'/gcaptcha.lib.php'); set_session('ss_bo_table', $bo_table); set_session('ss_wr_id', $wr_id); -// 090713 if (!$board['bo_table']) { alert('존재하지 않는 게시판입니다.', G4_URL); } @@ -15,6 +14,8 @@ if (!$bo_table) { alert("bo_table 값이 넘어오지 않았습니다.\\nwrite.php?bo_table=code 와 같은 방식으로 넘겨 주세요.", G4_URL); } +check_pc_mobile($board['bo_pc_mobile']); + @include_once (G4_PATH.'/skin/board/write.head.skin.php'); @include_once ($board_skin_path.'/write.head.skin.php'); diff --git a/install/gnuboard4s.sql b/install/gnuboard4s.sql index 5a4a5c6db..80e0e845d 100644 --- a/install/gnuboard4s.sql +++ b/install/gnuboard4s.sql @@ -23,6 +23,7 @@ CREATE TABLE IF NOT EXISTS `g4s_board` ( `bo_table` varchar(20) NOT NULL default '', `gr_id` varchar(255) NOT NULL default '', `bo_subject` varchar(255) NOT NULL default '', + `bo_pc_mobile` enum('both','pc','mobile') NOT NULL DEFAULT 'both', `bo_admin` varchar(255) NOT NULL default '', `bo_list_level` tinyint(4) NOT NULL default '0', `bo_read_level` tinyint(4) NOT NULL default '0', diff --git a/lib/common.lib.php b/lib/common.lib.php index a66e5d541..0c9a16cca 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -1716,4 +1716,19 @@ function iconv_euckr($str) { return iconv('utf-8', 'euc-kr', $str); } + + +// PC 또는 모바일 사용인지를 검사 +function check_pc_mobile($pc_mobile) +{ + global $is_admin; + + if ($is_admin) return; + + if ($pc_mobile=='pc' && G4_IS_MOBILE) { + alert('PC 전용 게시판입니다.', G4_URL); + } else if ($pc_mobile=='mobile' && !G4_IS_MOBILE) { + alert('모바일 전용 게시판입니다.', G4_URL); + } +} ?> \ No newline at end of file From cdbdf997ea2689cb2c5613ff14f3f6b0bcc8ba0f Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 15 Feb 2013 18:20:24 +0900 Subject: [PATCH 6/6] =?UTF-8?q?=EA=B2=8C=EC=8B=9C=ED=8C=90=EA=B7=B8?= =?UTF-8?q?=EB=A3=B9=20=EC=84=A0=ED=83=9D=EC=88=98=EC=A0=95,=20=EC=84=A0?= =?UTF-8?q?=ED=83=9D=EC=82=AD=EC=A0=9C=20=EA=B8=B0=EB=8A=A5=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/boardgroup_list.php | 12 ++++------ adm/boardgroup_list_update.php | 42 +++++++++++++++++++++++----------- 2 files changed, 34 insertions(+), 20 deletions(-) diff --git a/adm/boardgroup_list.php b/adm/boardgroup_list.php index 25bea246e..49065e2ba 100644 --- a/adm/boardgroup_list.php +++ b/adm/boardgroup_list.php @@ -94,12 +94,13 @@ var list_update_php = "./boardgroup_list_update.php"; 접근사용 옵션은 해당 그룹에 속한 모든 게시판에 적용됩니다.

-
+ +
- - +
- - +  
- - + + + diff --git a/adm/board_form_update.php b/adm/board_form_update.php index 39ce91d57..40ea10943 100644 --- a/adm/board_form_update.php +++ b/adm/board_form_update.php @@ -53,7 +53,7 @@ $bo_category_list = str_replace($src_char, $dst_char, $bo_category_list); $sql_common = " gr_id = '{$_POST['gr_id']}', bo_subject = '{$_POST['bo_subject']}', - bo_use = '{$_POST['bo_use']}', + bo_pc_mobile = '{$_POST['bo_pc_mobile']}', bo_admin = '{$_POST['bo_admin']}', bo_list_level = '{$_POST['bo_list_level']}', bo_read_level = '{$_POST['bo_read_level']}', diff --git a/adm/board_list.php b/adm/board_list.php index d6bf584a2..efa98620e 100644 --- a/adm/board_list.php +++ b/adm/board_list.php @@ -4,13 +4,13 @@ include_once('./_common.php'); auth_check($auth[$sub_menu], 'r'); -if (!isset($board['bo_use'])) { +if (!isset($board['bo_pc_mobile'])) { // 게시판 사용 필드 추가 // both : pc, mobile 둘다 사용 // pc : pc 전용 사용 // mobile : mobile 전용 사용 // none : 사용 안함 - sql_query(" ALTER TABLE `{$g4['board_table']}` ADD `bo_use` ENUM( 'both', 'pc', 'mobile', 'none' ) NOT NULL DEFAULT 'both' AFTER `bo_subject` ", false); + sql_query(" ALTER TABLE `{$g4['board_table']}` ADD `bo_pc_mobile` ENUM( 'both', 'pc', 'mobile' ) NOT NULL DEFAULT 'both' AFTER `bo_subject` ", false); } $sql_common = " from {$g4['board_table']} a "; @@ -116,9 +116,9 @@ var list_delete_php = 'board_list_delete.php'; 쓰기P포인트 댓글P포인트 다운P포인트검색
사용		검색
순서		선택검색
사용		검색
순서		접속기기 관리
- + + +
@@ -136,8 +137,7 @@ var list_update_php = "./boardgroup_list_update.php";
- - + @@ -172,10 +172,8 @@ var list_update_php = "./boardgroup_list_update.php";
- - - - + + 게시판그룹 추가
diff --git a/adm/boardgroup_list_update.php b/adm/boardgroup_list_update.php index fb2054a0f..cd263604c 100644 --- a/adm/boardgroup_list_update.php +++ b/adm/boardgroup_list_update.php @@ -6,20 +6,36 @@ check_demo(); auth_check($auth[$sub_menu], 'w'); -for ($i=0; $i