From 2b6603cb5781bc1ab15968420f14f8f290a84886 Mon Sep 17 00:00:00 2001 From: chicpro Date: Tue, 5 Mar 2013 10:12:42 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=ED=91=9C=EC=8B=9C=EC=88=98=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/config_form.php | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/adm/config_form.php b/adm/config_form.php index 02cdc82d4..730a114a1 100644 --- a/adm/config_form.php +++ b/adm/config_form.php @@ -18,10 +18,10 @@ if (!isset($config['cf_include_index'])) { } if (!isset($config['cf_mobile_new_skin'])) { - sql_query(" ALTER TABLE `{$g4['config_table']}` - ADD `cf_mobile_new_skin` VARCHAR(255) NOT NULL AFTER `cf_memo_send_point`, - ADD `cf_mobile_search_skin` VARCHAR(255) NOT NULL AFTER `cf_mobile_new_skin`, - ADD `cf_mobile_connect_skin` VARCHAR(255) NOT NULL AFTER `cf_mobile_search_skin`, + sql_query(" ALTER TABLE `{$g4['config_table']}` + ADD `cf_mobile_new_skin` VARCHAR(255) NOT NULL AFTER `cf_memo_send_point`, + ADD `cf_mobile_search_skin` VARCHAR(255) NOT NULL AFTER `cf_mobile_new_skin`, + ADD `cf_mobile_connect_skin` VARCHAR(255) NOT NULL AFTER `cf_mobile_search_skin`, ADD `cf_mobile_member_skin` VARCHAR(255) NOT NULL AFTER `cf_mobile_connect_skin` ", true); } @@ -30,6 +30,12 @@ if(!isset($config['cf_adult_check'])) { ADD `cf_adult_check` TINYINT(4) NOT NULL DEFAULT '0' AFTER `cf_memo_send_point` ", TRUE); } +if(!isset($config['cf_mobile_pages'])) { + sql_query(" ALTER TABLE `{$g4['config_table']}` + ADD `cf_mobile_pages` INT(11) NOT NULL DEFAULT '0' AFTER `cf_write_pages` ", TRUE); + sql_query(" UPDATE `{$g4['config_table']}` SET cf_mobile_pages = '5' ", TRUE); +} + $g4['title'] = '환경설정'; include_once ('./admin.head.php'); @@ -307,6 +313,10 @@ $pg_anchor = " 페이지씩 표시 + + + 페이지씩 표시 + From fbfe68bc023d241ce52a30f69eac939a5ab9be9a Mon Sep 17 00:00:00 2001 From: chicpro Date: Tue, 5 Mar 2013 10:12:51 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=ED=91=9C=EC=8B=9C=EC=88=98=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/config_form_update.php | 1 + 1 file changed, 1 insertion(+) diff --git a/adm/config_form_update.php b/adm/config_form_update.php index 00c864d21..a2dbfe816 100644 --- a/adm/config_form_update.php +++ b/adm/config_form_update.php @@ -44,6 +44,7 @@ $sql = " update {$g4['config_table']} cf_search_bgcolor = '{$_POST['cf_search_bgcolor']}', cf_search_color = '{$_POST['cf_search_color']}', cf_write_pages = '{$_POST['cf_write_pages']}', + cf_mobile_pages = '{$_POST['cf_mobile_pages']}', cf_link_target = '{$_POST['cf_link_target']}', cf_delay_sec = '{$_POST['cf_delay_sec']}', cf_filter = '{$_POST['cf_filter']}', From bf120c4d1287dca79816a8466b87cfcc8959d640 Mon Sep 17 00:00:00 2001 From: chicpro Date: Tue, 5 Mar 2013 10:13:57 +0900 Subject: [PATCH 3/4] =?UTF-8?q?write=5Fpages=20=EC=B2=98=EB=A6=AC=EC=97=90?= =?UTF-8?q?=20=EB=AA=A8=EB=B0=94=EC=9D=BC=ED=8E=98=EC=9D=B4=EC=A7=80=20?= =?UTF-8?q?=EC=88=98=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/list.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bbs/list.php b/bbs/list.php index 09e84a3b9..77a8bc3b4 100644 --- a/bbs/list.php +++ b/bbs/list.php @@ -18,7 +18,7 @@ if ($board['bo_use_category']) { $category = trim($categories[$i]); if ($category=='') continue; $category_option .= '
    • '; } @@ -137,7 +137,7 @@ while ($row = sql_fetch_array($result)) $k++; } -$write_pages = get_paging($config['cf_write_pages'], $page, $total_page, './board.php?bo_table='.$bo_table.$qstr.'&page='); +$write_pages = get_paging(G4_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, './board.php?bo_table='.$bo_table.$qstr.'&page='); $list_href = ''; $prev_part_href = ''; @@ -149,13 +149,13 @@ if ($sca || $stx) { $prev_spt = $spt - $config['cf_search_part']; if (isset($min_spt) && $prev_spt >= $min_spt) { $prev_part_href = './board.php?bo_table='.$bo_table.$qstr.'&spt='.$prev_spt.'&page=1'; - $write_pages = page_insertbefore($write_pages, '이전검색'); + $write_pages = page_insertbefore($write_pages, '이전검색'); } $next_spt = $spt + $config['cf_search_part']; if ($next_spt < 0) { $next_part_href = './board.php?bo_table='.$bo_table.$qstr.'&spt='.$next_spt.'&page=1'; - $write_pages = page_insertafter($write_pages, '다음검색'); + $write_pages = page_insertafter($write_pages, '다음검색'); } } From 44e072c96c8aa965c7ba5779522553b3af2b8e51 Mon Sep 17 00:00:00 2001 From: chicpro Date: Tue, 5 Mar 2013 10:14:19 +0900 Subject: [PATCH 4/4] =?UTF-8?q?cf=5Fmobile=5Fpages=20=ED=95=84=EB=93=9C=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 --- install/gnuboard4s.sql | 1 + install/install_db.php | 1 + 2 files changed, 2 insertions(+) diff --git a/install/gnuboard4s.sql b/install/gnuboard4s.sql index 4e562b761..7db12da86 100644 --- a/install/gnuboard4s.sql +++ b/install/gnuboard4s.sql @@ -206,6 +206,7 @@ CREATE TABLE IF NOT EXISTS `g4s_config` ( `cf_search_bgcolor` varchar(255) NOT NULL default '', `cf_search_color` varchar(255) NOT NULL default '', `cf_write_pages` int(11) NOT NULL default '0', + `cf_mobile_pages` int(11) NOT NULL default '0', `cf_link_target` varchar(255) NOT NULL default '', `cf_delay_sec` int(11) NOT NULL default '0', `cf_filter` text NOT NULL, diff --git a/install/install_db.php b/install/install_db.php index 269822395..64aa217b3 100644 --- a/install/install_db.php +++ b/install/install_db.php @@ -94,6 +94,7 @@ $sql = " insert into `{$table_prefix}config` cf_search_bgcolor = 'YELLOW', cf_search_color = 'RED', cf_write_pages = '10', + cf_mobile_pages = '5', cf_link_target = '_blank', cf_delay_sec = '30', cf_filter = '18아,18놈,18새끼,18년,18뇬,18노,18것,18넘,개년,개놈,개뇬,개새,개색끼,개세끼,개세이,개쉐이,개쉑,개쉽,개시키,개자식,개좆,게색기,게색끼,광뇬,뇬,눈깔,뉘미럴,니귀미,니기미,니미,도촬,되질래,뒈져라,뒈진다,디져라,디진다,디질래,병쉰,병신,뻐큐,뻑큐,뽁큐,삐리넷,새꺄,쉬발,쉬밸,쉬팔,쉽알,스패킹,스팽,시벌,시부랄,시부럴,시부리,시불,시브랄,시팍,시팔,시펄,실밸,십8,십쌔,십창,싶알,쌉년,썅놈,쌔끼,쌩쑈,썅,써벌,썩을년,쎄꺄,쎄엑,쓰바,쓰발,쓰벌,쓰팔,씨8,씨댕,씨바,씨발,씨뱅,씨봉알,씨부랄,씨부럴,씨부렁,씨부리,씨불,씨브랄,씨빠,씨빨,씨뽀랄,씨팍,씨팔,씨펄,씹,아가리,아갈이,엄창,접년,잡놈,재랄,저주글,조까,조빠,조쟁이,조지냐,조진다,조질래,존나,존니,좀물,좁년,좃,좆,좇,쥐랄,쥐롤,쥬디,지랄,지럴,지롤,지미랄,쫍빱,凸,퍽큐,뻑큐,빠큐,ㅅㅂㄹㅁ',