From: Joshua Rüsweg <josh@bastelstu.be>
Date: Tue, 28 Aug 2018 10:40:33 +0000 (+0200)
Subject: Add permission to manage own articles
X-Git-Tag: 5.2.0_Alpha_1~364^2~64
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a40df44c036bd6201e4e8f9cef5fb878dba4dd4f;p=GitHub%2FWoltLab%2FWCF.git

Add permission to manage own articles
See #2677
---

diff --git a/com.woltlab.wcf/templates/article.tpl b/com.woltlab.wcf/templates/article.tpl
index 20eb88b0b4..923599072a 100644
--- a/com.woltlab.wcf/templates/article.tpl
+++ b/com.woltlab.wcf/templates/article.tpl
@@ -93,7 +93,7 @@
 							</li>
 						{/if}
 					
-						{if $__wcf->getSession()->getPermission('admin.content.article.canManageArticle')}<li><a href="{link controller='ArticleEdit' id=$article->articleID isACP=true}{/link}" class="button"><span class="icon icon16 fa-pencil"></span> <span>{lang}wcf.acp.article.edit{/lang}</span></a></li>{/if}
+						{if $article->canEdit()}<li><a href="{link controller='ArticleEdit' id=$article->articleID isACP=true}{/link}" class="button"><span class="icon icon16 fa-pencil"></span> <span>{lang}wcf.acp.article.edit{/lang}</span></a></li>{/if}
 						{event name='contentHeaderNavigation'}
 					{/content}
 				</ul>
diff --git a/com.woltlab.wcf/userGroupOption.xml b/com.woltlab.wcf/userGroupOption.xml
index 0bdf43c768..010e457f0e 100644
--- a/com.woltlab.wcf/userGroupOption.xml
+++ b/com.woltlab.wcf/userGroupOption.xml
@@ -441,6 +441,14 @@
 				<usersonly>1</usersonly>
 				<options>module_article</options>
 			</option>
+			<option name="admin.content.article.canManageOwnArticles">
+				<categoryname>admin.content</categoryname>
+				<optiontype>boolean</optiontype>
+				<defaultvalue>0</defaultvalue>
+				<admindefaultvalue>1</admindefaultvalue>
+				<usersonly>1</usersonly>
+				<options>module_article</options>
+			</option>
 			<option name="admin.content.article.canManageCategory">
 				<categoryname>admin.content</categoryname>
 				<optiontype>boolean</optiontype>
diff --git a/wcfsetup/install/files/acp/templates/articleAdd.tpl b/wcfsetup/install/files/acp/templates/articleAdd.tpl
index 0047dea966..10c4cb13fa 100644
--- a/wcfsetup/install/files/acp/templates/articleAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/articleAdd.tpl
@@ -193,7 +193,7 @@
 			</dd>
 		</dl>
 		
-		{if $__wcf->session->getPermission('admin.content.article.canManageArticle')}
+		{if $__wcf->session->getPermission('admin.content.article.canManageArticle') || $__wcf->session->getPermission('admin.content.article.canManageOwnArticles')}
 			<dl>
 				<dt><label for="categoryID">{lang}wcf.acp.article.publicationStatus{/lang}</label></dt>
 				<dd class="floated">
diff --git a/wcfsetup/install/files/lib/acp/form/ArticleAddForm.class.php b/wcfsetup/install/files/lib/acp/form/ArticleAddForm.class.php
index 461e052c1f..72988440ca 100644
--- a/wcfsetup/install/files/lib/acp/form/ArticleAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/ArticleAddForm.class.php
@@ -231,7 +231,7 @@ class ArticleAddForm extends AbstractForm {
 		}
 		if (!empty($_POST['enableComments'])) $this->enableComments = 1;
 		
-		if (WCF::getSession()->getPermission('admin.content.article.canManageArticle')) {
+		if (WCF::getSession()->getPermission('admin.content.article.canManageArticle') || WCF::getSession()->getPermission('admin.content.article.canManageOwnArticles')) {
 			if (isset($_POST['publicationStatus'])) $this->publicationStatus = intval($_POST['publicationStatus']);
 		}
 		else {
diff --git a/wcfsetup/install/files/lib/acp/form/ArticleEditForm.class.php b/wcfsetup/install/files/lib/acp/form/ArticleEditForm.class.php
index 672c2817ab..cd11a102eb 100644
--- a/wcfsetup/install/files/lib/acp/form/ArticleEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/ArticleEditForm.class.php
@@ -52,10 +52,8 @@ class ArticleEditForm extends ArticleAddForm {
 		}
 		if ($this->article->isMultilingual) $this->isMultilingual = 1;
 		
-		if (!WCF::getSession()->getPermission('admin.content.article.canManageArticle')) {
-			if ($this->article->userID != WCF::getUser()->userID || $this->article->publicationStatus != Article::UNPUBLISHED) {
-				throw new PermissionDeniedException();
-			}
+		if (!$this->article->canEdit()) {
+			throw new PermissionDeniedException();
 		}
 	}
 	
diff --git a/wcfsetup/install/files/lib/acp/page/ArticleListPage.class.php b/wcfsetup/install/files/lib/acp/page/ArticleListPage.class.php
index 5dc7b4c19f..5888d31bdf 100644
--- a/wcfsetup/install/files/lib/acp/page/ArticleListPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/ArticleListPage.class.php
@@ -136,7 +136,11 @@ class ArticleListPage extends SortablePage {
 		if (!WCF::getSession()->getPermission('admin.content.article.canManageArticle')) {
 			// only show own articles
 			$this->objectList->getConditionBuilder()->add('article.userID = ?', [WCF::getUser()->userID]);
-			$this->objectList->getConditionBuilder()->add('article.publicationStatus = ?', [Article::UNPUBLISHED]);
+			
+			if (!WCF::getSession()->getPermission('admin.content.article.canManageOwnArticles')) {
+				// only show unpublished articles
+				$this->objectList->getConditionBuilder()->add('article.publicationStatus = ?', [Article::UNPUBLISHED]);
+			}
 		}
 		
 		$this->objectList->sqlSelects = "(SELECT title FROM wcf".WCF_N."_article_content WHERE articleID = article.articleID AND (languageID IS NULL OR languageID = ".WCF::getLanguage()->languageID.") LIMIT 1) AS title";
diff --git a/wcfsetup/install/files/lib/data/article/Article.class.php b/wcfsetup/install/files/lib/data/article/Article.class.php
index 9ce4ee3916..64ba21bb81 100644
--- a/wcfsetup/install/files/lib/data/article/Article.class.php
+++ b/wcfsetup/install/files/lib/data/article/Article.class.php
@@ -84,6 +84,10 @@ class Article extends DatabaseObject implements ILinkableObject {
 			return true;
 		}
 		
+		if (WCF::getSession()->getPermission('admin.content.article.canManageOwnArticles') && $this->userID == WCF::getUser()->userID) {
+			return true;
+		}
+		
 		return false;
 	}
 	
@@ -110,6 +114,48 @@ class Article extends DatabaseObject implements ILinkableObject {
 		return WCF::getSession()->getPermission('user.article.canRead');
 	}
 	
+	/**
+	 * Returns true if the current user can edit these article.
+	 * 
+	 * @return      boolean
+	 * @since       3.2
+	 */
+	public function canEdit() {
+		if (WCF::getSession()->getPermission('admin.content.article.canManageArticle')) {
+			return true; 
+		}
+		
+		if (WCF::getSession()->getPermission('admin.content.article.canManageOwnArticles') && $this->userID == WCF::getUser()->userID) {
+			return true;
+		}
+		
+		if ($this->publicationStatus != self::PUBLISHED) {
+			if (WCF::getSession()->getPermission('admin.content.article.canContributeArticle') && $this->userID == WCF::getUser()->userID) {
+				return false;
+			}
+		}
+		
+		return false; 
+	}
+	
+	/**
+	 * Returns true if the current user can publish these article. 
+	 * 
+	 * @return      boolean
+	 * @since       3.2
+	 */
+	public function canPublish() {
+		if (WCF::getSession()->getPermission('admin.content.article.canManageArticle')) {
+			return true;
+		}
+		
+		if (WCF::getSession()->getPermission('admin.content.article.canManageOwnArticles') && $this->userID == WCF::getUser()->userID) {
+			return true;
+		}
+		
+		return false;
+	}
+	
 	/**
 	 * @inheritDoc
 	 */
diff --git a/wcfsetup/install/files/lib/data/article/ArticleAction.class.php b/wcfsetup/install/files/lib/data/article/ArticleAction.class.php
index 1b4054f5b1..bd76ed3fef 100644
--- a/wcfsetup/install/files/lib/data/article/ArticleAction.class.php
+++ b/wcfsetup/install/files/lib/data/article/ArticleAction.class.php
@@ -8,6 +8,7 @@ use wcf\data\language\Language;
 use wcf\data\AbstractDatabaseObjectAction;
 use wcf\system\clipboard\ClipboardHandler;
 use wcf\system\comment\CommentHandler;
+use wcf\system\exception\PermissionDeniedException;
 use wcf\system\exception\UserInputException;
 use wcf\system\language\LanguageFactory;
 use wcf\system\like\LikeHandler;
@@ -274,8 +275,6 @@ class ArticleAction extends AbstractDatabaseObjectAction {
 	 * @throws	UserInputException
 	 */
 	public function validateDelete() {
-		WCF::getSession()->checkPermissions(['admin.content.article.canManageArticle']);
-		
 		if (empty($this->objects)) {
 			$this->readObjects();
 			
@@ -285,6 +284,10 @@ class ArticleAction extends AbstractDatabaseObjectAction {
 		}
 		
 		foreach ($this->getObjects() as $article) {
+			if (!$article->canDelete()) {
+				throw new PermissionDeniedException();
+			}
+			
 			if (!$article->isDeleted) {
 				throw new UserInputException('objectIDs');
 			}
@@ -331,8 +334,6 @@ class ArticleAction extends AbstractDatabaseObjectAction {
 	 * @throws	UserInputException
 	 */
 	public function validateTrash() {
-		WCF::getSession()->checkPermissions(['admin.content.article.canManageArticle']);
-		
 		if (empty($this->objects)) {
 			$this->readObjects();
 			
@@ -342,6 +343,10 @@ class ArticleAction extends AbstractDatabaseObjectAction {
 		}
 		
 		foreach ($this->getObjects() as $article) {
+			if (!$article->canDelete()) {
+				throw new PermissionDeniedException();
+			}
+			
 			if ($article->isDeleted) {
 				throw new UserInputException('objectIDs');
 			}
@@ -556,8 +561,6 @@ class ArticleAction extends AbstractDatabaseObjectAction {
 	 * @throws	UserInputException
 	 */
 	public function validatePublish() {
-		WCF::getSession()->checkPermissions(['admin.content.article.canManageArticle']);
-		
 		if (empty($this->objects)) {
 			$this->readObjects();
 			
@@ -567,6 +570,10 @@ class ArticleAction extends AbstractDatabaseObjectAction {
 		}
 		
 		foreach ($this->getObjects() as $article) {
+			if (!$article->canPublish()) {
+				throw new PermissionDeniedException();	
+			}
+			
 			if ($article->publicationStatus == Article::PUBLISHED) {
 				throw new UserInputException('objectIDs');
 			}
@@ -603,8 +610,6 @@ class ArticleAction extends AbstractDatabaseObjectAction {
 	 * @throws	UserInputException
 	 */
 	public function validateUnpublish() {
-		WCF::getSession()->checkPermissions(['admin.content.article.canManageArticle']);
-		
 		if (empty($this->objects)) {
 			$this->readObjects();
 			
@@ -614,6 +619,10 @@ class ArticleAction extends AbstractDatabaseObjectAction {
 		}
 		
 		foreach ($this->getObjects() as $article) {
+			if (!$article->canPublish()) {
+				throw new PermissionDeniedException();
+			}
+			
 			if ($article->publicationStatus != Article::PUBLISHED) {
 				throw new UserInputException('objectIDs');
 			}
diff --git a/wcfsetup/install/files/lib/system/clipboard/action/ArticleClipboardAction.class.php b/wcfsetup/install/files/lib/system/clipboard/action/ArticleClipboardAction.class.php
index 1518d54776..6ff5ddfc5e 100644
--- a/wcfsetup/install/files/lib/system/clipboard/action/ArticleClipboardAction.class.php
+++ b/wcfsetup/install/files/lib/system/clipboard/action/ArticleClipboardAction.class.php
@@ -93,15 +93,11 @@ class ArticleClipboardAction extends AbstractClipboardAction {
 	 * @return	integer[]
 	 */
 	public function validateDelete() {
-		if (!WCF::getSession()->getPermission('admin.content.article.canManageArticle')) {
-			return [];
-		}
-		
 		$objectIDs = [];
 		
 		/** @var Article $article */
 		foreach ($this->objects as $article) {
-			if ($article->isDeleted) {
+			if ($article->canDelete() && $article->isDeleted) {
 				$objectIDs[] = $article->articleID;
 			}
 		}
@@ -115,15 +111,11 @@ class ArticleClipboardAction extends AbstractClipboardAction {
 	 * @return	integer[]
 	 */
 	public function validatePublish() {
-		if (!WCF::getSession()->getPermission('admin.content.article.canManageArticle')) {
-			return [];
-		}
-		
 		$objectIDs = [];
 		
 		/** @var Article $article */
 		foreach ($this->objects as $article) {
-			if ($article->publicationStatus == Article::UNPUBLISHED) {
+			if ($article->canPublish() && $article->publicationStatus == Article::UNPUBLISHED) {
 				$objectIDs[] = $article->articleID;
 			}
 		}
@@ -159,15 +151,11 @@ class ArticleClipboardAction extends AbstractClipboardAction {
 	 * @return	integer[]
 	 */
 	public function validateTrash() {
-		if (!WCF::getSession()->getPermission('admin.content.article.canManageArticle')) {
-			return [];
-		}
-		
 		$objectIDs = [];
 		
 		/** @var Article $article */
 		foreach ($this->objects as $article) {
-			if (!$article->isDeleted) {
+			if ($article->canDelete() && !$article->isDeleted) {
 				$objectIDs[] = $article->articleID;
 			}
 		}
@@ -181,15 +169,11 @@ class ArticleClipboardAction extends AbstractClipboardAction {
 	 * @return	integer[]
 	 */
 	public function validateUnpublish() {
-		if (!WCF::getSession()->getPermission('admin.content.article.canManageArticle')) {
-			return [];
-		}
-		
 		$objectIDs = [];
 		
 		/** @var Article $article */
 		foreach ($this->objects as $article) {
-			if ($article->publicationStatus == Article::PUBLISHED) {
+			if ($article->canPublish() && $article->publicationStatus == Article::PUBLISHED) {
 				$objectIDs[] = $article->articleID;
 			}
 		}
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index f329e36707..967e4a7cd1 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -648,6 +648,7 @@
 		<item name="wcf.acp.group.option.user.tag.canViewTag"><![CDATA[Kann Tag sehen]]></item>
 		<item name="wcf.acp.group.option.category.user.cms"><![CDATA[CMS]]></item>
 		<item name="wcf.acp.group.option.admin.content.article.canManageArticle"><![CDATA[Kann Artikel verwalten]]></item>
+		<item name="wcf.acp.group.option.admin.content.article.canManageOwnArticles"><![CDATA[Kann eigene Artikel verwalten]]></item>
 		<item name="wcf.acp.group.option.admin.content.article.canContributeArticle"><![CDATA[Kann Artikel einreichen]]></item>
 		<item name="wcf.acp.group.option.admin.content.article.canManageCategory"><![CDATA[Kann Artikel-Kategorien verwalten]]></item>
 		<item name="wcf.acp.group.option.admin.content.cms.canManageBox"><![CDATA[Kann Boxen verwalten]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index c9e67029fb..847298c6eb 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -630,6 +630,7 @@
 		<item name="wcf.acp.group.option.user.tag.canViewTag"><![CDATA[Can view tags]]></item>
 		<item name="wcf.acp.group.option.category.user.cms"><![CDATA[CMS]]></item>
 		<item name="wcf.acp.group.option.admin.content.article.canManageArticle"><![CDATA[Can manage articles]]></item>
+		<item name="wcf.acp.group.option.admin.content.article.canManageOwnArticles"><![CDATA[Can manage own articles]]></item>
 		<item name="wcf.acp.group.option.admin.content.article.canContributeArticle"><![CDATA[Can contribute articles]]></item>
 		<item name="wcf.acp.group.option.admin.content.article.canManageCategory"><![CDATA[Can manage article categories]]></item>
 		<item name="wcf.acp.group.option.admin.content.cms.canManageBox"><![CDATA[Can manage boxes]]></item>