From c667e02282f24cbe718a9767fb99e4d3db1fa53b Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Mon, 1 Jul 2013 10:18:12 +0900
Subject: [PATCH 1/6] =?UTF-8?q?=EC=B9=B4=ED=85=8C=EA=B3=A0=EB=A6=AC=20?=
 =?UTF-8?q?=EC=84=A4=EC=A0=95=20=EC=A4=91=20=EB=AA=A8=EB=B0=94=EC=9D=BC=20?=
 =?UTF-8?q?=EC=83=81=ED=95=98=EB=8B=A8=20=EB=82=B4=EC=9A=A9=20=EC=A0=80?=
 =?UTF-8?q?=EC=9E=A5=EB=90=98=EC=A7=80=20=EC=95=8A=EB=8A=94=20=EC=98=A4?=
 =?UTF-8?q?=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/shop_admin/categoryformupdate.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/adm/shop_admin/categoryformupdate.php b/adm/shop_admin/categoryformupdate.php
index 98c61dc87..8ef24a3cf 100644
--- a/adm/shop_admin/categoryformupdate.php
+++ b/adm/shop_admin/categoryformupdate.php
@@ -70,6 +70,8 @@ $sql_common = " ca_skin                 = '$ca_skin',
                 ca_explan_html          = '$ca_explan_html',
                 ca_head_html            = '$ca_head_html',
                 ca_tail_html            = '$ca_tail_html',
+                ca_mobile_head_html     = '$ca_mobile_head_html',
+                ca_mobile_tail_html     = '$ca_mobile_tail_html',
                 ca_include_head         = '$ca_include_head',
                 ca_include_tail         = '$ca_include_tail',
                 ca_mb_id                = '$ca_mb_id',

From 8d38fcf3beab104153ecb00dcc56dcf85ca8e770 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Mon, 1 Jul 2013 11:11:22 +0900
Subject: [PATCH 2/6] =?UTF-8?q?=EC=83=81=ED=92=88=20=EC=83=81=ED=95=98?=
 =?UTF-8?q?=EB=8B=A8=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EC=97=85=EB=A1=9C?=
 =?UTF-8?q?=EB=93=9C=20=EC=98=A4=EB=A5=98=EC=99=80=20=EC=9D=B4=EB=AF=B8?=
 =?UTF-8?q?=EC=A7=80=EB=B3=B4=EA=B8=B0=20=EC=8A=A4=ED=81=AC=EB=A6=BD?=
 =?UTF-8?q?=ED=8A=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/shop_admin/itemform.php       | 91 +++++++++++++++++--------------
 adm/shop_admin/itemformupdate.php |  4 ++
 2 files changed, 55 insertions(+), 40 deletions(-)

diff --git a/adm/shop_admin/itemform.php b/adm/shop_admin/itemform.php
index 25be031c3..86a648f7b 100644
--- a/adm/shop_admin/itemform.php
+++ b/adm/shop_admin/itemform.php
@@ -984,44 +984,6 @@ $(function(){
     <?php } ?>
     </tbody>
     </table>
-
-    <?php if ($w == 'u') { ?>
-    <script>
-    $(".banner_or_img").addClass("sit_wimg");
-    $(function() {
-        $(".sit_wimg_view").bind("click", function() {
-            var sit_wimg_id = $(this).attr("id").split("_");
-            var $img_display = $("#"+sit_wimg_id[1]);
-
-            var $img = $("#"+sit_wimg_id[1]);
-            var width = $img_display.width();
-            var height = $img_display.height();
-            if(width > 700) {
-                var img_width = 700;
-                var img_height = Math.round((img_width * height) / width);
-
-                $img_display.children("img").width(img_width).height(img_height);
-            }
-
-            $img_display.toggle();
-
-            if($img_display.is(":visible")) {
-                $(this).text($(this).text().replace("확인", "닫기"));
-            } else {
-                $(this).text($(this).text().replace("닫기", "확인"));
-            }
-        });
-        $(".sit_wimg_close").bind("click", function() {
-            var $img_display = $(this).parents(".banner_or_img");
-            var id = $img_display.attr("id");
-            $img_display.toggle();
-            var $button = $("#it_"+id+"_view");
-            $button.text($button.text().replace("닫기", "확인"));
-        });
-    });
-    </script>
-    <?php } ?>
-
 </section>
 
 <div class="btn_confirm">
@@ -1331,7 +1293,14 @@ $(function(){
             ?>
             <label for="it_himg_del">상단이미지 삭제</label>
             <input type="checkbox" name="it_himg_del" value="1" id="it_himg_del">
-            <div class="banner_or_img"><img src="<?php echo G4_DATA_URL; ?>/item/<?php echo $it['it_id']; ?>_h" alt=""></div>
+            <span class="sit_wimg_himg"></span>
+            <div id="himg" class="banner_or_img">
+                <img src="<?php echo G4_DATA_URL; ?>/item/<?php echo $it['it_id']; ?>_h" alt="">
+                <button type="button" class="sit_wimg_close">닫기</button>
+            </div>
+            <script>
+            $('<button type="button" id="it_himg_view" class="btn_frmline sit_wimg_view">상단이미지 확인</button>').appendTo('.sit_wimg_himg');
+            </script>
             <?php } ?>
         </td>
     </tr>
@@ -1347,7 +1316,14 @@ $(function(){
             ?>
             <label for="it_timg_del">삭제</label>
             <input type="checkbox" name="it_timg_del" value="1" id="it_timg_del">
-            <div class="banner_or_img"><img src="<?php echo G4_DATA_URL; ?>/item/<?php echo $it['it_id']; ?>_t" alt=""></div>
+            <span class="sit_wimg_timg"></span>
+            <div id="timg" class="banner_or_img">
+                <img src="<?php echo G4_DATA_URL; ?>/item/<?php echo $it['it_id']; ?>_t" alt="">
+                <button type="button" class="sit_wimg_close">닫기</button>
+            </div>
+            <script>
+            $('<button type="button" id="it_timg_view" class="btn_frmline sit_wimg_view">하단이미지 확인</button>').appendTo('.sit_wimg_timg');
+            </script>
             <?php } ?>
         </td>
     </tr>
@@ -1414,6 +1390,41 @@ $(function(){
 <script>
 var f = document.fitemform;
 
+<?php if ($w == 'u') { ?>
+$(".banner_or_img").addClass("sit_wimg");
+$(function() {
+    $(".sit_wimg_view").bind("click", function() {
+        var sit_wimg_id = $(this).attr("id").split("_");
+        var $img_display = $("#"+sit_wimg_id[1]);
+
+        var $img = $("#"+sit_wimg_id[1]);
+        var width = $img_display.width();
+        var height = $img_display.height();
+        if(width > 700) {
+            var img_width = 700;
+            var img_height = Math.round((img_width * height) / width);
+
+            $img_display.children("img").width(img_width).height(img_height);
+        }
+
+        $img_display.toggle();
+
+        if($img_display.is(":visible")) {
+            $(this).text($(this).text().replace("확인", "닫기"));
+        } else {
+            $(this).text($(this).text().replace("닫기", "확인"));
+        }
+    });
+    $(".sit_wimg_close").bind("click", function() {
+        var $img_display = $(this).parents(".banner_or_img");
+        var id = $img_display.attr("id");
+        $img_display.toggle();
+        var $button = $("#it_"+id+"_view");
+        $button.text($button.text().replace("닫기", "확인"));
+    });
+});
+<?php } ?>
+
 function codedupcheck(id)
 {
     if (!id) {
diff --git a/adm/shop_admin/itemformupdate.php b/adm/shop_admin/itemformupdate.php
index 10351ff5e..576b74436 100644
--- a/adm/shop_admin/itemformupdate.php
+++ b/adm/shop_admin/itemformupdate.php
@@ -181,6 +181,10 @@ if ($_FILES['it_img10']['name']) {
     $it_img10 = it_img_upload($_FILES['it_img10']['tmp_name'], $_FILES['it_img10']['name'], $it_img_dir.'/'.$it_id);
 }
 
+// 상, 하단 이미지 업로드
+if ($_FILES['it_himg']['name'])  upload_file($_FILES['it_himg']['tmp_name'], $it_id . "_h", G4_DATA_PATH.'/item');
+if ($_FILES['it_timg']['name'])  upload_file($_FILES['it_timg']['tmp_name'], $it_id . "_t", G4_DATA_PATH.'/item');
+
 if ($w == "" || $w == "u")
 {
     // 다음 입력을 위해서 옵션값을 쿠키로 한달동안 저장함

From a356e64765a822aa0f02e737029658e084c4ff44 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Mon, 1 Jul 2013 11:22:42 +0900
Subject: [PATCH 3/6] =?UTF-8?q?=EB=B6=84=EB=A5=98=20=EC=83=81=ED=95=98?=
 =?UTF-8?q?=EB=8B=A8=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EB=B3=B4=EA=B8=B0=20?=
 =?UTF-8?q?=EC=8A=A4=ED=81=AC=EB=A6=BD=ED=8A=B8=20=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 | 78 ++++++++++++++++++++++++++-------
 1 file changed, 61 insertions(+), 17 deletions(-)

diff --git a/adm/shop_admin/categoryform.php b/adm/shop_admin/categoryform.php
index 63903bc63..101f7e325 100644
--- a/adm/shop_admin/categoryform.php
+++ b/adm/shop_admin/categoryform.php
@@ -297,15 +297,19 @@ $pg_anchor .= '</ul>';
             <?php
             $himg_str = "";
             $himg = "{$category_path}/{$ca['ca_id']}_h";
-            if (file_exists($himg))
-            {
-                echo "<input type=checkbox name=ca_himg_del value='1'>삭제";
-                $himg_str = "<img src='".G4_DATA_URL."/category/{$ca['ca_id']}_h' border=0>";
-                //$size = getimagesize($himg);
-                //echo "<img src='$g4[admin_path]/img/icon_viewer.gif' border=0 align=absmiddle onclick=\"imageview('himg', $size[0], $size[1]);\">";
-                //echo "<div id='himg' style='left:0; top:0; z-index:+1; display:none; position:absolute;'><img src='$himg' border=1></div>";
-            }
+            if (file_exists($himg)) {
             ?>
+            <label for="ca_himg_del">상단이미지 삭제</label>
+            <input type="checkbox" name="ca_himg_del" value="1" id="ca_himg_del">
+            <span class="sit_wimg_himg"></span>
+            <div id="himg" class="banner_or_img">
+                <img src="<?php echo G4_DATA_URL; ?>/category/<?php echo $ca['ca_id']; ?>_h" alt="">
+                <button type="button" class="sit_wimg_close">닫기</button>
+            </div>
+            <script>
+            $('<button type="button" id="ca_himg_view" class="btn_frmline sit_wimg_view">상단이미지 확인</button>').appendTo('.sit_wimg_himg');
+            </script>
+            <?php } ?>
         </td>
     </tr>
     <?php if ($himg_str) { echo "<tr><td colspan=4>$himg_str</td></tr>"; } ?>
@@ -315,16 +319,21 @@ $pg_anchor .= '</ul>';
             <?php echo help("상품리스트 페이지 하단에 출력하는 이미지입니다."); ?>
             <input type="file" name="ca_timg">
             <?php
-                $timg_str = "";
-                $timg = "{$category_path}/{$ca['ca_id']}_t";
-                if (file_exists($timg)) {
-                echo "<input type=checkbox name=ca_timg_del value='1'>삭제";
-                $timg_str = "<img src='".G4_DATA_URL."/category/{$ca['ca_id']}_t' border=0>";
-                //$size = getimagesize($timg);
-                //echo "<img src='$g4[admin_path]/img/icon_viewer.gif' border=0 align=absmiddle onclick=\"imageview('timg', $size[0], $size[1]);\"><input type=checkbox name=ca_timg_del value='1'>삭제";
-                //echo "<div id='timg' style='left:0; top:0; z-index:+1; display:none; position:absolute;'><img src='$timg' border=1></div>";
-            }
+            $timg_str = "";
+            $timg = "{$category_path}/{$ca['ca_id']}_t";
+            if (file_exists($timg)) {
             ?>
+            <label for="ca_timg_del">하단이미지 삭제</label>
+            <input type="checkbox" name="ca_timg_del" value="1" id="ca_timg_del">
+            <span class="sit_wimg_timg"></span>
+            <div id="timg" class="banner_or_img">
+                <img src="<?php echo G4_DATA_URL; ?>/category/<?php echo $ca['ca_id']; ?>_t" alt="">
+                <button type="button" class="sit_wimg_close">닫기</button>
+            </div>
+            <script>
+            $('<button type="button" id="ca_timg_view" class="btn_frmline sit_wimg_view">하단이미지 확인</button>').appendTo('.sit_wimg_timg');
+            </script>
+            <?php } ?>
         </td>
     </tr>
     <?php if ($timg_str) { echo "<tr><td colspan=4>$timg_str</td></tr>"; } ?>
@@ -391,6 +400,41 @@ $pg_anchor .= '</ul>';
 </form>
 
 <script>
+<?php if ($w == 'u') { ?>
+$(".banner_or_img").addClass("sit_wimg");
+$(function() {
+    $(".sit_wimg_view").bind("click", function() {
+        var sit_wimg_id = $(this).attr("id").split("_");
+        var $img_display = $("#"+sit_wimg_id[1]);
+
+        var $img = $("#"+sit_wimg_id[1]);
+        var width = $img_display.width();
+        var height = $img_display.height();
+        if(width > 700) {
+            var img_width = 700;
+            var img_height = Math.round((img_width * height) / width);
+
+            $img_display.children("img").width(img_width).height(img_height);
+        }
+
+        $img_display.toggle();
+
+        if($img_display.is(":visible")) {
+            $(this).text($(this).text().replace("확인", "닫기"));
+        } else {
+            $(this).text($(this).text().replace("닫기", "확인"));
+        }
+    });
+    $(".sit_wimg_close").bind("click", function() {
+        var $img_display = $(this).parents(".banner_or_img");
+        var id = $img_display.attr("id");
+        $img_display.toggle();
+        var $button = $("#ca_"+id+"_view");
+        $button.text($button.text().replace("닫기", "확인"));
+    });
+});
+<?php } ?>
+
 function fcategoryformcheck(f)
 {
     if (f.w.value == "") {

From 8d403db29402f12297846471ef0b677041fc42df Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Mon, 1 Jul 2013 12:53:05 +0900
Subject: [PATCH 4/6] =?UTF-8?q?IE8=EC=97=90=EC=84=9C=20=EB=AF=B8=EB=A6=AC?=
 =?UTF-8?q?=EB=B3=B4=EA=B8=B0=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EC=82=AC?=
 =?UTF-8?q?=EC=9D=B4=EC=A6=88=20=EB=B3=80=EA=B2=BD=EB=90=98=EC=A7=80=20?=
 =?UTF-8?q?=EC=95=8A=EB=8A=94=20=EC=98=A4=EB=A5=98=20=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 | 20 ++++++++++----------
 adm/shop_admin/itemform.php     | 22 +++++++++++-----------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/adm/shop_admin/categoryform.php b/adm/shop_admin/categoryform.php
index 101f7e325..c7028ead3 100644
--- a/adm/shop_admin/categoryform.php
+++ b/adm/shop_admin/categoryform.php
@@ -407,16 +407,6 @@ $(function() {
         var sit_wimg_id = $(this).attr("id").split("_");
         var $img_display = $("#"+sit_wimg_id[1]);
 
-        var $img = $("#"+sit_wimg_id[1]);
-        var width = $img_display.width();
-        var height = $img_display.height();
-        if(width > 700) {
-            var img_width = 700;
-            var img_height = Math.round((img_width * height) / width);
-
-            $img_display.children("img").width(img_width).height(img_height);
-        }
-
         $img_display.toggle();
 
         if($img_display.is(":visible")) {
@@ -424,6 +414,16 @@ $(function() {
         } else {
             $(this).text($(this).text().replace("닫기", "확인"));
         }
+
+        var $img = $("#"+sit_wimg_id[1]).children("img");
+        var width = $img.width();
+        var height = $img.height();
+        if(width > 700) {
+            var img_width = 700;
+            var img_height = Math.round((img_width * height) / width);
+
+            $img.width(img_width).height(img_height);
+        }
     });
     $(".sit_wimg_close").bind("click", function() {
         var $img_display = $(this).parents(".banner_or_img");
diff --git a/adm/shop_admin/itemform.php b/adm/shop_admin/itemform.php
index 86a648f7b..7afc59ec2 100644
--- a/adm/shop_admin/itemform.php
+++ b/adm/shop_admin/itemform.php
@@ -1314,7 +1314,7 @@ $(function(){
             $timg = G4_DATA_PATH."/item/{$it['it_id']}_t";
             if (file_exists($timg)) {
             ?>
-            <label for="it_timg_del">삭제</label>
+            <label for="it_timg_del">하단이미지 삭제</label>
             <input type="checkbox" name="it_timg_del" value="1" id="it_timg_del">
             <span class="sit_wimg_timg"></span>
             <div id="timg" class="banner_or_img">
@@ -1397,16 +1397,6 @@ $(function() {
         var sit_wimg_id = $(this).attr("id").split("_");
         var $img_display = $("#"+sit_wimg_id[1]);
 
-        var $img = $("#"+sit_wimg_id[1]);
-        var width = $img_display.width();
-        var height = $img_display.height();
-        if(width > 700) {
-            var img_width = 700;
-            var img_height = Math.round((img_width * height) / width);
-
-            $img_display.children("img").width(img_width).height(img_height);
-        }
-
         $img_display.toggle();
 
         if($img_display.is(":visible")) {
@@ -1414,6 +1404,16 @@ $(function() {
         } else {
             $(this).text($(this).text().replace("닫기", "확인"));
         }
+
+        var $img = $("#"+sit_wimg_id[1]).children("img");
+        var width = $img.width();
+        var height = $img.height();
+        if(width > 700) {
+            var img_width = 700;
+            var img_height = Math.round((img_width * height) / width);
+
+            $img.width(img_width).height(img_height);
+        }
     });
     $(".sit_wimg_close").bind("click", function() {
         var $img_display = $(this).parents(".banner_or_img");

From ba5f1b02f2a4a4b92e78645ce9599faabfdfe1af Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Mon, 1 Jul 2013 14:11:26 +0900
Subject: [PATCH 5/6] =?UTF-8?q?=EC=83=81=ED=92=88=EB=A6=AC=EC=8A=A4?=
 =?UTF-8?q?=ED=8A=B8=20=EC=83=81=EB=8B=A8=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20?=
 =?UTF-8?q?=EC=B6=9C=EB=A0=A5=EB=90=98=EC=A7=80=20=EC=95=8A=EB=8A=94=20?=
 =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shop/list.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/shop/list.php b/shop/list.php
index e4ee9f49e..7df00ea59 100644
--- a/shop/list.php
+++ b/shop/list.php
@@ -53,9 +53,9 @@ if ($is_admin)
     include G4_SHOP_PATH.'/navigation1.inc.php';
 
     // 상단 이미지
-    $himg = G4_DATA_URL.'/category/'.$ca_id.'_h';
+    $himg = G4_DATA_PATH.'/category/'.$ca_id.'_h';
     if (file_exists($himg)) {
-        echo '<div id="sct_himg" class="sct_img"><img src="'.$himg.'" alt=""></div>';
+        echo '<div id="sct_himg" class="sct_img"><img src="'.G4_DATA_URL.'/category/'.$ca_id.'_h" alt=""></div>';
     }
 
     // 상단 HTML

From e786be4628ca74fa56f01ec14f0e999b956d6946 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Mon, 1 Jul 2013 14:25:52 +0900
Subject: [PATCH 6/6] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=EC=83=81?=
 =?UTF-8?q?=ED=92=88=EC=83=81=ED=83=9C=20=EB=B3=80=EA=B2=BD=20=EC=8A=A4?=
 =?UTF-8?q?=ED=81=AC=EB=A6=BD=ED=8A=B8=20=EC=98=A4=EB=A5=98=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/shop_admin/orderform.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/adm/shop_admin/orderform.php b/adm/shop_admin/orderform.php
index 433fe298b..8fc5b373f 100644
--- a/adm/shop_admin/orderform.php
+++ b/adm/shop_admin/orderform.php
@@ -144,6 +144,7 @@ $pg_anchor = '<ul class="anchor">
 
     <ul id="sodr_ul">
         <?php
+        $chk_cnt = 0;
         for($i=0; $row=sql_fetch_array($result); $i++) {
             // 상품이미지
             $image = get_it_image($row['it_id'], 50, 50);
@@ -197,7 +198,7 @@ $pg_anchor = '<ul class="anchor">
             <tr>
                 <td class="td_chk">
                     <label for="ct_opt_chk_<?php echo $i.$k; ?>" class="sound_only"><?php echo $opt['ct_option']; ?></label>
-                    <input type="checkbox" name="ct_chk[]" id="ct_opt_chk_<?php echo $i.$k; ?>" value="<?php echo $opt['ct_id']; ?>">
+                    <input type="checkbox" name="ct_chk[]" id="ct_chk_<?php echo $chk_cnt; ?>" value="<?php echo $opt['ct_id']; ?>">
                 </td>
                 <td><?php echo $opt['ct_option']; ?></td>
                 <td class="td_smallmng"><?php echo $opt['ct_status']; ?></td>
@@ -210,6 +211,7 @@ $pg_anchor = '<ul class="anchor">
                 <td class="td_smallmng"><?php echo get_yn($opt['ct_stock_use']); ?></td>
             </tr>
             <?php
+                $chk_cnt++;
             }
             ?>
             </tbody>
@@ -225,6 +227,7 @@ $pg_anchor = '<ul class="anchor">
     </ul>
 
     <div class="btn_list">
+        <input type="hidden" name="chk_cnt" value="<?php echo $chk_cnt; ?>">
         <input type="submit" name="act_button" value="주문" onclick="document.pressed=this.value">
         <input type="submit" name="act_button" value="상품준비중" onclick="document.pressed=this.value">
         <input type="submit" name="act_button" value="배송중" onclick="document.pressed=this.value">