From: Marcel Werk <burntime@woltlab.com>
Date: Mon, 18 Apr 2016 13:53:27 +0000 (+0200)
Subject: Added box for page comments
X-Git-Tag: 3.0.0_Beta_1~1850
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=139e9108789737b050ca7c4c8d08fecd5fbbfea7;p=GitHub%2FWoltLab%2FWCF.git

Added box for page comments
---

diff --git a/com.woltlab.wcf/box.xml b/com.woltlab.wcf/box.xml
index c7c840ef35..cccf7d63a7 100644
--- a/com.woltlab.wcf/box.xml
+++ b/com.woltlab.wcf/box.xml
@@ -176,5 +176,15 @@
 			<showHeader>1</showHeader>
 			<visibleEverywhere>0</visibleEverywhere>
 		</box>
+		
+		<box identifier="com.woltlab.wcf.PageComments">
+			<name language="de">Kommentare</name>
+			<name language="en">Page Comments</name>
+			<boxType>system</boxType>
+			<controller>wcf\system\box\PageCommentsBoxController</controller>
+			<position>contentBottom</position>
+			<showHeader>1</showHeader>
+			<visibleEverywhere>0</visibleEverywhere>
+		</box>
 	</import>
 </data>
diff --git a/com.woltlab.wcf/objectType.xml b/com.woltlab.wcf/objectType.xml
index ddb79aae23..91e6426c8e 100644
--- a/com.woltlab.wcf/objectType.xml
+++ b/com.woltlab.wcf/objectType.xml
@@ -151,6 +151,12 @@
 			<classname><![CDATA[wcf\system\user\notification\object\type\ModerationQueueCommentResponseUserNotificationObjectType]]></classname>
 			<category>com.woltlab.wcf.moderation</category>
 		</type>
+		
+		<type>
+			<name>com.woltlab.wcf.page</name>
+			<definitionname>com.woltlab.wcf.comment.commentableContent</definitionname>
+			<classname><![CDATA[wcf\system\comment\manager\PageCommentManager]]></classname>
+		</type>
 		<!-- /comments -->
 		
 		<!-- moderation -->
diff --git a/com.woltlab.wcf/templates/boxPageComments.tpl b/com.woltlab.wcf/templates/boxPageComments.tpl
new file mode 100644
index 0000000000..d2e5a0d926
--- /dev/null
+++ b/com.woltlab.wcf/templates/boxPageComments.tpl
@@ -0,0 +1,5 @@
+{include file='__commentJavaScript' commentContainerID='pageCommentList'}
+
+<ul id="pageCommentList" class="commentList containerList" data-can-add="{if $commentCanAdd}true{else}false{/if}" data-object-id="{@$pageID}" data-object-type-id="{@$commentObjectTypeID}" data-comments="{@$commentList->countObjects()}" data-last-comment-time="{@$lastCommentTime}">
+	{include file='commentList'}
+</ul>
diff --git a/com.woltlab.wcf/userGroupOption.xml b/com.woltlab.wcf/userGroupOption.xml
index eb6cc9cecc..fdb84aa4a4 100644
--- a/com.woltlab.wcf/userGroupOption.xml
+++ b/com.woltlab.wcf/userGroupOption.xml
@@ -29,6 +29,10 @@
 				<parent>user.message</parent>
 			</category>
 			
+			<category name="user.pageComment">
+				<parent>user</parent>
+			</category>
+			
 			<category name="mod" />
 			<category name="mod.general">
 				<parent>mod</parent>
@@ -36,6 +40,9 @@
 			<category name="mod.profileComment">
 				<parent>mod.general</parent>
 			</category>
+			<category name="mod.pageComment">
+				<parent>mod.general</parent>
+			</category>
 			
 			<category name="admin" />
 			
@@ -693,6 +700,25 @@ png]]></defaultvalue>
 			</option>
 			<!-- /user.profile -->
 			
+			<option name="user.pageComment.canAddComment">
+				<categoryname>user.pageComment</categoryname>
+				<optiontype>boolean</optiontype>
+				<defaultvalue>1</defaultvalue>
+			</option>
+			<option name="user.pageComment.canEditComment">
+				<categoryname>user.pageComment</categoryname>
+				<optiontype>boolean</optiontype>
+				<defaultvalue>1</defaultvalue>
+				<usersonly>1</usersonly>
+			</option>
+			<option name="user.pageComment.canDeleteComment">
+				<categoryname>user.pageComment</categoryname>
+				<optiontype>boolean</optiontype>
+				<defaultvalue>0</defaultvalue>
+				<admindefaultvalue>1</admindefaultvalue>
+				<usersonly>1</usersonly>
+			</option>
+			
 			<option name="mod.general.canUseModeration">
 				<categoryname>mod.general</categoryname>
 				<optiontype>boolean</optiontype>
@@ -739,6 +765,28 @@ png]]></defaultvalue>
 			</option>
 			<!-- /mod.general -->
 			
+			<option name="mod.pageComment.canEditComment">
+				<categoryname>mod.pageComment</categoryname>
+				<optiontype>boolean</optiontype>
+				<defaultvalue>0</defaultvalue>
+				<moddefaultvalue>1</moddefaultvalue>
+				<usersonly>1</usersonly>
+			</option>
+			<option name="mod.pageComment.canDeleteComment">
+				<categoryname>mod.pageComment</categoryname>
+				<optiontype>boolean</optiontype>
+				<defaultvalue>0</defaultvalue>
+				<moddefaultvalue>1</moddefaultvalue>
+				<usersonly>1</usersonly>
+			</option>
+			<option name="mod.pageComment.canModerateComment">
+				<categoryname>mod.pageComment</categoryname>
+				<optiontype>boolean</optiontype>
+				<defaultvalue>0</defaultvalue>
+				<moddefaultvalue>1</moddefaultvalue>
+				<usersonly>1</usersonly>
+			</option>
+			
 			<!-- user.profileComment -->
 			<option name="user.profileComment.canAddComment">
 				<categoryname>user.profileComment</categoryname>
diff --git a/wcfsetup/install/files/lib/acp/form/PageEditForm.class.php b/wcfsetup/install/files/lib/acp/form/PageEditForm.class.php
index bca4e3ceee..a81b81e22e 100644
--- a/wcfsetup/install/files/lib/acp/form/PageEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/PageEditForm.class.php
@@ -94,7 +94,7 @@ class PageEditForm extends PageAddForm {
 		
 		if ($this->pageType == 'system') {
 			$data['controllerCustomURL'] = (!empty($_POST['customURL'][0]) ? $_POST['customURL'][0] : '');
-			$this->objectAction = new PageAction(array($this->page), 'update', array('data' => array_merge($this->additionalFields, $data)));
+			$this->objectAction = new PageAction(array($this->page), 'update', array('data' => array_merge($this->additionalFields, $data), 'boxToPage' => $this->getBoxToPage()));
 			$this->objectAction->executeAction();
 		}
 		else {
diff --git a/wcfsetup/install/files/lib/system/box/PageCommentsBoxController.class.php b/wcfsetup/install/files/lib/system/box/PageCommentsBoxController.class.php
new file mode 100644
index 0000000000..85a00a6908
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/box/PageCommentsBoxController.class.php
@@ -0,0 +1,50 @@
+<?php
+namespace wcf\system\box;
+use wcf\system\comment\CommentHandler;
+use wcf\system\request\RequestHandler;
+use wcf\system\WCF;
+
+/**
+ * Box for page comments.
+ *
+ * @author	Marcel Werk
+ * @copyright	2001-2016 WoltLab GmbH
+ * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @package	com.woltlab.wcf
+ * @subpackage	system.box
+ * @category	Community Framework
+ */
+class PageCommentsBoxController extends AbstractBoxController {
+	/**
+	 * @inheritDoc
+	 */
+	protected $supportedPositions = ['contentTop', 'contentBottom'];
+	
+	/**
+	 * @inheritDoc
+	 */
+	public function getTitle() {
+		return WCF::getLanguage()->get('wcf.page.comments');
+	}
+	
+	/**
+	 * @inheritDoc
+	 */
+	protected function loadContent() {
+		$commentObjectTypeID = CommentHandler::getInstance()->getObjectTypeID('com.woltlab.wcf.page');
+		$commentManager = CommentHandler::getInstance()->getObjectType($commentObjectTypeID)->getProcessor();
+		$commentList = CommentHandler::getInstance()->getCommentList($commentManager, $commentObjectTypeID, RequestHandler::getInstance()->getActiveRequest()->getPageID());
+		
+		if (WCF::getSession()->getPermission('user.pageComment.canAddComment') || count($commentList)) {
+			WCF::getTPL()->assign([
+				'pageID' => RequestHandler::getInstance()->getActiveRequest()->getPageID(),
+				'commentCanAdd' => WCF::getSession()->getPermission('user.pageComment.canAddComment'),
+				'commentList' => $commentList,
+				'commentObjectTypeID' => $commentObjectTypeID,
+				'lastCommentTime' => $commentList->getMinCommentTime()
+			]);
+			
+			$this->content = WCF::getTPL()->fetch('boxPageComments');
+		}	
+	}
+}
diff --git a/wcfsetup/install/files/lib/system/comment/manager/PageCommentManager.class.php b/wcfsetup/install/files/lib/system/comment/manager/PageCommentManager.class.php
new file mode 100644
index 0000000000..4f67d9c660
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/comment/manager/PageCommentManager.class.php
@@ -0,0 +1,81 @@
+<?php
+namespace wcf\system\comment\manager;
+use wcf\system\request\LinkHandler;
+
+/**
+ * Page comment manager implementation.
+ *
+ * @author	Marcel Werk
+ * @copyright	2001-2016 WoltLab GmbH
+ * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @package	com.woltlab.wcf
+ * @subpackage	system.comment.manager
+ * @category	Community Framework
+ */
+class PageCommentManager extends AbstractCommentManager {
+	/**
+	 * @inheritDoc
+	 */
+	protected $permissionAdd = 'user.pageComment.canAddComment';
+	
+	/**
+	 * @inheritDoc
+	 */
+	protected $permissionDelete = 'user.pageComment.canDeleteComment';
+	
+	/**
+	 * @inheritDoc
+	 */
+	protected $permissionEdit = 'user.pageComment.canEditComment';
+	
+	/**
+	 * @inheritDoc
+	 */
+	protected $permissionModDelete = 'mod.pageComment.canDeleteComment';
+	
+	/**
+	 * @inheritDoc
+	 */
+	protected $permissionModEdit = 'mod.pageComment.canEditComment';
+	
+	/**
+	 * @inheritDoc
+	 */
+	public function isAccessible($objectID, $validateWritePermission = false) {
+		// @todo
+		return true;
+	}
+	
+	/**
+	 * @inheritDoc
+	 */
+	public function getLink($objectTypeID, $objectID) {
+		return LinkHandler::getInstance()->getCmsLink($objectID);
+	}
+	
+	/**
+	 * @inheritDoc
+	 */
+	public function getTitle($objectTypeID, $objectID, $isResponse = false) {
+		return '';
+	}
+	
+	/**
+	 * @inheritDoc
+	 */
+	public function updateCounter($objectID, $value) {}
+	
+	/**
+	 * @inheritDoc
+	 */
+	public function supportsLike() {
+		return false;
+	}
+	
+	/**
+	 * @inheritDoc
+	 */
+	public function supportsReport() {
+		return false;
+	}
+}
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index bd1e6ed120..4797657fc3 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -2567,6 +2567,7 @@ Fehler sind beispielsweise:
 		<item name="wcf.page.onlineLocation.com.woltlab.wcf.AvatarEdit"><![CDATA[Avatar-Verwaltung]]></item>
 		<item name="wcf.page.onlineLocation.com.woltlab.wcf.Settings"><![CDATA[Einstellungen]]></item>
 		<item name="wcf.page.onlineLocation.com.woltlab.wcf.SignatureEdit"><![CDATA[Signatur-Verwaltung]]></item>
+		<item name="wcf.page.comments"><![CDATA[Kommentare]]></item>
 	</category>
 	
 	<category name="wcf.paidSubscription">
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 2234c3d5e7..96e6b176b6 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -2604,6 +2604,7 @@ Errors are:
 		<item name="wcf.page.onlineLocation.com.woltlab.wcf.AvatarEdit"><![CDATA[Avatar Management]]></item>
 		<item name="wcf.page.onlineLocation.com.woltlab.wcf.Settings"><![CDATA[Settings]]></item>
 		<item name="wcf.page.onlineLocation.com.woltlab.wcf.SignatureEdit"><![CDATA[Signature Management]]></item>
+		<item name="wcf.page.comments"><![CDATA[Comments]]></item>
 	</category>
 	
 	<category name="wcf.paidSubscription">