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 15:40:19 +09:00
parent b6b5ddd6a5 a3512c4187
commit ff35046dc9
12 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
adm/auth_list.php
View File

@ -132,7 +132,7 @@ $colspan = 5;
</div>
<?
$pagelist = get_paging($config['cf_write_pages'], $page, $total_page, $_SERVER['PHP_SELF'].'?'.$qstr.'&amp;page=');
$pagelist = get_paging(G4_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, $_SERVER['PHP_SELF'].'?'.$qstr.'&amp;page=');
echo $pagelist;
?>

2
adm/board_list.php
View File

@ -175,7 +175,7 @@ $colspan = 8;
</form>
</section>
<?=get_paging($config['cf_write_pages'], $page, $total_page, $_SERVER['PHP_SELF'].'?'.$qstr.'&amp;page=');?>
<?=get_paging(G4_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, $_SERVER['PHP_SELF'].'?'.$qstr.'&amp;page=');?>
<script>
function fboardlist_submit(f)

2
adm/boardgroup_list.php
View File

@ -178,7 +178,7 @@ $colspan = 8;
</section>
<?
$pagelist = get_paging($config['cf_write_pages'], $page, $total_page, $_SERVER['PHP_SELF'].'?'.$qstr.'&amp;page=');
$pagelist = get_paging(G4_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, $_SERVER['PHP_SELF'].'?'.$qstr.'&amp;page=');
echo $pagelist;
?>

2
adm/boardgroupmember_list.php
View File

@ -132,7 +132,7 @@ $colspan = 7;
</form>
</section>
<?=get_paging($config['cf_write_pages'], $page, $total_page, "{$_SERVER['PHP_SELF']}?$qstr&amp;gr_id=$gr_id&page=");?>
<?=get_paging(G4_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, "{$_SERVER['PHP_SELF']}?$qstr&amp;gr_id=$gr_id&page=");?>
<script>
function fboardgroupmember_submit(f)

2
adm/member_list.php
View File

@ -217,7 +217,7 @@ $colspan = 15;
</form>
</section>
<?=get_paging($config['cf_write_pages'], $page, $total_page, '?'.$qstr.'&amp;page=');?>
<?=get_paging(G4_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, '?'.$qstr.'&amp;page=');?>
<script>
function fmemberlist_submit(f)

2
adm/point_list.php
View File

@ -173,7 +173,7 @@ function point_clear()
</form>
</section>
<?=get_paging($config['cf_write_pages'], $page, $total_page, "{$_SERVER['PHP_SELF']}?$qstr&amp;page=");?>
<?=get_paging(G4_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, "{$_SERVER['PHP_SELF']}?$qstr&amp;page=");?>
<section id="point_mng" class="cbox">
<h2>개별회원 포인트 증감 설정</h2>

2
adm/poll_list.php
View File

@ -133,7 +133,7 @@ $colspan = 6;
</form>
</section>
<?=get_paging($config['cf_write_pages'], $page, $total_page, "{$_SERVER['PHP_SELF']}?$qstr&amp;page=");?>
<?=get_paging(G4_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, "{$_SERVER['PHP_SELF']}?$qstr&amp;page=");?>
<script>
$(function() {

2
adm/popular_list.php
View File

@ -141,7 +141,7 @@ var list_delete_php = 'popular_list.php';
</form>
</section>
<?=get_paging($config['cf_write_pages'], $page, $total_page, "{$_SERVER['PHP_SELF']}?$qstr&amp;page=");?>
<?=get_paging(G4_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, "{$_SERVER['PHP_SELF']}?$qstr&amp;page=");?>
<script>
$(function() {

4
adm/popular_rank.php
View File

@ -27,7 +27,7 @@ $sql = " select pp_word, count(*) as cnt {$sql_common} {$sql_search} {$sql_group
$result = sql_query($sql);
$listall = '';
if (!empty($_GET['fr_date']) || !empty($_GET['to_date']))
if (!empty($_GET['fr_date']) || !empty($_GET['to_date']))
$listall = '<a href="'.$_SERVER['PHP_SELF'].'">전체목록</a>';
$g4['title'] = '인기검색어순위';
@ -95,7 +95,7 @@ $colspan = 3;
</section>
<?
echo get_paging($config['cf_write_pages'], $page, $total_page, "{$_SERVER['PHP_SELF']}?$qstr&amp;page=");
echo get_paging(G4_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, "{$_SERVER['PHP_SELF']}?$qstr&amp;page=");
?>
<?

4
common.php
View File

@ -160,9 +160,9 @@ if (G4_HTTPS_DOMAIN) {
// G4_MOBILE_AGENT : config.php 에서 선언
//------------------------------------------------------------------------------
$is_mobile = false;
if (isset($_REQUEST['pc']))
if ($_REQUEST['device']=='pc')
$is_mobile = false;
else if (isset($_REQUEST['mobile']))
else if ($_REQUEST['device']=='mobile')
$is_mobile = true;
else if (isset($_SESSION['ss_is_mobile']))
$is_mobile = $_SESSION['ss_is_mobile'];

2
mobile/tail.php
View File

@ -16,6 +16,8 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
</div>
</footer>
<a href="?device=pc">PC버전</a>
<?
include_once(G4_PATH."/tail.sub.php");
?>

4
tail.php
View File

@ -29,6 +29,10 @@ if ($config['cf_include_tail']) {
</div>
</footer>
<?if(is_mobile()){?>
<a href="?device=mobile">모바일 버전으로 보기</a>
<?}?>
<?
include_once(G4_PATH."/tail.sub.php");
?>