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 18:38:21 +09:00
parent f24ef3e1c2 7034568896
commit 9cc476505b
5 changed files with 91 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bbs/new.php
View File

@ -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&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');

39
bbs/point.php
View File

@ -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,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');
?>

32
bbs/search.php
View File

@ -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="">전체 분류';

95
js/common.js
View File

@ -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,59 @@ 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");
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);

2
mobile/skin/member/basic/scrap.skin.php
View File

@ -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>