firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

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

Browse Source
This commit is contained in:
whitedot
2013-03-05 10:27:57 +09:00
parent 431e6c32b1 d5ab335836
commit 78b61f89a9
5 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
adm/config_form.php
View File

@ -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 = "
<th scope="row"><label for="cf_write_pages">페이지 표시 수<strong class="sound_only">필수</strong></label></th>
<td><input type="text" id="cf_write_pages" name="cf_write_pages" class="required numeric frm_input" required value="<?=$config['cf_write_pages']?>" size="3"> 페이지씩 표시</td>
</tr>
<tr>
<th scope="row"><label for="cf_mobile_pages">모바일 페이지 표시 수<strong class="sound_only">필수</strong></label></th>
<td colspan="3"><input type="text" id="cf_mobile_pages" name="cf_mobile_pages" class="required numeric frm_input" required value="<?=$config['cf_mobile_pages']?>" size="3"> 페이지씩 표시</td>
</tr>
<tr>
<th scope="row"><label for="cf_image_extension">이미지 업로드 확장자</label></th>
<td colspan="3">

1
adm/config_form_update.php
View File

@ -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']}',

8
bbs/list.php
View File

@ -18,7 +18,7 @@ if ($board['bo_use_category']) {
$category = trim($categories[$i]);
if ($category=='') continue;
$category_option .= '<li><a href="'.($category_href."&amp;sca=".urlencode($category)).'"';
if ($category==$sca)
if ($category==$sca)
$category_option .= ' id="bo_cate_on"';
$category_option .= '>'.$category.'</a></li>';
}
@ -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.'&amp;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.'&amp;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.'&amp;spt='.$prev_spt.'&amp;page=1';
$write_pages = page_insertbefore($write_pages, '<a href="'.$prev_part_href.'" class="pg_page pg_prev">이전검색</a>');
$write_pages = page_insertbefore($write_pages, '<a href="'.$prev_part_href.'" class="pg_page pg_prev">이전검색</a>');
}
$next_spt = $spt + $config['cf_search_part'];
if ($next_spt < 0) {
$next_part_href = './board.php?bo_table='.$bo_table.$qstr.'&amp;spt='.$next_spt.'&amp;page=1';
$write_pages = page_insertafter($write_pages, '<a href="'.$next_part_href.'" class="pg_page pg_end">다음검색</a>');
$write_pages = page_insertafter($write_pages, '<a href="'.$next_part_href.'" class="pg_page pg_end">다음검색</a>');
}
}

1
install/gnuboard4s.sql
View File

@ -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,

1
install/install_db.php
View File

@ -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,씨댕,씨바,씨발,씨뱅,씨봉알,씨부랄,씨부럴,씨부렁,씨부리,씨불,씨브랄,씨빠,씨빨,씨뽀랄,씨팍,씨팔,씨펄,씹,아가리,아갈이,엄창,접년,잡놈,재랄,저주글,조까,조빠,조쟁이,조지냐,조진다,조질래,존나,존니,좀물,좁년,좃,좆,좇,쥐랄,쥐롤,쥬디,지랄,지럴,지롤,지미랄,쫍빱,凸,퍽큐,뻑큐,빠큐,ㅅㅂㄹㅁ',