From 882ffaa8e61c60ea203aedf6802e1afaf1b5442e Mon Sep 17 00:00:00 2001
From: gnuboard <kagla@naver.com>
Date: Fri, 25 Jan 2013 13:25:06 +0900
Subject: [PATCH] =?UTF-8?q?=EC=83=B5=EC=9D=B4=20=EC=9D=BC=EB=8B=A8=20?=
 =?UTF-8?q?=EA=B5=AC=EB=8F=99=20=EB=90=98=EB=8F=84=EB=A1=9D=20=ED=95=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 extend/shop.extend.php |  3 ---
 shop.config.php        |  3 ++-
 shop.php               | 27 ++-------------------------
 3 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/extend/shop.extend.php b/extend/shop.extend.php
index 510c1562c..b2e4ece0e 100644
--- a/extend/shop.extend.php
+++ b/extend/shop.extend.php
@@ -2,9 +2,6 @@
 if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 include_once("$g4[path]/shop.config.php");
 include_once("$g4[path]/lib/shop.lib.php");
-include_once("$g4[path]/lib/fs.lib.php");
-
-$g4['yc4_uniqid_table'] = "yc4_uniqid";
 
 //==============================================================================
 // 쇼핑몰 필수 실행코드 모음 시작
diff --git a/shop.config.php b/shop.config.php
index 9fc7fd4f3..925566700 100644
--- a/shop.config.php
+++ b/shop.config.php
@@ -34,7 +34,7 @@ define(_MISU_QUERY_, "
 // 쇼핑몰 변수 모음 시작
 //------------------------------------------------------------------------------
 // 쇼핑몰 디렉토리
-$g4['shop']           = "fs";
+$g4['shop']           = "shop";
 $g4['shop_path']      = "$g4[path]/$g4[shop]";
 $g4['shop_url']       = "$g4[url]/$g4[shop]";
 
@@ -73,6 +73,7 @@ $g4['yc4_supplement_table']    = "yc4_supplement";            // 추가옵션 
 $g4['yc4_coupon_table']        = "yc4_coupon";                // 쿠폰정보 테이블
 $g4['yc4_coupon_history_table']= "yc4_coupon_history";        // 쿠폰사용내역 테이블
 $g4['yc4_sendcost_table']      = "yc4_sendcost";              // 추가배송비 테이블
+$g4['yc4_uniqid_table']        = "yc4_uniqid";
 
 
 // 신용카드결제대행사 URL
diff --git a/shop.php b/shop.php
index 09c81164e..965930638 100644
--- a/shop.php
+++ b/shop.php
@@ -70,33 +70,10 @@ include_once("$g4[path]/head.php");
                 ?>
             </td>
         </tr>
-        <tr><td colspan=2 height=20></td></tr>
-        <tr>
-            <td valign=top width=50% align=center>
-                <table width=95% cellpadding=0 cellspacing=0>
-                <tr><td><?=latest('basic', 'qa', 5, 30);?></td></tr>
-                </table></td>
-            <td valign=top width=50% align=center>
-                <table width=95% cellpadding=0 cellspacing=0>
-                <tr><td><?=latest('basic', 'free', 5, 30);?></td></tr>
-                </table></td>
-            </tr>
         </table>
     </td>
     <td valign=top>
 
-		<!-- 공지사항 -->
-        <table width=177 bgcolor=#DEDEDE cellpadding=1 cellspacing=0>
-        <tr><td align=center>
-            <table cellpadding=0 cellspacing=0 bgcolor=#FFFFFF height=97>
-            <tr><td height=28><a href='<?=$g4[bbs_path]?>/board.php?bo_table=notice'><img src='<?=$g4[shop_img_path]?>/bar_notice.gif' border=0></a></td></tr>
-            <tr>
-                <td><?=latest('shop_notice', 'notice', 3, 25);?></td>
-            </tr>
-            </table>
-        </td></tr>
-        </table><BR>
-
         <?
         // 최신상품
         $type = 3;
@@ -108,10 +85,10 @@ include_once("$g4[path]/head.php");
         ?><br><br>
 
 		<!-- 온라인 투표 -->
-        <?=poll('shop_poll');?><br>
+        <?=poll();?><br>
 
 		<!-- 방문자 수 -->
-        <?=visit('shop_visit');?><br>
+        <?=visit();?><br>
 
 		<!-- 메인 배너 -->
         <?=display_banner('메인');?><br>