From 27f1cdda14b203e14293ef5da3a9cb8b6cb9a406 Mon Sep 17 00:00:00 2001 From: chicpro Date: Tue, 29 Jan 2013 11:47:49 +0900 Subject: [PATCH 1/4] =?UTF-8?q?G4=5FADM=20=EA=B2=BD=EB=A1=9C=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/admin.tail.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adm/admin.tail.php b/adm/admin.tail.php index 4c92f2d0b..8c410218a 100644 --- a/adm/admin.tail.php +++ b/adm/admin.tail.php @@ -16,7 +16,7 @@ if (!defined('_GNUBOARD_')) exit; - + Date: Tue, 29 Jan 2013 11:48:32 +0900 Subject: [PATCH 2/4] =?UTF-8?q?$w=EB=A5=BC=20$act=EB=A1=9C=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shop/orderform.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shop/orderform.php b/shop/orderform.php index 8623d2935..4afe4206d 100644 --- a/shop/orderform.php +++ b/shop/orderform.php @@ -122,7 +122,7 @@ else
- + From fba32f4d00848deb3a9fcf16238b44bdf8acf43f Mon Sep 17 00:00:00 2001 From: chicpro Date: Tue, 29 Jan 2013 11:48:36 +0900 Subject: [PATCH 3/4] =?UTF-8?q?$w=EB=A5=BC=20$act=EB=A1=9C=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shop/orderformupdate.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/shop/orderformupdate.php b/shop/orderformupdate.php index c89d23309..425f78ba9 100644 --- a/shop/orderformupdate.php +++ b/shop/orderformupdate.php @@ -57,7 +57,7 @@ $sql = " select a.it_id, and a.ct_direct = '$sw_direct' and a.it_id = b.it_id "; -if($w == "selectedbuy") +if($act == "selectedbuy") $sql .= " and a.ct_selected = '1' "; $result = sql_query($sql); @@ -158,7 +158,7 @@ else if($default['de_send_cost_case'] == "상한") { and a.ct_direct = '$sw_direct' and a.ct_parent = '0' "; - if($w == "selectedbuy") + if($act == "selectedbuy") $sql .= " and a.ct_selected = '1' "; $sql .= " order by a.ct_id "; @@ -748,7 +748,7 @@ if ($default['de_sms_use2'] && $receive_number) // 세션값 제거 -if($w != "selectedbuy") +if($act != "selectedbuy") set_session('ss_uniqid', ''); set_session('ss_order_uniqid', ''); set_session('ss_direct', ''); From 6acaeb76815bac9c8455a8811c61129e7c05dc7a Mon Sep 17 00:00:00 2001 From: chicpro Date: Tue, 29 Jan 2013 11:49:04 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=EC=83=81=ED=92=88=EC=9D=B4=EB=AF=B8?= =?UTF-8?q?=EC=A7=80=20=EC=97=85=EB=A1=9C=EB=93=9C=20=EA=B8=B0=EB=8A=A5=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20=EC=9E=91=EC=97=85=20=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/itemform.php | 34 +++---- adm/shop_admin/itemformupdate.php | 148 +++++++++++++++--------------- lib/shop.lib.php | 24 +++++ 3 files changed, 111 insertions(+), 95 deletions(-) diff --git a/adm/shop_admin/itemform.php b/adm/shop_admin/itemform.php index 0f93269b4..07b873890 100644 --- a/adm/shop_admin/itemform.php +++ b/adm/shop_admin/itemform.php @@ -386,25 +386,15 @@ ul { margin: 0; padding: 0; list-style: none; } 이미지(대) - + 삭제"; - echo ""; + $img1 = G4_DATA_PATH."/item/{$it['it_img1']}"; + if (file_exists($img1) && is_file($img1)) { + $size = getimagesize($img1); + echo "삭제"; + echo ""; } ?> - - 이미지(중), 이미지(소)를 자동생성 하시려면 체크하세요. JPG 파일만 가능합니다. "; - echo "
중, 소 이미지를 자동으로 생성하시는 경우에 체크하세요. (JPG 파일만 가능)"; - echo help("이미지(중) 이미지(소) 의 사이즈를 환경설정에서 정한 폭과 높이로 자동생성합니다.\n\nJPG 파일만 가능합니다."); - } - */ - ?> @@ -442,13 +432,13 @@ ul { margin: 0; padding: 0; list-style: none; } 이미지(대) - size=40> + size=40> 삭제"; - echo "