From a09aa36cd63e0e2d3260554a5b0e7cc73b7c0a8d Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@sir.co.kr>
Date: Tue, 22 Sep 2015 15:43:52 +0900
Subject: [PATCH] =?UTF-8?q?=ED=85=8C=EB=A7=88=EC=97=90=EC=84=9C=20?=
 =?UTF-8?q?=EB=A7=88=EC=9D=B4=ED=8E=98=EC=9D=B4=EC=A7=80=EB=93=B1=EC=9D=84?=
 =?UTF-8?q?=20=EC=A7=80=EC=A0=95=ED=95=A0=20=EC=88=98=20=EC=9E=88=EB=8F=84?=
 =?UTF-8?q?=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

---
 mobile/shop/mypage.php           | 11 +++++++++--
 mobile/shop/orderinquiry.sub.php | 10 ++++++++++
 mobile/shop/orderinquiryview.php | 26 ++++++++------------------
 mobile/shop/wishlist.php         | 17 ++++++++++++-----
 shop/mypage.php                  | 14 ++++++++++++--
 shop/orderinquiry.sub.php        | 10 ++++++++++
 shop/orderinquiryview.php        | 20 +++++++++++++++-----
 shop/wishlist.php                | 14 ++++++++++++--
 8 files changed, 88 insertions(+), 34 deletions(-)

diff --git a/mobile/shop/mypage.php b/mobile/shop/mypage.php
index d6865727f..43649494c 100644
--- a/mobile/shop/mypage.php
+++ b/mobile/shop/mypage.php
@@ -1,8 +1,15 @@
 <?php
 include_once('./_common.php');
 
-if (!$is_member)
-    goto_url(G5_BBS_URL."/login.php?url=".urlencode(G5_SHOP_URL."/mypage.php"));
+// 테마에 mypage.php 있으면 include
+if(defined('G5_THEME_SHOP_PATH')) {
+    $theme_mypage_file = G5_THEME_MSHOP_PATH.'/mypage.php';
+    if(is_file($theme_mypage_file)) {
+        include_once($theme_mypage_file);
+        return;
+        unset($theme_mypage_file);
+    }
+}
 
 $g5['title'] = '마이페이지';
 include_once(G5_MSHOP_PATH.'/_head.php');
diff --git a/mobile/shop/orderinquiry.sub.php b/mobile/shop/orderinquiry.sub.php
index b0463ce45..9aa6cc35e 100644
--- a/mobile/shop/orderinquiry.sub.php
+++ b/mobile/shop/orderinquiry.sub.php
@@ -2,6 +2,16 @@
 if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
 
 if (!defined("_ORDERINQUIRY_")) exit; // 개별 페이지 접근 불가
+
+// 테마에 orderinquiry.sub.php 있으면 include
+if(defined('G5_THEME_SHOP_PATH')) {
+    $theme_inquiry_file = G5_THEME_MSHOP_PATH.'/orderinquiry.sub.php';
+    if(is_file($theme_inquiry_file)) {
+        include_once($theme_inquiry_file);
+        return;
+        unset($theme_inquiry_file);
+    }
+}
 ?>
 
 <?php if (!$limit) { ?>총 <?php echo $cnt; ?> 건<?php } ?>
diff --git a/mobile/shop/orderinquiryview.php b/mobile/shop/orderinquiryview.php
index 262c5fdd4..fc191441a 100644
--- a/mobile/shop/orderinquiryview.php
+++ b/mobile/shop/orderinquiryview.php
@@ -1,26 +1,16 @@
 <?php
 include_once('./_common.php');
 
-// 불법접속을 할 수 없도록 세션에 아무값이나 저장하여 hidden 으로 넘겨서 다음 페이지에서 비교함
-$token = md5(uniqid(rand(), true));
-set_session("ss_token", $token);
-
-if (!$is_member) {
-    if (get_session('ss_orderview_uid') != $_GET['uid'])
-        alert("직접 링크로는 주문서 조회가 불가합니다.\\n\\n주문조회 화면을 통하여 조회하시기 바랍니다.", G5_SHOP_URL);
+// 테마에 orderinquiryview.php 있으면 include
+if(defined('G5_THEME_SHOP_PATH')) {
+    $theme_inquiryview_file = G5_THEME_MSHOP_PATH.'/orderinquiryview.php';
+    if(is_file($theme_inquiryview_file)) {
+        include_once($theme_inquiryview_file);
+        return;
+        unset($theme_inquiryview_file);
+    }
 }
 
-$sql = "select * from {$g5['g5_shop_order_table']} where od_id = '$od_id' ";
-if($is_member && !$is_admin)
-    $sql .= " and mb_id = '{$member['mb_id']}' ";
-$od = sql_fetch($sql);
-if (!$od['od_id'] || (!$is_member && md5($od['od_id'].$od['od_time'].$od['od_ip']) != get_session('ss_orderview_uid'))) {
-    alert("조회하실 주문서가 없습니다.", G5_SHOP_URL);
-}
-
-// 결제방법
-$settle_case = $od['od_settle_case'];
-
 $g5['title'] = '주문상세내역';
 include_once(G5_MSHOP_PATH.'/_head.php');
 
diff --git a/mobile/shop/wishlist.php b/mobile/shop/wishlist.php
index 30ac75839..b903bbcce 100644
--- a/mobile/shop/wishlist.php
+++ b/mobile/shop/wishlist.php
@@ -1,8 +1,15 @@
 <?php
 include_once('./_common.php');
 
-if (!$is_member)
-    goto_url(G5_BBS_URL."/login.php?url=".urlencode(G5_SHOP_URL.'/wishlist.php'));
+// 테마에 wishlist.php 있으면 include
+if(defined('G5_THEME_SHOP_PATH')) {
+    $theme_wishlist_file = G5_THEME_MSHOP_PATH.'/wishlist.php';
+    if(is_file($theme_wishlist_file)) {
+        include_once($theme_wishlist_file);
+        return;
+        unset($theme_wishlist_file);
+    }
+}
 
 $g5['title'] = "위시리스트";
 include_once(G5_MSHOP_PATH.'/_head.php');
@@ -35,7 +42,7 @@ include_once(G5_MSHOP_PATH.'/_head.php');
 
             $image = get_it_image($row['it_id'], 50, 50);
     ?>
-    
+
         <li>
                 <div class="wish_img"><?php echo $image; ?></div>
                 <div class="wish_info">
@@ -59,7 +66,7 @@ include_once(G5_MSHOP_PATH.'/_head.php');
                     <input type="hidden"   name="ct_qty[<?php echo $row['it_id']; ?>][0]" value="1">
                 </div>
                 <span class="wish_del"><a href="<?php echo G5_SHOP_URL; ?>/wishupdate.php?w=d&amp;wi_id=<?php echo $row['wi_id']; ?>">삭제</a></span>
-                 
+
         </li>
         <?php
         }
@@ -68,7 +75,7 @@ include_once(G5_MSHOP_PATH.'/_head.php');
         ?>
     </ul>
 
-    
+
     <div id="sod_ws_act">
         <button type="submit" class="btn02" onclick="return fwishlist_check(document.fwishlist,'direct_buy');">BUY NOW</button>
         <button type="submit" class="btn01" onclick="return fwishlist_check(document.fwishlist,'');">CART</button>
diff --git a/shop/mypage.php b/shop/mypage.php
index 321a47615..bb5d3afa2 100644
--- a/shop/mypage.php
+++ b/shop/mypage.php
@@ -1,13 +1,23 @@
 <?php
 include_once('./_common.php');
 
+if (!$is_member)
+    goto_url(G5_BBS_URL."/login.php?url=".urlencode(G5_SHOP_URL."/mypage.php"));
+
 if (G5_IS_MOBILE) {
     include_once(G5_MSHOP_PATH.'/mypage.php');
     return;
 }
 
-if (!$is_member)
-    goto_url(G5_BBS_URL."/login.php?url=".urlencode(G5_SHOP_URL."/mypage.php"));
+// 테마에 mypage.php 있으면 include
+if(defined('G5_THEME_SHOP_PATH')) {
+    $theme_mypage_file = G5_THEME_SHOP_PATH.'/mypage.php';
+    if(is_file($theme_mypage_file)) {
+        include_once($theme_mypage_file);
+        return;
+        unset($theme_mypage_file);
+    }
+}
 
 $g5['title'] = $member['mb_name'].'님 마이페이지';
 include_once('./_head.php');
diff --git a/shop/orderinquiry.sub.php b/shop/orderinquiry.sub.php
index ad3227a44..270411d93 100644
--- a/shop/orderinquiry.sub.php
+++ b/shop/orderinquiry.sub.php
@@ -2,6 +2,16 @@
 if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
 
 if (!defined("_ORDERINQUIRY_")) exit; // 개별 페이지 접근 불가
+
+// 테마에 orderinquiry.sub.php 있으면 include
+if(defined('G5_THEME_SHOP_PATH')) {
+    $theme_inquiry_file = G5_THEME_SHOP_PATH.'/orderinquiry.sub.php';
+    if(is_file($theme_inquiry_file)) {
+        include_once($theme_inquiry_file);
+        return;
+        unset($theme_inquiry_file);
+    }
+}
 ?>
 
 <!-- 주문 내역 목록 시작 { -->
diff --git a/shop/orderinquiryview.php b/shop/orderinquiryview.php
index 930686dde..b8a5634d8 100644
--- a/shop/orderinquiryview.php
+++ b/shop/orderinquiryview.php
@@ -1,11 +1,6 @@
 <?php
 include_once('./_common.php');
 
-if (G5_IS_MOBILE) {
-    include_once(G5_MSHOP_PATH.'/orderinquiryview.php');
-    return;
-}
-
 // 불법접속을 할 수 없도록 세션에 아무값이나 저장하여 hidden 으로 넘겨서 다음 페이지에서 비교함
 $token = md5(uniqid(rand(), true));
 set_session("ss_token", $token);
@@ -26,6 +21,21 @@ if (!$od['od_id'] || (!$is_member && md5($od['od_id'].$od['od_time'].$od['od_ip'
 // 결제방법
 $settle_case = $od['od_settle_case'];
 
+if (G5_IS_MOBILE) {
+    include_once(G5_MSHOP_PATH.'/orderinquiryview.php');
+    return;
+}
+
+// 테마에 orderinquiryview.php 있으면 include
+if(defined('G5_THEME_SHOP_PATH')) {
+    $theme_inquiryview_file = G5_THEME_SHOP_PATH.'/orderinquiryview.php';
+    if(is_file($theme_inquiryview_file)) {
+        include_once($theme_inquiryview_file);
+        return;
+        unset($theme_inquiryview_file);
+    }
+}
+
 $g5['title'] = '주문상세내역';
 include_once('./_head.php');
 
diff --git a/shop/wishlist.php b/shop/wishlist.php
index 6491c76cd..6b81f656d 100644
--- a/shop/wishlist.php
+++ b/shop/wishlist.php
@@ -1,13 +1,23 @@
 <?php
 include_once('./_common.php');
 
+if (!$is_member)
+    goto_url(G5_BBS_URL."/login.php?url=".urlencode(G5_SHOP_URL.'/wishlist.php'));
+
 if (G5_IS_MOBILE) {
     include_once(G5_MSHOP_PATH.'/wishlist.php');
     return;
 }
 
-if (!$is_member)
-    goto_url(G5_BBS_URL."/login.php?url=".urlencode(G5_SHOP_URL.'/wishlist.php'));
+// 테마에 wishlist.php 있으면 include
+if(defined('G5_THEME_SHOP_PATH')) {
+    $theme_wishlist_file = G5_THEME_SHOP_PATH.'/wishlist.php';
+    if(is_file($theme_wishlist_file)) {
+        include_once($theme_wishlist_file);
+        return;
+        unset($theme_wishlist_file);
+    }
+}
 
 $g5['title'] = "위시리스트";
 include_once('./_head.php');