Merge branch 'g5'

This commit is contained in:
chicpro
2014-03-12 18:19:41 +09:00
21 changed files with 359 additions and 158 deletions

View File

@ -6,7 +6,7 @@ if (G5_IS_MOBILE) {
echo stripslashes($board['bo_mobile_content_tail']);
// 모바일의 경우 설정을 따르지 않는다.
include_once('./_tail.php');
} else if ($board['bo_include_tail']) {
} else {
echo stripslashes($board['bo_content_tail']);
@include ($board['bo_include_tail']);
}

View File

@ -9,7 +9,7 @@ include_once(G5_PATH.'/head.sub.php');
$list = array();
$sql_common = " from {$g5['point_table']} where mb_id = '".mysql_escape_string($member['mb_id'])."' ";
$sql_common = " from {$g5['point_table']} where mb_id = '".escape_trim($member['mb_id'])."' ";
$sql_order = " order by po_id desc ";
$sql = " select count(*) as cnt {$sql_common} ";
@ -18,92 +18,10 @@ $total_count = $row['cnt'];
$rows = $config['cf_page_rows'];
$total_page = ceil($total_count / $rows); // 전체 페이지 계산
if (!$page) { $page = 1; } // 페이지가 없으면 첫 페이지 (1 페이지)
if ($page < 1) { $page = 1; } // 페이지가 없으면 첫 페이지 (1 페이지)
$from_record = ($page - 1) * $rows; // 시작 열을 구함
?>
<div id="point" class="new_win">
<h1 id="win_title"><?php echo $g5['title'] ?></h1>
include_once($member_skin_path.'/point.skin.php');
<div class="tbl_head01 tbl_wrap">
<table>
<caption>포인트 사용내역 목록</caption>
<thead>
<tr>
<th scope="col">일시</th>
<th scope="col">내용</th>
<th scope="col">만료일</th>
<th scope="col">지급포인트</th>
<th scope="col">사용포인트</th>
</tr>
</thead>
<tbody>
<?php
$sum_point1 = $sum_point2 = $sum_point3 = 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'];
}
$po_content = $row['po_content'];
$expr = '';
if($row['po_expired'] == 1)
$expr = ' txt_expired';
?>
<tr>
<td class="td_datetime"><?php echo $row['po_datetime']; ?></td>
<td><?php echo $po_content; ?></td>
<td class="td_date<?php echo $expr; ?>">
<?php if ($row['po_expired'] == 1) { ?>
만료<?php echo substr(str_replace('-', '', $row['po_expire_date']), 2); ?>
<?php } else echo $row['po_expire_date'] == '9999-12-31' ? '&nbsp;' : $row['po_expire_date']; ?>
</td>
<td class="td_numbig"><?php echo $point1; ?></td>
<td class="td_numbig"><?php echo $point2; ?></td>
</tr>
<?php
}
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>
<tfoot>
<tr>
<th scope="row" colspan="3">소계</th>
<td><?php echo $sum_point1; ?></td>
<td><?php echo $sum_point2; ?></td>
</tr>
<tr>
<th scope="row" colspan="3">보유포인트</th>
<td colspan="2"><?php echo number_format($member['mb_point']); ?></td>
</tr>
</tfoot>
</table>
</div>
<?php echo get_paging(G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, $_SERVER['PHP_SELF'].'?'.$qstr.'&amp;page='); ?>
<div class="win_btn"><button type="button" onclick="javascript:window.close();">창닫기</button></div>
</div>
<?php
include_once(G5_PATH.'/tail.sub.php');
?>

18
bbs/qahead.php Normal file
View File

@ -0,0 +1,18 @@
<?php
if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
$qa_skin_path = (G5_IS_MOBILE ? G5_MOBILE_PATH : G5_PATH).'/'.G5_SKIN_DIR.'/qa/'.$qaconfig['qa_skin'];
$qa_skin_url = (G5_IS_MOBILE ? G5_MOBILE_URL : G5_URL).'/'.G5_SKIN_DIR.'/qa/'.$qaconfig['qa_skin'];
if (G5_IS_MOBILE) {
// 모바일의 경우 설정을 따르지 않는다.
include_once('./_head.php');
echo stripslashes($qaconfig['qa_mobile_content_head']);
} else {
if($qaconfig['qa_include_head'])
@include ($qaconfig['qa_include_head']);
else
include ('./_head.php');
echo stripslashes($qaconfig['qa_content_head']);
}
?>

View File

@ -7,10 +7,8 @@ if($is_guest)
$qaconfig = get_qa_config();
$g5['title'] = $qaconfig['qa_title'];
include_once('./_head.php');
include_once('./qahead.php');
$qa_skin_path = (G5_IS_MOBILE ? G5_MOBILE_PATH : G5_PATH).'/'.G5_SKIN_DIR.'/qa/'.$qaconfig['qa_skin'];
$qa_skin_url = (G5_IS_MOBILE ? G5_MOBILE_URL : G5_URL).'/'.G5_SKIN_DIR.'/qa/'.$qaconfig['qa_skin'];
$skin_file = $qa_skin_path.'/list.skin.php';
$category_option = '';
@ -120,5 +118,5 @@ if(is_file($skin_file)) {
echo '<div>'.str_replace(G5_PATH.'/', '', $skin_file).'이 존재하지 않습니다.</div>';
}
include_once('./_tail.php');
include_once('./qatail.php');
?>

15
bbs/qatail.php Normal file
View File

@ -0,0 +1,15 @@
<?php
if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
if (G5_IS_MOBILE) {
echo stripslashes($qaconfig['qa_mobile_content_tail']);
// 모바일의 경우 설정을 따르지 않는다.
include_once('./_tail.php');
} else {
echo stripslashes($qaconfig['qa_mobile_content_tail']);
if($qaconfig['qa_include_tail'])
@include ($board['bo_include_tail']);
else
include ('./_tail.php');
}
?>

View File

@ -8,10 +8,8 @@ if($is_guest)
$qaconfig = get_qa_config();
$g5['title'] = $qaconfig['qa_title'];
include_once('./_head.php');
include_once('./qahead.php');
$qa_skin_path = (G5_IS_MOBILE ? G5_MOBILE_PATH : G5_PATH).'/'.G5_SKIN_DIR.'/qa/'.$qaconfig['qa_skin'];
$qa_skin_url = (G5_IS_MOBILE ? G5_MOBILE_URL : G5_URL).'/'.G5_SKIN_DIR.'/qa/'.$qaconfig['qa_skin'];
$skin_file = $qa_skin_path.'/view.skin.php';
if(is_file($skin_file)) {
@ -173,5 +171,5 @@ if(is_file($skin_file)) {
echo '<div>'.str_replace(G5_PATH.'/', '', $skin_file).'이 존재하지 않습니다.</div>';
}
include_once('./_tail.php');
include_once('./qatail.php');
?>

View File

@ -12,10 +12,8 @@ if($is_guest)
$qaconfig = get_qa_config();
$g5['title'] = $qaconfig['qa_title'];
include_once('./_head.php');
include_once('./qahead.php');
$qa_skin_path = (G5_IS_MOBILE ? G5_MOBILE_PATH : G5_PATH).'/'.G5_SKIN_DIR.'/qa/'.$qaconfig['qa_skin'];
$qa_skin_url = (G5_IS_MOBILE ? G5_MOBILE_URL : G5_URL).'/'.G5_SKIN_DIR.'/qa/'.$qaconfig['qa_skin'];
$skin_file = $qa_skin_path.'/write.skin.php';
if(is_file($skin_file)) {
@ -137,5 +135,5 @@ if(is_file($skin_file)) {
echo '<div>'.str_replace(G5_PATH.'/', '', $skin_file).'이 존재하지 않습니다.</div>';
}
include_once('./_tail.php');
include_once('./qatail.php');
?>