From 58dc48d3eaec66a2fecc19e714e372d004cb38d7 Mon Sep 17 00:00:00 2001 From: thisgun Date: Mon, 11 Jul 2022 10:32:49 +0900 Subject: [PATCH 1/8] =?UTF-8?q?=EC=98=81=EC=B9=B4=ED=8A=B8=20=EC=83=81?= =?UTF-8?q?=ED=92=88=EB=A6=AC=EC=8A=A4=ED=8A=B8=20sort=20=ED=82=A4?= =?UTF-8?q?=EC=97=90=20it=5Fname=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mobile/shop/list.php | 2 +- shop/event.php | 2 +- shop/list.php | 2 +- shop/listtype.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mobile/shop/list.php b/mobile/shop/list.php index 5165b5d5c..e6d459f1f 100644 --- a/mobile/shop/list.php +++ b/mobile/shop/list.php @@ -2,7 +2,7 @@ include_once('./_common.php'); // 상품 리스트에서 다른 필드로 정렬을 하려면 아래의 배열 코드에서 해당 필드를 추가하세요. -if( isset($sort) && ! in_array($sort, array('it_sum_qty', 'it_price', 'it_use_avg', 'it_use_cnt', 'it_update_time')) ){ +if( isset($sort) && ! in_array($sort, array('it_name', 'it_sum_qty', 'it_price', 'it_use_avg', 'it_use_cnt', 'it_update_time')) ){ $sort=''; } diff --git a/shop/event.php b/shop/event.php index b56c68a52..ae2ff9372 100644 --- a/shop/event.php +++ b/shop/event.php @@ -6,7 +6,7 @@ $skin = isset($_GET['skin']) ? clean_xss_tags($_GET['skin'], 1, 1) : ''; $ca_id = isset($_GET['ca_id']) ? clean_xss_tags($_GET['ca_id'], 1, 1) : ''; // 상품 리스트에서 다른 필드로 정렬을 하려면 아래의 배열 코드에서 해당 필드를 추가하세요. -if( isset($sort) && ! in_array($sort, array('it_sum_qty', 'it_price', 'it_use_avg', 'it_use_cnt', 'it_update_time')) ){ +if( isset($sort) && ! in_array($sort, array('it_name', 'it_sum_qty', 'it_price', 'it_use_avg', 'it_use_cnt', 'it_update_time')) ){ $sort=''; } diff --git a/shop/list.php b/shop/list.php index a53d2aee1..71f20927f 100644 --- a/shop/list.php +++ b/shop/list.php @@ -5,7 +5,7 @@ $ca_id = isset($_REQUEST['ca_id']) ? safe_replace_regex($_REQUEST['ca_id'], 'ca_ $skin = isset($_REQUEST['skin']) ? safe_replace_regex($_REQUEST['skin'], 'skin') : ''; // 상품 리스트에서 다른 필드로 정렬을 하려면 아래의 배열 코드에서 해당 필드를 추가하세요. -if( isset($sort) && ! in_array($sort, array('it_sum_qty', 'it_price', 'it_use_avg', 'it_use_cnt', 'it_update_time')) ){ +if( isset($sort) && ! in_array($sort, array('it_name', 'it_sum_qty', 'it_price', 'it_use_avg', 'it_use_cnt', 'it_update_time')) ){ $sort=''; } diff --git a/shop/listtype.php b/shop/listtype.php index d0e9fe55c..21aea7de7 100644 --- a/shop/listtype.php +++ b/shop/listtype.php @@ -2,7 +2,7 @@ include_once('./_common.php'); // 상품 리스트에서 다른 필드로 정렬을 하려면 아래의 배열 코드에서 해당 필드를 추가하세요. -$sort = (isset($_REQUEST['sort']) && in_array($_REQUEST['sort'], array('it_sum_qty', 'it_price', 'it_use_avg', 'it_use_cnt', 'it_update_time'))) ? $_REQUEST['sort'] : ''; +$sort = (isset($_REQUEST['sort']) && in_array($_REQUEST['sort'], array('it_name', 'it_sum_qty', 'it_price', 'it_use_avg', 'it_use_cnt', 'it_update_time'))) ? $_REQUEST['sort'] : ''; $type = isset($_REQUEST['type']) ? preg_replace("/[\<\>\'\"\\\'\\\"\%\=\(\)\s]/", "", $_REQUEST['type']) : ''; if (G5_IS_MOBILE) { From 95492a5cd84872b467f41388ffe5df3871826b3b Mon Sep 17 00:00:00 2001 From: thisgun Date: Mon, 11 Jul 2022 11:02:46 +0900 Subject: [PATCH 2/8] =?UTF-8?q?G5-82=20<=EC=82=AC=EC=9A=A9=ED=95=98?= =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EB=8A=94=20=EA=B5=AC=EA=B8=80=ED=94=8C?= =?UTF-8?q?=EB=9F=AC=EC=8A=A4=20=EA=B4=80=EB=A0=A8=20=EC=BD=94=EB=93=9C=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C>?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/sns.js | 5 ----- lib/shop.lib.php | 3 --- mobile/skin/shop/basic/item.form.skin.php | 1 - mobile/skin/shop/basic/list.10.skin.php | 1 - mobile/skin/shop/basic/main.10.skin.php | 1 - mobile/skin/shop/basic/main.20.skin.php | 1 - mobile/skin/shop/basic/main.30.skin.php | 1 - mobile/skin/shop/basic/style.css | 4 ---- plugin/sns/view.sns.skin.php | 1 - shop/item.php | 1 - skin/shop/basic/list.10.skin.php | 1 - skin/shop/basic/list.20.skin.php | 1 - skin/shop/basic/list.30.skin.php | 1 - skin/shop/basic/list.40.skin.php | 1 - skin/shop/basic/main.20.skin.php | 1 - skin/shop/basic/main.30.skin.php | 1 - skin/shop/basic/main.40.skin.php | 1 - skin/shop/basic/relation.10.skin.php | 1 - skin/shop/basic/style.css | 5 ----- theme/basic/mobile/skin/shop/basic/item.form.skin.php | 1 - theme/basic/mobile/skin/shop/basic/list.10.skin.php | 1 - theme/basic/mobile/skin/shop/basic/main.10.skin.php | 1 - theme/basic/mobile/skin/shop/basic/main.20.skin.php | 1 - theme/basic/mobile/skin/shop/basic/main.30.skin.php | 1 - theme/basic/mobile/skin/shop/basic/style.css | 4 ---- theme/basic/skin/shop/basic/list.10.skin.php | 1 - theme/basic/skin/shop/basic/list.20.skin.php | 1 - theme/basic/skin/shop/basic/list.30.skin.php | 1 - theme/basic/skin/shop/basic/list.40.skin.php | 1 - theme/basic/skin/shop/basic/main.20.skin.php | 1 - theme/basic/skin/shop/basic/main.30.skin.php | 1 - theme/basic/skin/shop/basic/main.40.skin.php | 1 - theme/basic/skin/shop/basic/relation.10.skin.php | 1 - theme/basic/skin/shop/basic/style.css | 5 ----- 34 files changed, 54 deletions(-) diff --git a/js/sns.js b/js/sns.js index 38ca4f725..3430b6d26 100644 --- a/js/sns.js +++ b/js/sns.js @@ -8,9 +8,4 @@ $(function() { window.open($(this).attr("href"), "win_twitter", "menubar=1,resizable=1,width=600,height=350"); return false; }); - - $(".share-googleplus").click(function() { - window.open($(this).attr("href"), "win_googleplus", "menubar=1,resizable=1,width=600,height=600"); - return false; - }); }); \ No newline at end of file diff --git a/lib/shop.lib.php b/lib/shop.lib.php index 1d591621b..a74dad8ea 100644 --- a/lib/shop.lib.php +++ b/lib/shop.lib.php @@ -1521,9 +1521,6 @@ function get_sns_share_link($sns, $url, $title, $img) case 'twitter': $str = ''; break; - case 'googleplus': - $str = ''; - break; case 'kakaotalk': if($config['cf_kakao_js_apikey']) $str = ''; diff --git a/mobile/skin/shop/basic/item.form.skin.php b/mobile/skin/shop/basic/item.form.skin.php index 592b75791..d9d9620d4 100644 --- a/mobile/skin/shop/basic/item.form.skin.php +++ b/mobile/skin/shop/basic/item.form.skin.php @@ -77,7 +77,6 @@ add_javascript('', 10);
- SNS 공유"; echo get_sns_share_link('facebook', $sns_url, $sns_title, G5_MSHOP_SKIN_URL.'/img/facebook.png'); echo get_sns_share_link('twitter', $sns_url, $sns_title, G5_MSHOP_SKIN_URL.'/img/twitter.png'); - echo get_sns_share_link('googleplus', $sns_url, $sns_title, G5_MSHOP_SKIN_URL.'/img/gplus.png'); echo get_sns_share_link('kakaotalk', $sns_url, $sns_title, G5_MSHOP_SKIN_URL.'/img/sns_kakao.png'); echo ""; echo "
\n"; diff --git a/mobile/skin/shop/basic/main.10.skin.php b/mobile/skin/shop/basic/main.10.skin.php index 4600f2723..4a047bd21 100644 --- a/mobile/skin/shop/basic/main.10.skin.php +++ b/mobile/skin/shop/basic/main.10.skin.php @@ -108,7 +108,6 @@ foreach((array) $list as $row){ echo "

SNS 공유

"; echo get_sns_share_link('facebook', $sns_url, $sns_title, G5_MSHOP_SKIN_URL.'/img/facebook.png'); echo get_sns_share_link('twitter', $sns_url, $sns_title, G5_MSHOP_SKIN_URL.'/img/twitter.png'); - echo get_sns_share_link('googleplus', $sns_url, $sns_title, G5_MSHOP_SKIN_URL.'/img/gplus.png'); echo get_sns_share_link('kakaotalk', $sns_url, $sns_title, G5_MSHOP_SKIN_URL.'/img/sns_kakao.png'); echo ""; echo "\n"; diff --git a/mobile/skin/shop/basic/main.20.skin.php b/mobile/skin/shop/basic/main.20.skin.php index 772588e63..64bd97e7f 100644 --- a/mobile/skin/shop/basic/main.20.skin.php +++ b/mobile/skin/shop/basic/main.20.skin.php @@ -104,7 +104,6 @@ foreach((array) $list as $row){ echo "
"; echo get_sns_share_link('facebook', $sns_url, $sns_title, G5_MSHOP_SKIN_URL.'/img/facebook.png'); echo get_sns_share_link('twitter', $sns_url, $sns_title, G5_MSHOP_SKIN_URL.'/img/twitter.png'); - echo get_sns_share_link('googleplus', $sns_url, $sns_title, G5_MSHOP_SKIN_URL.'/img/gplus.png'); echo get_sns_share_link('kakaotalk', $sns_url, $sns_title, G5_MSHOP_SKIN_URL.'/img/sns_kakao.png'); echo "
\n"; } diff --git a/mobile/skin/shop/basic/main.30.skin.php b/mobile/skin/shop/basic/main.30.skin.php index a52474e5d..5c0051bce 100644 --- a/mobile/skin/shop/basic/main.30.skin.php +++ b/mobile/skin/shop/basic/main.30.skin.php @@ -104,7 +104,6 @@ foreach((array) $list as $row){ echo "
"; echo get_sns_share_link('facebook', $sns_url, $sns_title, G5_MSHOP_SKIN_URL.'/img/facebook.png'); echo get_sns_share_link('twitter', $sns_url, $sns_title, G5_MSHOP_SKIN_URL.'/img/twitter.png'); - echo get_sns_share_link('googleplus', $sns_url, $sns_title, G5_MSHOP_SKIN_URL.'/img/gplus.png'); echo get_sns_share_link('kakaotalk', $sns_url, $sns_title, G5_MSHOP_SKIN_URL.'/img/sns_kakao.png'); echo "
\n"; } diff --git a/mobile/skin/shop/basic/style.css b/mobile/skin/shop/basic/style.css index 52ab9fd3a..d6cc2ebc1 100644 --- a/mobile/skin/shop/basic/style.css +++ b/mobile/skin/shop/basic/style.css @@ -69,7 +69,6 @@ .sct_sns a {display:inline-block;margin:0 2px;width:28px;height:28px;line-height:28px;border-radius:3px;font-size:0;text-align:center} .share-facebook {background:#415b92} .share-twitter {background:#35b3dc} -.share-googleplus {background:#d5503a} .share-kakaotalk {background:#ffeb00} .sct_sns img {width:20px;height:auto;vertical-align:middle} .sct_sns button {margin:0 4px 0 0;padding:0;border:0} @@ -103,7 +102,6 @@ .sct_10 .sct_sns a {display:inline-block;border-radius:50%;width:50px;height:50px;line-height:25px;text-align:center;padding:13px 0;margin:20px 5px} .sct_10 .sct_sns .share-facebook {background:#415b92} .sct_10 .sct_sns .share-twitter {background:#35b3dc} -.sct_10 .sct_sns .share-googleplus {background:#ea3838} .sct_10 .sct_sns img {width:24px} .sct_10 .sct_sns_bg {background:rgba(0,0,0,0.1);width:100%;height:100%} .sct_10 .sct_sns_cls {position:absolute;right:0;top:0;color:#b5b8bb;border:0;padding:12px 15px;font-size:16px;background:#fff;margin:0;height:50px} @@ -129,7 +127,6 @@ .sct_10_list .sct_sns a {display:inline-block;border-radius:50%;width:50px;height:50px;line-height:25px;text-align:center;padding:13px 0;margin:20px 5px} .sct_10_list .sct_sns .share-facebook {background:#415b92} .sct_10_list .sct_sns .share-twitter {background:#35b3dc} -.sct_10_list .sct_sns .share-googleplus {background:#ea3838} .sct_10_list .sct_sns img {width:24px} .sct_10_list .sct_sns_bg {background:rgba(0,0,0,0.1);width:100%;height:100%} .sct_10_list .sct_sns_cls {position:absolute;right:0;top:0;color:#b5b8bb;border:0;padding:12px 15px;font-size:16px;background:#fff} @@ -332,7 +329,6 @@ #sit_star_sns .sns_area a {display:inline-block;width:35px;height:35px;line-height:35px;background:#eee;text-align:center;border-radius:50%;padding-top:5px} #sit_star_sns .sns_area a img {width:24px;height:auto} #sit_star_sns .sns_area #sit_btn_rec {font-size:15px;padding-top:0} -#sit_star_sns .sns_area .share-googleplus {background:#ea3838} #sit_star_sns .sns_area .share-facebook {background:#415b92} #sit_star_sns .sns_area .share-twitter {background:#35b3dc} diff --git a/plugin/sns/view.sns.skin.php b/plugin/sns/view.sns.skin.php index 4d3533c74..41824dd5c 100644 --- a/plugin/sns/view.sns.skin.php +++ b/plugin/sns/view.sns.skin.php @@ -62,7 +62,6 @@ $bo_v_sns_class = $config['cf_kakao_js_apikey'] ? 'show_kakao' : '';