From: Alexander Ebert <ebert@woltlab.com>
Date: Fri, 21 Jul 2017 08:36:21 +0000 (+0200)
Subject: Added option to force plain text pasting
X-Git-Tag: 3.1.0_Alpha_1~232
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=20f61b7583e0ce8abce413cc44c35213c3141d9a;p=GitHub%2FWoltLab%2FWCF.git

Added option to force plain text pasting

Closes #2343
---

diff --git a/com.woltlab.wcf/templates/wysiwyg.tpl b/com.woltlab.wcf/templates/wysiwyg.tpl
index 7c5e77fa05..df8b7eac98 100644
--- a/com.woltlab.wcf/templates/wysiwyg.tpl
+++ b/com.woltlab.wcf/templates/wysiwyg.tpl
@@ -182,6 +182,7 @@
 				linkSize: 0xBADC0DED, // some random value to disable truncating
 				minHeight: 200,
 				pasteImages: {if $__wcf->getBBCodeHandler()->isAvailableBBCode('img')}true{else}false{/if},
+				pastePlainText: {if !$__wcf->user->userID || $__wcf->user->editorPastePreserveFormatting}true{else}false{/if},
 				plugins: [
 					// Imperavi
 					'alignment',
diff --git a/com.woltlab.wcf/userOption.xml b/com.woltlab.wcf/userOption.xml
index 3c1d26973e..163f34219a 100644
--- a/com.woltlab.wcf/userOption.xml
+++ b/com.woltlab.wcf/userOption.xml
@@ -197,6 +197,12 @@
 				<defaultvalue>1</defaultvalue>
 				<options>module_user_signature</options>
 			</option>
+			<option name="editorPastePreserveFormatting">
+				<categoryname>settings.general.interface</categoryname>
+				<optiontype>boolean</optiontype>
+				<editable>3</editable>
+				<defaultvalue>1</defaultvalue>
+			</option>
 			
 			<!-- settings.privacy.content -->
 			<option name="canViewOnlineStatus">
diff --git a/wcfsetup/install/files/acp/templates/wysiwyg.tpl b/wcfsetup/install/files/acp/templates/wysiwyg.tpl
index 8f21440e03..df8b7eac98 100644
--- a/wcfsetup/install/files/acp/templates/wysiwyg.tpl
+++ b/wcfsetup/install/files/acp/templates/wysiwyg.tpl
@@ -24,6 +24,7 @@
 			'{@$__wcf->getPath()}js/3rdParty/redactor2/plugins/WoltLabEvent.js?v={@LAST_UPDATE_TIME}',
 			'{@$__wcf->getPath()}js/3rdParty/redactor2/plugins/WoltLabFont.js?v={@LAST_UPDATE_TIME}',
 			'{@$__wcf->getPath()}js/3rdParty/redactor2/plugins/WoltLabFullscreen.js?v={@LAST_UPDATE_TIME}',
+			'{@$__wcf->getPath()}js/3rdParty/redactor2/plugins/WoltLabHtml.js?v={@LAST_UPDATE_TIME}',
 			'{@$__wcf->getPath()}js/3rdParty/redactor2/plugins/WoltLabImage.js?v={@LAST_UPDATE_TIME}',
 			'{@$__wcf->getPath()}js/3rdParty/redactor2/plugins/WoltLabInlineCode.js?v={@LAST_UPDATE_TIME}',
 			'{@$__wcf->getPath()}js/3rdParty/redactor2/plugins/WoltLabInsert.js?v={@LAST_UPDATE_TIME}',
@@ -71,6 +72,9 @@
 				'wcf.editor.code.line.description': '{lang}wcf.editor.code.line.description{/lang}',
 				'wcf.editor.code.title': '{lang __literal=true}wcf.editor.code.title{/lang}',
 				
+				'wcf.editor.html.description': '{lang}wcf.editor.html.description{/lang}',
+				'wcf.editor.html.title': '{lang}wcf.editor.html.title{/lang}',
+				
 				'wcf.editor.image.edit': '{lang}wcf.editor.image.edit{/lang}',
 				'wcf.editor.image.insert': '{lang}wcf.editor.image.insert{/lang}',
 				'wcf.editor.image.link': '{lang}wcf.editor.image.link{/lang}',
@@ -178,6 +182,7 @@
 				linkSize: 0xBADC0DED, // some random value to disable truncating
 				minHeight: 200,
 				pasteImages: {if $__wcf->getBBCodeHandler()->isAvailableBBCode('img')}true{else}false{/if},
+				pastePlainText: {if !$__wcf->user->userID || $__wcf->user->editorPastePreserveFormatting}true{else}false{/if},
 				plugins: [
 					// Imperavi
 					'alignment',
@@ -201,6 +206,7 @@
 					'WoltLabDropdown',
 					{if $__wcf->getBBCodeHandler()->isAvailableBBCode('font')}'WoltLabFont',{/if}
 					'WoltLabFullscreen',
+					{if $__wcf->getBBCodeHandler()->isAvailableBBCode('html')}'WoltLabHtml',{/if}
 					'WoltLabImage',
 					'WoltLabInlineCode',
 					'WoltLabInsert',
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 26587081e3..054557123a 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -3986,6 +3986,8 @@ Benachrichtigungen auf <a href="{link isEmail=true}{/link}">{PAGE_TITLE|language
 		<item name="wcf.user.option.googlePlus"><![CDATA[Google+]]></item>
 		<item name="wcf.user.option.googlePlus.description"><![CDATA[21-stellige Google-Plus-ID, Google-Plus Benutzername (+Benutzername) oder URL zum Google-Plus-Profil]]></item>
 		<item name="wcf.user.option.canWriteProfileComments"><![CDATA[Kann Pinnwand-Kommentare schreiben]]></item>
+		<item name="wcf.user.option.editorPastePreserveFormatting"><![CDATA[Text-Formatierung beim Einfügen in den Editor übernehmen]]></item>
+		<item name="wcf.user.option.editorPastePreserveFormatting.description"><![CDATA[Die Deaktivierung dieser Option erzwingt das Einfügen aus der Zwischenablage in reiner Textform, Formatierungen werden dabei entfernt.]]></item>
 		
 		<item name="wcf.user.option.searchRadioButtonOption"><![CDATA[Auswahl des Benutzers bei „{lang}wcf.user.option.{$option->optionName}{/lang}“:]]></item>
 		<item name="wcf.user.option.searchTextOption"><![CDATA[„{lang}wcf.user.option.{$option->optionName}{/lang}“ enthält:]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 212d3b4b20..093f6817f9 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -3979,6 +3979,8 @@ your notifications on <a href="{link isEmail=true}{/link}">{PAGE_TITLE|language}
 		<item name="wcf.user.option.googlePlus"><![CDATA[Google+]]></item>
 		<item name="wcf.user.option.googlePlus.description"><![CDATA[Enter the 21 digit Google Plus user ID, Google Plus username (+Username), or the URL of your Google Plus profile.]]></item>
 		<item name="wcf.user.option.canWriteProfileComments"><![CDATA[Can Write Comments on My Wall]]></item>
+		<item name="wcf.user.option.editorPastePreserveFormatting"><![CDATA[Preserve text formatting when pasting into the editor]]></item>
+		<item name="wcf.user.option.editorPastePreserveFormatting.description"><![CDATA[Disabling this option will force any content to be pasted from clipboard as plain text, stripping all formatting.]]></item>
 		
 		<item name="wcf.user.option.searchRadioButtonOption"><![CDATA[User’s selection for “{lang}wcf.user.option.{$option->optionName}{/lang}”:]]></item>
 		<item name="wcf.user.option.searchTextOption"><![CDATA[“{lang}wcf.user.option.{$option->optionName}{/lang}” contains:]]></item>