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-01-23 12:04:03 +09:00
parent 4e03f9fbf1 14cbbf16d1
commit 1164ef3c2d
5 changed files with 20 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
adm/admin.tail.php
View File

@ -17,7 +17,6 @@ if (!defined("_GNUBOARD_")) exit;
<!-- <p>실행시간 : <?=get_microtime() - $begin_time;?> -->
<script src="<?=$g4['admin_path']?>/admin.js"></script>
<script src="<?=$g4['admin_path']?>/gnb.js"></script>
<?
include_once($g4['path'].'/tail.sub.php');

22
adm/popular_rank.php
View File

@ -14,10 +14,7 @@ $sql_search = " where trim(pp_word) <> '' and pp_date between '{$fr_date}' and '
$sql_group = " group by pp_word ";
$sql_order = " order by cnt desc ";
$sql = " select pp_word
{$sql_common}
{$sql_search}
{$sql_group} ";
$sql = " select pp_word {$sql_common} {$sql_search} {$sql_group} ";
$result = sql_query($sql);
$total_count = mysql_num_rows($result);
@ -26,12 +23,7 @@ $total_page = ceil($total_count / $rows); // 전체 페이지 계산
if ($page == '') { $page = 1; } // 페이지가 없으면 첫 페이지 (1 페이지)
$from_record = ($page - 1) * $rows; // 시작 열을 구함
$sql = " select pp_word, count(*) as cnt
{$sql_common}
{$sql_search}
{$sql_group}
{$sql_order}
limit {$from_record}, {$rows} ";
$sql = " select pp_word, count(*) as cnt {$sql_common} {$sql_search} {$sql_group} {$sql_order} limit {$from_record}, {$rows} ";
$result = sql_query($sql);
$listall = '';
@ -97,15 +89,7 @@ if ($i == 0)
</table>
<?
$pagelist = get_paging($config['cf_write_pages'], $page, $total_page, "{$_SERVER['PHP_SELF']}?$qstr&amp;page=");
?>
<div class="pg">
<?=$pagelist?>
</div>
<?
if (isset($stx))
echo "<script>document.fsearch.sfl.value = '$sfl';</script>";
echo get_paging($config['cf_write_pages'], $page, $total_page, "{$_SERVER['PHP_SELF']}?$qstr&amp;page=");
?>
</form>

14
head.php
View File

@ -1,4 +1,4 @@
<?
<?php
if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
include_once($g4['path'].'/head.sub.php');
@ -11,6 +11,18 @@ include_once($g4['path'].'/lib/popular.lib.php');
//print_r2(get_defined_constants());
?>
<?
// 쪽지를 받았나?
if (isset($member['mb_memo_call']) && $member['mb_memo_call']) {
$mb = get_member($member['mb_memo_call'], "mb_nick");
sql_query(" update {$g4['member_table']} set mb_memo_call = '' where mb_id = '{$member['mb_id']}' ");
//alert($mb['mb_nick'].'님으로부터 쪽지가 전달되었습니다.', $_SERVER['REQUEST_URI'], false);
$memo_msg = $mb['mb_nick'].'님으로부터 쪽지가 전달되었습니다.\\n\\n바로 확인하시겠습니까?';
include_once($g4['bbs_path'].'/memocall.php');
}
?>
<header id="header">
<div id="to_content"><a href="#wrapper">본문 바로가기</a></div>
<div id="logo"><a href="<?=$g4['path']?>/"><img src="<?=$g4['path']?>/img/logo.jpg" alt="처음으로"></a></div>

12
head.sub.php
View File

@ -94,18 +94,6 @@ if (!empty($g4['js_file'])) {
<body>
<a id="g4_head"></a>
<?
// 쪽지를 받았나?
if (isset($member['mb_memo_call']) && $member['mb_memo_call']) {
$mb = get_member($member['mb_memo_call'], "mb_nick");
sql_query(" update {$g4['member_table']} set mb_memo_call = '' where mb_id = '{$member['mb_id']}' ");
//alert($mb['mb_nick'].'님으로부터 쪽지가 전달되었습니다.', $_SERVER['REQUEST_URI'], false);
$memo_msg = $mb['mb_nick'].'님으로부터 쪽지가 전달되었습니다.\\n\\n바로 확인하시겠습니까?';
include_once($g4['bbs_path'].'/memocall.php');
}
?>
<?
if (G4_IS_MOBILE) {
include_once($g4['path'].'/mobile.head.php');

7
lib/common.lib.php
View File

@ -19,7 +19,6 @@ function get_microtime()
function get_paging($write_pages, $cur_page, $total_page, $url, $add="")
{
$str = '';
$str .= "<span class=\"pg_wrap\">";
if ($cur_page > 1) {
$str .= '<a href="'.$url.'1'.$add.'" class="pg_page pg_start">처음</a>'.PHP_EOL;
}
@ -45,9 +44,11 @@ function get_paging($write_pages, $cur_page, $total_page, $url, $add="")
if ($cur_page < $total_page) {
$str .= '<a href="'.$url.$total_page.$add.'" class="pg_page pg_end">맨끝</a>'.PHP_EOL;
}
$str .= "</span>";
return $str;
if ($str)
return "<div class=\"pg\"><span class=\"pg_wrap\">{$str}</span></div>";
else
return "";
}