From c655ccb98fbe1c4677fe6ccf1a7c998ede68a30a Mon Sep 17 00:00:00 2001 From: chicpro Date: Tue, 4 Mar 2014 17:36:00 +0900 Subject: [PATCH 01/18] =?UTF-8?q?=EC=83=81=ED=92=88=EB=93=B1=EB=A1=9D=20?= =?UTF-8?q?=EA=B3=84=EC=86=8D=20=EC=9E=85=EB=A0=A5=20=EC=84=A0=ED=83=9D=20?= =?UTF-8?q?=EB=95=8C=20=EC=9D=B4=EB=8F=99=20url=20=EC=98=A4=EB=A5=98=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/itemformupdate.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adm/shop_admin/itemformupdate.php b/adm/shop_admin/itemformupdate.php index b5e58a6d2..8d845bca8 100644 --- a/adm/shop_admin/itemformupdate.php +++ b/adm/shop_admin/itemformupdate.php @@ -559,7 +559,7 @@ echo ""; From defd0bd38aea45bf5d19cb8fd946ed283f4a60ca Mon Sep 17 00:00:00 2001 From: chicpro Date: Tue, 4 Mar 2014 17:40:16 +0900 Subject: [PATCH 02/18] =?UTF-8?q?escape=5Ftrim=20=ED=95=A8=EC=88=98?= =?UTF-8?q?=EC=97=90=EC=84=9C=20G5=5FESCAPE=5FFUNCTION=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95=EC=82=AC=EC=9A=A9=ED=95=98=EB=8F=84=EB=A1=9D=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 --- lib/common.lib.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/common.lib.php b/lib/common.lib.php index de725408f..e36816502 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -1883,10 +1883,7 @@ function convert_charset($from_charset, $to_charset, $str) function escape_trim($field) { if ($field) { - $str = mysql_real_escape_string(@trim($field)); - - //if(PHP_VERSION < '5.3.0') - // $str = stripslashes($str); + $str = call_user_func(G5_ESCAPE_FUNCTION, $field); return $str; } From f42a3185c898c57f8eeb50c5ef127f2cd6ce7101 Mon Sep 17 00:00:00 2001 From: chicpro Date: Tue, 4 Mar 2014 18:08:13 +0900 Subject: [PATCH 03/18] =?UTF-8?q?=EC=A3=BC=EB=AC=B8=EB=82=B4=EC=97=AD=20?= =?UTF-8?q?=EC=A3=BC=EB=AC=B8=EB=B2=88=ED=98=B8=20=ED=91=9C=EC=8B=9C=20?= =?UTF-8?q?=EA=B4=80=EB=A0=A8=20=EC=BD=94=EB=93=9C=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/orderlist.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/adm/shop_admin/orderlist.php b/adm/shop_admin/orderlist.php index 9c5665099..6186a8689 100644 --- a/adm/shop_admin/orderlist.php +++ b/adm/shop_admin/orderlist.php @@ -303,6 +303,16 @@ if(!sql_query(" select mb_id from {$g5['g5_shop_order_delete_table']} limit 1 ", if($row['od_mobile']) $od_mobile = '(M)'; + // 주문번호에 - 추가 + switch(strlen($row['od_id'])) { + case 16: + $disp_od_id = substr($row['od_id'],0,8).'-'.substr($row['od_id'],8); + break; + default: + $disp_od_id = substr($row['od_id'],0,6).'-'.substr($row['od_id'],6); + break; + } + // 주문 번호에 에스크로 표시 $od_paytype = ''; if($default['de_escrow_use'] && $row['od_escrow']) @@ -331,7 +341,7 @@ if(!sql_query(" select mb_id from {$g5['g5_shop_order_delete_table']} limit 1 ",
--> - + From 864a7a67a010cbe6da03e7fc5e761e069beecd95 Mon Sep 17 00:00:00 2001 From: chicpro Date: Wed, 5 Mar 2014 11:09:21 +0900 Subject: [PATCH 04/18] =?UTF-8?q?=EC=83=81=20=ED=95=98=EB=8B=A8=20?= =?UTF-8?q?=EB=A1=9C=EA=B3=A0=20=EB=B6=84=EB=A6=AC=20=EB=93=B1=EB=A1=9D=20?= =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/configform.php | 64 ++++++++++++++++++++--------- adm/shop_admin/configformupdate.php | 6 ++- install/install_db.php | 3 +- mobile/shop/shop.tail.php | 2 +- shop/shop.tail.php | 2 +- 5 files changed, 52 insertions(+), 25 deletions(-) diff --git a/adm/shop_admin/configform.php b/adm/shop_admin/configform.php index 36cd57c31..e80f60c2f 100644 --- a/adm/shop_admin/configform.php +++ b/adm/shop_admin/configform.php @@ -844,9 +844,9 @@ if(!isset($default['de_mobile_rel_list_use'])) { - 로고이미지 + 상단로고이미지 - + - + - 메인이미지 + 하단로고이미지 - - + + - - - -