From 9dd66876f88e081aed88668618e4bc526b1fde35 Mon Sep 17 00:00:00 2001
From: thisgun <thisgun@naver.com>
Date: Fri, 14 Feb 2014 16:29:46 +0900
Subject: [PATCH] =?UTF-8?q?=ED=8C=9D=EC=97=85=EB=A0=88=EC=9D=B4=EC=96=B4?=
 =?UTF-8?q?=EC=97=90=EC=84=9C=20=EA=B7=B8=EB=88=84=EB=B3=B4=EB=93=9C5,=20?=
 =?UTF-8?q?=EC=98=81=EC=B9=B4=ED=8A=B85=20=EA=B5=AC=EB=B6=84=EC=A7=93?=
 =?UTF-8?q?=EB=8A=94=20=ED=95=84=EB=93=9C=20=EC=9D=B4=EB=A6=84=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/newwinform.php | 8 ++++----
 bbs/newwin.inc.php | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/adm/newwinform.php b/adm/newwinform.php
index 0b5ead9b4..1dc981e56 100644
--- a/adm/newwinform.php
+++ b/adm/newwinform.php
@@ -52,11 +52,11 @@ include_once (G5_ADMIN_PATH.'/admin.head.php');
     <tr>
         <th scope="row"><label for="nw_division">구분</label></th>
         <td>
-            <?php echo help("그누보드5에 표시될 것인지 영카트5에 표시될 것인지를 설정합니다."); ?>
+            <?php echo help("커뮤니티에 표시될 것인지 쇼핑몰에 표시될 것인지를 설정합니다."); ?>
             <select name="nw_division" id="nw_division">
-                <option value="both"<?php echo get_selected($nw['nw_division'], 'both', true); ?>>그누보드5와 영카트5</option>
-                <option value="g5"<?php echo get_selected($nw['nw_division'], 'g5'); ?>>그누보드5</option>
-                <option value="yc5"<?php echo get_selected($nw['nw_division'], 'yc5'); ?>>영카트5</option>
+                <option value="both"<?php echo get_selected($nw['nw_division'], 'both', true); ?>>커뮤니티와 쇼핑몰</option>
+                <option value="comm"<?php echo get_selected($nw['nw_division'], 'comm'); ?>>커뮤니티</option>
+                <option value="shop"<?php echo get_selected($nw['nw_division'], 'shop'); ?>>쇼핑몰</option>
             </select>
         </td>
     </tr>
diff --git a/bbs/newwin.inc.php b/bbs/newwin.inc.php
index aa063600a..0c0027516 100644
--- a/bbs/newwin.inc.php
+++ b/bbs/newwin.inc.php
@@ -2,14 +2,14 @@
 if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
 
 if (!defined('_SHOP_')) {
-    $g5['pop_division'] = 'g5';
+    $pop_division = 'comm';
 } else {
-    $g5['pop_division'] = 'yc5';
+    $pop_division = 'shop';
 }
 
 $sql = " select * from {$g5['new_win_table']}
           where '".G5_TIME_YMDHIS."' between nw_begin_time and nw_end_time
-            and nw_device IN ( 'both', 'pc' ) and nw_division IN ( 'both', '".$g5['pop_division']."' )
+            and nw_device IN ( 'both', 'pc' ) and nw_division IN ( 'both', '".$pop_division."' )
           order by nw_id asc ";
 $result = sql_query($sql, false);
 for ($i=0; $row_nw=sql_fetch_array($result); $i++)