From ecaae4d8fa0ff5b51581b08ed892cff633a8981b Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Tue, 5 Mar 2013 16:01:06 +0900
Subject: [PATCH 1/6] =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC=EC=9A=A9=20?=
 =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=95=20=EB=B3=80=EC=88=98=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bbs/new.php                             |  4 ++--
 bbs/point.php                           | 31 ++++++++++++-------------
 mobile/skin/member/basic/scrap.skin.php |  2 +-
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/bbs/new.php b/bbs/new.php
index 2d23a6ea7..d2b2c3978 100644
--- a/bbs/new.php
+++ b/bbs/new.php
@@ -48,7 +48,7 @@ for ($i=0; $row=sql_fetch_array($result); $i++) {
     $tmp_write_table = $g4['write_prefix'].$row['bo_table'];
 
     if ($row['wr_id'] == $row['wr_parent']) {
-        
+
         // 원글
         $comment = "";
         $comment_link = "";
@@ -103,7 +103,7 @@ for ($i=0; $row=sql_fetch_array($result); $i++) {
     $list[$i]['wr_subject'] = $row2['wr_subject'];
 }
 
-$write_pages = get_paging($config['cf_write_pages'], $page, $total_page, "?gr_id=$gr_id&amp;view=$view&amp;mb_id=$mb_id&amp;page=");
+$write_pages = get_paging(G4_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, "?gr_id=$gr_id&amp;view=$view&amp;mb_id=$mb_id&amp;page=");
 
 include_once($new_skin_path.'/new.skin.php');
 
diff --git a/bbs/point.php b/bbs/point.php
index 6c24174d6..1c1762cb9 100644
--- a/bbs/point.php
+++ b/bbs/point.php
@@ -1,22 +1,22 @@
 <?
 include_once('./_common.php');
 
-if (!$member[mb_id])
+if ($is_guest)
     alert_close('회원만 조회하실 수 있습니다.');
 
-$g4['title'] = $member[mb_nick].' 님의 포인트 내역';
+$g4['title'] = $member['mb_nick'].' 님의 포인트 내역';
 include_once(G4_PATH.'/head.sub.php');
 
 $list = array();
 
-$sql_common = " from {$g4[point_table]} where mb_id = '".mysql_escape_string($member[mb_id])."' ";
+$sql_common = " from {$g4['point_table']} where mb_id = '".mysql_escape_string($member['mb_id'])."' ";
 $sql_order = " order by po_id desc ";
 
 $sql = " select count(*) as cnt {$sql_common} ";
 $row = sql_fetch($sql);
-$total_count = $row[cnt];
+$total_count = $row['cnt'];
 
-$rows = $config[cf_page_rows];
+$rows = $config['cf_page_rows'];
 $total_page  = ceil($total_count / $rows);  // 전체 페이지 계산
 if (!$page) { $page = 1; } // 페이지가 없으면 첫 페이지 (1 페이지)
 $from_record = ($page - 1) * $rows; // 시작 열을 구함
@@ -58,7 +58,7 @@ for($i=0; $row=sql_fetch_array($result); $i++) {
     </tr>
     <tr>
         <th scope="row" colspan="2">보유포인트</th>
-        <td colspan="2"><?=number_format($member[mb_point])?></td>
+        <td colspan="2"><?=number_format($member['mb_point'])?></td>
     </tr>
     </tfoot>
     <tbody>
@@ -72,18 +72,18 @@ for($i=0; $row=sql_fetch_array($result); $i++) {
     $result = sql_query($sql);
     for ($i=0; $row=sql_fetch_array($result); $i++) {
         $point1 = $point2 = 0;
-        if ($row[po_point] > 0) {
-            $point1 = '+' .number_format($row[po_point]);
-            $sum_point1 += $row[po_point];
+        if ($row['po_point'] > 0) {
+            $point1 = '+' .number_format($row['po_point']);
+            $sum_point1 += $row['po_point'];
         } else {
-            $point2 = number_format($row[po_point]);
-            $sum_point2 += $row[po_point];
+            $point2 = number_format($row['po_point']);
+            $sum_point2 += $row['po_point'];
         }
 
     ?>
     <tr>
-        <td class="td_datetime"><?=$row[po_datetime]?></td>
-        <td><?=$row[po_content]?></td>
+        <td class="td_datetime"><?=$row['po_datetime']?></td>
+        <td><?=$row['po_content']?></td>
         <td class="td_bignum"><?=$point1?></td>
         <td class="td_bignum"><?=$point2?></td>
     </tr>
@@ -102,14 +102,13 @@ for($i=0; $row=sql_fetch_array($result); $i++) {
     </table>
 
 
-    <?=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=');?>
 
+    <div class="btn_win"><a>창닫기</a></div>
 </div>
 
 <script>
 $(function() {
-    $("#point").append("<div class=\"btn_win\"><a>창닫기</a></div>");
-
     $(".btn_win a").click(function() {
         window.close();
     });
diff --git a/mobile/skin/member/basic/scrap.skin.php b/mobile/skin/member/basic/scrap.skin.php
index c7c8c098e..c7e8eb282 100644
--- a/mobile/skin/member/basic/scrap.skin.php
+++ b/mobile/skin/member/basic/scrap.skin.php
@@ -27,7 +27,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
     </tbody>
     </table>
 
-    <?=get_paging($config['cf_write_pages'], $page, $total_page, "?$qstr&amp;page=");?>
+    <?=get_paging($config['cf_mobile_pages'], $page, $total_page, "?$qstr&amp;page=");?>
 
     <div class="btn_win"><a href="javascript:;" onclick="window.close();">창닫기</a></div>
 </div>

From a49dbb1656d200d374b8b95251c57b554c2e1959 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Tue, 5 Mar 2013 16:03:19 +0900
Subject: [PATCH 2/6] =?UTF-8?q?=ED=8C=9D=EC=97=85=EC=B0=BD=20=EB=8B=AB?=
 =?UTF-8?q?=EA=B8=B0=20=EB=B2=84=ED=8A=BC=20=EA=B4=80=EB=A0=A8=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bbs/point.php | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/bbs/point.php b/bbs/point.php
index 1c1762cb9..c0a13575c 100644
--- a/bbs/point.php
+++ b/bbs/point.php
@@ -104,17 +104,9 @@ for($i=0; $row=sql_fetch_array($result); $i++) {
 
     <?=get_paging(G4_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, $_SERVER['PHP_SELF'].'?'.$qstr.'&amp;page=');?>
 
-    <div class="btn_win"><a>창닫기</a></div>
+    <div class="btn_win"><a href="javascript:;" onclick="window.close();">창닫기</a></div>
 </div>
 
-<script>
-$(function() {
-    $(".btn_win a").click(function() {
-        window.close();
-    });
-});
-</script>
-
 <?
 include_once(G4_PATH.'/tail.sub.php');
 ?>
\ No newline at end of file

From a63f950606ac838fa2a8b5c2f2164f342c216849 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Tue, 5 Mar 2013 16:06:14 +0900
Subject: [PATCH 3/6] =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC=20=ED=8E=98?=
 =?UTF-8?q?=EC=9D=B4=EC=A7=95=20=EB=B3=80=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/search.php | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/bbs/search.php b/bbs/search.php
index b4be43264..448e1bd55 100644
--- a/bbs/search.php
+++ b/bbs/search.php
@@ -29,9 +29,9 @@ if ($stx) {
         $sql .= " and bo_table = '{$onetable}' ";
     $sql .= " order by bo_order, gr_id, bo_table ";
     $result = sql_query($sql);
-    for ($i=0; $row=sql_fetch_array($result); $i++) 
+    for ($i=0; $row=sql_fetch_array($result); $i++)
     {
-        if ($is_admin != 'super') 
+        if ($is_admin != 'super')
         {
             // 그룹접근 사용에 대한 검색 차단
             $sql2 = " select gr_use_access, gr_admin from {$g4['group_table']} where gr_id = '{$row['gr_id']}' ";
@@ -44,7 +44,7 @@ if ($stx) {
                 } else {
                     $sql3 = " select count(*) as cnt from {$g4['group_member_table']} where gr_id = '{$row['gr_id']}' and mb_id = '{$member['mb_id']}' and mb_id <> '' ";
                     $row3 = sql_fetch($sql3);
-                    if (!$row3['cnt']) 
+                    if (!$row3['cnt'])
                         continue;
                 }
             }
@@ -73,7 +73,7 @@ if ($stx) {
         $search_str = $s[$i];
         $str .= $op1;
         $str .= "(";
-        
+
         $op2 = '';
         // 필드의 수만큼 다중 필드 검색 가능 (필드1+필드2...)
         for ($k=0; $k<count($field); $k++) {
@@ -169,8 +169,8 @@ if ($stx) {
             $list[$idx][$i] = $row;
             $list[$idx][$i][href] = './board.php?bo_table='.$search_table[$idx].'&amp;wr_id='.$row['wr_parent'];
 
-            if ($row['wr_is_comment']) 
-            { 
+            if ($row['wr_is_comment'])
+            {
                 $link .= '#c'.$row['wr_id'];
                 $sql2 = " select wr_subject, wr_option from {$tmp_write_table} where wr_id = '{$row['wr_parent']}' ";
                 $row2 = sql_fetch($sql2);
@@ -179,17 +179,17 @@ if ($stx) {
             }
 
             // 비밀글은 검색 불가
-            if (strstr($row['wr_option'].$row2['wr_option'], 'secret')) 
+            if (strstr($row['wr_option'].$row2['wr_option'], 'secret'))
                 $row['wr_content'] = '[비밀글 입니다.]';
 
             $subject = get_text($row['wr_subject']);
-            if (strstr($sfl, 'wr_subject')) 
+            if (strstr($sfl, 'wr_subject'))
                 $subject = search_font($stx, $subject);
 
             if ($read_level[$idx] <= $member['mb_level'])
             {
                 $content = cut_str(get_text(strip_tags($row['wr_content'])),300,"…");
-                if (strstr($sfl, 'wr_content')) 
+                if (strstr($sfl, 'wr_content'))
                     $content = search_font($stx, $content);
             }
             else
@@ -198,20 +198,20 @@ if ($stx) {
             $list[$idx][$i]['subject'] = $subject;
             $list[$idx][$i]['content'] = $content;
             $list[$idx][$i]['name'] = get_sideview($row['mb_id'], cut_str($row['wr_name'], $config['cf_cut_name']), $row['wr_email'], $row['wr_homepage']);
-            
+
             $k++;
-            if ($k >= $rows) 
-                break; 
+            if ($k >= $rows)
+                break;
         }
         sql_free_result($result);
-        
-        if ($k >= $rows) 
-            break; 
+
+        if ($k >= $rows)
+            break;
 
         $from_record = 0;
     }
 
-    $write_pages = get_paging($config['cf_write_pages'], $page, $total_page, $_SERVER['PHP_SELF'].'?'.$search_query.'&amp;gr_id='.$gr_id.'&amp;srows='.$srows.'&amp;onetable='.$onetable.'&amp;page=');
+    $write_pages = get_paging(G4_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, $_SERVER['PHP_SELF'].'?'.$search_query.'&amp;gr_id='.$gr_id.'&amp;srows='.$srows.'&amp;onetable='.$onetable.'&amp;page=');
 }
 
 $group_select = '<select id="gr_id" name="gr_id" class="select" title="그룹선택"><option value="">전체 분류';

From 0e4d04543c676d6c104076793e5c6e6809652d49 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Tue, 5 Mar 2013 17:59:47 +0900
Subject: [PATCH 4/6] =?UTF-8?q?=ED=85=8D=EC=8A=A4=ED=8A=B8=20=EB=A6=AC?=
 =?UTF-8?q?=EC=82=AC=EC=9D=B4=EC=A6=88=EC=8B=9C=20=ED=85=8D=EC=8A=A4?=
 =?UTF-8?q?=ED=8A=B8=20=EB=85=B8=EB=93=9C=EB=8F=84=20=EB=A6=AC=EC=82=AC?=
 =?UTF-8?q?=EC=9D=B4=EC=A6=88=20=EB=90=98=EB=8F=84=EB=A1=9D=20=EC=8A=A4?=
 =?UTF-8?q?=ED=81=AC=EB=A6=BD=ED=8A=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 js/common.js | 94 +++++++++++++++++++++++++++++++---------------------
 1 file changed, 56 insertions(+), 38 deletions(-)

diff --git a/js/common.js b/js/common.js
index 058368b65..d2320825d 100644
--- a/js/common.js
+++ b/js/common.js
@@ -525,31 +525,26 @@ var win_poll = function(href) {
 function text_increase()
 {
     var $elements = $("#container *:visible");
-    var fs = tx = unit = "";
-    var fsize;
-    var x = 0;
+    var mode = "increase";
+
     $elements.each(function() {
         if($(this).hasClass("no_text_resize"))
             return true;
 
-        fs = $(this).css("font-size");
-        tx = $(this).html();
-        unit = fs.replace(/[0-9]/g, "");
-        fsize = parseFloat(fs.replace(/[^0-9\.]/g, ""));
-
-        if(!fsize)
+        if($(this).children().length != 0) {
             return true;
+        } else {
+            var $parent = $(this).parent();
+            var text = $parent.contents().filter(function() {
+                return this.nodeType == 3;
+            }).text().replace(/\s*/, "");
 
-        if(tx.search("<") > -1)
-            return true;
-
-        if(unit == "em")
-            x = 1;
-
-        nfsize = (fsize * 1.2);
-        nfsize = nfsize.toFixed(x);
-
-        $(this).css("font-size", nfsize+unit);
+            if(text.length) {
+                font_resize($parent, mode);
+            } else {
+                font_resize($(this), mode);
+            }
+        }
     });
 }
 
@@ -559,35 +554,58 @@ function text_increase()
 function text_decrease()
 {
     var $elements = $("#container *:visible");
-    var fs = tx = unit = "";
-    var fsize;
-    var x = 0;
+    var mode = "decrease";
+
     $elements.each(function() {
         if($(this).hasClass("no_text_resize"))
             return true;
 
-        fs = $(this).css("font-size");
-        tx = $(this).html();
-        unit = fs.replace(/[0-9]/g, "");
-        fsize = parseFloat(fs.replace(/[^0-9\.]/g, ""));
-
-        if(!fsize)
+        if($(this).children().length != 0) {
             return true;
+        } else {
+            var $parent = $(this).parent();
+            var text = $parent.contents().filter(function() {
+                return this.nodeType == 3;
+            }).text().replace(/\s*/, "");
 
-        if(tx.search("<") > -1)
-            return true;
-
-        if(unit == "em")
-            x = 1;
-
-        nfsize = (fsize * 0.8);
-        nfsize = nfsize.toFixed(x);
-
-        $(this).css("font-size", nfsize+unit);
+            if(text.length) {
+                font_resize($parent, mode);
+            } else {
+                font_resize($(this), mode);
+            }
+        }
     });
 }
 
 
+/**
+ * 텍스트 resize
+**/
+function font_resize(el, mode)
+{
+    var x = 0;
+    var fs = el.css("font-size");
+    unit = fs.replace(/[0-9\.]/g, "");
+    fsize = parseFloat(fs.replace(/[^0-9\.]/g, ""));
+
+    if(!fsize)
+        return true;
+
+    if(unit == "em")
+        x = 1;
+
+    if(mode == "increase") {
+        nfsize = (fsize * 1.2);
+    } else {
+        nfsize = (fsize / 1.2);
+    }
+
+    nfsize = nfsize.toFixed(x);
+
+    el.css("font-size", nfsize+unit);
+}
+
+
 $(function(){
     $('.win_point').click(function() {
         win_point(this.href);

From 46e4536ba9b83b25ae0467b475438845264f5534 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Tue, 5 Mar 2013 18:01:00 +0900
Subject: [PATCH 5/6] =?UTF-8?q?=EB=B3=80=EC=88=98=20=EC=84=A0=EC=96=B8=20?=
 =?UTF-8?q?=EB=B9=A0=EC=A7=84=20=EA=B2=83=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 js/common.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/js/common.js b/js/common.js
index d2320825d..86efc459f 100644
--- a/js/common.js
+++ b/js/common.js
@@ -587,6 +587,7 @@ function font_resize(el, mode)
     var fs = el.css("font-size");
     unit = fs.replace(/[0-9\.]/g, "");
     fsize = parseFloat(fs.replace(/[^0-9\.]/g, ""));
+    nfsize;
 
     if(!fsize)
         return true;

From 7034568896605faa8b114da39d7369004c0e7686 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Tue, 5 Mar 2013 18:04:12 +0900
Subject: [PATCH 6/6] =?UTF-8?q?=EB=B3=80=EC=88=98=20=EC=84=A0=EC=96=B8=20?=
 =?UTF-8?q?=EB=B9=A0=EC=A7=84=20=EA=B2=83=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 js/common.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/js/common.js b/js/common.js
index 86efc459f..3ee1bdd07 100644
--- a/js/common.js
+++ b/js/common.js
@@ -585,9 +585,9 @@ function font_resize(el, mode)
 {
     var x = 0;
     var fs = el.css("font-size");
-    unit = fs.replace(/[0-9\.]/g, "");
-    fsize = parseFloat(fs.replace(/[^0-9\.]/g, ""));
-    nfsize;
+    var unit = fs.replace(/[0-9\.]/g, "");
+    var fsize = parseFloat(fs.replace(/[^0-9\.]/g, ""));
+    var nfsize;
 
     if(!fsize)
         return true;