From: Alexander Ebert <ebert@woltlab.com>
Date: Wed, 16 Apr 2014 13:52:08 +0000 (+0200)
Subject: Added support for attachments within the editor (e.g. quick reply)
X-Git-Tag: 2.1.0_Alpha_1~895^2~1
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6783707115336afd851460c43ddd388aaa9a5700;p=GitHub%2FWoltLab%2FWCF.git

Added support for attachments within the editor (e.g. quick reply)
---

diff --git a/com.woltlab.wcf/templates/wysiwyg.tpl b/com.woltlab.wcf/templates/wysiwyg.tpl
index 384f49d3ac..889da3d328 100644
--- a/com.woltlab.wcf/templates/wysiwyg.tpl
+++ b/com.woltlab.wcf/templates/wysiwyg.tpl
@@ -1,3 +1,4 @@
+{if !$wysiwygEnableUpload|isset}{assign var=wysiwygEnableUpload value=false}{/if}
 <link rel="stylesheet" type="text/css" href="{@$__wcf->getPath()}js/3rdParty/redactor/redactor.css" />
 <script data-relocate="true">
 var __REDACTOR_ICON_PATH = '{@$__wcf->getPath()}icon/';
@@ -10,6 +11,20 @@ $(function() {
 	var $editorName = '{if $wysiwygSelector|isset}{$wysiwygSelector|encodeJS}{else}text{/if}';
 	var $callbackIdentifier = 'Redactor_' + $editorName;
 	
+	{if $wysiwygEnableUpload}
+		WCF.Language.addObject({
+			'wcf.attachment.upload.error.invalidExtension': '{lang}wcf.attachment.upload.error.invalidExtension{/lang}',
+			'wcf.attachment.upload.error.tooLarge': '{lang}wcf.attachment.upload.error.tooLarge{/lang}',
+			'wcf.attachment.upload.error.reachedLimit': '{lang}wcf.attachment.upload.error.reachedLimit{/lang}',
+			'wcf.attachment.upload.error.reachedRemainingLimit': '{lang}wcf.attachment.upload.error.reachedRemainingLimit{/lang}',
+			'wcf.attachment.upload.error.uploadFailed': '{lang}wcf.attachment.upload.error.uploadFailed{/lang}',
+			'wcf.global.button.upload': '{lang}wcf.global.button.upload{/lang}',
+			'wcf.attachment.insert': '{lang}wcf.attachment.insert{/lang}',
+			'wcf.attachment.delete.sure': '{lang}wcf.attachment.delete.sure{/lang}',
+			'wcf.attachment.upload.limits': '{'wcf.attachment.upload.limits'|language|encodeJS}'
+		});
+	{/if}
+	
 	WCF.System.Dependency.Manager.setup($callbackIdentifier, function() {
 		var $textarea = $('#' + $editorName);
 		var $buttons = [ ];
@@ -28,12 +43,24 @@ $(function() {
 			}
 		};
 		
+		{if $wysiwygEnableUpload}
+			$config.plugins.push('wupload');
+			$config.wattachment = {
+				maxCount: {@$attachmentHandler->getMaxCount()},
+				objectType: '{@$attachmentObjectType}',
+				objectID: '{@$attachmentObjectID}',
+				parentObjectID: '{@$attachmentParentObjectID}',
+				tmpHash: '{$tmpHash|encodeJS}'
+			};
+		{/if}
+		
 		{event name='javascriptInit'}
 		
 		$textarea.redactor($config);
 	});
 	
 	head.load([
+		'{@$__wcf->getPath()}js/WCF.Attachment{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}',
 		'{@$__wcf->getPath()}js/3rdParty/redactor/redactor.js',
 		'{@$__wcf->getPath()}js/3rdParty/redactor/plugins/wbbcode.js',
 		'{@$__wcf->getPath()}js/3rdParty/redactor/plugins/wbutton.js',
@@ -41,7 +68,8 @@ $(function() {
 		'{@$__wcf->getPath()}js/3rdParty/redactor/plugins/wfontfamily.js',
 		'{@$__wcf->getPath()}js/3rdParty/redactor/plugins/wfontsize.js',
 		'{@$__wcf->getPath()}js/3rdParty/redactor/plugins/wmonkeypatch.js',
-		'{@$__wcf->getPath()}js/3rdParty/redactor/plugins/wutil.js'
+		'{@$__wcf->getPath()}js/3rdParty/redactor/plugins/wutil.js',
+		'{@$__wcf->getPath()}js/3rdParty/redactor/plugins/wupload.js'
 		{event name='javascriptFiles'}
 	], function() {
 		WCF.System.Dependency.Manager.invoke($callbackIdentifier);
diff --git a/com.woltlab.wcf/templates/wysiwygToolbar.tpl b/com.woltlab.wcf/templates/wysiwygToolbar.tpl
index f86978fc72..787729a2a2 100644
--- a/com.woltlab.wcf/templates/wysiwygToolbar.tpl
+++ b/com.woltlab.wcf/templates/wysiwygToolbar.tpl
@@ -67,6 +67,10 @@ if ($buttons.length && $buttons[$buttons.length -1] != 'separator') {
 	$buttons.push('table');
 {/if}
 
+{if $wysiwygEnableUpload}
+	$buttons.push('upload');
+{/if}
+
 {if MODULE_SMILEY && (!$permissionCanUseSmilies|isset || $__wcf->getSession()->getPermission($permissionCanUseSmilies)) && $defaultSmilies|isset && $defaultSmilies|count}
 	$buttons.push('smiley');
 {/if}
diff --git a/wcfsetup/install/files/js/3rdParty/redactor/plugins/wupload.js b/wcfsetup/install/files/js/3rdParty/redactor/plugins/wupload.js
new file mode 100644
index 0000000000..eb7b2142f5
--- /dev/null
+++ b/wcfsetup/install/files/js/3rdParty/redactor/plugins/wupload.js
@@ -0,0 +1,40 @@
+if (!RedactorPlugins) var RedactorPlugins = {};
+
+/**
+ * Provides file uploads for Redactor.
+ * 
+ * @author	Alexander Ebert
+ * @copyright	2001-2014 WoltLab GmbH
+ * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ */
+RedactorPlugins.wupload = {
+	/**
+	 * attachments container object
+	 * @var	jQuery
+	 */
+	_attachmentsContainer: null,
+	
+	/**
+	 * Initializes the RedactorPlugins.wupload plugin.
+	 */
+	init: function() {
+		var self = this;
+		this.buttonReplace('upload', 'upload', 'Upload', function() { self._attachmentsContainer.toggle(); });
+		this.buttonAwesome('upload', 'fa-upload');
+		
+		this._initAttachments();
+	},
+	
+	/**
+	 * Initializes the attachments user interface.
+	 */
+	_initAttachments: function() {
+		this._attachmentsContainer = $('<div class="redactorAttachmentContainer" />').hide().appendTo(this.$box);
+		$('<ul class="formAttachmentList clearfix" />').hide().appendTo(this._attachmentsContainer);
+		$('<dl class="wide"><dt></dt><dd><div data-max-size="{@$attachmentHandler->getMaxSize()}"></div><small>' + WCF.String.unescapeHTML(WCF.Language.get('wcf.attachment.upload.limits')) + '</small></dd></dl>').appendTo(this._attachmentsContainer);
+		
+		var $options = this.getOption('wattachment');
+		new WCF.Attachment.Upload(this._attachmentsContainer.find('> dl > dd > div'), this._attachmentsContainer.children('ul'), $options.objectType, $options.objectID, $options.tmpHash, $options.parentObjectID, $options.maxCount, this.$source.wcfIdentify());
+		new WCF.Action.Delete('wcf\\data\\attachment\\AttachmentAction', '.formAttachmentList > li');
+	}
+};
diff --git a/wcfsetup/install/files/js/WCF.Message.js b/wcfsetup/install/files/js/WCF.Message.js
index 0a07af3083..bec2fe99a4 100644
--- a/wcfsetup/install/files/js/WCF.Message.js
+++ b/wcfsetup/install/files/js/WCF.Message.js
@@ -772,7 +772,8 @@ WCF.Message.QuickReply = Class.extend({
 			},
 			lastPostTime: this._container.data('lastPostTime'),
 			pageNo: this._container.data('pageNo'),
-			removeQuoteIDs: (this._quoteManager === null ? [ ] : this._quoteManager.getQuotesMarkedForRemoval())
+			removeQuoteIDs: (this._quoteManager === null ? [ ] : this._quoteManager.getQuotesMarkedForRemoval()),
+			tmpHash: this._container.data('tmpHash') || ''
 		};
 		if (this._container.data('anchor')) {
 			$parameters.anchor = this._container.data('anchor');
diff --git a/wcfsetup/install/files/lib/data/IAttachmentMessageQuickReplyAction.class.php b/wcfsetup/install/files/lib/data/IAttachmentMessageQuickReplyAction.class.php
new file mode 100644
index 0000000000..4f30f186ec
--- /dev/null
+++ b/wcfsetup/install/files/lib/data/IAttachmentMessageQuickReplyAction.class.php
@@ -0,0 +1,21 @@
+<?php
+namespace wcf\data;
+
+/**
+ * Default interface for actions implementing quick reply with attachment support.
+ * 
+ * @author	Alexander Ebert
+ * @copyright	2001-2014 WoltLab GmbH
+ * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @package	com.woltlab.wcf
+ * @subpackage	data
+ * @category	Community Framework
+ */
+interface IAttachmentMessageQuickReplyAction extends IExtendedMessageQuickReplyAction {
+	/**
+	 * Returns an attachment handler object.
+	 * 
+	 * @param	\wcf\data\DatabaseObject	$container
+	 */
+	public function getAttachmentHandler(DatabaseObject $container);
+}
diff --git a/wcfsetup/install/files/lib/system/message/QuickReplyManager.class.php b/wcfsetup/install/files/lib/system/message/QuickReplyManager.class.php
index efaf1a0b9a..165ce50fcb 100644
--- a/wcfsetup/install/files/lib/system/message/QuickReplyManager.class.php
+++ b/wcfsetup/install/files/lib/system/message/QuickReplyManager.class.php
@@ -12,6 +12,8 @@ use wcf\system\WCF;
 use wcf\util\ArrayUtil;
 use wcf\util\ClassUtil;
 use wcf\util\MessageUtil;
+use wcf\util\StringUtil;
+use wcf\data\IAttachmentMessageQuickReplyAction;
 
 /**
  * Manages quick replies and stored messages.
@@ -152,6 +154,9 @@ class QuickReplyManager extends SingletonFactory {
 		// check for message quote ids
 		$parameters['removeQuoteIDs'] = (isset($parameters['removeQuoteIDs']) && is_array($parameters['removeQuoteIDs'])) ? ArrayUtil::trim($parameters['removeQuoteIDs']) : array();
 		
+		// check for tmp hash (attachments)
+		$parameters['tmpHash'] = (isset($parameters['tmpHash'])) ? StringUtil::trim($parameters['tmpHash']) : '';
+		
 		EventHandler::getInstance()->fireAction($this, 'validateParameters');
 	}
 	
@@ -185,6 +190,11 @@ class QuickReplyManager extends SingletonFactory {
 		
 		$parameters['data'] = array_merge($this->additionalFields, $parameters['data']);
 		
+		// attachment support
+		if (MODULE_ATTACHMENT && $object instanceof IAttachmentMessageQuickReplyAction) {
+			$parameters['attachmentHandler'] = $object->getAttachmentHandler($this->container);
+		}
+		
 		// clean up
 		$this->additionalFields = array();
 		
diff --git a/wcfsetup/install/files/style/message.less b/wcfsetup/install/files/style/message.less
index d127b7b499..4fddf24d2d 100644
--- a/wcfsetup/install/files/style/message.less
+++ b/wcfsetup/install/files/style/message.less
@@ -975,6 +975,13 @@ li:nth-child(2n+1) .message {
 	}
 }
 
+.redactorAttachmentContainer {
+	background-color: rgba(255, 255, 255, 1);
+	border: 1px solid rgba(238, 238, 238, 1);
+	border-top-width: 0;
+	padding: 7px 14px 7px;
+}
+
 .redactor_dropdown_box_wsmiley > ul > li:not(:last-child) {
 	margin-right: 3px !important;
 }