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

bbs/new.php

@@ -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&view=$view&mb_id=$mb_id&page=");
+$write_pages = get_paging(G4_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, "?gr_id=$gr_id&view=$view&mb_id=$mb_id&page=");
 
 include_once($new_skin_path.'/new.skin.php');
 

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) {
+        if ($row['po_point'] > 0) {
-            $point1 = '+' .number_format($row[po_point]);
+            $point1 = '+' .number_format($row['po_point']);
-            $sum_point1 += $row[po_point];
+            $sum_point1 += $row['po_point'];
         } else {
-            $point2 = number_format($row[po_point]);
+            $point2 = number_format($row['po_point']);
-            $sum_point2 += $row[po_point];
+            $sum_point2 += $row['po_point'];
         }
 
     ?>
     <tr>
-        <td class="td_datetime"><?=$row[po_datetime]?></td>
+        <td class="td_datetime"><?=$row['po_datetime']?></td>
-        <td><?=$row[po_content]?></td>
+        <td><?=$row['po_content']?></td>
         <td class="td_bignum"><?=$point1?></td>
         <td class="td_bignum"><?=$point2?></td>
     </tr>
@@ -102,20 +102,11 @@ 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 href="javascript:;" onclick="window.close();">창닫기</a></div>
 </div>
 
-<script>
-$(function() {
-    $("#point").append("<div class=\"btn_win\"><a>창닫기</a></div>");
-
-    $(".btn_win a").click(function() {
-        window.close();
-    });
-});
-</script>
-
 <?
 include_once(G4_PATH.'/tail.sub.php');
 ?>

bbs/search.php

@@ -211,7 +211,7 @@ if ($stx) {
         $from_record = 0;
     }
 
-    $write_pages = get_paging($config['cf_write_pages'], $page, $total_page, $_SERVER['PHP_SELF'].'?'.$search_query.'&gr_id='.$gr_id.'&srows='.$srows.'&onetable='.$onetable.'&page=');
+    $write_pages = get_paging(G4_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, $_SERVER['PHP_SELF'].'?'.$search_query.'&gr_id='.$gr_id.'&srows='.$srows.'&onetable='.$onetable.'&page=');
 }
 
 $group_select = '<select id="gr_id" name="gr_id" class="select" title="그룹선택"><option value="">전체 분류';

js/common.js

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

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>