From 8c04da7a2cc5d49c76cd88499c6871f8a77daa3c Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Thu, 21 Jul 2016 12:54:56 +0200
Subject: [PATCH] Message options now have WYSIWYG support / fixed signature

---
 com.woltlab.wcf/objectType.xml                |  8 ++++
 com.woltlab.wcf/userOption.xml                |  1 +
 .../files/acp/templates/messageOptionType.tpl |  1 +
 .../install/files/acp/templates/userAdd.tpl   |  1 +
 .../files/lib/acp/form/UserAddForm.class.php  | 20 ++++++++-
 .../files/lib/acp/form/UserEditForm.class.php |  8 +---
 .../lib/form/SignatureEditForm.class.php      |  5 +++
 .../system/option/MessageOptionType.class.php | 45 +++++++++++--------
 .../user/signature/SignatureCache.class.php   |  2 +-
 9 files changed, 63 insertions(+), 28 deletions(-)

diff --git a/com.woltlab.wcf/objectType.xml b/com.woltlab.wcf/objectType.xml
index 6c726a2bd1..fc34092717 100644
--- a/com.woltlab.wcf/objectType.xml
+++ b/com.woltlab.wcf/objectType.xml
@@ -74,6 +74,14 @@
 			<name>com.woltlab.wcf.box.content</name>
 			<definitionname>com.woltlab.wcf.message</definitionname>
 		</type>
+		<type>
+			<name>com.woltlab.wcf.user.aboutMe</name>
+			<definitionname>com.woltlab.wcf.message</definitionname>
+		</type>
+		<type>
+			<name>com.woltlab.wcf.user.signature</name>
+			<definitionname>com.woltlab.wcf.message</definitionname>
+		</type>
 		
 		<type>
 			<name>com.woltlab.wcf.bbcode.smiley</name>
diff --git a/com.woltlab.wcf/userOption.xml b/com.woltlab.wcf/userOption.xml
index 546cb6789b..a56cc8b442 100644
--- a/com.woltlab.wcf/userOption.xml
+++ b/com.woltlab.wcf/userOption.xml
@@ -61,6 +61,7 @@
 				<outputclass>wcf\system\option\user\MessageUserOptionOutput</outputclass>
 				<visible>15</visible>
 				<editable>3</editable>
+				<messageObjectType>com.woltlab.wcf.user.aboutMe</messageObjectType>
 			</option>
 			<option name="birthday">
 				<categoryname>profile.personal</categoryname>
diff --git a/wcfsetup/install/files/acp/templates/messageOptionType.tpl b/wcfsetup/install/files/acp/templates/messageOptionType.tpl
index 310cd47267..4c314f0ca7 100644
--- a/wcfsetup/install/files/acp/templates/messageOptionType.tpl
+++ b/wcfsetup/install/files/acp/templates/messageOptionType.tpl
@@ -1 +1,2 @@
 <textarea id="{$option->optionName}" name="values[{$option->optionName}]" cols="40" rows="10">{$value}</textarea>
+{include file='wysiwyg' wysiwygSelector=$option->optionName}
diff --git a/wcfsetup/install/files/acp/templates/userAdd.tpl b/wcfsetup/install/files/acp/templates/userAdd.tpl
index 0814e53b2d..a062e4511f 100644
--- a/wcfsetup/install/files/acp/templates/userAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userAdd.tpl
@@ -295,6 +295,7 @@
 						<dt><label for="signature">{lang}wcf.user.signature{/lang}</label></dt>
 						<dd>
 							<textarea name="signature" id="signature" cols="40" rows="10">{$signature}</textarea>
+							{include file='wysiwyg' wysiwygSelector='signature'}
 						</dd>
 					</dl>
 					
diff --git a/wcfsetup/install/files/lib/acp/form/UserAddForm.class.php b/wcfsetup/install/files/lib/acp/form/UserAddForm.class.php
index ca6d4e8a5c..fa39aadf68 100644
--- a/wcfsetup/install/files/lib/acp/form/UserAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserAddForm.class.php
@@ -3,8 +3,10 @@ namespace wcf\acp\form;
 use wcf\data\user\group\UserGroup;
 use wcf\data\user\UserAction;
 use wcf\form\AbstractForm;
+use wcf\system\bbcode\BBCodeHandler;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\exception\UserInputException;
+use wcf\system\html\input\HtmlInputProcessor;
 use wcf\system\language\LanguageFactory;
 use wcf\system\WCF;
 use wcf\util\ArrayUtil;
@@ -66,6 +68,11 @@ class UserAddForm extends UserOptionListForm {
 	 */
 	public $groupIDs = [];
 	
+	/**
+	 * @var HtmlInputProcessor
+	 */
+	public $htmlInputProcessor;
+	
 	/**
 	 * language id
 	 * @var	integer
@@ -220,6 +227,17 @@ class UserAddForm extends UserOptionListForm {
 			$this->errorType[$e->getField()] = $e->getType();
 		}
 		
+		// validate signature
+		$this->htmlInputProcessor = new HtmlInputProcessor();
+		$this->htmlInputProcessor->process($this->signature, 'com.woltlab.wcf.user.signature', 0);
+		
+		BBCodeHandler::getInstance()->setDisallowedBBCodes(explode(',', WCF::getSession()->getPermission('user.signature.disallowedBBCodes')));
+		$disallowedBBCodes = $this->htmlInputProcessor->validate();
+		if (!empty($disallowedBBCodes)) {
+			WCF::getTPL()->assign('disallowedBBCodes', $disallowedBBCodes);
+			throw new UserInputException('signature', 'disallowedBBCodes');
+		}
+		
 		// validate dynamic options
 		parent::validate();
 	}
@@ -239,7 +257,7 @@ class UserAddForm extends UserOptionListForm {
 				'email' => $this->email,
 				'password' => $this->password,
 				'userTitle' => $this->userTitle,
-				'signature' => $this->signature
+				'signature' => $this->htmlInputProcessor->getHtml()
 			]),
 			'groups' => $this->groupIDs,
 			'languageIDs' => $this->visibleLanguages,
diff --git a/wcfsetup/install/files/lib/acp/form/UserEditForm.class.php b/wcfsetup/install/files/lib/acp/form/UserEditForm.class.php
index 046bde5b5c..22257b6989 100755
--- a/wcfsetup/install/files/lib/acp/form/UserEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserEditForm.class.php
@@ -194,9 +194,6 @@ class UserEditForm extends UserAddForm {
 		$this->userTitle = $this->user->userTitle;
 		
 		$this->signature = $this->user->signature;
-		$this->signatureEnableBBCodes = $this->user->signatureEnableBBCodes;
-		$this->signatureEnableSmilies = $this->user->signatureEnableSmilies;
-		$this->signatureEnableHtml = $this->user->signatureEnableHtml;
 		$this->disableSignature = $this->user->disableSignature;
 		$this->disableSignatureReason = $this->user->disableSignatureReason;
 		$this->disableSignatureExpires = $this->user->disableSignatureExpires;
@@ -291,10 +288,7 @@ class UserEditForm extends UserAddForm {
 				'password' => $this->password,
 				'languageID' => $this->languageID,
 				'userTitle' => $this->userTitle,
-				'signature' => $this->signature,
-				'signatureEnableBBCodes' => $this->signatureEnableBBCodes,
-				'signatureEnableSmilies' => $this->signatureEnableSmilies,
-				'signatureEnableHtml' => $this->signatureEnableHtml
+				'signature' => $this->htmlInputProcessor->getHtml()
 			]),
 			'groups' => $this->groupIDs,
 			'languageIDs' => $this->visibleLanguages,
diff --git a/wcfsetup/install/files/lib/form/SignatureEditForm.class.php b/wcfsetup/install/files/lib/form/SignatureEditForm.class.php
index b4ec37f299..ad7e051aa4 100644
--- a/wcfsetup/install/files/lib/form/SignatureEditForm.class.php
+++ b/wcfsetup/install/files/lib/form/SignatureEditForm.class.php
@@ -26,6 +26,11 @@ class SignatureEditForm extends MessageForm {
 	 */
 	public $loginRequired = true;
 	
+	/**
+	 * @inheritDoc
+	 */
+	public $messageObjectType = 'com.woltlab.wcf.user.signature';
+	
 	/**
 	 * @inheritDoc
 	 */
diff --git a/wcfsetup/install/files/lib/system/option/MessageOptionType.class.php b/wcfsetup/install/files/lib/system/option/MessageOptionType.class.php
index f9eebbe512..cf2ab8e66e 100644
--- a/wcfsetup/install/files/lib/system/option/MessageOptionType.class.php
+++ b/wcfsetup/install/files/lib/system/option/MessageOptionType.class.php
@@ -22,29 +22,39 @@ class MessageOptionType extends TextareaOptionType {
 	 */
 	protected $htmlInputProcessor;
 	
+	/**
+	 * object type for definition 'com.woltlab.wcf.message'
+	 * @var string
+	 */
+	protected $messageObjectType = '';
+	
 	/**
 	 * @inheritDoc
 	 */
-	/*public function getData(Option $option, $newValue) {
-		if ($option->disallowedbbcodepermission) {
-			BBCodeHandler::getInstance()->setDisallowedBBCodes(explode(',', ArrayUtil::trim(WCF::getSession()->getPermission($option->disallowedbbcodepermission))));
+	public function getData(Option $option, $newValue) {
+		if (!$this->messageObjectType) $this->messageObjectType = $option->messageObjectType;
+		if (empty($this->messageObjectType)) {
+			throw new \RuntimeException("Message object type '".$option->optionName."' requires an object type for definition 'com.woltlab.wcf.message'.");
 		}
 		
+		$permission = ($option->disallowedbbcodepermission) ?: 'user.message.disallowedBBCodes';
+		BBCodeHandler::getInstance()->setDisallowedBBCodes(explode(',', ArrayUtil::trim(WCF::getSession()->getPermission($permission))));
+		
 		$this->htmlInputProcessor = new HtmlInputProcessor();
-		$this->htmlInputProcessor->process($newValue, 'com.woltlab.wcf.invalid', 0);
+		
+		// the object id is fixed because options are not tied to a specific object
+		// especially when used in the user option context, such as "about me"
+		$this->htmlInputProcessor->process($newValue, $this->messageObjectType, 0);
 		
 		return parent::getData($option, $this->htmlInputProcessor->getHtml());
-	}*/
+	}
 	
 	/**
 	 * @inheritDoc
 	 */
 	public function getFormElement(Option $option, $value) {
-		$disallowedBBCodes = [];
-		if ($option->disallowedbbcodepermission) {
-			$disallowedBBCodes = explode(',', WCF::getSession()->getPermission($option->disallowedbbcodepermission));
-		}
-		BBCodeHandler::getInstance()->setDisallowedBBCodes($disallowedBBCodes);
+		$permission = ($option->disallowedbbcodepermission) ?: 'user.message.disallowedBBCodes';
+		BBCodeHandler::getInstance()->setDisallowedBBCodes(explode(',', ArrayUtil::trim(WCF::getSession()->getPermission($permission))));
 		
 		WCF::getTPL()->assign([
 			'defaultSmilies' => SmileyCache::getInstance()->getCategorySmilies(),
@@ -58,16 +68,13 @@ class MessageOptionType extends TextareaOptionType {
 	/**
 	 * @inheritDoc
 	 */
-	/*public function validate(Option $option, $newValue) {
+	public function validate(Option $option, $newValue) {
 		parent::validate($option, $newValue);
 		
-		if ($option->disallowedbbcodepermission) {
-			$disallowedBBCodes = $this->htmlInputProcessor->validate();
-			
-			if (!empty($disallowedBBCodes)) {
-				WCF::getTPL()->assign('disallowedBBCodes', $disallowedBBCodes);
-				throw new UserInputException($option->optionName, 'disallowedBBCodes');
-			}
+		$disallowedBBCodes = $this->htmlInputProcessor->validate();
+		if (!empty($disallowedBBCodes)) {
+			WCF::getTPL()->assign('disallowedBBCodes', $disallowedBBCodes);
+			throw new UserInputException($option->optionName, 'disallowedBBCodes');
 		}
-	}*/
+	}
 }
diff --git a/wcfsetup/install/files/lib/system/user/signature/SignatureCache.class.php b/wcfsetup/install/files/lib/system/user/signature/SignatureCache.class.php
index 1e1dc6e7fd..4f13d0ceb2 100644
--- a/wcfsetup/install/files/lib/system/user/signature/SignatureCache.class.php
+++ b/wcfsetup/install/files/lib/system/user/signature/SignatureCache.class.php
@@ -36,7 +36,7 @@ class SignatureCache extends SingletonFactory {
 				$this->htmlOutputProcessor = new HtmlOutputProcessor();
 			}
 			
-			$this->htmlOutputProcessor->process($user->signature, 'com.woltlab.wcf.userSignature', $user->userID);
+			$this->htmlOutputProcessor->process($user->signature, 'com.woltlab.wcf.user.signature', $user->userID);
 			$this->signatures[$user->userID] = $this->htmlOutputProcessor->getHtml();
 		}
 		
-- 
2.20.1