From cf374062bd065b84e3bd16f09b316665fbfc8e26 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Tue, 23 Jul 2013 16:45:40 +0900
Subject: [PATCH] =?UTF-8?q?=ED=9A=8C=EC=9B=90=20=ED=8F=AC=EC=9D=B8?=
 =?UTF-8?q?=ED=8A=B8=20=EB=82=B4=EC=97=AD=EC=97=90=20=EC=86=8C=EB=A9=B8=20?=
 =?UTF-8?q?=ED=8F=AC=EC=9D=B8=ED=8A=B8=20=ED=91=9C=EC=8B=9C=ED=95=98?=
 =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bbs/point.php | 61 +++++++++++++++++++++++++--------------------------
 1 file changed, 30 insertions(+), 31 deletions(-)

diff --git a/bbs/point.php b/bbs/point.php
index 310c31fb3..eafce2aaf 100644
--- a/bbs/point.php
+++ b/bbs/point.php
@@ -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,20 @@ for($i=0; $row=sql_fetch_array($result); $i++) {
             $sum_point2 += $row['po_point'];
         }
 
+        $po_content = $row['po_content'];
+
+        // 소멸포인트
+        if($row['po_point'] >= 0 && $row['po_expired'] == 1) {
+            $sum_point3 += $row['po_point'];
+            $po_content = '<span style="color: #999">'.$po_content.'</span>';
+        }
+
     ?>
     <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 +81,23 @@ 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>
+    <?php if($sum_point3) { ?>
+    <tr>
+        <th scope="row" colspan="2">소멸포인트</th>
+        <td colspan="2"><?php echo number_format($sum_point3); ?></td>
+    </tr>
+    <?php } ?>
+    <tr>
+        <th scope="row" colspan="2">보유포인트</th>
+        <td colspan="2"><?php echo number_format($member['mb_point']); ?></td>
+    </tr>
+    </tfoot>
     </table>