From ccaa57f9e07fef8affad8871231b8a82109f46c0 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Fri, 27 Jun 2014 15:48:14 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B6=84=EB=A5=98=20=EC=8A=A4=ED=82=A8=20?=
 =?UTF-8?q?=EA=B2=BD=EB=A1=9C=EA=B4=80=EB=A0=A8=20=EC=BD=94=EB=93=9C=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

---
 adm/shop_admin/categoryform.php | 19 +++++++++++++++----
 adm/shop_admin/categorylist.php | 15 +++++++++++++--
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/adm/shop_admin/categoryform.php b/adm/shop_admin/categoryform.php
index 05e03878b..b379f00f9 100644
--- a/adm/shop_admin/categoryform.php
+++ b/adm/shop_admin/categoryform.php
@@ -109,6 +109,17 @@ if(!sql_query(" select ca_order from {$g5['g5_shop_category_table']} limit 1 ",
                     ADD `ca_order` int(11) NOT NULL DEFAULT '0' AFTER `ca_name` ", true);
     sql_query(" ALTER TABLE `{$g5['g5_shop_category_table']}` ADD INDEX(`ca_order`) ", true);
 }
+
+// 스킨 Path
+if(!$ca['ca_skin_dir'])
+    $g5_shop_skin_path = G5_SHOP_SKIN_PATH;
+else
+    $g5_shop_skin_path  = G5_PATH.'/'.G5_SKIN_DIR.'/shop/'.$ca['ca_skin_dir'];
+
+if(!$ca['ca_mobile_skin_dir'])
+    $g5_mshop_skin_path = G5_MSHOP_SKIN_PATH;
+else
+    $g5_mshop_skin_path = G5_MOBILE_PATH.'/'.G5_SKIN_DIR.'/shop/'.$ca['ca_mobile_skin_dir'];
 ?>
 
 <form name="fcategoryform" action="./categoryformupdate.php" onsubmit="return fcategoryformcheck(this);" method="post" enctype="multipart/form-data">
@@ -219,9 +230,9 @@ if(!sql_query(" select ca_order from {$g5['g5_shop_category_table']} limit 1 ",
         <tr>
             <th scope="row"><label for="ca_skin">출력스킨</label></th>
             <td>
-                <?php echo help('기본으로 제공하는 스킨은 '.str_replace(G5_PATH.'/', '', G5_SHOP_SKIN_PATH).'/list.*.skin.php 입니다.'); ?>
+                <?php echo help('기본으로 제공하는 스킨은 '.str_replace(G5_PATH.'/', '', $g5_shop_skin_path).'/list.*.skin.php 입니다.'); ?>
                 <select id="ca_skin" name="ca_skin">
-                    <?php echo get_list_skin_options("^list.[0-9]+\.skin\.php", G5_SHOP_SKIN_PATH, $ca['ca_skin']); ?>
+                    <?php echo get_list_skin_options("^list.[0-9]+\.skin\.php", $g5_shop_skin_path, $ca['ca_skin']); ?>
                 </select>
             </td>
         </tr>
@@ -256,9 +267,9 @@ if(!sql_query(" select ca_order from {$g5['g5_shop_category_table']} limit 1 ",
         <tr>
             <th scope="row"><label for="ca_mobile_skin">모바일 출력스킨</label></th>
             <td>
-                <?php echo help('기본으로 제공하는 스킨은 '.str_replace(G5_PATH.'/', '', G5_MSHOP_SKIN_PATH).'/list.*.skin.php 입니다.'); ?>
+                <?php echo help('기본으로 제공하는 스킨은 '.str_replace(G5_PATH.'/', '', $g5_mshop_skin_path).'/list.*.skin.php 입니다.'); ?>
                 <select id="ca_mobile_skin" name="ca_mobile_skin">
-                    <?php echo get_list_skin_options("^list.[0-9]+\.skin\.php", G5_MSHOP_SKIN_PATH, $ca['ca_mobile_skin']); ?>
+                    <?php echo get_list_skin_options("^list.[0-9]+\.skin\.php", $g5_mshop_skin_path, $ca['ca_mobile_skin']); ?>
                 </select>
             </td>
         </tr>
diff --git a/adm/shop_admin/categorylist.php b/adm/shop_admin/categorylist.php
index b62072209..56ff40421 100644
--- a/adm/shop_admin/categorylist.php
+++ b/adm/shop_admin/categorylist.php
@@ -160,6 +160,17 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
                       or ca_id3 = '{$row['ca_id']}' ";
         $row1 = sql_fetch($sql1);
 
+        // 스킨 Path
+        if(!$row['ca_skin_dir'])
+            $g5_shop_skin_path = G5_SHOP_SKIN_PATH;
+        else
+            $g5_shop_skin_path  = G5_PATH.'/'.G5_SKIN_DIR.'/shop/'.$row['ca_skin_dir'];
+
+        if(!$row['ca_mobile_skin_dir'])
+            $g5_mshop_skin_path = G5_MSHOP_SKIN_PATH;
+        else
+            $g5_mshop_skin_path = G5_MOBILE_PATH.'/'.G5_SKIN_DIR.'/shop/'.$row['ca_mobile_skin_dir'];
+
         $bg = 'bg'.($i%2);
     ?>
     <tr class="<?php echo $bg; ?>">
@@ -192,7 +203,7 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
             </select>
             <label for="ca_skin<?php echo $i; ?>" class="sound_only">PC스킨파일</label>
             <select id="ca_skin<?php echo $i; ?>" name="ca_skin[<?php echo $i; ?>]" required class="required">
-                <?php echo get_list_skin_options("^list.[0-9]+\.skin\.php", G5_SHOP_SKIN_PATH, $row['ca_skin']); ?>
+                <?php echo get_list_skin_options("^list.[0-9]+\.skin\.php", $g5_shop_skin_path, $row['ca_skin']); ?>
             </select>
         </td>
         <td class="td_mng" rowspan="2">
@@ -239,7 +250,7 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
             </select>
             <label for="ca_mobile_skin<?php echo $i; ?>" class="sound_only">모바일스킨파일</label>
             <select id="ca_mobile_skin<?php echo $i; ?>" name="ca_mobile_skin[<?php echo $i; ?>]" required class="required">
-                <?php echo get_list_skin_options("^list.[0-9]+\.skin\.php", G5_MSHOP_SKIN_PATH, $row['ca_mobile_skin']); ?>
+                <?php echo get_list_skin_options("^list.[0-9]+\.skin\.php", $g5_mshop_skin_path, $row['ca_mobile_skin']); ?>
             </select>
         </td>
     </tr>