From ac85d37d9a8b13f8bb5f431855dbf5b1a2bb073d Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Thu, 31 Oct 2019 19:09:10 +0100
Subject: [PATCH] Improved the visibility filter for articles

- Admin: All articles are shown
- Edit own articles only: All public articles + own regardless of status
- Anybody else: Only published and non-deleted articles
---
 com.woltlab.wcf/templates/article.tpl                    | 4 ++++
 com.woltlab.wcf/templates/articleListItems.tpl           | 1 +
 .../lib/data/article/AccessibleArticleList.class.php     | 9 +++++++--
 .../files/lib/data/article/ViewableArticle.class.php     | 8 ++++++++
 wcfsetup/install/lang/de.xml                             | 2 ++
 wcfsetup/install/lang/en.xml                             | 2 ++
 6 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/com.woltlab.wcf/templates/article.tpl b/com.woltlab.wcf/templates/article.tpl
index 52bc634a06..3a66b24855 100644
--- a/com.woltlab.wcf/templates/article.tpl
+++ b/com.woltlab.wcf/templates/article.tpl
@@ -115,6 +115,10 @@
 
 {include file='header'}
 
+{if !$article->isPublished()}
+	<p class="info">{lang publicationDate=$article->publicationDate}wcf.article.publicationStatus.{@$article->publicationStatus}{/lang}</p>
+{/if}
+
 <div class="section">
 	{if $articleContent->teaser}
 		<div class="section articleTeaserContainer">
diff --git a/com.woltlab.wcf/templates/articleListItems.tpl b/com.woltlab.wcf/templates/articleListItems.tpl
index 64682d77e9..6458acd637 100644
--- a/com.woltlab.wcf/templates/articleListItems.tpl
+++ b/com.woltlab.wcf/templates/articleListItems.tpl
@@ -9,6 +9,7 @@
 						<div class="contentItemBadges">
 							{content}
 								{if $article->isDeleted}<span class="badge label red contentItemBadge contentItemBadgeIsDeleted">{lang}wcf.message.status.deleted{/lang}</span>{/if}
+								{if !$article->isPublished()}<span class="badge label green contentItemBadge contentItemBadgeIsDisabled">{lang}wcf.message.status.disabled{/lang}</span>{/if}
 								{if ARTICLE_ENABLE_VISIT_TRACKING && $article->isNew()}<span class="badge label contentItemBadge contentItemBadgeNew">{lang}wcf.message.new{/lang}</span>{/if}
 								
 								{event name='contentItemBadges'}
diff --git a/wcfsetup/install/files/lib/data/article/AccessibleArticleList.class.php b/wcfsetup/install/files/lib/data/article/AccessibleArticleList.class.php
index 6d56601c01..ef8c1cad3f 100644
--- a/wcfsetup/install/files/lib/data/article/AccessibleArticleList.class.php
+++ b/wcfsetup/install/files/lib/data/article/AccessibleArticleList.class.php
@@ -26,10 +26,15 @@ class AccessibleArticleList extends ViewableArticleList {
 		}
 		else {
 			$this->getConditionBuilder()->add('article.categoryID IN (?)', [$accessibleCategoryIDs]);
-			$this->getConditionBuilder()->add('article.publicationStatus = ?', [Article::PUBLISHED]);
 			
 			if (!WCF::getSession()->getPermission('admin.content.article.canManageArticle')) {
-				$this->getConditionBuilder()->add('article.isDeleted = ?', [0]);
+				if (WCF::getSession()->getPermission('admin.content.article.canManageOwnArticles')) {
+					$this->getConditionBuilder()->add('(article.userID = ? OR (article.isDeleted = ? AND article.publicationStatus = ?))', [WCF::getUser()->userID, 0, Article::PUBLISHED]);
+				}
+				else {
+					$this->getConditionBuilder()->add('article.isDeleted = ?', [0]);
+					$this->getConditionBuilder()->add('article.publicationStatus = ?', [Article::PUBLISHED]);
+				}
 			}
 		}
 	}
diff --git a/wcfsetup/install/files/lib/data/article/ViewableArticle.class.php b/wcfsetup/install/files/lib/data/article/ViewableArticle.class.php
index 9b7b332599..c523da874f 100644
--- a/wcfsetup/install/files/lib/data/article/ViewableArticle.class.php
+++ b/wcfsetup/install/files/lib/data/article/ViewableArticle.class.php
@@ -205,6 +205,14 @@ class ViewableArticle extends DatabaseObjectDecorator {
 		return !empty($this->labels);
 	}
 	
+	/**
+	 * @return bool
+	 * @since 5.2
+	 */
+	public function isPublished() {
+		return $this->publicationStatus == Article::PUBLISHED;
+	}
+	
 	/**
 	 * Returns the number of unread articles.
 	 *
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index cba4c38f5b..47a9ff0ec2 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -3247,6 +3247,8 @@ Benutzerkontos nun in vollem Umfang nutzen.]]></item>
 		<item name="wcf.article.search.error.tooShort"><![CDATA[Der Suchbegriff ist zu kurz.]]></item>
 		<item name="wcf.article.search.name"><![CDATA[Titel durchsuchen]]></item>
 		<item name="wcf.article.search.results"><![CDATA[Suchergebnisse]]></item>
+		<item name="wcf.article.publicationStatus.0"><![CDATA[Dieser Artikel wurde noch nicht veröffentlicht.]]></item>
+		<item name="wcf.article.publicationStatus.2"><![CDATA[Dieser Artikel wird am {@$publicationDate|plainTime} veröffentlicht.]]></item>
 	</category>
 	<category name="wcf.attachment">
 		<item name="wcf.attachment.file.info"><![CDATA[({@$attachment->filesize|filesize}, <b>{#$attachment->downloads}</b> Mal heruntergeladen{if $attachment->downloads > 0}, zuletzt: {@$attachment->lastDownloadTime|time}{/if})]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index b1f1177d2b..b2fca935ed 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -3171,6 +3171,8 @@ full extend.]]></item>
 		<item name="wcf.article.search.error.tooShort"><![CDATA[The entered keyword is too short.]]></item>
 		<item name="wcf.article.search.name"><![CDATA[Search Titles]]></item>
 		<item name="wcf.article.search.results"><![CDATA[Search Results]]></item>
+		<item name="wcf.article.publicationStatus.0"><![CDATA[This article has not been published yet.]]></item>
+		<item name="wcf.article.publicationStatus.2"><![CDATA[This article will be published on {@$publicationDate|plainTime}.]]></item>
 	</category>
 	<category name="wcf.attachment">
 		<item name="wcf.attachment.file.info"><![CDATA[({@$attachment->filesize|filesize}, downloaded <b>{#$attachment->downloads}</b> times{if $attachment->downloads > 0}, last: {@$attachment->lastDownloadTime|time}{/if})]]></item>
-- 
2.20.1