From 78d5dce761f14a22345632e5324bfa3fcc769acd Mon Sep 17 00:00:00 2001 From: 39hn Date: Wed, 10 Aug 2022 13:05:17 +0900 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=ED=83=9D=EB=B0=B0=EC=82=AC=20?= =?UTF-8?q?=EB=B0=B0=EC=86=A1=EC=A1=B0=ED=9A=8C=20=EC=A3=BC=EC=86=8C=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 대신택배, 우체국, 한진택배, CVSnet편의점택배, 건영택배 주소 수정 --- extend/shop.extend.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/extend/shop.extend.php b/extend/shop.extend.php index c0feded8a..9ee29b3a8 100644 --- a/extend/shop.extend.php +++ b/extend/shop.extend.php @@ -9,19 +9,19 @@ if (!defined('G5_USE_SHOP') || !G5_USE_SHOP) return; */ define('G5_DELIVERY_COMPANY', '(경동택배^https://kdexp.com/basicNewDelivery.kd?barcode=^080-873-2178)' - .'(대신택배^http://home.daesinlogistics.co.kr/daesin/jsp/d_freight_chase/d_general_process2.jsp?billno1=^043-222-4582)' + .'(대신택배^https://www.ds3211.co.kr/freight/internalFreightSearch.ht?billno=^043-222-4582)' .'(동부택배^http://www.dongbups.com/delivery/delivery_search_view.jsp?item_no=^1588-8848)' .'(로젠택배^https://www.ilogen.com/m/personal/trace.pop/^1588-9988)' - .'(우체국^http://service.epost.go.kr/trace.RetrieveRegiPrclDeliv.postal?sid1=^1588-1300)' + .'(우체국^https://m.epost.go.kr/postal/mobile/mobile.trace.RetrieveDomRigiTraceList.comm?ems_gubun=E&sid1=^1588-1300)' .'(이노지스택배^http://www.innogis.co.kr/tracking_view.asp?invoice=^1566-4082)' - .'(한진택배^http://www.hanjin.co.kr/Delivery_html/inquiry/result_waybill.jsp?wbl_num=^1588-0011)' + .'(한진택배^https://www.hanjin.co.kr/kor/CMS/DeliveryMgr/WaybillResult.do?mCode=MN038&schLang=KR&wblnumText2=^1588-0011)' .'(롯데택배^https://www.lotteglogis.com/open/tracking?invno=^1588-2121)' .'(CJ대한통운^https://www.doortodoor.co.kr/parcel/doortodoor.do?fsp_action=PARC_ACT_002&fsp_cmd=retrieveInvNoACT&invc_no=^1588-1255)' - .'(CVSnet편의점택배^http://was.cvsnet.co.kr/_ver2/board/ctod_status.jsp?invoice_no=^1577-1287)' + .'(CVSnet편의점택배^https://www.cvsnet.co.kr/invoice/tracking.do?invoice_no=^1577-1287)' .'(KG옐로우캡택배^http://www.yellowcap.co.kr/custom/inquiry_result.asp?invoice_no=^1588-0123)' .'(KGB택배^http://www.kgbls.co.kr/sub5/trace.asp?f_slipno=^1577-4577)' .'(KG로지스^http://www.kglogis.co.kr/contents/waybill.jsp?item_no=^1588-8848)' - .'(건영택배^http://www.kunyoung.com/goods/goods_01.php?mulno=^031-460-2700)' + .'(건영택배^https://www.kunyoung.com/goods/goods_01.php?mulno=^031-460-2700)' .'(호남택배^http://www.honamlogis.co.kr/04estimate/songjang_list.php?c_search1=^031-376-6070)' ); From 25b3d8f6edce77079b651130582ae1c48e228fa4 Mon Sep 17 00:00:00 2001 From: kjh Date: Mon, 22 Aug 2022 15:57:20 +0900 Subject: [PATCH 2/2] =?UTF-8?q?Fix=20gnuboard/gnuboard5#200=20HTTP=5FX=5FF?= =?UTF-8?q?ORWARDED=5FPROTO=20=EC=A1=B0=EA=B1=B4=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/common.php b/common.php index 84f71e8df..e32b546da 100644 --- a/common.php +++ b/common.php @@ -362,7 +362,12 @@ if( $config['cf_cert_use'] || (defined('G5_YOUNGCART_VER') && G5_YOUNGCART_VER) // IE 브라우저 또는 엣지브라우저 또는 IOS 모바일과 http환경에서는 secure; SameSite=None을 설정하지 않습니다. if (isset($_SERVER['HTTP_USER_AGENT'])) { - if( preg_match('/Edge/i', $_SERVER['HTTP_USER_AGENT']) || preg_match('/(iPhone|iPod|iPad).*AppleWebKit.*Safari/i', $_SERVER['HTTP_USER_AGENT']) || preg_match('~MSIE|Internet Explorer~i', $_SERVER['HTTP_USER_AGENT']) || preg_match('~Trident/7.0(; Touch)?; rv:11.0~',$_SERVER['HTTP_USER_AGENT']) || ! (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS']=='on') ){ + if (preg_match('/Edge/i', $_SERVER['HTTP_USER_AGENT']) + || preg_match('/(iPhone|iPod|iPad).*AppleWebKit.*Safari/i', $_SERVER['HTTP_USER_AGENT']) + || preg_match('~MSIE|Internet Explorer~i', $_SERVER['HTTP_USER_AGENT']) + || preg_match('~Trident/7.0(; Touch)?; rv:11.0~',$_SERVER['HTTP_USER_AGENT']) + || !(isset($_SERVER['HTTPS']) && $_SERVER['HTTPS']=='on') + || !(isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == "https")){ return $res; } }