From 2d1af9a3b2a196e7b34f4a9fc68ca5e3161e22b0 Mon Sep 17 00:00:00 2001 From: thisgun Date: Mon, 10 Feb 2020 14:05:30 +0900 Subject: [PATCH 1/4] =?UTF-8?q?sms=20=EC=84=A4=EC=B9=98=ED=85=8C=EC=9D=B4?= =?UTF-8?q?=EB=B8=94=20G5=5FDB=5FENGINE=20=EC=84=A4=EC=A0=95=EC=97=90=20?= =?UTF-8?q?=EB=94=B0=EB=A5=B4=EA=B2=8C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/sms_admin/install.php | 1 + 1 file changed, 1 insertion(+) diff --git a/adm/sms_admin/install.php b/adm/sms_admin/install.php index c7a13441d..025ecda8e 100644 --- a/adm/sms_admin/install.php +++ b/adm/sms_admin/install.php @@ -53,6 +53,7 @@ eval("\$file = \"$file\";"); $f = explode(";", $file); for ($i=0; $i Date: Mon, 10 Feb 2020 16:29:30 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=EC=B9=B4=EC=B9=B4=EC=98=A4=20=EB=A1=9C?= =?UTF-8?q?=EA=B7=B8=EC=9D=B8=20v2=20=EC=82=AC=EC=9A=A9=EC=9E=90=20?= =?UTF-8?q?=EC=A0=95=EB=B3=B4=20=EC=9A=94=EC=B2=ADapi=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 --- plugin/social/Hybrid/Providers/Kakao.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/plugin/social/Hybrid/Providers/Kakao.php b/plugin/social/Hybrid/Providers/Kakao.php index 1b1130768..24effe868 100644 --- a/plugin/social/Hybrid/Providers/Kakao.php +++ b/plugin/social/Hybrid/Providers/Kakao.php @@ -26,7 +26,7 @@ class Hybrid_Providers_Kakao extends Hybrid_Provider_Model_OAuth2 parent::initialize(); // Provider API end-points - $this->api->api_base_url = "https://kapi.kakao.com/v1/"; + $this->api->api_base_url = "https://kapi.kakao.com/v2/"; $this->api->authorize_url = "https://kauth.kakao.com/oauth/authorize"; $this->api->token_url = "https://kauth.kakao.com/oauth/token"; @@ -72,7 +72,8 @@ class Hybrid_Providers_Kakao extends Hybrid_Provider_Model_OAuth2 */ function getUserProfile() { - $params = array('property_keys'=>'kaccount_email'); + //$params = array('property_keys'=>'kaccount_email'); // v1 parameter + $params = array('property_keys'=>array('kakao_account.email')); // v2 parameter $this->api->decode_json = false; $this->api->curl_header = array( 'Authorization: Bearer ' . $this->api->access_token ); @@ -86,7 +87,9 @@ class Hybrid_Providers_Kakao extends Hybrid_Provider_Model_OAuth2 $this->user->profile->identifier = @ $data->id; $this->user->profile->displayName = @ $data->properties->nickname; $this->user->profile->photoURL = @ $data->properties->thumbnail_image; - $email = @ $data->kaccount_email; + //$email = @ $data->properties->kaccount_email; // v1 version + + $email = @ $data->kakao_account->email; // v2 version if( $email ){ $this->user->profile->email = $email; From d9823615412e7bad50f1f6d2bd307db4d8aa6ccb Mon Sep 17 00:00:00 2001 From: thisgun Date: Mon, 10 Feb 2020 17:32:50 +0900 Subject: [PATCH 3/4] =?UTF-8?q?get=5Fclass=5Fencrypt=20=ED=95=A8=EC=88=98?= =?UTF-8?q?=EB=82=B4=20=EC=9E=98=EB=AA=BB=EB=90=9C=20=EC=BD=94=EB=93=9C=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/get_data.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/get_data.lib.php b/lib/get_data.lib.php index 16f91d4fa..cfa53a81f 100644 --- a/lib/get_data.lib.php +++ b/lib/get_data.lib.php @@ -329,7 +329,7 @@ function get_db_create_replace($sql_str){ function get_class_encrypt(){ static $cache; - if( $cache && is_object($obj) ){ + if( $cache && is_object($cache) ){ return $cache; } From 2581bdba9b424680e352dd40877f7839f12711a5 Mon Sep 17 00:00:00 2001 From: thisgun Date: Mon, 10 Feb 2020 19:03:56 +0900 Subject: [PATCH 4/4] =?UTF-8?q?5.4=EB=B2=84=EC=A0=84=20exist=5Fseo=5Furl?= =?UTF-8?q?=20=ED=95=A8=EC=88=98=20=EB=82=B4=20=EC=A0=95=EA=B7=9C=EC=8B=9D?= =?UTF-8?q?=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 --- lib/uri.lib.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/uri.lib.php b/lib/uri.lib.php index 792c9ee3f..6221fc865 100644 --- a/lib/uri.lib.php +++ b/lib/uri.lib.php @@ -229,7 +229,8 @@ function exist_seo_url($type, $seo_title, $write_table, $sql_id=0){ global $g5; $exists_title = ''; - $sql_id = preg_replace('/[^a-z0-9_]/i', '', $sql_id); + $sql_id = preg_replace('/[^a-z0-9_\-]/i', '', $sql_id); + // 영카트 상품코드의 경우 - 하이픈이 들어가야 함 if( $type === 'bbs' ){ $sql = "select wr_seo_title FROM {$write_table} WHERE wr_seo_title = '".sql_real_escape_string($seo_title)."' AND wr_id <> '$sql_id' limit 1";