From: Matthias Schmidt <gravatronics@live.com>
Date: Wed, 9 Apr 2014 16:49:53 +0000 (+0200)
Subject: Add permission to delete foreign comments on own wall
X-Git-Tag: 2.1.0_Alpha_1~905^2~2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0d76d267933cf7a50de82d8a5b5ecf3f655034ce;p=GitHub%2FWoltLab%2FWCF.git

Add permission to delete foreign comments on own wall
---

diff --git a/com.woltlab.wcf/userGroupOption.xml b/com.woltlab.wcf/userGroupOption.xml
index e8867ec71d..a14e67de1b 100644
--- a/com.woltlab.wcf/userGroupOption.xml
+++ b/com.woltlab.wcf/userGroupOption.xml
@@ -577,19 +577,22 @@ png]]></defaultvalue>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>1</defaultvalue>
 			</option>
-			
 			<option name="user.profileComment.canEditComment">
 				<categoryname>user.profileComment</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>1</defaultvalue>
 			</option>
-			
 			<option name="user.profileComment.canDeleteComment">
 				<categoryname>user.profileComment</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>0</defaultvalue>
 				<admindefaultvalue>1</admindefaultvalue>
 			</option>
+			<option name="user.profileComment.canDeleteCommentInOwnProfile">
+				<categoryname>user.profileComment</categoryname>
+				<optiontype>boolean</optiontype>
+				<defaultvalue>0</defaultvalue>
+			</option>
 			<!-- /user.profileComment -->
 			
 			<option name="admin.content.label.canManageLabel">
diff --git a/wcfsetup/install/files/lib/data/comment/StructuredCommentList.class.php b/wcfsetup/install/files/lib/data/comment/StructuredCommentList.class.php
index 3857ea6bf1..23e01bd4da 100644
--- a/wcfsetup/install/files/lib/data/comment/StructuredCommentList.class.php
+++ b/wcfsetup/install/files/lib/data/comment/StructuredCommentList.class.php
@@ -91,7 +91,7 @@ class StructuredCommentList extends CommentList {
 				$this->responseIDs[] = $responseID;
 				$responseIDs[$responseID] = $comment->commentID;
 			}
-
+			
 			if ($comment->userID) {
 				$userIDs[] = $comment->userID;
 			}
diff --git a/wcfsetup/install/files/lib/system/comment/manager/UserProfileCommentManager.class.php b/wcfsetup/install/files/lib/system/comment/manager/UserProfileCommentManager.class.php
index e391930a68..aeae3d325d 100644
--- a/wcfsetup/install/files/lib/system/comment/manager/UserProfileCommentManager.class.php
+++ b/wcfsetup/install/files/lib/system/comment/manager/UserProfileCommentManager.class.php
@@ -1,5 +1,7 @@
 <?php
 namespace wcf\system\comment\manager;
+use wcf\data\comment\response\CommentResponse;
+use wcf\data\comment\Comment;
 use wcf\data\user\UserProfile;
 use wcf\system\request\LinkHandler;
 use wcf\system\WCF;
@@ -93,5 +95,29 @@ class UserProfileCommentManager extends AbstractCommentManager {
 	/**
 	 * @see	\wcf\system\comment\manager\ICommentManager::updateCounter()
 	 */
-	public function updateCounter($objectID, $value) { }
+	public function updateCounter($objectID, $value) {
+		// does nothing
+	}
+	
+	/**
+	 * @see	\wcf\system\comment\manager\ICommentManager::canDeleteComment()
+	 */
+	public function canDeleteComment(Comment $comment) {
+		if ($comment->objectID == WCF::getUser()->userID && WCF::getSession()->getPermission('user.profileComment.canDeleteCommentInOwnProfile')) {
+			return true;
+		}
+		
+		return parent::canDeleteComment($comment);
+	}
+	
+	/**
+	 * @see	\wcf\system\comment\manager\ICommentManager::canDeleteResponse()
+	 */
+	public function canDeleteResponse(CommentResponse $response) {
+		if ($response->getComment()->objectID == WCF::getUser()->userID && WCF::getSession()->getPermission('user.profileComment.canDeleteCommentInOwnProfile')) {
+			return true;
+		}
+		
+		return parent::canDeleteResponse($response);
+	}
 }
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index bc39f8475c..f751d89f69 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -357,6 +357,7 @@
 		<item name="wcf.acp.group.option.user.profileComment.canAddComment"><![CDATA[Kann Pinnwand-Kommentare erstellen]]></item>
 		<item name="wcf.acp.group.option.user.profileComment.canEditComment"><![CDATA[Kann eigene Pinnwand-Kommentare bearbeiten]]></item>
 		<item name="wcf.acp.group.option.user.profileComment.canDeleteComment"><![CDATA[Kann eigene Pinnwand-Kommentare löschen]]></item>
+		<item name="wcf.acp.group.option.user.profileComment.canDeleteCommentInOwnProfile"><![CDATA[Kann Kommentare an der eigenen Pinnwand löschen]]></item>
 		<item name="wcf.acp.group.option.mod.profileComment.canEditComment"><![CDATA[Kann Pinnwand-Kommentare bearbeiten]]></item>
 		<item name="wcf.acp.group.option.mod.profileComment.canDeleteComment"><![CDATA[Kann Pinnwand-Kommentare löschen]]></item>
 		<item name="wcf.acp.group.option.mod.profileComment.canModerateComment"><![CDATA[Kann Pinnwand-Kommentare moderieren]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index f52f3cc2b2..2b46c08c13 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -356,6 +356,7 @@ Examples for medium ID detection:
 		<item name="wcf.acp.group.option.user.profileComment.canAddComment"><![CDATA[Can create comments]]></item>
 		<item name="wcf.acp.group.option.user.profileComment.canEditComment"><![CDATA[Can edit own comments]]></item>
 		<item name="wcf.acp.group.option.user.profileComment.canDeleteComment"><![CDATA[Can delete own comments]]></item>
+		<item name="wcf.acp.group.option.user.profileComment.canDeleteCommentInOwnProfile"><![CDATA[Can delete comments on their own wall]]></item>
 		<item name="wcf.acp.group.option.mod.profileComment.canEditComment"><![CDATA[Can edit comments]]></item>
 		<item name="wcf.acp.group.option.mod.profileComment.canDeleteComment"><![CDATA[Can delete comments]]></item>
 		<item name="wcf.acp.group.option.mod.profileComment.canModerateComment"><![CDATA[Can moderate comments]]></item>