fix #1833 【ページ】管理画面で公開期間外の固定ページへの確認リンクが表示される

baserproject · Jun 18, 2022 · af30bb3 · af30bb3
1 parent d5adcd2
commit af30bb3
Show file tree

Hide file tree

Showing 11 changed files with 93 additions and 34 deletions.
diff --git a/lib/Baser/Controller/ContentFoldersController.php b/lib/Baser/Controller/ContentFoldersController.php
@@ -115,7 +115,7 @@ public function admin_edit($entityId)
 		$site = BcSite::findById($this->request->data['Content']['site_id']);
 		$this->set('folderTemplateList', $this->ContentFolder->getFolderTemplateList($this->request->data['Content']['id'], $theme));
 		$this->set('pageTemplateList', $this->Page->getPageTemplateList($this->request->data['Content']['id'], $theme));
-		$this->set('publishLink', $this->Content->getUrl($this->request->data['Content']['url'], true, $site->useSubDomain));
+		$this->set('publishLink', $this->Content->getPublishUrl($this->request->data['Content']));
 	}
 
 	/**

diff --git a/lib/Baser/Controller/ContentLinksController.php b/lib/Baser/Controller/ContentLinksController.php
@@ -93,8 +93,7 @@ public function admin_edit($entityId)
 				$this->redirect(['plugin' => false, 'admin' => true, 'controller' => 'contents', 'action' => 'index']);
 			}
 		}
-		$site = BcSite::findById($this->request->data['Content']['site_id']);
-		$this->set('publishLink', $this->Content->getUrl($this->request->data['Content']['url'], true, $site->useSubDomain));
+		$this->set('publishLink', $this->Content->getPublishUrl($this->request->data['Content']));
 	}
 
 	/**

diff --git a/lib/Baser/Controller/PagesController.php b/lib/Baser/Controller/PagesController.php
@@ -265,11 +265,7 @@ public function admin_edit($id)
 		}
 
 		// 公開リンク
-		$publishLink = '';
-		if ($this->request->data['Content']['status']) {
-			$site = BcSite::findById($this->request->data['Content']['site_id']);
-			$publishLink = $this->Content->getUrl($this->request->data['Content']['url'], true, $site->useSubDomain);
-		}
+		$publishLink = $this->Content->getPublishUrl($this->request->data['Content']);
 		// エディタオプション
 		$editorOptions = ['editorDisableDraft' => false];
 		if (!empty($this->siteConfigs['editor_styles'])) {

diff --git a/lib/Baser/Model/Content.php b/lib/Baser/Model/Content.php
@@ -1409,6 +1409,21 @@ public function isPublish($status, $publishBegin, $publishEnd)
 		return true;
 	}
 
+	/**
+	 * 公開されたURLを取得
+	 *
+	 * @param array $content
+	 * @return string|bool
+	 */
+	public function getPublishUrl($content)
+	{
+		if (!$this->isPublish($content['status'], $content['publish_begin'], $content['publish_end'])) {
+			return false;
+		}
+		$site = BcSite::findById($content['site_id']);
+		return $this->getUrl($content['url'], true, $site->useSubDomain);
+	}
+
 	/**
 	 * 移動元のコンテンツと移動先のディレクトリから移動が可能かチェックする
 	 *

diff --git a/lib/Baser/Plugin/Blog/Controller/BlogCategoriesController.php b/lib/Baser/Plugin/Blog/Controller/BlogCategoriesController.php
@@ -219,7 +219,10 @@ public function admin_edit($blogContentId, $id)
 		} else {
 			$parents = ['' => __d('baser', '指定しない')];
 		}
-		$this->set('publishLink', $this->Content->getUrl($this->request->params['Content']['url'] . 'archives/category/' . $this->request->data['BlogCategory']['name'], true, $this->request->params['Site']['use_subdomain']));
+
+		if ($this->Content->isPublish($this->request->params['Content']['status'], $this->request->params['Content']['publish_begin'], $this->request->params['Content']['publish_end'])) {
+			$this->set('publishLink', $this->Content->getUrl($this->request->params['Content']['url'] . 'archives/category/' . $this->request->data['BlogCategory']['name'], true, $this->request->params['Site']['use_subdomain']));
+		}
 		$this->set('parents', $parents);
 		$this->pageTitle = sprintf(__d('baser', '%s｜カテゴリ編集'), $this->request->params['Content']['title']);
 		$this->help = 'blog_categories_form';

diff --git a/lib/Baser/Plugin/Blog/Controller/BlogContentsController.php b/lib/Baser/Plugin/Blog/Controller/BlogContentsController.php
@@ -164,10 +164,7 @@ public function admin_edit($id)
 				$this->redirect(['plugin' => false, 'admin' => true, 'controller' => 'contents', 'action' => 'index']);
 			}
 		}
-		$site = BcSite::findById($this->request->data['Content']['site_id']);
-		if (!empty($this->request->data['Content']['status'])) {
-			$this->set('publishLink', $this->Content->getUrl($this->request->data['Content']['url'], true, $site->useSubDomain));
-		}
+		$this->set('publishLink', $this->Content->getPublishUrl($this->request->data['Content']));
 		$this->request->params['Content'] = $this->BcContents->getContent($id)['Content'];
 		$this->set('blogContent', $this->request->data);
 		$this->subMenuElements = ['blog_posts'];

diff --git a/lib/Baser/Plugin/Blog/Controller/BlogPostsController.php b/lib/Baser/Plugin/Blog/Controller/BlogPostsController.php
@@ -182,9 +182,7 @@ public function admin_index($blogContentId)
 			return;
 		}
 
-		if ($this->request->params['Content']['status']) {
-			$this->set('publishLink', $this->Content->getUrl($this->request->params['Content']['url'], true, $this->request->params['Site']['use_subdomain']));
-		}
+		$this->set('publishLink', $this->Content->getPublishUrl($this->request->param('Content')));
 		$this->pageTitle = sprintf(__d('baser', '%s｜記事一覧'), strip_tags($this->request->params['Content']['title']));
 		$this->search = 'blog_posts_index';
 		$this->help = 'blog_posts_index';
@@ -458,7 +456,7 @@ public function admin_edit($blogContentId, $id)
 			'empty' => __d('baser', '指定しない')
 		]);
 
-		if ($this->request->data['BlogPost']['status']) {
+		if ($this->BlogPost->allowPublish($this->request->data['BlogPost']) && $this->Content->isPublish($this->request->params['Content']['status'], $this->request->params['Content']['publish_begin'], $this->request->params['Content']['publish_end'])) {
 			$this->set('publishLink', $this->Content->getUrl($this->request->params['Content']['url'] . 'archives/' . $this->request->data['BlogPost']['no'], true, $this->request->params['Site']['use_subdomain']));
 		}
 

diff --git a/lib/Baser/Plugin/Mail/Controller/MailContentsController.php b/lib/Baser/Plugin/Mail/Controller/MailContentsController.php
@@ -219,17 +219,7 @@ public function admin_edit($id)
 		}
 
 		$this->request->param('Content', $this->BcContents->getContent($id)['Content']);
-		if ($this->request->data['Content']['status']) {
-			$site = BcSite::findById($this->request->data['Content']['site_id']);
-			$this->set(
-				'publishLink',
-				$this->Content->getUrl(
-					$this->request->data['Content']['url'],
-					true,
-					$site->useSubDomain
-				)
-			);
-		}
+		$this->set('publishLink', $this->Content->getPublishUrl($this->request->data['Content']));
 		$this->set('mailContent', $this->request->data);
 		$this->subMenuElements = ['mail_fields'];
 		$this->pageTitle = __d('baser', 'メールフォーム設定編集');

diff --git a/lib/Baser/Plugin/Mail/Controller/MailFieldsController.php b/lib/Baser/Plugin/Mail/Controller/MailFieldsController.php
@@ -79,12 +79,7 @@ public function beforeFilter()
 				$mailContentId
 			]
 		];
-		if ($this->request->param('Content.status')) {
-			$site = BcSite::findById($this->request->param('Content.site_id'));
-			$this->set('publishLink', $this->Content->getUrl(
-				$this->request->param('Content.url'), true, $site->useSubDomain)
-			);
-		}
+		$this->set('publishLink', $this->Content->getPublishUrl($this->request->param('Content')));
 	}
 
 	/**

diff --git a/lib/Baser/Test/Case/Model/ContentTest.php b/lib/Baser/Test/Case/Model/ContentTest.php
@@ -24,6 +24,7 @@ class ContentTest extends BaserTestCase
 	public $fixtures = [
 		'baser.Model.Content.ContentIsMovable',
 		'baser.Model.Content.ContentStatusCheck',
+		'baser.Model.Site.SiteSubDomain',
 		'baser.Routing.Route.BcContentsRoute.SiteBcContentsRoute',
 		'baser.Routing.Route.BcContentsRoute.ContentBcContentsRoute',
 		'baser.Default.SiteConfig',
@@ -594,6 +595,28 @@ public function isPublishDataProvider()
 		];
 	}
 
+	/**
+	 * 公開されたURLを取得
+	 *
+	 * @dataProvider getPublishUrlProvider
+	 */
+	public function testGetPublishUrl($content, $expected)
+	{
+		$this->loadFixtures('SiteSubDomain');
+		$result = $this->Content->getPublishUrl($content);
+		$this->assertEquals($expected, $result);
+	}
+
+	public function getPublishUrlProvider()
+	{
+		return [
+			[['status' => true, 'publish_begin' => '', 'publish_end' => '', 'site_id' => 0, 'url' => '/test1'], 'https://localhost/test1'],
+			[['status' => true, 'publish_begin' => '', 'publish_end' => '', 'site_id' => 1, 'url' => '/subdomain/test2'], 'http://subdomain.localhost/test2'],
+			[['status' => true, 'publish_begin' => date('Y-m-d H:i:s', strtotime('+1 hour')), 'publish_end' => ''], false],
+			[['status' => false, 'publish_begin' => '', 'publish_end' => ''], false],
+		];
+	}
+
 	/**
 	 * 移動元のコンテンツと移動先のディレクトリから移動が可能かチェックする
 	 * @throws Exception

diff --git a/lib/Baser/Test/Fixture/Model/Site/SiteSubDomainFixture.php b/lib/Baser/Test/Fixture/Model/Site/SiteSubDomainFixture.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * SiteSubDomainFixture
+ */
+class SiteSubDomainFixture extends BaserTestFixture
+{
+
+	/**
+	 * Name of the object
+	 *
+	 * @var string
+	 */
+	public $name = 'Site';
+
+	/**
+	 * Records
+	 *
+	 * @var array
+	 */
+	public $records = [
+		[
+			'id' => '1',
+			'main_site_id' => '0',
+			'name' => 'subdomain',
+			'display_name' => 'subdomain',
+			'title' => 'subdomain',
+			'alias' => 'subdomain',
+			'theme' => '',
+			'status' => 1,
+			'device' => '',
+			'lang' => '',
+			'auto_redirect' => true,
+			'auto_link' => true,
+			'same_main_url' => false,
+			'use_subdomain' => 1,
+			'relate_main_site' => 0,
+			'created' => '2022-06-18 21:20:15',
+			'modified' => null
+		],
+	];
+
+}