From: Matthias Schmidt <gravatronics@live.com>
Date: Thu, 6 Oct 2016 15:24:03 +0000 (+0200)
Subject: Add box controller for article comments
X-Git-Tag: 3.0.0_Beta_3~50^2~74
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0943780a1c054ad75baa8f1773f364d0447f0c2e;p=GitHub%2FWoltLab%2FWCF.git

Add box controller for article comments
---

diff --git a/com.woltlab.wcf/objectType.xml b/com.woltlab.wcf/objectType.xml
index 8391774765..5e14c1269d 100644
--- a/com.woltlab.wcf/objectType.xml
+++ b/com.woltlab.wcf/objectType.xml
@@ -1084,6 +1084,11 @@
 			<definitionname>com.woltlab.wcf.boxController</definitionname>
 			<classname>wcf\system\box\ArticleListBoxController</classname>
 		</type>
+		<type>
+			<name>com.woltlab.wcf.articleCommentList</name>
+			<definitionname>com.woltlab.wcf.boxController</definitionname>
+			<classname>wcf\system\box\ArticleCommentListBoxController</classname>
+		</type>
 		<type>
 			<name>com.woltlab.wcf.whoWasOnline</name>
 			<definitionname>com.woltlab.wcf.boxController</definitionname>
diff --git a/wcfsetup/install/files/lib/system/box/ArticleCommentListBoxController.class.php b/wcfsetup/install/files/lib/system/box/ArticleCommentListBoxController.class.php
new file mode 100644
index 0000000000..f83d04e723
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/box/ArticleCommentListBoxController.class.php
@@ -0,0 +1,45 @@
+<?php
+namespace wcf\system\box;
+use wcf\data\article\Article;
+use wcf\data\article\category\ArticleCategory;
+use wcf\data\comment\ViewableCommentList;
+use wcf\system\language\LanguageFactory;
+use wcf\system\WCF;
+
+/**
+ * Box controller implementation for a list of article comments.
+ * 
+ * @author	Matthias Schmidt
+ * @copyright	2001-2016 WoltLab GmbH
+ * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @package	WoltLabSuite\Core\System\Box
+ */
+class ArticleCommentListBoxController extends AbstractCommentListBoxController {
+	/**
+	 * @inheritDoc
+	 */
+	protected $objectTypeName = 'com.woltlab.wcf.articleComment';
+	
+	/**
+	 * @inheritDoc
+	 */
+	protected function applyObjectTypeFilters(ViewableCommentList $commentList) {
+		$accessibleCategoryIDs = ArticleCategory::getAccessibleCategoryIDs();
+		if (!empty($accessibleCategoryIDs)) {
+			$commentList->sqlJoins .= ' INNER JOIN wcf' . WCF_N . '_article_content article_content ON (article_content.articleContentID = comment.objectID)';
+			$commentList->sqlJoins .= ' INNER JOIN wcf' . WCF_N . '_article article ON (article.articleID = article_content.articleID)';
+			$commentList->sqlSelects = 'article_content.title';
+			
+			$commentList->getConditionBuilder()->add('article.categoryID IN (?)', [$accessibleCategoryIDs]);
+			$commentList->getConditionBuilder()->add('article.publicationStatus = ?', [Article::PUBLISHED]);
+			
+			// apply language filter
+			if (LanguageFactory::getInstance()->multilingualismEnabled() && !empty(WCF::getUser()->getLanguageIDs())) {
+				$commentList->getConditionBuilder()->add('(article_content.languageID IN (?) OR article_content.languageID IS NULL)', [WCF::getUser()->getLanguageIDs()]);
+			}
+		}
+		else {
+			$commentList->getConditionBuilder()->add('0 = 1');
+		}
+	}
+}
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index a367266d18..02662fa00e 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -196,6 +196,7 @@
 		<item name="wcf.acp.box.visibilityException.visible"><![CDATA[Box auf ausgewählten Seiten <strong>explizit anzeigen</strong>]]></item>
 		<item name="wcf.acp.box.visibilityException.hidden"><![CDATA[Box auf ausgewählten Seiten <strong>nicht anzeigen</strong>]]></item>
 		<item name="wcf.acp.box.boxController.com.woltlab.wcf.articleCategories"><![CDATA[Artikel-Kategorien]]></item>
+		<item name="wcf.acp.box.boxController.com.woltlab.wcf.articleCommentList"><![CDATA[Artikel-Kommentare]]></item>
 		<item name="wcf.acp.box.boxController.com.woltlab.wcf.articleList"><![CDATA[Artikel]]></item>
 		<item name="wcf.acp.box.boxController.com.woltlab.wcf.followingsOnline"><![CDATA[Benutzer online, denen der aktive Nutzer folgt]]></item>
 		<item name="wcf.acp.box.boxController.com.woltlab.wcf.pageCommentList"><![CDATA[Seiten-Kommentare]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index f065d85ec5..594eff83cf 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -193,6 +193,7 @@ Examples for medium ID detection:
 		<item name="wcf.acp.box.visibilityException.visible"><![CDATA[Choose Where the Box Will be Explicitly <strong>Visible</strong>]]></item>
 		<item name="wcf.acp.box.visibilityException.hidden"><![CDATA[Choose Where the Box Will be Explicitly <strong>Hidden</strong>]]></item>
 		<item name="wcf.acp.box.boxController.com.woltlab.wcf.articleCategories"><![CDATA[Article Categories]]></item>
+		<item name="wcf.acp.box.boxController.com.woltlab.wcf.articleCommentList"><![CDATA[Article Comments]]></item>
 		<item name="wcf.acp.box.boxController.com.woltlab.wcf.articleList"><![CDATA[Articles]]></item>
 		<item name="wcf.acp.box.boxController.com.woltlab.wcf.followingsOnline"><![CDATA[Users Online Followed by Active User]]></item>
 		<item name="wcf.acp.box.boxController.com.woltlab.wcf.pageCommentList"><![CDATA[Page Comments]]></item>