From: Alexander Ebert <ebert@woltlab.com>
Date: Thu, 13 Jun 2013 23:57:13 +0000 (+0200)
Subject: Added support for content delete reason
X-Git-Tag: 2.0.0_Beta_4~41^2~4
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=865142667d5d0d211fb301263a4cead312b777af;p=GitHub%2FWoltLab%2FWCF.git

Added support for content delete reason
---

diff --git a/com.woltlab.wcf/templates/moderationReport.tpl b/com.woltlab.wcf/templates/moderationReport.tpl
index 7ccadf38b6..b4a3432d04 100644
--- a/com.woltlab.wcf/templates/moderationReport.tpl
+++ b/com.woltlab.wcf/templates/moderationReport.tpl
@@ -13,6 +13,7 @@
 			
 			WCF.Language.addObject({
 				'wcf.moderation.report.removeContent.confirmMessage': '{lang}wcf.moderation.report.removeContent.confirmMessage{/lang}',
+				'wcf.moderation.report.removeContent.reason': '{lang}wcf.moderation.report.removeContent.reason{/lang}',
 				'wcf.moderation.report.removeReport.confirmMessage': '{lang}wcf.moderation.report.removeReport.confirmMessage{/lang}'
 			});
 		});
diff --git a/wcfsetup/install/files/js/WCF.Moderation.js b/wcfsetup/install/files/js/WCF.Moderation.js
index 44c6470539..71c56bccac 100644
--- a/wcfsetup/install/files/js/WCF.Moderation.js
+++ b/wcfsetup/install/files/js/WCF.Moderation.js
@@ -26,6 +26,12 @@ WCF.Moderation.Management = Class.extend({
 	 */
 	_className: '',
 	
+	/**
+	 * list of templates for confirmation message by action name
+	 * @var	object
+	 */
+	_confirmationTemplate: { },
+	
 	/**
 	 * language item pattern
 	 * @var	string
@@ -85,19 +91,41 @@ WCF.Moderation.Management = Class.extend({
 	 */
 	_click: function(event) {
 		var $actionName = $(event.currentTarget).wcfIdentify();
+		var $innerTemplate = '';
+		if (this._confirmationTemplate[$actionName]) {
+			$innerTemplate = this._confirmationTemplate[$actionName];
+		}
 		
 		WCF.System.Confirmation.show(WCF.Language.get(this._languageItem.replace(/{actionName}/, $actionName)), $.proxy(function(action) {
 			if (action === 'confirm') {
-				this._proxy.setOption('data', {
+				var $parameters = {
 					actionName: $actionName,
 					className: this._className,
 					objectIDs: [ this._queueID ]
-				});
+				};
+				if (this._confirmationTemplate[$actionName]) {
+					$parameters.parameters = { };
+					$innerTemplate.find('input, textarea').each(function(index, element) {
+						var $element = $(element);
+						var $value = $element.val();
+						if ($element.getTagName() === 'input' && $element.attr('type') === 'checkbox') {
+							if (!$element.is(':checked')) {
+								$value = null;
+							}
+						}
+						
+						if ($value !== null) {
+							$parameters.parameters[$element.attr('name')] = $value;
+						}
+					});
+				}
+				
+				this._proxy.setOption('data', $parameters);
 				this._proxy.sendRequest();
 				
 				$(this._buttonSelector).disable();
 			}
-		}, this));
+		}, this), { }, $innerTemplate);
 	},
 	
 	/**
@@ -338,6 +366,8 @@ WCF.Moderation.Report.Management = WCF.Moderation.Management.extend({
 		this._className = 'wcf\\data\\moderation\\queue\\ModerationQueueReportAction';
 		
 		this._super(queueID, redirectURL, 'wcf.moderation.report.{actionName}.confirmMessage');
+		
+		this._confirmationTemplate.removeContent = $('<fieldset><dl><dt><label for="message">' + WCF.Language.get('wcf.moderation.report.removeContent.reason') + '</label></dt><dd><textarea name="message" id="message" cols="40" rows="3" /></dd></dl></fieldset>');
 	}
 });
 
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 5e0817a5e5..6cb3107de2 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -1719,6 +1719,7 @@ Erlaubte Dateiendungen: {', '|implode:$attachmentHandler->getAllowedExtensions()
 		<item name="wcf.moderation.report.reason.description"><![CDATA[Diese Funktion ist ausschließlich zu verwenden bei: Spam, Werbung und anderen problematischen (rassistischen, gewaltverherrlichenden, agressiven, beleidigenden oder sexistischen) Inhalten.]]></item>
 		<item name="wcf.moderation.report.removeContent"><![CDATA[Gemeldeten Inhalt löschen]]></item>
 		<item name="wcf.moderation.report.removeContent.confirmMessage"><![CDATA[Wollen Sie den gemeldeten Inhalt wirklich löschen?]]></item>
+		<item name="wcf.moderation.report.removeContent.reason"><![CDATA[Begründung (optional)]]></item>
 		<item name="wcf.moderation.report.removeReport"><![CDATA[Meldung löschen]]></item>
 		<item name="wcf.moderation.report.removeReport.confirmMessage"><![CDATA[Wollen Sie diese Meldung wirklich löschen?]]></item>
 		<item name="wcf.moderation.report.reportContent"><![CDATA[Inhalt melden]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 63f4099e16..e53c295d85 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -1718,6 +1718,7 @@ Allowed extensions: {', '|implode:$attachmentHandler->getAllowedExtensions()}]]>
 		<item name="wcf.moderation.report.reason.description"><![CDATA[This function is reserved for: Spam, Advertisement and other questionable (rassism, glorification of violence, offending or sexist) content]]></item>
 		<item name="wcf.moderation.report.removeContent"><![CDATA[Delete Reported Content]]></item>
 		<item name="wcf.moderation.report.removeContent.confirmMessage"><![CDATA[Do you really want to delete the reported content?]]></item>
+		<item name="wcf.moderation.report.removeContent.reason"><![CDATA[Reason (optional)]]></item>
 		<item name="wcf.moderation.report.removeReport"><![CDATA[Delete Report]]></item>
 		<item name="wcf.moderation.report.removeReport.confirmMessage"><![CDATA[Do you really want to delete this report?]]></item>
 		<item name="wcf.moderation.report.reportContent"><![CDATA[Report Content]]></item>