From: Alexander Ebert <ebert@woltlab.com>
Date: Mon, 6 Mar 2017 14:33:38 +0000 (+0100)
Subject: Added permissions and `isDisabled` for comments
X-Git-Tag: 3.1.0_Alpha_1~601
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3e84029c4e080094e6821084aace9f4b8abcd29d;p=GitHub%2FWoltLab%2FWCF.git

Added permissions and `isDisabled` for comments

See #2219
---

diff --git a/com.woltlab.wcf/userGroupOption.xml b/com.woltlab.wcf/userGroupOption.xml
index 56358406bc..5cb3aa245a 100644
--- a/com.woltlab.wcf/userGroupOption.xml
+++ b/com.woltlab.wcf/userGroupOption.xml
@@ -704,6 +704,11 @@ png</defaultvalue>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>1</defaultvalue>
 			</option>
+			<option name="user.page.canAddCommentWithoutModeration">
+				<categoryname>user.page</categoryname>
+				<optiontype>boolean</optiontype>
+				<defaultvalue>1</defaultvalue>
+			</option>
 			<option name="user.page.canEditComment">
 				<categoryname>user.page</categoryname>
 				<optiontype>boolean</optiontype>
@@ -728,6 +733,11 @@ png</defaultvalue>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>1</defaultvalue>
 			</option>
+			<option name="user.page.canAddCommentWithoutModeration">
+				<categoryname>user.article</categoryname>
+				<optiontype>boolean</optiontype>
+				<defaultvalue>1</defaultvalue>
+			</option>
 			<option name="user.article.canEditComment">
 				<categoryname>user.article</categoryname>
 				<optiontype>boolean</optiontype>
@@ -838,6 +848,11 @@ png</defaultvalue>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>1</defaultvalue>
 			</option>
+			<option name="user.page.canAddCommentWithoutModeration">
+				<categoryname>user.profileComment</categoryname>
+				<optiontype>boolean</optiontype>
+				<defaultvalue>1</defaultvalue>
+			</option>
 			<option name="user.profileComment.canEditComment">
 				<categoryname>user.profileComment</categoryname>
 				<optiontype>boolean</optiontype>
diff --git a/wcfsetup/install/files/lib/data/comment/Comment.class.php b/wcfsetup/install/files/lib/data/comment/Comment.class.php
index 52d6cbeb90..8a80c84ddf 100644
--- a/wcfsetup/install/files/lib/data/comment/Comment.class.php
+++ b/wcfsetup/install/files/lib/data/comment/Comment.class.php
@@ -25,6 +25,7 @@ use wcf\util\StringUtil;
  * @property-read	integer		$responses		number of responses on the comment
  * @property-read	string		$responseIDs		serialized array with the ids of the five latest comment responses
  * @property-read       integer         $enableHtml             is 1 if HTML will rendered in the comment, otherwise 0
+ * @property-read	integer		$isDisabled		is 1 if the comment is disabled, otherwise 0
  */
 class Comment extends DatabaseObject implements IMessage {
 	use TUserContent;
diff --git a/wcfsetup/install/files/lib/data/comment/response/CommentResponse.class.php b/wcfsetup/install/files/lib/data/comment/response/CommentResponse.class.php
index 4ba92bf895..fa30c110e8 100644
--- a/wcfsetup/install/files/lib/data/comment/response/CommentResponse.class.php
+++ b/wcfsetup/install/files/lib/data/comment/response/CommentResponse.class.php
@@ -22,6 +22,7 @@ use wcf\util\StringUtil;
  * @property-read	integer|null	$userID		id of the user who wrote the comment response or `null` if the user does not exist anymore or if the comment response has been written by a guest
  * @property-read	string		$username	name of the user or guest who wrote the comment response
  * @property-read	string		$message	comment response message
+ * @property-read	integer		$isDisabled	is 1 if the comment response is disabled, otherwise 0
  */
 class CommentResponse extends DatabaseObject implements IMessage {
 	use TUserContent;
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index d31829bc03..37073036f2 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -488,6 +488,7 @@
 		<item name="wcf.acp.group.option.user.like.canLike"><![CDATA[Kann Inhalte liken]]></item>
 		<item name="wcf.acp.group.option.category.user.profileComment"><![CDATA[Benutzerprofil-Pinnwand]]></item>
 		<item name="wcf.acp.group.option.user.profileComment.canAddComment"><![CDATA[Kann Kommentare erstellen]]></item>
+		<item name="wcf.acp.group.option.user.profileComment.canAddCommentWithoutModeration"><![CDATA[Kann Kommentare ohne Moderation erstellen]]></item>
 		<item name="wcf.acp.group.option.user.profileComment.canEditComment"><![CDATA[Kann eigene Kommentare bearbeiten]]></item>
 		<item name="wcf.acp.group.option.user.profileComment.canDeleteComment"><![CDATA[Kann eigene Kommentare löschen]]></item>
 		<item name="wcf.acp.group.option.user.profileComment.canDeleteCommentInOwnProfile"><![CDATA[Kann Kommentare an der eigenen Pinnwand löschen]]></item>
@@ -555,10 +556,12 @@
 		<item name="wcf.acp.group.option.mod.page.canEditComment"><![CDATA[Kann Kommentare bearbeiten]]></item>
 		<item name="wcf.acp.group.option.mod.page.canModerateComment"><![CDATA[Kann Kommentare moderieren]]></item>
 		<item name="wcf.acp.group.option.user.article.canAddComment"><![CDATA[Kann Kommentare erstellen]]></item>
+		<item name="wcf.acp.group.option.user.article.canAddCommentWithoutModeration"><![CDATA[Kann Kommentare ohne Moderation erstellen]]></item>
 		<item name="wcf.acp.group.option.user.article.canDeleteComment"><![CDATA[Kann eigene Kommentare löschen]]></item>
 		<item name="wcf.acp.group.option.user.article.canEditComment"><![CDATA[Kann eigene Kommentare bearbeiten]]></item>
 		<item name="wcf.acp.group.option.user.article.canReadArticle"><![CDATA[Kann Artikel lesen]]></item>
 		<item name="wcf.acp.group.option.user.page.canAddComment"><![CDATA[Kann Kommentare erstellen]]></item>
+		<item name="wcf.acp.group.option.user.page.canAddCommentWithoutModeration"><![CDATA[Kann Kommentare ohne Moderation erstellen]]></item>
 		<item name="wcf.acp.group.option.user.page.canDeleteComment"><![CDATA[Kann eigene Kommentare löschen]]></item>
 		<item name="wcf.acp.group.option.user.page.canEditComment"><![CDATA[Kann eigene Kommentare bearbeiten]]></item>
 	</category>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index cc91dedab0..07bb7db52c 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -484,6 +484,7 @@ Examples for medium ID detection:
 		<item name="wcf.acp.group.option.user.like.canLike"><![CDATA[Can like content]]></item>
 		<item name="wcf.acp.group.option.category.user.profileComment"><![CDATA[User Profile Wall]]></item>
 		<item name="wcf.acp.group.option.user.profileComment.canAddComment"><![CDATA[Can create comments]]></item>
+		<item name="wcf.acp.group.option.user.profileComment.canAddCommentWithoutModeration"><![CDATA[Can create comments without approval]]></item>
 		<item name="wcf.acp.group.option.user.profileComment.canEditComment"><![CDATA[Can edit their comments]]></item>
 		<item name="wcf.acp.group.option.user.profileComment.canDeleteComment"><![CDATA[Can delete their comments]]></item>
 		<item name="wcf.acp.group.option.user.profileComment.canDeleteCommentInOwnProfile"><![CDATA[Can delete users’ comments on their wall]]></item>
@@ -551,10 +552,12 @@ Examples for medium ID detection:
 		<item name="wcf.acp.group.option.mod.page.canEditComment"><![CDATA[Can edit comments]]></item>
 		<item name="wcf.acp.group.option.mod.page.canModerateComment"><![CDATA[Can moderate comments]]></item>
 		<item name="wcf.acp.group.option.user.article.canAddComment"><![CDATA[Can create comments]]></item>
+		<item name="wcf.acp.group.option.user.article.canAddCommentWithoutModeration"><![CDATA[Can create comments without approval]]></item>
 		<item name="wcf.acp.group.option.user.article.canDeleteComment"><![CDATA[Can delete their comments]]></item>
 		<item name="wcf.acp.group.option.user.article.canEditComment"><![CDATA[Can edit their comments]]></item>
 		<item name="wcf.acp.group.option.user.article.canReadArticle"><![CDATA[Can read articles]]></item>
 		<item name="wcf.acp.group.option.user.page.canAddComment"><![CDATA[Can create comments]]></item>
+		<item name="wcf.acp.group.option.user.page.canAddCommentWithoutModeration"><![CDATA[Can create comments without approval]]></item>
 		<item name="wcf.acp.group.option.user.page.canDeleteComment"><![CDATA[Can delete their comments]]></item>
 		<item name="wcf.acp.group.option.user.page.canEditComment"><![CDATA[Can edit their comments]]></item>
 	</category>
diff --git a/wcfsetup/setup/db/install.sql b/wcfsetup/setup/db/install.sql
index 14679f2c77..65bef88bd7 100644
--- a/wcfsetup/setup/db/install.sql
+++ b/wcfsetup/setup/db/install.sql
@@ -380,8 +380,9 @@ CREATE TABLE wcf1_comment (
 	responses MEDIUMINT(7) NOT NULL DEFAULT '0',
 	responseIDs VARCHAR(255) NOT NULL DEFAULT '',
 	enableHtml TINYINT(1) NOT NULL DEFAULT 0,
+	isDisabled TINYINT(1) NOT NULL DEFAULT 0,
 	
-	KEY (objectTypeID, objectID, time),
+	KEY (objectTypeID, objectID, isDisabled, time),
 	KEY lastCommentTime (userID, time)
 );
 
@@ -393,8 +394,9 @@ CREATE TABLE wcf1_comment_response (
 	userID INT(10),
 	username VARCHAR(255) NOT NULL,
 	message TEXT NOT NULL,
+	isDisabled TINYINT(1) NOT NULL DEFAULT 0,
 	
-	KEY (commentID, time),
+	KEY (commentID, isDisabled, time),
 	KEY lastResponseTime (userID, time)
 );