From fa844a88c30e3c1f4c2514d03795e2b721276372 Mon Sep 17 00:00:00 2001 From: chicpro Date: Mon, 28 Jan 2013 11:58:41 +0900 Subject: [PATCH 1/4] =?UTF-8?q?G4=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 --- shop/cart.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shop/cart.php b/shop/cart.php index e87b9b862..9e2b09d98 100644 --- a/shop/cart.php +++ b/shop/cart.php @@ -5,13 +5,13 @@ $g4['title'] = "장바구니"; include_once('./_head.php'); ?> -

+



From 0c6608ab99c2100a6320de4b451b84965301fd9c Mon Sep 17 00:00:00 2001 From: chicpro Date: Mon, 28 Jan 2013 11:58:55 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=EB=B3=80=EC=88=98=20w=EB=A5=BC=20act?= =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shop/cartsub.inc.php | 34 +++++++++++++++++----------------- shop/cartupdate.php | 18 +++++++++--------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/shop/cartsub.inc.php b/shop/cartsub.inc.php index 3db96144c..5c9d0ff7a 100644 --- a/shop/cartsub.inc.php +++ b/shop/cartsub.inc.php @@ -416,7 +416,7 @@ if ($i == 0) { if ($s_page == "cart.php" || $s_page == "orderinquiryview.php") echo "  \n"; echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; } ?> @@ -426,16 +426,16 @@ if ($i == 0) { "; + echo "
"; } else { echo "
- \"구매하기\"  - \"선택주문\"  - \"장바구니  - \"장바구니  - \"선택삭제\"  - \"계속쇼핑하기\""; + \"구매하기\"  + \"선택주문\"  + \"장바구니  + \"장바구니  + \"선택삭제\"  + \"계속쇼핑하기\""; } } ?> @@ -488,7 +488,7 @@ $(function() { if (act == "buy") { - f.w.value = act; + f.act.value = act; } else if (act == "selectedbuy") { @@ -514,19 +514,19 @@ $(function() { return false; } - f.w.value = act; + f.act.value = act; f.action = "./cartupdate.php"; f.submit(); } else if (act == "alldelete") { - f.w.value = act; + f.act.value = act; f.action = "./cartupdate.php"; f.submit(); } else if(act == "seldelete") { - f.w.value = act; + f.act.value = act; f.action = "./cartupdate.php"; f.submit(); } @@ -559,7 +559,7 @@ $(function() { return; } } - f.w.value = act; + f.act.value = act; f.action = "./cartupdate.php"; f.submit(); } @@ -573,13 +573,13 @@ $(function() {

- - + - +
+
· 상품 주문하기 : 주문서를 작성하시려면 '주문하기' 버튼을 누르세요.
· 상품 수량변경 : 주문수량을 변경하시려면 원하시는 수량을 입력하신 후 '수량변경' 버튼을 누르세요.
· 상품 삭제하기 : 모든 주문내용을 삭제하시려면 '삭제하기' 버튼을 누르세요.
· 쇼핑 계속하기 : 쇼핑하시던 페이지로 돌아가시려면 '쇼핑 계속하기' 버튼을 누르세요.


diff --git a/shop/cartupdate.php b/shop/cartupdate.php index f21babe61..df0918453 100644 --- a/shop/cartupdate.php +++ b/shop/cartupdate.php @@ -38,13 +38,13 @@ if($default['de_guest_cart_use']) { } } -if ($w == 'alldelete') // 모두 삭제이면 +if ($act == 'alldelete') // 모두 삭제이면 { $sql = " delete from {$g4['yc4_cart_table']} where uq_id = '$uq_id' "; sql_query($sql); } -else if ($w == 'seldelete') // 선택 삭제이면 +else if ($act == 'seldelete') // 선택 삭제이면 { $sel_count = count($_POST['ct_chk']); if(!$sel_count) { @@ -57,7 +57,7 @@ else if ($w == 'seldelete') // 선택 삭제이면 sql_query($sql); } } -else if($w == 'selectedbuy') // 선택주문이면 +else if($act == 'selectedbuy') // 선택주문이면 { $chk_count = count($_POST['ct_chk']); if(!$chk_count) @@ -84,14 +84,14 @@ else if($w == 'selectedbuy') // 선택주문이면 if ($is_member) { - goto_url("{$g4['shop_url']}/orderform.php?w=selectedbuy"); + goto_url(G4_SHOP_URL."/orderform.php?act=$act"); } else { - goto_url("{$g4['url']}/{$g4['bbs']}/login.php?url=".urlencode("{$g4['shop_path']}/orderform.php?w=selectedbuy")); + goto_url(G4_BBS_URL."/login.php?url=".urlencode(G4_SHOP_URL."/orderform.php?act=$act")); } } -else if ($w == 'allupdate') // 수량 변경이면 : 모두 수정이면 +else if ($act == 'allupdate') // 수량 변경이면 : 모두 수정이면 { $fldcnt = count($_POST['ct_id']); @@ -316,15 +316,15 @@ if ($sw_direct) { if ($is_member) { - goto_url("{$g4['shop_url']}/orderform.php?sw_direct=$sw_direct"); + goto_url(G4_SHOP_URL."/orderform.php?sw_direct=$sw_direct"); } else { - goto_url("{$g4['url']}/{$g4['bbs']}/login.php?url=".urlencode("{$g4['shop_path']}/orderform.php?sw_direct=$sw_direct")); + goto_url(G4_BBS_URL."/login.php?url=".urlencode(G4_SHOP_URL."/orderform.php?sw_direct=$sw_direct")); } } else { - goto_url("{$g4['shop_url']}/cart.php"); + goto_url(G4_SHOP_URL."/cart.php"); } ?> From a4f794787c5644ca881c4a1b86a4a69eed07e738 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Mon, 28 Jan 2013 13:04:48 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=EC=9B=90=EA=B2=A9=EC=9D=98=20config.user.p?= =?UTF-8?q?hp=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 - config.php | 4 ++-- config.user.php | 8 -------- 3 files changed, 2 insertions(+), 11 deletions(-) delete mode 100644 config.user.php diff --git a/.gitignore b/.gitignore index 3a8b89b7e..f4c32d208 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ data -dbconfig.php test.php diff --git a/config.php b/config.php index 4dbfce256..f2843825f 100644 --- a/config.php +++ b/config.php @@ -33,7 +33,7 @@ define('_GNUBOARD_', true); // URL 은 브라우저상에서의 경로 (도메인으로 부터의) define('G4_URL', $g4_path['url']); -define('G4_ADM_URL', G4_URL.'/adm'); +define('G4_ADMIN_URL', G4_URL.'/adm'); define('G4_BBS_URL', G4_URL.'/bbs'); define('G4_CSS_URL', G4_URL.'/css'); define('G4_DATA_URL', G4_URL.'/data'); @@ -47,7 +47,7 @@ define('G4_CACHE_URL', G4_DATA_URL.'/cache'); // PATH 는 서버상에서의 절대경로 define('G4_PATH', $g4_path['path']); -define('G4_ADM_PATH', G4_PATH.'/adm'); +define('G4_ADMIN_PATH', G4_PATH.'/adm'); define('G4_BBS_PATH', G4_PATH.'/bbs'); define('G4_DATA_PATH', G4_PATH.'/data'); define('G4_EXTEND_PATH', G4_PATH.'/extend'); diff --git a/config.user.php b/config.user.php deleted file mode 100644 index bf97db03b..000000000 --- a/config.user.php +++ /dev/null @@ -1,8 +0,0 @@ - \ No newline at end of file From 431d8fc8c2d144db88c7c06e0d826ad4f7ca8a2a Mon Sep 17 00:00:00 2001 From: gnuboard Date: Mon, 28 Jan 2013 13:06:03 +0900 Subject: [PATCH 4/4] =?UTF-8?q?config.user.php=20=EA=B0=80=20push=20?= =?UTF-8?q?=EB=90=98=EC=A7=80=20=EC=95=8A=EB=8F=84=EB=A1=9D=20=ED=95=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index f4c32d208..9294dfdb5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ data +config.user.php test.php