From 38a47decb49524e369f6422038bee459d8e75a06 Mon Sep 17 00:00:00 2001
From: thisgun <thisgun@naver.com>
Date: Fri, 14 Feb 2014 16:10: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=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/newwinform.php       | 15 +++++++++++++++
 adm/newwinformupdate.php |  3 ++-
 bbs/newwin.inc.php       |  8 +++++++-
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/adm/newwinform.php b/adm/newwinform.php
index 9af03c821..0b5ead9b4 100644
--- a/adm/newwinform.php
+++ b/adm/newwinform.php
@@ -5,6 +5,10 @@ include_once(G5_EDITOR_LIB);
 
 auth_check($auth[$sub_menu], "w");
 
+// 팝업레이어 테이블에 영카트, 그누보드 인지 구분하는 여부 필드 추가
+$sql = " ALTER TABLE `{$g5['new_win_table']}` ADD `nw_division` VARCHAR(10) NOT NULL DEFAULT 'both' ";
+sql_query($sql, false);
+
 $html_title = "팝업레이어";
 if ($w == "u")
 {
@@ -45,6 +49,17 @@ include_once (G5_ADMIN_PATH.'/admin.head.php');
         <col>
     </colgroup>
     <tbody>
+    <tr>
+        <th scope="row"><label for="nw_division">구분</label></th>
+        <td>
+            <?php echo help("그누보드5에 표시될 것인지 영카트5에 표시될 것인지를 설정합니다."); ?>
+            <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>
+            </select>
+        </td>
+    </tr>
     <tr>
         <th scope="row"><label for="nw_device">접속기기</label></th>
         <td>
diff --git a/adm/newwinformupdate.php b/adm/newwinformupdate.php
index a7286ad2f..4553188ab 100644
--- a/adm/newwinformupdate.php
+++ b/adm/newwinformupdate.php
@@ -10,7 +10,8 @@ if ($W == 'd')
 else
     auth_check($auth[$sub_menu], "w");
 
-$sql_common = " nw_device = '$nw_device',
+$sql_common = " nw_division = '$nw_division',
+                nw_device = '$nw_device',
                 nw_begin_time = '$nw_begin_time',
                 nw_end_time = '$nw_end_time',
                 nw_disable_hours = '$nw_disable_hours',
diff --git a/bbs/newwin.inc.php b/bbs/newwin.inc.php
index 176638c70..aa063600a 100644
--- a/bbs/newwin.inc.php
+++ b/bbs/newwin.inc.php
@@ -1,9 +1,15 @@
 <?php
 if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
 
+if (!defined('_SHOP_')) {
+    $g5['pop_division'] = 'g5';
+} else {
+    $g5['pop_division'] = 'yc5';
+}
+
 $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_device IN ( 'both', 'pc' ) and nw_division IN ( 'both', '".$g5['pop_division']."' )
           order by nw_id asc ";
 $result = sql_query($sql, false);
 for ($i=0; $row_nw=sql_fetch_array($result); $i++)