From 259ad83f44b5616e39791aba728aec65b272a3a9 Mon Sep 17 00:00:00 2001 From: "Sakamoto, Kazunori" Date: Fri, 8 May 2020 23:42:34 +0900 Subject: [PATCH 1/4] feat: use cacheDomain instead of FULL_BASE_URL --- View/Elements/entry_footer.ctp | 2 +- View/Helper/BlogOgpHelper.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/View/Elements/entry_footer.ctp b/View/Elements/entry_footer.ctp index 5dc2b95..89f26e6 100644 --- a/View/Elements/entry_footer.ctp +++ b/View/Elements/entry_footer.ctp @@ -2,7 +2,7 @@
- NetCommonsHtml->url(array( + NetCommonsHtml->url(array( 'action' => 'view', 'frame_id' => Current::read('Frame.id'), 'key' => $blogEntry['BlogEntry']['key'], diff --git a/View/Helper/BlogOgpHelper.php b/View/Helper/BlogOgpHelper.php index 582a0ce..b328247 100644 --- a/View/Helper/BlogOgpHelper.php +++ b/View/Helper/BlogOgpHelper.php @@ -169,7 +169,7 @@ private function __convertFullUrl($imageUrl) { // ルートパス if (substr($imageUrl, 0, 1) === '/') { // "/" はじまりならルートパスなのでhttpホスト名を追加する - $imageUrl = FULL_BASE_URL . $imageUrl; + $imageUrl = "https://" . Configure::read('App.cacheDomain') . $imageUrl; return $imageUrl; } @@ -278,7 +278,7 @@ private function __isWysiwygImage($imageUrl) { private function __getOgpParams($blogEntry) { $ogpParams = []; $ogpParams['og:title'] = $blogEntry['BlogEntry']['title']; - $contentUrl = FULL_BASE_URL . $this->NetCommonsHtml->url( + $contentUrl = "https://" . Configure::read('App.cacheDomain') . $this->NetCommonsHtml->url( array( 'action' => 'view', 'frame_id' => Current::read('Frame.id'), From 3a1827982f1b8468ec0e9e3d7336f95e4b495f06 Mon Sep 17 00:00:00 2001 From: "Sakamoto, Kazunori" Date: Sat, 9 May 2020 00:39:21 +0900 Subject: [PATCH 2/4] fix: get url scheme from FULL_BASE_URL --- View/Elements/entry_footer.ctp | 5 +++-- View/Helper/BlogOgpHelper.php | 11 +++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/View/Elements/entry_footer.ctp b/View/Elements/entry_footer.ctp index 89f26e6..4229d13 100644 --- a/View/Elements/entry_footer.ctp +++ b/View/Elements/entry_footer.ctp @@ -1,8 +1,9 @@
- - NetCommonsHtml->url(array( + NetCommonsHtml->url(array( 'action' => 'view', 'frame_id' => Current::read('Frame.id'), 'key' => $blogEntry['BlogEntry']['key'], diff --git a/View/Helper/BlogOgpHelper.php b/View/Helper/BlogOgpHelper.php index b328247..e99622d 100644 --- a/View/Helper/BlogOgpHelper.php +++ b/View/Helper/BlogOgpHelper.php @@ -169,7 +169,8 @@ private function __convertFullUrl($imageUrl) { // ルートパス if (substr($imageUrl, 0, 1) === '/') { // "/" はじまりならルートパスなのでhttpホスト名を追加する - $imageUrl = "https://" . Configure::read('App.cacheDomain') . $imageUrl; + $urlPrefix = parse_url(Configure::read('App.fullBaseUrl'), PHP_URL_SCHEME) . '://'; + $imageUrl = $urlPrefix . Configure::read('App.cacheDomain') . $imageUrl; return $imageUrl; } @@ -263,10 +264,7 @@ private function __getWysiwygSmallImageUrl($imageUrl) { * @return bool */ private function __isWysiwygImage($imageUrl) { - if (strstr($imageUrl, FULL_BASE_URL . '/wysiwyg/image/download') !== false) { - return true; - } - return false; + return strstr($imageUrl, Configure::read('App.fullBaseUrl') . '/wysiwyg/image/download') !== false; } /** @@ -278,7 +276,8 @@ private function __isWysiwygImage($imageUrl) { private function __getOgpParams($blogEntry) { $ogpParams = []; $ogpParams['og:title'] = $blogEntry['BlogEntry']['title']; - $contentUrl = "https://" . Configure::read('App.cacheDomain') . $this->NetCommonsHtml->url( + $urlPrefix = parse_url(Configure::read('App.fullBaseUrl'), PHP_URL_SCHEME) . '://'; + $contentUrl = $urlPrefix . Configure::read('App.cacheDomain') . $this->NetCommonsHtml->url( array( 'action' => 'view', 'frame_id' => Current::read('Frame.id'), From 92a2a3a516f71e7eb4fda18208870668ddfbda33 Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Fri, 10 Sep 2021 22:47:45 +0900 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20test:=20phpcs=E3=82=A8=E3=83=A9?= =?UTF-8?q?=E3=83=BC=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- View/Helper/BlogOgpHelper.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/View/Helper/BlogOgpHelper.php b/View/Helper/BlogOgpHelper.php index e99622d..cbe1e61 100644 --- a/View/Helper/BlogOgpHelper.php +++ b/View/Helper/BlogOgpHelper.php @@ -264,7 +264,8 @@ private function __getWysiwygSmallImageUrl($imageUrl) { * @return bool */ private function __isWysiwygImage($imageUrl) { - return strstr($imageUrl, Configure::read('App.fullBaseUrl') . '/wysiwyg/image/download') !== false; + $fullBaseUrl = Configure::read('App.fullBaseUrl'); + return strstr($imageUrl, $fullBaseUrl . '/wysiwyg/image/download') !== false; } /** From 8e0484eb8c09a33dcaef42a795c6c3ed1dce545d Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Fri, 19 Jan 2024 12:23:04 +0900 Subject: [PATCH 4/4] =?UTF-8?q?change:=20=E3=82=A4=E3=83=B3=E3=83=A9?= =?UTF-8?q?=E3=82=A4=E3=83=B3=E7=94=BB=E5=83=8F=E3=81=AE=E5=A0=B4=E5=90=88?= =?UTF-8?q?=E3=81=AF=E5=87=A6=E7=90=86=E3=81=97=E3=81=AA=E3=81=84=E3=82=88?= =?UTF-8?q?=E3=81=86=E3=81=AB=E4=BF=AE=E6=AD=A3(edumap)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- View/Helper/BlogOgpHelper.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/View/Helper/BlogOgpHelper.php b/View/Helper/BlogOgpHelper.php index cbe1e61..492ca76 100644 --- a/View/Helper/BlogOgpHelper.php +++ b/View/Helper/BlogOgpHelper.php @@ -198,6 +198,11 @@ private function __getOgImageParams($content) { $ogpParams = []; if (preg_match_all($pattern, $content, $images)) { foreach ($images[1] as $imageUrl) { + //インライン画像の場合、処理しない + if (substr($imageUrl, 0, 4) === 'data') { + continue; + } + $imageUrl = $this->__convertFullUrl($imageUrl); $imageUrl = str_replace('&', '&', $imageUrl);