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 
Conflicts:
	skin/member/neo/register_form.skin.php
This commit is contained in:
gnuboard
2013-01-08 09:06:05 +09:00
parent 7feb58aeab 8532cb0366
commit f2ffc6139c
28 changed files with 774 additions and 409 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bbs/board.php
View File

@ -180,7 +180,7 @@ if ($member['mb_id'] && ($is_admin == 'super' || $group['gr_admin'] == $member['
include_once('./board_head.php');
echo '<script src="'.$g4['path'].'/js/sideview.js"></script>';
echo "<script src=\"".$g4['path']."/js/sideview.js\"></script>";
// 게시물 아이디가 있다면 게시물 보기를 INCLUDE
if (isset($wr_id) && $wr_id) {

2
bbs/new.php
View File

@ -25,7 +25,7 @@ $total_page = ceil($total_count / $rows); // 전체 페이지 계산
if (!$page) $page = 1; // 페이지가 없으면 첫 페이지 (1 페이지)
$from_record = ($page - 1) * $rows; // 시작 열을 구함
$group_select = '<select name="gr_id" id="gr_id" onchange="select_change();"><option value="">전체그룹';
$group_select = '<select name="gr_id" id="gr_id" title="검색대상" onchange="select_change();"><option value="">전체그룹';
$sql = " select gr_id, gr_subject from {$g4[group_table]} order by gr_id ";
$result = sql_query($sql);
for ($i=0; $row=sql_fetch_array($result); $i++)

121
bbs/point.php
View File

@ -37,72 +37,75 @@ for($i=0; $row=sql_fetch_array($result); $i++) {
}
?>
<h1>포인트내역</h1>
<div id="point" class="new_win">
<h1><?=$g4['title']?></h1>
<table>
<caption>포인트내역 목록</caption>
<thead>
<tr>
<th scope="col">일시</th>
<th scope="col">내용</th>
<th scope="col">지급포인트</th>
<th scope="col">사용포인트</th>
</tr>
</thead>
<tfoot>
<tr>
<td colspan="2">소계</td>
<td><?=number_format($sum_point1)?></td>
<td><?=number_format($sum_point2)?></td>
</tr>
</tfoot>
<tbody>
<?
$sum_point1 = $sum_point2 = 0;
<table>
<caption>포인트내역 목록</caption>
<thead>
<tr>
<th scope="col">일시</th>
<th scope="col">내용</th>
<th scope="col">지급포인트</th>
<th scope="col">사용포인트</th>
</tr>
</thead>
<tfoot>
<tr>
<td colspan="2">소계</td>
<td><?=number_format($sum_point1)?></td>
<td><?=number_format($sum_point2)?></td>
</tr>
</tfoot>
<tbody>
<?
$sum_point1 = $sum_point2 = 0;
$sql = " select *
{$sql_common}
{$sql_order}
limit {$from_record}, {$rows} ";
$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];
} else {
$point2 = number_format($row[po_point]);
$sum_point2 += $row[po_point];
$sql = " select *
{$sql_common}
{$sql_order}
limit {$from_record}, {$rows} ";
$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];
} else {
$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_bignum"><?=$point1?></td>
<td class="td_bignum"><?=$point2?></td>
</tr>
<?
}
?>
<tr>
<td><?=$row[po_datetime]?></td>
<td><?=$row[po_content]?></td>
<td><?=$point1?></td>
<td><?=$point2?></td>
</tr>
<?
}
if ($i == 0)
echo '<tr><td colspan="5" class="empty_table">자료가 없습니다.</td></tr>';
else {
if ($sum_point1 > 0)
$sum_point1 = "+" . number_format($sum_point1);
$sum_point2 = number_format($sum_point2);
}
?>
</tbody>
</table>
if ($i == 0)
echo '<tr><td colspan="5" class="empty_table">자료가 없습니다.</td></tr>';
else {
if ($sum_point1 > 0)
$sum_point1 = "+" . number_format($sum_point1);
$sum_point2 = number_format($sum_point2);
}
?>
</tbody>
</table>
<p>보유 포인트 <?=number_format($member[mb_point])?>점</p>
<div class="pg">
<?=get_paging($config[cf_write_pages], $page, $total_page, $_SERVER[PHP_SELF].'?'.$qstr.'&amp;page=');?>
</div>
<div class="pg">
<?=get_paging($config[cf_write_pages], $page, $total_page, $_SERVER[PHP_SELF].'?'.$qstr.'&amp;page=');?>
</div>
<p>보유 포인트 <?=number_format($member[mb_point])?>점</p>
<div class="btn_window">
<a href="javascript:window.close();">창닫기</a>
<div class="btn_window">
<a href="javascript:window.close();">창닫기</a>
</div>
</div>
<?

4
bbs/search.php
View File

@ -3,7 +3,7 @@ include_once('./_common.php');
//if (!$stx) alert("검색어가 없습니다.");
$g4['title'] = '검색 : '.$stx;
$g4['title'] = "전체검색 결과";
include_once('./_head.php');
if ($stx)
@ -221,7 +221,7 @@ if ($stx)
echo '<script src="'.$g4['path'].'/js/sideview.js"></script>';
}
$group_select = '<select id="gr_id" name="gr_id" class="select"><option value="">전체 분류';
$group_select = '<select id="gr_id" name="gr_id" class="select" title="그룹선택"><option value="">전체 분류';
$sql = " select gr_id, gr_subject from {$g4[group_table]} order by gr_id ";
$result = sql_query($sql);
for ($i=0; $row=sql_fetch_array($result); $i++)