From f8f60bbae49d6748458ff8b15c4666bfb418e03f Mon Sep 17 00:00:00 2001
From: gnuboard <kagla@naver.com>
Date: Wed, 23 Jan 2013 09:06:17 +0900
Subject: [PATCH 1/4] =?UTF-8?q?get=5Fpaging()=20=EC=97=90=20div,=20span=20?=
 =?UTF-8?q?=ED=83=9C=EA=B7=B8=EB=A5=BC=20=ED=95=A9=EC=B3=90=20page=20?=
 =?UTF-8?q?=EA=B0=80=20=EC=97=86=EB=8A=94=20=EA=B2=BD=EC=9A=B0=EB=8A=94=20?=
 =?UTF-8?q?=EC=B6=9C=EB=A0=A5=EC=9D=B4=20=EC=97=86=EB=8F=84=EB=A1=9D=20?=
 =?UTF-8?q?=ED=95=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/common.lib.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/common.lib.php b/lib/common.lib.php
index 88565ae1d..99b1b5217 100644
--- a/lib/common.lib.php
+++ b/lib/common.lib.php
@@ -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 "";
 }
 
 

From 375d39ab32711075ed8d4da89d24d51a54bf9410 Mon Sep 17 00:00:00 2001
From: gnuboard <kagla@naver.com>
Date: Wed, 23 Jan 2013 09:06:34 +0900
Subject: [PATCH 2/4] =?UTF-8?q?gnb.js=20=ED=98=B8=EC=B6=9C=20=EC=82=AD?=
 =?UTF-8?q?=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/admin.tail.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/adm/admin.tail.php b/adm/admin.tail.php
index e30b0949f..cf8887a65 100644
--- a/adm/admin.tail.php
+++ b/adm/admin.tail.php
@@ -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');

From c883bfa11e4d76a9225933e7f3fb43945959f786 Mon Sep 17 00:00:00 2001
From: gnuboard <kagla@naver.com>
Date: Wed, 23 Jan 2013 09:06:58 +0900
Subject: [PATCH 3/4] =?UTF-8?q?sfl=20js=20=EC=98=A4=EB=A5=98=20=ED=95=B4?=
 =?UTF-8?q?=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/popular_rank.php | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/adm/popular_rank.php b/adm/popular_rank.php
index 848c9417b..6313666d2 100644
--- a/adm/popular_rank.php
+++ b/adm/popular_rank.php
@@ -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>
 

From 14cbbf16d19656250208501b09eb921a6a896461 Mon Sep 17 00:00:00 2001
From: gnuboard <kagla@naver.com>
Date: Wed, 23 Jan 2013 11:01:12 +0900
Subject: [PATCH 4/4] =?UTF-8?q?=EC=AA=BD=EC=A7=80=20=EC=95=8C=EB=A6=BC?=
 =?UTF-8?q?=EC=9D=84=20head.sub.php=20=EC=97=90=EC=84=9C=20head.php=20?=
 =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD=20=EC=9D=B4=EC=9C=A0=EB=8A=94=20?=
 =?UTF-8?q?=EC=83=88=EC=B0=BD=EC=97=90=EC=84=9C=20=EA=B5=B3=EC=9D=B4=20?=
 =?UTF-8?q?=EC=AA=BD=EC=A7=80=20=EC=95=8C=EB=A6=BC=EC=9D=84=20=EB=B3=BC=20?=
 =?UTF-8?q?=EC=9D=B4=EC=9C=A0=EA=B0=80=20=EC=97=86=EC=9D=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 head.php     | 14 +++++++++++++-
 head.sub.php | 12 ------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/head.php b/head.php
index 2d0534bb8..32f016bc0 100644
--- a/head.php
+++ b/head.php
@@ -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>
diff --git a/head.sub.php b/head.sub.php
index c708878c3..370bd9cdb 100644
--- a/head.sub.php
+++ b/head.sub.php
@@ -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');