firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

g4s merge 충돌 수정

Browse Source
This commit is contained in:
chicpro
2013-07-31 15:32:25 +09:00
parent fc914c0a88 573746d8cd
commit 1768e09aaa
15 changed files with 417 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bbs/delete.php
View File

@ -101,8 +101,8 @@ while ($row = sql_fetch_array($result))
else
{
// 코멘트 포인트 삭제
if (!delete_point($row['mb_id'], $bo_table, $row['wr_id'], '코멘트'))
insert_point($row['mb_id'], $board['bo_comment_point'] * (-1), "{$board['bo_subject']} {$write['wr_id']}-{$row['wr_id']} 코멘트삭제");
if (!delete_point($row['mb_id'], $bo_table, $row['wr_id'], '댓글'))
insert_point($row['mb_id'], $board['bo_comment_point'] * (-1), "{$board['bo_subject']} {$write['wr_id']}-{$row['wr_id']} 댓글삭제");
$count_comment++;
}

4
bbs/delete_all.php
View File

@ -114,8 +114,8 @@ for ($i=count($tmp_array)-1; $i>=0; $i--)
else
{
// 코멘트 포인트 삭제
if (!delete_point($row['mb_id'], $bo_table, $row['wr_id'], '코멘트'))
insert_point($row['mb_id'], $board['bo_comment_point'] * (-1), "{$board['bo_subject']} {$write['wr_id']}-{$row['wr_id']} 코멘트삭제");
if (!delete_point($row['mb_id'], $bo_table, $row['wr_id'], '댓글'))
insert_point($row['mb_id'], $board['bo_comment_point'] * (-1), "{$board['bo_subject']} {$write['wr_id']}-{$row['wr_id']} 댓글삭제");
$count_comment++;
}

4
bbs/delete_comment.php
View File

@ -58,9 +58,9 @@ $row = sql_fetch($sql);
if ($row['cnt'] && !$is_admin)
alert('이 코멘트와 관련된 답변코멘트가 존재하므로 삭제 할 수 없습니다.');
// 코멘트 삭제
// 코멘트 포인트 삭제
if (!delete_point($write['mb_id'], $bo_table, $comment_id, '댓글'))
insert_point($write['mb_id'], $board['bo_comment_point'] * (-1), "{$board['bo_subject']} {$write['wr_parent']}-{$comment_id} 코멘트삭제");
insert_point($write['mb_id'], $board['bo_comment_point'] * (-1), "{$board['bo_subject']} {$write['wr_parent']}-{$comment_id} 댓글삭제");
// 코멘트 삭제
sql_query(" delete from {$write_table} where wr_id = '{$comment_id}' ");

8
bbs/login_check.php
View File

@ -40,6 +40,14 @@ set_session('ss_mb_id', $mb['mb_id']);
// FLASH XSS 공격에 대응하기 위하여 회원의 고유키를 생성해 놓는다. 관리자에서 검사함 - 110106
set_session('ss_mb_key', md5($mb['mb_datetime'] . $_SERVER['REMOTE_ADDR'] . $_SERVER['HTTP_USER_AGENT']));
// 포인트 체크
if($config['cf_use_point']) {
$sum_point = get_point_sum($mb['mb_id']);
$sql= " update {$g4['member_table']} set mb_point = '$sum_point' where mb_id = '{$mb['mb_id']}' ";
sql_query($sql);
}
// 3.26
// 아이디 쿠키에 한달간 저장
if ($auto_login) {

48
bbs/point.php
View File

@ -20,21 +20,6 @@ $rows = $config['cf_page_rows'];
$total_page = ceil($total_count / $rows); // 전체 페이지 계산
if (!$page) { $page = 1; } // 페이지가 없으면 첫 페이지 (1 페이지)
$from_record = ($page - 1) * $rows; // 시작 열을 구함
// 포인트소계
$sql = " select po_point
{$sql_common}
{$sql_order}
limit {$from_record}, {$rows} ";
$result = sql_query($sql);
$sum_point1 = $sum_point2 = 0;
for($i=0; $row=sql_fetch_array($result); $i++) {
if($row['po_point'] >= 0) {
$sum_point1 += $row['po_point'];
} else {
$sum_point2 += $row['po_point'];
}
}
?>
<div id="point" class="new_win">
@ -50,20 +35,9 @@ for($i=0; $row=sql_fetch_array($result); $i++) {
<th scope="col">사용포인트</th>
</tr>
</thead>
<tfoot>
<tr>
<th scope="row" colspan="2">소계</th>
<td><?php echo number_format($sum_point1) ?></td>
<td><?php echo number_format($sum_point2) ?></td>
</tr>
<tr>
<th scope="row" colspan="2">보유포인트</th>
<td colspan="2"><?php echo number_format($member['mb_point']) ?></td>
</tr>
</tfoot>
<tbody>
<?php
$sum_point1 = $sum_point2 = 0;
$sum_point1 = $sum_point2 = $sum_point3 = 0;
$sql = " select *
{$sql_common}
@ -80,12 +54,13 @@ for($i=0; $row=sql_fetch_array($result); $i++) {
$sum_point2 += $row['po_point'];
}
$po_content = $row['po_content'];
?>
<tr>
<td class="td_datetime"><?php echo $row['po_datetime'] ?></td>
<td><?php echo $row['po_content'] ?></td>
<td class="td_bignum"><?php echo $point1 ?></td>
<td class="td_bignum"><?php echo $point2 ?></td>
<td class="td_datetime"><?php echo $row['po_datetime']; ?></td>
<td><?php echo $po_content; ?></td>
<td class="td_bignum"><?php echo $point1; ?></td>
<td class="td_bignum"><?php echo $point2; ?></td>
</tr>
<?php
}
@ -99,6 +74,17 @@ for($i=0; $row=sql_fetch_array($result); $i++) {
}
?>
</tbody>
<tfoot>
<tr>
<th scope="row" colspan="2">소계</th>
<td><?php echo $sum_point1; ?></td>
<td><?php echo $sum_point2; ?></td>
</tr>
<tr>
<th scope="row" colspan="2">보유포인트</th>
<td colspan="2"><?php echo number_format($member['mb_point']); ?></td>
</tr>
</tfoot>
</table>