From f5fe47df0c34fc377417240bbd9da52335efce9f Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Fri, 28 Jun 2013 17:54:22 +0900
Subject: [PATCH] =?UTF-8?q?=EC=87=BC=ED=95=91=EB=AA=B0=20=EB=A1=9C?=
 =?UTF-8?q?=EA=B7=B8=EC=95=84=EC=9B=83=EC=8B=9C=20=EC=87=BC=ED=95=91?=
 =?UTF-8?q?=EB=AA=B0=EC=97=90=20=EB=A8=B8=EB=AC=BC=EB=8F=84=EB=A1=9D=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bbs/logout.php                               | 9 ++++++---
 mobile/shop/shop.head.php                    | 2 +-
 shop/shop.head.php                           | 2 +-
 skin/outlogin/shop_basic/outlogin.skin.2.php | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/bbs/logout.php b/bbs/logout.php
index f3c5bff41..b62fb3af7 100644
--- a/bbs/logout.php
+++ b/bbs/logout.php
@@ -2,8 +2,8 @@
 include_once('./_common.php');
 
 // 이호경님 제안 코드
-session_unset(); // 모든 세션변수를 언레지스터 시켜줌 
-session_destroy(); // 세션해제함 
+session_unset(); // 모든 세션변수를 언레지스터 시켜줌
+session_destroy(); // 세션해제함
 
 // 자동로그인 해제 --------------------------------
 set_cookie('ck_mb_id', '', 0);
@@ -16,7 +16,10 @@ if ($url) {
         alert('url에 도메인을 지정할 수 없습니다.');
     }
 
-    $link = $url;
+    if($url == 'shop')
+        $link = G4_SHOP_URL;
+    else
+        $link = $url;
 } else if ($bo_table) {
     $link = G4_BBS_URL.'/board.php?bo_table='.$bo_table;
 } else {
diff --git a/mobile/shop/shop.head.php b/mobile/shop/shop.head.php
index 843b00594..b9c1d2702 100644
--- a/mobile/shop/shop.head.php
+++ b/mobile/shop/shop.head.php
@@ -42,7 +42,7 @@ include_once(G4_LIB_PATH.'/popular.lib.php');
 
     <ul id="hd_mb">
         <?php if ($is_member) { ?>
-        <li><a href="<?php echo G4_BBS_URL; ?>/logout.php">로그아웃</a></li>
+        <li><a href="<?php echo G4_BBS_URL; ?>/logout.php?url=shop">로그아웃</a></li>
         <?php } else { ?>
         <li><a href="<?php echo G4_BBS_URL; ?>/login.php?url=<?php echo $urlencode; ?>">로그인</a></li>
         <?php } ?>
diff --git a/shop/shop.head.php b/shop/shop.head.php
index 3ad802d99..9382e4f5b 100644
--- a/shop/shop.head.php
+++ b/shop/shop.head.php
@@ -71,7 +71,7 @@ include_once(G4_LIB_PATH.'/popular.lib.php');
                 <h3>회원메뉴 및 FAQ</h3>
                 <ul>
                     <?php if ($is_member) { ?>
-                    <li><a href="<?php echo G4_BBS_URL; ?>/logout.php">로그아웃</a></li>
+                    <li><a href="<?php echo G4_BBS_URL; ?>/logout.php?url=shop">로그아웃</a></li>
                     <li><a href="<?php echo G4_BBS_URL; ?>/member_confirm.php?url=register_form.php">정보수정</a></li>
                     <?php } else { ?>
                     <li><a href="<?php echo G4_BBS_URL; ?>/login.php?url=<?php echo $urlencode; ?>">로그인</a></li>
diff --git a/skin/outlogin/shop_basic/outlogin.skin.2.php b/skin/outlogin/shop_basic/outlogin.skin.2.php
index 410f75f51..471de1abe 100644
--- a/skin/outlogin/shop_basic/outlogin.skin.2.php
+++ b/skin/outlogin/shop_basic/outlogin.skin.2.php
@@ -30,7 +30,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
     </ul>
     <footer id="ol_after_ft">
         <a href="<?php echo G4_BBS_URL; ?>/member_confirm.php?url=register_form.php" id="ol_after_info">정보수정</a>
-        <a href="<?php echo G4_BBS_URL; ?>/logout.php" id="ol_after_logout">로그아웃</a>
+        <a href="<?php echo G4_BBS_URL; ?>/logout.php?url=shop" id="ol_after_logout">로그아웃</a>
     </footer>
 </section>