From 477f6668abcef42b09b5bcc8cdfd70be8f463983 Mon Sep 17 00:00:00 2001
From: Matthias Schmidt <gravatronics@live.com>
Date: Wed, 3 Apr 2019 19:20:33 +0200
Subject: [PATCH] Add JavaScript data handlers for form builder forms
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

… for easier Ajax form support.

See #2509
---
 .../templates/__captchaFormField.tpl          |   2 +
 com.woltlab.wcf/templates/__form.tpl          |  16 +-
 .../templates/__formFieldDataHandler.tpl      |  16 ++
 .../templates/__formFieldFooter.tpl           |   1 +
 .../templates/__labelFormField.tpl            |   2 +-
 .../templates/__ratingFormField.tpl           |   2 +-
 .../templates/uploadFieldComponent.tpl        |   2 +-
 .../acp/templates/__captchaFormField.tpl      |   2 +
 .../install/files/acp/templates/__form.tpl    |  16 +-
 .../acp/templates/__formFieldDataHandler.tpl  |  16 ++
 .../files/acp/templates/__formFieldFooter.tpl |   1 +
 .../files/acp/templates/__labelFormField.tpl  |   2 +-
 .../files/acp/templates/__ratingFormField.tpl |   2 +-
 .../acp/templates/__simpleAclFormField.tpl    |   3 +
 .../acp/templates/uploadFieldComponent.tpl    |   2 +-
 .../WoltLabSuite/Core/Form/Builder/Dialog.js  | 195 ++++++++++++++++++
 .../Core/Form/Builder/Field/Captcha.js        |  49 +++++
 .../Core/Form/Builder/Field/Checkboxes.js     |  46 +++++
 .../Core/Form/Builder/Field/Checked.js        |  34 +++
 .../Builder/Field/{ => Controller}/Label.js   |   3 +-
 .../Builder/Field/{ => Controller}/Rating.js  |   3 +-
 .../Core/Form/Builder/Field/Date.js           |  33 +++
 .../Form/Builder/Field/Dependency/Manager.js  |  41 ++++
 .../Core/Form/Builder/Field/Field.js          |  87 ++++++++
 .../Core/Form/Builder/Field/ItemList.js       |  43 ++++
 .../Core/Form/Builder/Field/RadioButton.js    |  45 ++++
 .../Core/Form/Builder/Field/SimpleAcl.js      |  53 +++++
 .../Core/Form/Builder/Field/Tag.js            |  37 ++++
 .../Core/Form/Builder/Field/User.js           |  40 ++++
 .../Core/Form/Builder/Field/Value.js          |  34 +++
 .../Core/Form/Builder/Field/ValueI18n.js      |  47 +++++
 .../WoltLabSuite/Core/Form/Builder/Manager.js | 169 +++++++++++++++
 .../js/WoltLabSuite/Core/Language/Input.js    |  15 ++
 .../form/builder/DialogFormDocument.class.php |   2 +
 .../form/builder/FormDocument.class.php       |   6 +-
 .../builder/field/AbstractFormField.class.php |  11 +-
 .../field/AbstractNumericFormField.class.php  |   5 +
 .../builder/field/BooleanFormField.class.php  |   5 +
 .../builder/field/CaptchaFormField.class.php  |   5 +
 .../builder/field/DateFormField.class.php     |   5 +
 .../builder/field/IconFormField.class.php     |   5 +
 .../builder/field/ItemListFormField.class.php |   5 +
 .../MultipleSelectionFormField.class.php      |   5 +
 .../field/RadioButtonFormField.class.php      |   5 +
 .../builder/field/RatingFormField.class.php   |   5 +
 .../field/SingleSelectionFormField.class.php  |  23 ++-
 .../builder/field/TI18nFormField.class.php    |  18 +-
 .../builder/field/TextFormField.class.php     |   5 +
 .../builder/field/UploadFormField.class.php   |   5 +
 .../acl/simple/SimpleAclFormField.class.php   |   7 +-
 .../field/label/LabelFormField.class.php      |   5 +
 .../builder/field/tag/TagFormField.class.php  |   5 +
 .../field/user/UserFormField.class.php        |   5 +
 .../field/user/UsernameFormField.class.php    |   5 +
 .../field/wysiwyg/WysiwygFormField.class.php  |   2 +-
 .../lib/system/language/I18nHandler.class.php |  14 +-
 56 files changed, 1196 insertions(+), 21 deletions(-)
 create mode 100644 com.woltlab.wcf/templates/__formFieldDataHandler.tpl
 create mode 100644 wcfsetup/install/files/acp/templates/__formFieldDataHandler.tpl
 create mode 100644 wcfsetup/install/files/acp/templates/__simpleAclFormField.tpl
 create mode 100644 wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Dialog.js
 create mode 100644 wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/Captcha.js
 create mode 100644 wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/Checkboxes.js
 create mode 100644 wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/Checked.js
 rename wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/{ => Controller}/Label.js (97%)
 rename wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/{ => Controller}/Rating.js (98%)
 create mode 100644 wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/Date.js
 create mode 100644 wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/Field.js
 create mode 100644 wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/ItemList.js
 create mode 100644 wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/RadioButton.js
 create mode 100644 wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/SimpleAcl.js
 create mode 100644 wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/Tag.js
 create mode 100644 wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/User.js
 create mode 100644 wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/Value.js
 create mode 100644 wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/ValueI18n.js
 create mode 100644 wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Manager.js

diff --git a/com.woltlab.wcf/templates/__captchaFormField.tpl b/com.woltlab.wcf/templates/__captchaFormField.tpl
index f4202f8f1c..360f272abc 100644
--- a/com.woltlab.wcf/templates/__captchaFormField.tpl
+++ b/com.woltlab.wcf/templates/__captchaFormField.tpl
@@ -1 +1,3 @@
 {@$field->getObjectType()->getProcessor()->getFormElement()}
+
+{include file='__formFieldDataHandler'}
diff --git a/com.woltlab.wcf/templates/__form.tpl b/com.woltlab.wcf/templates/__form.tpl
index 4a1fcadb94..8719c7e04b 100644
--- a/com.woltlab.wcf/templates/__form.tpl
+++ b/com.woltlab.wcf/templates/__form.tpl
@@ -1,7 +1,21 @@
 <script data-relocate="true">
 	{* register form with dependency manager before any form field-related JavaScript code is executed below *}
-	require(['WoltLabSuite/Core/Form/Builder/Field/Dependency/Manager'], function(FormBuilderFieldDependencyManager) {
+	require([
+		'WoltLabSuite/Core/Form/Builder/Field/Dependency/Manager'
+		{if $form->isAjax()}
+			, 'WoltLabSuite/Core/Form/Builder/Manager'
+		{/if}
+	], function(
+		FormBuilderFieldDependencyManager
+		{if $form->isAjax()}
+			, FormBuilderManager
+		{/if}
+	) {
 		FormBuilderFieldDependencyManager.register('{@$form->getId()}');
+		
+		{if $form->isAjax()}
+			FormBuilderManager.registerForm('{@$form->getId()}');
+		{/if}
 	});
 </script>
 
diff --git a/com.woltlab.wcf/templates/__formFieldDataHandler.tpl b/com.woltlab.wcf/templates/__formFieldDataHandler.tpl
new file mode 100644
index 0000000000..83b9800f29
--- /dev/null
+++ b/com.woltlab.wcf/templates/__formFieldDataHandler.tpl
@@ -0,0 +1,16 @@
+{if $field->getDocument()->isAjax() && !$javaScriptDataHandlerModule|empty}
+	<script data-relocate="true">
+		require([
+			'{$javaScriptDataHandlerModule}{if $field|is_subclass_of:'wcf\system\form\builder\field\II18nFormField' && $field->isI18n()}I18n{/if}',
+			'WoltLabSuite/Core/Form/Builder/Manager'
+		], function(
+			FormBuilderField,
+			FormBuilderManager
+		) {
+			FormBuilderManager.registerField(
+				'{@$field->getDocument()->getId()}',
+				new FormBuilderField('{@$field->getPrefixedId()}')
+			);
+		});
+	</script>
+{/if}
diff --git a/com.woltlab.wcf/templates/__formFieldFooter.tpl b/com.woltlab.wcf/templates/__formFieldFooter.tpl
index bb5c687390..f420d74d3d 100644
--- a/com.woltlab.wcf/templates/__formFieldFooter.tpl
+++ b/com.woltlab.wcf/templates/__formFieldFooter.tpl
@@ -1,5 +1,6 @@
 		{include file='__formFieldDescription'}
 		{include file='__formFieldErrors'}
 		{include file='__formFieldDependencies'}
+		{include file='__formFieldDataHandler'}
 	</dd>
 </dl>
diff --git a/com.woltlab.wcf/templates/__labelFormField.tpl b/com.woltlab.wcf/templates/__labelFormField.tpl
index 071acec516..971066d4b1 100644
--- a/com.woltlab.wcf/templates/__labelFormField.tpl
+++ b/com.woltlab.wcf/templates/__labelFormField.tpl
@@ -27,7 +27,7 @@
 
 {js application='wcf' file='WCF.Label' bundle='WCF.Combined'}
 <script data-relocate="true">
-	require(['Dom/Util', 'Language', 'WoltLabSuite/Core/Form/Builder/Field/Label'], function(DomUtil, Language, FormBuilderFieldLabel) {
+	require(['Dom/Util', 'Language', 'WoltLabSuite/Core/Form/Builder/Field/Controller/Label'], function(DomUtil, Language, FormBuilderFieldLabel) {
 		Language.addObject({
 			'wcf.label.none': '{lang}wcf.label.none{/lang}',
 			'wcf.label.withoutSelection': '{lang}wcf.label.withoutSelection{/lang}'
diff --git a/com.woltlab.wcf/templates/__ratingFormField.tpl b/com.woltlab.wcf/templates/__ratingFormField.tpl
index 0dc9978b88..d1d8ded8e7 100644
--- a/com.woltlab.wcf/templates/__ratingFormField.tpl
+++ b/com.woltlab.wcf/templates/__ratingFormField.tpl
@@ -17,7 +17,7 @@
 </noscript>
 
 <script data-relocate="true">
-	require(['WoltLabSuite/Core/Form/Builder/Field/Rating'], function(FormBuilderFieldRating) {
+	require(['WoltLabSuite/Core/Form/Builder/Field/Controller/Rating'], function(FormBuilderFieldRating) {
 		new FormBuilderFieldRating(
 			'{@$field->getPrefixedId()}',
 			{if $field->getValue() !== null}{@$field->getValue()}{else}''{/if},
diff --git a/com.woltlab.wcf/templates/uploadFieldComponent.tpl b/com.woltlab.wcf/templates/uploadFieldComponent.tpl
index 90995ce7a9..927cf8249a 100644
--- a/com.woltlab.wcf/templates/uploadFieldComponent.tpl
+++ b/com.woltlab.wcf/templates/uploadFieldComponent.tpl
@@ -30,7 +30,7 @@
 
 <div id="{$uploadFieldId}UploadButtonDiv" class="uploadButtonDiv"></div>
 
-<input type="hidden" name="{$uploadFieldId}" value="{$uploadField->getInternalId()}">
+<input type="hidden" id="{$uploadFieldId}" name="{$uploadFieldId}" value="{$uploadField->getInternalId()}">
 
 <script data-relocate="true">
 	require(['WoltLabSuite/Core/Ui/File/Upload', 'Language'], function(Upload, Language) {
diff --git a/wcfsetup/install/files/acp/templates/__captchaFormField.tpl b/wcfsetup/install/files/acp/templates/__captchaFormField.tpl
index f4202f8f1c..360f272abc 100644
--- a/wcfsetup/install/files/acp/templates/__captchaFormField.tpl
+++ b/wcfsetup/install/files/acp/templates/__captchaFormField.tpl
@@ -1 +1,3 @@
 {@$field->getObjectType()->getProcessor()->getFormElement()}
+
+{include file='__formFieldDataHandler'}
diff --git a/wcfsetup/install/files/acp/templates/__form.tpl b/wcfsetup/install/files/acp/templates/__form.tpl
index 4a1fcadb94..8719c7e04b 100644
--- a/wcfsetup/install/files/acp/templates/__form.tpl
+++ b/wcfsetup/install/files/acp/templates/__form.tpl
@@ -1,7 +1,21 @@
 <script data-relocate="true">
 	{* register form with dependency manager before any form field-related JavaScript code is executed below *}
-	require(['WoltLabSuite/Core/Form/Builder/Field/Dependency/Manager'], function(FormBuilderFieldDependencyManager) {
+	require([
+		'WoltLabSuite/Core/Form/Builder/Field/Dependency/Manager'
+		{if $form->isAjax()}
+			, 'WoltLabSuite/Core/Form/Builder/Manager'
+		{/if}
+	], function(
+		FormBuilderFieldDependencyManager
+		{if $form->isAjax()}
+			, FormBuilderManager
+		{/if}
+	) {
 		FormBuilderFieldDependencyManager.register('{@$form->getId()}');
+		
+		{if $form->isAjax()}
+			FormBuilderManager.registerForm('{@$form->getId()}');
+		{/if}
 	});
 </script>
 
diff --git a/wcfsetup/install/files/acp/templates/__formFieldDataHandler.tpl b/wcfsetup/install/files/acp/templates/__formFieldDataHandler.tpl
new file mode 100644
index 0000000000..d4651bd1c2
--- /dev/null
+++ b/wcfsetup/install/files/acp/templates/__formFieldDataHandler.tpl
@@ -0,0 +1,16 @@
+{if $field->getDocument()->isAjax() && !$javaScriptDataHandlerModule|empty}
+	<script data-relocate="true">
+		require([
+			'{$javaScriptDataHandlerModule}',
+			'WoltLabSuite/Core/Form/Builder/Manager'
+		], function(
+			FormBuilderField,
+			FormBuilderManager
+		) {
+			FormBuilderManager.registerField(
+				'{@$field->getDocument()->getId()}',
+				new FormBuilderField('{@$field->getPrefixedId()}')
+			);
+		});
+	</script>
+{/if}
diff --git a/wcfsetup/install/files/acp/templates/__formFieldFooter.tpl b/wcfsetup/install/files/acp/templates/__formFieldFooter.tpl
index bb5c687390..f420d74d3d 100644
--- a/wcfsetup/install/files/acp/templates/__formFieldFooter.tpl
+++ b/wcfsetup/install/files/acp/templates/__formFieldFooter.tpl
@@ -1,5 +1,6 @@
 		{include file='__formFieldDescription'}
 		{include file='__formFieldErrors'}
 		{include file='__formFieldDependencies'}
+		{include file='__formFieldDataHandler'}
 	</dd>
 </dl>
diff --git a/wcfsetup/install/files/acp/templates/__labelFormField.tpl b/wcfsetup/install/files/acp/templates/__labelFormField.tpl
index 071acec516..971066d4b1 100644
--- a/wcfsetup/install/files/acp/templates/__labelFormField.tpl
+++ b/wcfsetup/install/files/acp/templates/__labelFormField.tpl
@@ -27,7 +27,7 @@
 
 {js application='wcf' file='WCF.Label' bundle='WCF.Combined'}
 <script data-relocate="true">
-	require(['Dom/Util', 'Language', 'WoltLabSuite/Core/Form/Builder/Field/Label'], function(DomUtil, Language, FormBuilderFieldLabel) {
+	require(['Dom/Util', 'Language', 'WoltLabSuite/Core/Form/Builder/Field/Controller/Label'], function(DomUtil, Language, FormBuilderFieldLabel) {
 		Language.addObject({
 			'wcf.label.none': '{lang}wcf.label.none{/lang}',
 			'wcf.label.withoutSelection': '{lang}wcf.label.withoutSelection{/lang}'
diff --git a/wcfsetup/install/files/acp/templates/__ratingFormField.tpl b/wcfsetup/install/files/acp/templates/__ratingFormField.tpl
index 0dc9978b88..d1d8ded8e7 100644
--- a/wcfsetup/install/files/acp/templates/__ratingFormField.tpl
+++ b/wcfsetup/install/files/acp/templates/__ratingFormField.tpl
@@ -17,7 +17,7 @@
 </noscript>
 
 <script data-relocate="true">
-	require(['WoltLabSuite/Core/Form/Builder/Field/Rating'], function(FormBuilderFieldRating) {
+	require(['WoltLabSuite/Core/Form/Builder/Field/Controller/Rating'], function(FormBuilderFieldRating) {
 		new FormBuilderFieldRating(
 			'{@$field->getPrefixedId()}',
 			{if $field->getValue() !== null}{@$field->getValue()}{else}''{/if},
diff --git a/wcfsetup/install/files/acp/templates/__simpleAclFormField.tpl b/wcfsetup/install/files/acp/templates/__simpleAclFormField.tpl
new file mode 100644
index 0000000000..f24fac96b5
--- /dev/null
+++ b/wcfsetup/install/files/acp/templates/__simpleAclFormField.tpl
@@ -0,0 +1,3 @@
+{include file='aclSimple'}
+
+{include file='__formFieldDataHandler'}
diff --git a/wcfsetup/install/files/acp/templates/uploadFieldComponent.tpl b/wcfsetup/install/files/acp/templates/uploadFieldComponent.tpl
index 90995ce7a9..927cf8249a 100644
--- a/wcfsetup/install/files/acp/templates/uploadFieldComponent.tpl
+++ b/wcfsetup/install/files/acp/templates/uploadFieldComponent.tpl
@@ -30,7 +30,7 @@
 
 <div id="{$uploadFieldId}UploadButtonDiv" class="uploadButtonDiv"></div>
 
-<input type="hidden" name="{$uploadFieldId}" value="{$uploadField->getInternalId()}">
+<input type="hidden" id="{$uploadFieldId}" name="{$uploadFieldId}" value="{$uploadField->getInternalId()}">
 
 <script data-relocate="true">
 	require(['WoltLabSuite/Core/Ui/File/Upload', 'Language'], function(Upload, Language) {
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Dialog.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Dialog.js
new file mode 100644
index 0000000000..b833273669
--- /dev/null
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Dialog.js
@@ -0,0 +1,195 @@
+/**
+ * Provides API to easily create a dialog form created by form builder.
+ * 
+ * @author	Matthias Schmidt
+ * @copyright	2001-2019 WoltLab GmbH
+ * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @module	WoltLabSuite/Core/Form/Builder/Manager
+ * @since	5.2
+ */
+define(['Ajax', 'Core', './Manager', 'Ui/Dialog'], function(Ajax, Core, FormBuilderManager, UiDialog) {
+	"use strict";
+	
+	/**
+	 * @constructor
+	 */
+	function FormBuilderDialog(dialogId, className, actionName, options) {
+		this.init(dialogId, className, actionName, options);
+	};
+	FormBuilderDialog.prototype = {
+		/**
+		 * Initializes the dialog.
+		 * 
+		 * @param	{string}	dialogId
+		 * @param	{string}	className
+		 * @param	{string}	actionName
+		 * @param	{{actionParameters: object, destoryOnClose: boolean, dialog: object}}	options
+		 */
+		init: function(dialogId, className, actionName, options) {
+			this._dialogId = dialogId;
+			this._className = className;
+			this._actionName = actionName;
+			this._options = Core.extend({
+				actionParameters: {},
+				destroyOnClose: false
+			}, options);
+			this._options.dialog = Core.extend(this._options.dialog || {}, {
+				onClose: this._dialogOnClose.bind(this),
+				onSetup: this._dialogOnSetup.bind(this)
+			});
+			
+			this._formId = '';
+			this._dialogContent = '';
+		},
+		
+		/**
+		 * Returns the data for Ajax to setup the Ajax/Request object.
+		 * 
+		 * @return	{object}	setup data for Ajax/Request object
+		 */
+		_ajaxSetup: function() {
+			return {
+				data: {
+					actionName: this._actionName,
+					className: this._className,
+					parameters: this._options.actionParameters
+				}
+			};
+		},
+		
+		/**
+		 * Handles successful Ajax requests.
+		 *
+		 * @param	{object}	data	response data
+		 */
+		_ajaxSuccess: function(data) {
+			if (data.returnValues === undefined) {
+				throw new Error("Missing return data.");
+			}
+			else if (data.returnValues.dialog === undefined) {
+				throw new Error("Missing dialog template in return data.");
+			}
+			else if (data.returnValues.formId === undefined) {
+				throw new Error("Missing form id in return data.");
+			}
+			
+			this.destroy(true);
+			
+			this._formId = data.returnValues.formId;
+			this._dialogContent = data.returnValues.dialog;
+			
+			UiDialog.open(this, this._dialogContent);
+		},
+		
+		/**
+		 * Is called when clicking on the dialog form's close button.
+		 */
+		_closeDialog: function() {
+			UiDialog.close(this);
+		},
+		
+		/**
+		 * Is called when the dialog is set up.
+		 * 
+		 * @param	{HTMLElement}	content		dialog's content element
+		 */
+		_dialogOnSetup: function(content) {
+			var cancelButton = elById(this._formId + '_cancelButton', content);
+			if (cancelButton !== null) {
+				cancelButton.addEventListener('click', this._closeDialog.bind(this));
+			}
+		},
+		
+		/**
+		 * Is called by the dialog API when the dialog is closed.
+		 */
+		_dialogOnClose: function() {
+			if (this._options.destroyOnClose) {
+				this.destroy();
+			}
+		},
+		
+		/**
+		 * Returns the data used to setup the dialog.
+		 * 
+		 * @return	{object}	setup data
+		 */
+		_dialogSetup: function() {
+			return {
+				id: this._dialogId,
+				options : this._options.dialog,
+				source: this._dialogContent
+			};
+		},
+		
+		/**
+		 * Is called by the dialog API when the dialog form is submitted.
+		 */
+		_dialogSubmit: function() {
+			this.getData().then(this._submitForm.bind(this));
+		},
+		
+		/**
+		 * Submits the form with the given form data.
+		 * 
+		 * @param	{object}	formData
+		 */
+		_submitForm: function(formData) {
+			if (typeof this._options.onSubmit === 'function') {
+				this._options.onSubmit(formData);
+			}
+			else if (typeof this._options.submitActionName === 'string') {
+				Ajax.api(this, {
+					actionName: this._options.submitActionName,
+					parameters: {
+						data: formData
+					}
+				});
+			}
+		},
+		
+		/**
+		 * Destroys the dialog.
+		 * 
+		 * @param	{boolean}	ignoreDialog	if `true`, the actual dialog is not destroyed, only the form is
+		 */
+		destroy: function(ignoreDialog) {
+			if (this._formId !== '') {
+				if (FormBuilderManager.hasForm(this._formId)) {
+					FormBuilderManager.unregisterForm(this._formId);
+				}
+				
+				if (ignoreDialog !== true) {
+					UiDialog.destroy(this);
+				}
+			}
+		},
+		
+		/**
+		 * Returns a promise that all of the dialog form's data.
+		 * 
+		 * @return	{Promise}
+		 */
+		getData: function() {
+			if (this._formId === '') {
+				throw new Error("Form has not been requested yet.");
+			}
+			
+			return FormBuilderManager.getData(this._formId);
+		},
+		
+		/**
+		 * Opens the dialog form.
+		 */
+		open: function() {
+			if (UiDialog.getDialog(this._dialogId)) {
+				UiDialog.openStatic(this._dialogId);
+			}
+			else {
+				Ajax.api(this);
+			}
+		}
+	};
+	
+	return FormBuilderDialog;
+});
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/Captcha.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/Captcha.js
new file mode 100644
index 0000000000..4419c64b6b
--- /dev/null
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/Captcha.js
@@ -0,0 +1,49 @@
+/**
+ * Data handler for a captcha form builder field in an Ajax form.
+ * 
+ * @author	Matthias Schmidt
+ * @copyright	2001-2019 WoltLab GmbH
+ * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @module	WoltLabSuite/Core/Form/Builder/Field/Captcha
+ * @since	5.2
+ */
+define(['Core', './Field', 'WoltLabSuite/Core/Controller/Captcha'], function(Core, FormBuilderField, Captcha) {
+	"use strict";
+	
+	/**
+	 * @constructor
+	 */
+	function FormBuilderFieldCaptcha(fieldId) {
+		this.init(fieldId);
+	};
+	Core.inherit(FormBuilderFieldCaptcha, FormBuilderField, {
+		/**
+		 * @see	WoltLabSuite/Core/Form/Builder/Field/Field#getData
+		 */
+		_getData: function() {
+			if (Captcha.has(this._fieldId)) {
+				return Captcha.getData(this._fieldId);
+			}
+			
+			return {};
+		},
+		
+		/**
+		 * @see	WoltLabSuite/Core/Form/Builder/Field/Field#_readField
+		 */
+		_readField: function() {
+			// does nothing
+		},
+		
+		/**
+		 * @see	WoltLabSuite/Core/Form/Builder/Field/Field#destroy
+		 */
+		destroy: function() {
+			if (Captcha.has(this._fieldId)) {
+				Captcha.delete(this._fieldId);
+			}
+		}
+	});
+	
+	return FormBuilderFieldCaptcha;
+});
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/Checkboxes.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/Checkboxes.js
new file mode 100644
index 0000000000..ecca075a87
--- /dev/null
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/Checkboxes.js
@@ -0,0 +1,46 @@
+/**
+ * Data handler for a form builder field in an Ajax form represented by checkboxes.
+ * 
+ * @author	Matthias Schmidt
+ * @copyright	2001-2019 WoltLab GmbH
+ * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @module	WoltLabSuite/Core/Form/Builder/Field/Checkboxes
+ * @since	5.2
+ */
+define(['Core', './Field'], function(Core, FormBuilderField) {
+	"use strict";
+	
+	/**
+	 * @constructor
+	 */
+	function FormBuilderFieldCheckboxes(fieldId) {
+		this.init(fieldId);
+	};
+	Core.inherit(FormBuilderFieldCheckboxes, FormBuilderField, {
+		/**
+		 * @see	WoltLabSuite/Core/Form/Builder/Field/Field#_getData
+		 */
+		_getData: function() {
+			var data = {};
+			
+			data[this._fieldId] = [];
+			
+			for (var i = 0, length = this._fields.length; i < length; i++) {
+				if (this._fields[i].checked) {
+					data[this._fieldId].push(this._fields[i].value);
+				}
+			}
+			
+			return data;
+		},
+		
+		/**
+		 * @see	WoltLabSuite/Core/Form/Builder/Field/Field#_readField
+		 */
+		_readField: function() {
+			this._fields = elBySelAll('input[name="' + this._fieldId + '[]"]');
+		}
+	});
+	
+	return FormBuilderFieldCheckboxes;
+});
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/Checked.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/Checked.js
new file mode 100644
index 0000000000..7673985c97
--- /dev/null
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/Checked.js
@@ -0,0 +1,34 @@
+/**
+ * Data handler for a form builder field in an Ajax form that stores its value via a checkbox being
+ * checked or not.
+ * 
+ * @author	Matthias Schmidt
+ * @copyright	2001-2019 WoltLab GmbH
+ * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @module	WoltLabSuite/Core/Form/Builder/Field/Checked
+ * @since	5.2
+ */
+define(['Core', './Field'], function(Core, FormBuilderField) {
+	"use strict";
+	
+	/**
+	 * @constructor
+	 */
+	function FormBuilderFieldInput(fieldId) {
+		this.init(fieldId);
+	};
+	Core.inherit(FormBuilderFieldInput, FormBuilderField, {
+		/**
+		 * @see	WoltLabSuite/Core/Form/Builder/Field/Field#_getData
+		 */
+		_getData: function() {
+			var data = {};
+			
+			data[this._fieldId] = ~~this._field.checked;
+			
+			return data;
+		}
+	});
+	
+	return FormBuilderFieldInput;
+});
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/Label.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/Controller/Label.js
similarity index 97%
rename from wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/Label.js
rename to wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/Controller/Label.js
index ef136f797e..e0150da902 100644
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/Label.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/Controller/Label.js
@@ -4,7 +4,7 @@
  * @author	Alexander Ebert, Matthias Schmidt
  * @copyright	2001-2019 WoltLab GmbH
  * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
- * @module	WoltLabSuite/Core/Form/Builder/Field/Label
+ * @module	WoltLabSuite/Core/Form/Builder/Field/Controller/Label
  * @since	5.2
  */
 define(['Core', 'Dom/Util', 'Language', 'Ui/SimpleDropdown'], function(Core, DomUtil, Language, UiSimpleDropdown) {
@@ -34,6 +34,7 @@ define(['Core', 'Dom/Util', 'Language', 'Ui/SimpleDropdown'], function(Core, Dom
 			
 			this._input = elCreate('input');
 			this._input.type = 'hidden';
+			this._input.id = fieldId;
 			this._input.name = fieldId;
 			this._input.value = ~~labelId;
 			this._formFieldContainer.appendChild(this._input);
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/Rating.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/Controller/Rating.js
similarity index 98%
rename from wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/Rating.js
rename to wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/Controller/Rating.js
index 441a036038..b9c6692db4 100644
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/Rating.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/Controller/Rating.js
@@ -4,7 +4,7 @@
  * @author	Matthias Schmidt
  * @copyright	2001-2019 WoltLab GmbH
  * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
- * @module	WoltLabSuite/Core/Form/Builder/Field/Rating
+ * @module	WoltLabSuite/Core/Form/Builder/Field/Controller/Rating
  * @since	5.2
  */
 define(['Dictionary'], function(Dictionary) {
@@ -32,6 +32,7 @@ define(['Dictionary'], function(Dictionary) {
 			}
 			
 			this._input = elCreate('input');
+			this._input.id = fieldId;
 			this._input.name = fieldId;
 			this._input.type = 'hidden';
 			this._input.value = value;
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/Date.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/Date.js
new file mode 100644
index 0000000000..770d742a6c
--- /dev/null
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/Date.js
@@ -0,0 +1,33 @@
+/**
+ * Data handler for a date form builder field in an Ajax form.
+ * 
+ * @author	Matthias Schmidt
+ * @copyright	2001-2019 WoltLab GmbH
+ * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @module	WoltLabSuite/Core/Form/Builder/Field/Date
+ * @since	5.2
+ */
+define(['Core', 'WoltLabSuite/Core/Date/Picker', './Field'], function(Core, DatePicker, FormBuilderField) {
+	"use strict";
+	
+	/**
+	 * @constructor
+	 */
+	function FormBuilderFieldDate(fieldId) {
+		this.init(fieldId);
+	};
+	Core.inherit(FormBuilderFieldDate, FormBuilderField, {
+		/**
+		 * @see	WoltLabSuite/Core/Form/Builder/Field/Field#_getData
+		 */
+		_getData: function() {
+			var data = {};
+			
+			data[this._fieldId] = DatePicker.getValue(this._field);
+			
+			return data;
+		}
+	});
+	
+	return FormBuilderFieldDate;
+});
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/Dependency/Manager.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/Dependency/Manager.js
index 84e461dcab..3c26dbca6f 100644
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/Dependency/Manager.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/Dependency/Manager.js
@@ -306,6 +306,47 @@ define(['Dictionary', 'Dom/ChangeListener', 'EventHandler', 'List', 'Dom/Travers
 			}
 			
 			_forms.add(form);
+		},
+		
+		/**
+		 * Unregisters the form with the given id and all of its dependencies.
+		 * 
+		 * @param	{string}	formId		id of unregistered form
+		 */
+		unregister: function(formId) {
+			var form = elById(formId);
+			
+			if (form === null) {
+				throw new Error("Unknown element with id '" + formId + "'");
+			}
+			
+			if (!_forms.has(form)) {
+				throw new Error("Form with id '" + formId + "' has not been registered.");
+			}
+			
+			_forms.delete(form);
+			
+			_dependencyHiddenNodes.forEach(function(hiddenNode) {
+				if (form.contains(hiddenNode)) {
+					_dependencyHiddenNodes.delete(hiddenNode);
+				}
+			});
+			_nodeDependencies.forEach(function(dependencies, nodeId) {
+				if (form.contains(elById(nodeId))) {
+					_nodeDependencies.delete(nodeId);
+				}
+				
+				for (var i = 0, length = dependencies.length; i < length; i++) {
+					var fields = dependencies[i].getFields();
+					for (var j = 0, length = fields.length; j < length; j++) {
+						var field = fields[j];
+						
+						_fields.delete(field.id);
+						
+						_validatedFieldProperties.delete(field);
+					}
+				}
+			});
 		}
 	};
 });
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/Field.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/Field.js
new file mode 100644
index 0000000000..59edc17076
--- /dev/null
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/Field.js
@@ -0,0 +1,87 @@
+/**
+ * Data handler for a form builder field in an Ajax form.
+ *
+ * @author	Matthias Schmidt
+ * @copyright	2001-2019 WoltLab GmbH
+ * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @module	WoltLabSuite/Core/Form/Builder/Field/Field
+ * @since	5.2
+ */
+define([], function() {
+	"use strict";
+	
+	/**
+	 * @constructor
+	 */
+	function FormBuilderField(fieldId) {
+		this.init(fieldId);
+	};
+	FormBuilderField.prototype = {
+		/**
+		 * Initializes the form field.
+		 * 
+		 * @param	{string}	fieldId		id of the relevant form builder field
+		 */
+		init: function(fieldId) {
+			this._fieldId = fieldId;
+			
+			this._readField();
+		},
+		
+		/**
+		 * Returns the current data of the field or a promise returning the current data
+		 * of the field.
+		 * 
+		 * @return	{Promise|data}
+		 */
+		_getData: function() {
+			throw new Error("Missing implementation of WoltLabSuite/Core/Form/Builder/Field/Field._getData!");
+		},
+		
+		/**
+		 * Reads the field HTML element.
+		 */
+		_readField: function() {
+			this._field = elById(this._fieldId);
+			
+			if (this._field === null) {
+				throw new Error("Unknown field with id '" + this._fieldId + "'.");
+			}
+		},
+		
+		/**
+		 * Destroys the field.
+		 * 
+		 * This function is useful for remove registered elements from other APIs like dialogs.
+		 */
+		destroy: function() {
+			// does nothing
+		},
+		
+		/**
+		 * Returns a promise returning the current data of the field.
+		 * 
+		 * @return	{Promise}
+		 */
+		getData: function() {
+			var data = this._getData();
+			
+			if (!(data instanceof Promise)) {
+				return Promise.resolve(data);
+			}
+			
+			return data;
+		},
+		
+		/**
+		 * Returns the id of the field.
+		 * 
+		 * @return	{string}
+		 */
+		getId: function() {
+			return this._fieldId;
+		}
+	};
+	
+	return FormBuilderField;
+});
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/ItemList.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/ItemList.js
new file mode 100644
index 0000000000..0cc5513749
--- /dev/null
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/ItemList.js
@@ -0,0 +1,43 @@
+/**
+ * Data handler for an item list form builder field in an Ajax form.
+ * 
+ * @author	Matthias Schmidt
+ * @copyright	2001-2019 WoltLab GmbH
+ * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @module	WoltLabSuite/Core/Form/Builder/Field/ItemList
+ * @since	5.2
+ */
+define(['Core', './Field', 'WoltLabSuite/Core/Ui/ItemList/Static'], function(Core, FormBuilderField, UiItemListStatic) {
+	"use strict";
+	
+	/**
+	 * @constructor
+	 */
+	function FormBuilderFieldItemList(fieldId) {
+		this.init(fieldId);
+	};
+	Core.inherit(FormBuilderFieldItemList, FormBuilderField, {
+		/**
+		 * @see	WoltLabSuite/Core/Form/Builder/Field/Field#_getData
+		 */
+		_getData: function() {
+			var data = {};
+			data[this._fieldId] = [];
+			
+			var values = UiItemListStatic.getValues(this._fieldId);
+			for (var i = 0, length = values.length; i < length; i++) {
+				// TODO: data[this._fieldId] is an array but if code assumes object
+				if (values[i].objectId) {
+					data[this._fieldId][values[i].objectId] = values[i].value;
+				}
+				else {
+					data[this._fieldId].push(values[i].value);
+				}
+			}
+			
+			return data;
+		}
+	});
+	
+	return FormBuilderFieldItemList;
+});
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/RadioButton.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/RadioButton.js
new file mode 100644
index 0000000000..b08f6b6f2f
--- /dev/null
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/RadioButton.js
@@ -0,0 +1,45 @@
+/**
+ * Data handler for a radio button form builder field in an Ajax form.
+ * 
+ * @author	Matthias Schmidt
+ * @copyright	2001-2019 WoltLab GmbH
+ * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @module	WoltLabSuite/Core/Form/Builder/Field/RadioButton
+ * @since	5.2
+ */
+define(['Core', './Field'], function(Core, FormBuilderField) {
+	"use strict";
+
+	/**
+	 * @constructor
+	 */
+	function FormBuilderFieldRadioButton(fieldId) {
+		this.init(fieldId);
+	};
+	Core.inherit(FormBuilderFieldRadioButton, FormBuilderField, {
+		/**
+		 * @see	WoltLabSuite/Core/Form/Builder/Field/Field#getData
+		 */
+		_getData: function() {
+			var data = {};
+			
+			for (var i = 0, length = this._fields.length; i < length; i++) {
+				if (this._fields[i].checked) {
+					data[this._fieldId] = this._fields[i].value;
+					break;
+				}
+			}
+			
+			return data;
+		},
+		
+		/**
+		 * @see	WoltLabSuite/Core/Form/Builder/Field/Field#_readField
+		 */
+		_readField: function() {
+			this._fields = elBySelAll('input[name=' + this._fieldId + ']');
+		},
+	});
+	
+	return FormBuilderFieldRadioButton;
+});
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/SimpleAcl.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/SimpleAcl.js
new file mode 100644
index 0000000000..2da8625915
--- /dev/null
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/SimpleAcl.js
@@ -0,0 +1,53 @@
+/**
+ * Data handler for a simple acl form builder field in an Ajax form.
+ * 
+ * @author	Matthias Schmidt
+ * @copyright	2001-2019 WoltLab GmbH
+ * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @module	WoltLabSuite/Core/Form/Builder/Field/SimpleAcl
+ * @since	5.2
+ */
+define(['Core', './Field'], function(Core, FormBuilderField) {
+	"use strict";
+	
+	/**
+	 * @constructor
+	 */
+	function FormBuilderFieldSimpleAcl(fieldId) {
+		this.init(fieldId);
+	};
+	Core.inherit(FormBuilderFieldSimpleAcl, FormBuilderField, {
+		/**
+		 * @see	WoltLabSuite/Core/Form/Builder/Field/Field#_getData
+		 */
+		_getData: function() {
+			var groupIds = [];
+			elBySelAll('input[name="' + this._fieldId + '[group][]"]', undefined, function(input) {
+				groupIds.push(~~input.value);
+			});
+			
+			var usersIds = [];
+			elBySelAll('input[name="' + this._fieldId + '[user][]"]', undefined, function(input) {
+				usersIds.push(~~input.value);
+			});
+			
+			var data = {};
+			
+			data[this._fieldId] = {
+				group: groupIds,
+				user: usersIds
+			};
+			
+			return data;
+		},
+		
+		/**
+		 * @see	WoltLabSuite/Core/Form/Builder/Field/Field#_readField
+		 */
+		_readField: function() {
+			// does nothing
+		}
+	});
+	
+	return FormBuilderFieldSimpleAcl;
+});
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/Tag.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/Tag.js
new file mode 100644
index 0000000000..a56bed994c
--- /dev/null
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/Tag.js
@@ -0,0 +1,37 @@
+/**
+ * Data handler for a tag form builder field in an Ajax form.
+ * 
+ * @author	Matthias Schmidt
+ * @copyright	2001-2019 WoltLab GmbH
+ * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @module	WoltLabSuite/Core/Form/Builder/Field/Tag
+ * @since	5.2
+ */
+define(['Core', './Field', 'WoltLabSuite/Core/Ui/ItemList'], function(Core, FormBuilderField, UiItemList) {
+	"use strict";
+	
+	/**
+	 * @constructor
+	 */
+	function FormBuilderFieldTag(fieldId) {
+		this.init(fieldId);
+	};
+	Core.inherit(FormBuilderFieldTag, FormBuilderField, {
+		/**
+		 * @see	WoltLabSuite/Core/Form/Builder/Field/Field#_getData
+		 */
+		_getData: function() {
+			var data = {};
+			data[this._fieldId] = [];
+			
+			var values = UiItemList.getValues(this._fieldId);
+			for (var i = 0, length = values.length; i < length; i++) {
+				data[this._fieldId].push(values[i].value);
+			}
+			
+			return data;
+		}
+	});
+	
+	return FormBuilderFieldTag;
+});
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/User.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/User.js
new file mode 100644
index 0000000000..2cb81e1b8d
--- /dev/null
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/User.js
@@ -0,0 +1,40 @@
+/**
+ * Data handler for a user form builder field in an Ajax form.
+ * 
+ * @author	Matthias Schmidt
+ * @copyright	2001-2019 WoltLab GmbH
+ * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @module	WoltLabSuite/Core/Form/Builder/Field/User
+ * @since	5.2
+ */
+define(['Core', './Field', 'WoltLabSuite/Core/Ui/ItemList'], function(Core, FormBuilderField, UiItemList) {
+	"use strict";
+	
+	/**
+	 * @constructor
+	 */
+	function FormBuilderFieldUser(fieldId) {
+		this.init(fieldId);
+	};
+	Core.inherit(FormBuilderFieldUser, FormBuilderField, {
+		/**
+		 * @see	WoltLabSuite/Core/Form/Builder/Field/Field#_getData
+		 */
+		_getData: function() {
+			var values = UiItemList.getValues(this._fieldId);
+			var usernames = [];
+			for (var i = 0, length = values.length; i < length; i++) {
+				if (values[i].objectId) {
+					usernames.push(values[i].value);
+				}
+			}
+			
+			var data = {};
+			data[this._fieldId] = usernames.join(',');
+			
+			return data;
+		}
+	});
+	
+	return FormBuilderFieldUser;
+});
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/Value.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/Value.js
new file mode 100644
index 0000000000..a404ee4a60
--- /dev/null
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/Value.js
@@ -0,0 +1,34 @@
+/**
+ * Data handler for a form builder field in an Ajax form that stores its value in an input's value
+ * attribute.
+ * 
+ * @author	Matthias Schmidt
+ * @copyright	2001-2019 WoltLab GmbH
+ * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @module	WoltLabSuite/Core/Form/Builder/Field/Value
+ * @since	5.2
+ */
+define(['Core', './Field'], function(Core, FormBuilderField) {
+	"use strict";
+	
+	/**
+	 * @constructor
+	 */
+	function FormBuilderFieldValue(fieldId) {
+		this.init(fieldId);
+	};
+	Core.inherit(FormBuilderFieldValue, FormBuilderField, {
+		/**
+		 * @see	WoltLabSuite/Core/Form/Builder/Field/Field#_getData
+		 */
+		_getData: function() {
+			var data = {};
+			
+			data[this._fieldId] = this._field.value;
+			
+			return data;
+		}
+	});
+	
+	return FormBuilderFieldValue;
+});
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/ValueI18n.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/ValueI18n.js
new file mode 100644
index 0000000000..7aceb81547
--- /dev/null
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/ValueI18n.js
@@ -0,0 +1,47 @@
+/**
+ * Data handler for an i18n form builder field in an Ajax form that stores its value in an input's
+ * value attribute.
+ * 
+ * @author	Matthias Schmidt
+ * @copyright	2001-2019 WoltLab GmbH
+ * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @module	WoltLabSuite/Core/Form/Builder/Field/ValueI18n
+ * @since	5.2
+ */
+define(['Core', './Field', 'WoltLabSuite/Core/Language/Input'], function(Core, FormBuilderField, LanguageInput) {
+	"use strict";
+	
+	/**
+	 * @constructor
+	 */
+	function FormBuilderFieldValueI18n(fieldId) {
+		this.init(fieldId);
+	};
+	Core.inherit(FormBuilderFieldValueI18n, FormBuilderField, {
+		/**
+		 * @see	WoltLabSuite/Core/Form/Builder/Field/Field#_getData
+		 */
+		_getData: function() {
+			var data = {};
+			
+			var values = LanguageInput.getValues(this._fieldId);
+			if (values.size > 1) {
+				data[this._fieldId + '_i18n'] = values.toObject();
+			}
+			else {
+				data[this._fieldId] = values.get(0);
+			}
+			
+			return data;
+		},
+		
+		/**
+		 * @see	WoltLabSuite/Core/Form/Builder/Field/Field#destroy
+		 */
+		destroy: function() {
+			LanguageInput.unregister(this._fieldId);
+		}
+	});
+	
+	return FormBuilderFieldValueI18n;
+});
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Manager.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Manager.js
new file mode 100644
index 0000000000..550a32e66f
--- /dev/null
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Manager.js
@@ -0,0 +1,169 @@
+/**
+ * Manager for registered Ajax forms and its fields that can be used to retrieve the current data
+ * of the registered forms.
+ * 
+ * @author	Matthias Schmidt
+ * @copyright	2001-2019 WoltLab GmbH
+ * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @module	WoltLabSuite/Core/Form/Builder/Manager
+ * @since	5.2
+ */
+define([
+	'Core',
+	'Dictionary',
+	'./Field/Dependency/Manager',
+	'./Field/Field'
+], function(
+	Core,
+	Dictionary,
+	FormBuilderFieldDependencyManager,
+	FormBuilderField
+) {
+	"use strict";
+	
+	var _fields = new Dictionary();
+	var _forms = new Dictionary();
+	
+	return {
+		/**
+		 * Returns a promise returning the data of the form with the given id.
+		 * 
+		 * @param	{string}	formId
+		 * @return	{Promise}
+		 */
+		getData: function(formId) {
+			if (!this.hasForm(formId)) {
+				throw new Error("Unknown form with id '" + formId + "'.");
+			}
+			
+			var promises = [];
+			
+			_fields.get(formId).forEach(function(field) {
+				var fieldData = field.getData();
+				
+				if (!(fieldData instanceof Promise)) {
+					throw new TypeError("Data for field with id '" + field.getId() + "' is no promise.");
+				}
+				
+				promises.push(fieldData);
+			});
+			
+			return new Promise(function(resolve, reject) {
+				Promise.all(promises).then(function(promiseData) {
+					var data = {};
+					
+					for (var i = 0, length = promiseData.length; i < length; i++) {
+						data = Core.extend(data, promiseData[i]);
+					}
+					
+					resolve(data);
+				});
+			});
+		},
+		
+		/**
+		 * Returns the registered form with given id.
+		 * 
+		 * @param	{string}	formId
+		 * @return	{HTMLElement}
+		 */
+		getForm: function(formId) {
+			if (!this.hasForm(formId)) {
+				throw new Error("Unknown form with id '" + formId + "'.");
+			}
+			
+			return _forms.get(formId);
+		},
+		
+		/**
+		 * Returns `true` if a field with the given id has been registered for the form with
+		 * the given id and `false` otherwise.
+		 * 
+		 * @param	{string}	formId
+		 * @param	{string}	fieldId
+		 * @return	{boolean}
+		 */
+		hasField: function(formId, fieldId) {
+			if (!this.hasForm(formId)) {
+				throw new Error("Unknown form with id '" + formId + "'.");
+			}
+			
+			return _fields.get(formId).has(fieldId);
+		},
+		
+		/**
+		 * Returns `true` if a form with the given id has been registered and `false`
+		 * otherwise.
+		 * 
+		 * @param	{string}	formId
+		 * @return	{boolean}
+		 */
+		hasForm: function(formId) {
+			return _forms.has(formId);
+		},
+		
+		/**
+		 * Registers the given field for the form with the given id.
+		 * 
+		 * @param	{string}					formId
+		 * @param	{WoltLabSuite/Core/Form/Builder/Field/Field}	field
+		 */
+		registerField: function(formId, field) {
+			if (!this.hasForm(formId)) {
+				throw new Error("Unknown form with id '" + formId + "'.");
+			}
+			
+			if (!(field instanceof FormBuilderField)) {
+				throw new Error("Add field is no instance of 'WoltLabSuite/Core/Form/Builder/Field/Field'.");
+			}
+			
+			var fieldId = field.getId();
+			
+			if (this.hasField(formId, fieldId)) {
+				throw new Error("Form field with id '" + fieldId + "' has already been registered for form with id '" + fieldId + "'.");
+			}
+			
+			_fields.get(formId).set(fieldId, field);
+		},
+		
+		/**
+		 * Registers the form with the given id.
+		 * 
+		 * @param	{string}	formId
+		 */
+		registerForm: function(formId) {
+			if (this.hasForm(formId)) {
+				throw new Error("Form with id '" + formId + "' has already been registered.");
+			}
+			
+			var form = elById(formId);
+			if (form === null) {
+				throw new Error("Unknown form with id '" + formId + "'.");
+			}
+			
+			_forms.set(formId, form);
+			_fields.set(formId, new Dictionary());
+		},
+		
+		/**
+		 * Unregisters the form with the given id.
+		 * 
+		 * @param	{string}	formId
+		 */
+		unregisterForm: function(formId) {
+			if (!this.hasForm(formId)) {
+				throw new Error("Unknown form with id '" + formId + "'.");
+			}
+			
+			_forms.delete(formId);
+			
+			_fields.get(formId).forEach(function(field) {
+				field.destroy();
+			});
+			
+			_fields.delete(formId);
+			
+			FormBuilderFieldDependencyManager.unregister(formId);
+		}
+	};
+});
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Language/Input.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Language/Input.js
index 05595a9389..d0a0856dd4 100644
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Language/Input.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Language/Input.js
@@ -69,6 +69,21 @@ define(['Core', 'Dictionary', 'Language', 'ObjectMap', 'StringUtil', 'Dom/Traver
 			_elements.get(elementId).callbacks.set(eventName, callback);
 		},
 		
+		/**
+		 * Unregisters the element with the given id.
+		 * 
+		 * @param	{string}	elementId
+		 * @since	5.2
+		 */
+		unregister: function(elementId) {
+			if (!_values.has(elementId)) {
+				throw new Error("Unknown element id '" + elementId + "'.");
+			}
+			
+			_values.delete(elementId);
+			_elements.delete(elementId);
+		},
+		
 		/**
 		 * Caches common event listener callbacks.
 		 */
diff --git a/wcfsetup/install/files/lib/system/form/builder/DialogFormDocument.class.php b/wcfsetup/install/files/lib/system/form/builder/DialogFormDocument.class.php
index 781a0876f5..f9937a92f9 100644
--- a/wcfsetup/install/files/lib/system/form/builder/DialogFormDocument.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/DialogFormDocument.class.php
@@ -51,6 +51,8 @@ class DialogFormDocument extends FormDocument {
 	protected function createDefaultButton() {
 		parent::createDefaultButton();
 		
+		$this->getButtons()['submitButton']->attribute('data-type', 'submit');
+		
 		if ($this->isCancelable()) {
 			$this->addButton(
 				FormButton::create('cancelButton')
diff --git a/wcfsetup/install/files/lib/system/form/builder/FormDocument.class.php b/wcfsetup/install/files/lib/system/form/builder/FormDocument.class.php
index 34bca7cd0c..b6416492d7 100644
--- a/wcfsetup/install/files/lib/system/form/builder/FormDocument.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/FormDocument.class.php
@@ -151,7 +151,11 @@ class FormDocument implements IFormDocument {
 	 * @inheritDoc
 	 */
 	public function addButton(IFormButton $button) {
-		$this->buttons[] = $button;
+		if (isset($this->buttons[$button->getId()])) {
+			throw new \InvalidArgumentException("There is already button with id '{$button->getId()}'.");
+		}
+		
+		$this->buttons[$button->getId()] = $button;
 		
 		$button->parent($this);
 		
diff --git a/wcfsetup/install/files/lib/system/form/builder/field/AbstractFormField.class.php b/wcfsetup/install/files/lib/system/form/builder/field/AbstractFormField.class.php
index 3255efde56..738cb2960b 100644
--- a/wcfsetup/install/files/lib/system/form/builder/field/AbstractFormField.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/field/AbstractFormField.class.php
@@ -21,6 +21,12 @@ abstract class AbstractFormField implements IFormField {
 	use TFormChildNode;
 	use TFormElement;
 	
+	/**
+	 * name of the JavaScript data handler module used for Ajax dialogs
+	 * @var	null|string
+	 */
+	protected $javaScriptDataHandlerModule;
+	
 	/**
 	 * name of the object property this field represents
 	 * @var	null|string
@@ -98,7 +104,10 @@ abstract class AbstractFormField implements IFormField {
 		return WCF::getTPL()->fetch(
 			$this->templateName,
 			'wcf',
-			array_merge($this->getHtmlVariables(), ['field' => $this]),
+			array_merge($this->getHtmlVariables(), [
+				'field' => $this,
+				'javaScriptDataHandlerModule' => $this->javaScriptDataHandlerModule
+			]),
 			true
 		);
 	}
diff --git a/wcfsetup/install/files/lib/system/form/builder/field/AbstractNumericFormField.class.php b/wcfsetup/install/files/lib/system/form/builder/field/AbstractNumericFormField.class.php
index b6031142b0..85faf4972d 100644
--- a/wcfsetup/install/files/lib/system/form/builder/field/AbstractNumericFormField.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/field/AbstractNumericFormField.class.php
@@ -26,6 +26,11 @@ abstract class AbstractNumericFormField extends AbstractFormField implements IAu
 	 */
 	protected $integerValues = false;
 	
+	/**
+	 * @inheritDoc
+	 */
+	protected $javaScriptDataHandlerModule = 'WoltLabSuite/Core/Form/Builder/Field/Value';
+	
 	/**
 	 * step value for the input element
 	 * @var	null|number
diff --git a/wcfsetup/install/files/lib/system/form/builder/field/BooleanFormField.class.php b/wcfsetup/install/files/lib/system/form/builder/field/BooleanFormField.class.php
index 0c5d6f280f..665acba3f6 100644
--- a/wcfsetup/install/files/lib/system/form/builder/field/BooleanFormField.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/field/BooleanFormField.class.php
@@ -15,6 +15,11 @@ class BooleanFormField extends AbstractFormField implements IAutoFocusFormField,
 	use TAutoFocusFormField;
 	use TImmutableFormField;
 	
+	/**
+	 * @inheritDoc
+	 */
+	protected $javaScriptDataHandlerModule = 'WoltLabSuite/Core/Form/Builder/Field/Checked';
+	
 	/**
 	 * @inheritDoc
 	 */
diff --git a/wcfsetup/install/files/lib/system/form/builder/field/CaptchaFormField.class.php b/wcfsetup/install/files/lib/system/form/builder/field/CaptchaFormField.class.php
index 153ffac4d8..9b163d4c11 100644
--- a/wcfsetup/install/files/lib/system/form/builder/field/CaptchaFormField.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/field/CaptchaFormField.class.php
@@ -21,6 +21,11 @@ class CaptchaFormField extends AbstractFormField implements IObjectTypeFormNode
 		objectType as defaultObjectType;
 	}
 	
+	/**
+	 * @inheritDoc
+	 */
+	protected $javaScriptDataHandlerModule = 'WoltLabSuite/Core/Form/Builder/Field/Captcha';
+	
 	/**
 	 * @inheritDoc
 	 */
diff --git a/wcfsetup/install/files/lib/system/form/builder/field/DateFormField.class.php b/wcfsetup/install/files/lib/system/form/builder/field/DateFormField.class.php
index 13c13e6244..84dcbd2363 100644
--- a/wcfsetup/install/files/lib/system/form/builder/field/DateFormField.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/field/DateFormField.class.php
@@ -17,6 +17,11 @@ class DateFormField extends AbstractFormField implements IAutoFocusFormField, II
 	use TImmutableFormField;
 	use TNullableFormField;
 	
+	/**
+	 * @inheritDoc
+	 */
+	protected $javaScriptDataHandlerModule = 'WoltLabSuite/Core/Form/Builder/Field/Date';
+	
 	/**
 	 * date time format of the save value
 	 * @var	string
diff --git a/wcfsetup/install/files/lib/system/form/builder/field/IconFormField.class.php b/wcfsetup/install/files/lib/system/form/builder/field/IconFormField.class.php
index 11b76e03b5..3890b70d7a 100644
--- a/wcfsetup/install/files/lib/system/form/builder/field/IconFormField.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/field/IconFormField.class.php
@@ -15,6 +15,11 @@ use wcf\system\style\StyleHandler;
 class IconFormField extends AbstractFormField implements IImmutableFormField {
 	use TImmutableFormField;
 	
+	/**
+	 * @inheritDoc
+	 */
+	protected $javaScriptDataHandlerModule = 'WoltLabSuite/Core/Form/Builder/Field/Value';
+	
 	/**
 	 * @inheritDoc
 	 */
diff --git a/wcfsetup/install/files/lib/system/form/builder/field/ItemListFormField.class.php b/wcfsetup/install/files/lib/system/form/builder/field/ItemListFormField.class.php
index f0d7e5e03e..a98eede6c7 100644
--- a/wcfsetup/install/files/lib/system/form/builder/field/ItemListFormField.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/field/ItemListFormField.class.php
@@ -18,6 +18,11 @@ class ItemListFormField extends AbstractFormField implements IAutoFocusFormField
 	use TAutoFocusFormField;
 	use TImmutableFormField;
 	
+	/**
+	 * @inheritDoc
+	 */
+	protected $javaScriptDataHandlerModule = 'WoltLabSuite/Core/Form/Builder/Field/ItemList';
+	
 	/**
 	 * type of the returned save value (see `SAVE_VALUE_TYPE_*` constants)
 	 * @var	string
diff --git a/wcfsetup/install/files/lib/system/form/builder/field/MultipleSelectionFormField.class.php b/wcfsetup/install/files/lib/system/form/builder/field/MultipleSelectionFormField.class.php
index 59fc1e7f32..484fe87d79 100644
--- a/wcfsetup/install/files/lib/system/form/builder/field/MultipleSelectionFormField.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/field/MultipleSelectionFormField.class.php
@@ -16,6 +16,11 @@ class MultipleSelectionFormField extends AbstractFormField implements IFilterabl
 	use TImmutableFormField;
 	use TNullableFormField;
 	
+	/**
+	 * @inheritDoc
+	 */
+	protected $javaScriptDataHandlerModule = 'WoltLabSuite/Core/Form/Builder/Field/Checkboxes';
+	
 	/**
 	 * @inheritDoc
 	 */
diff --git a/wcfsetup/install/files/lib/system/form/builder/field/RadioButtonFormField.class.php b/wcfsetup/install/files/lib/system/form/builder/field/RadioButtonFormField.class.php
index 77ce5eca0a..00b022cc64 100644
--- a/wcfsetup/install/files/lib/system/form/builder/field/RadioButtonFormField.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/field/RadioButtonFormField.class.php
@@ -15,6 +15,11 @@ class RadioButtonFormField extends AbstractFormField implements IImmutableFormFi
 	use TImmutableFormField;
 	use TSelectionFormField;
 	
+	/**
+	 * @inheritDoc
+	 */
+	protected $javaScriptDataHandlerModule = 'WoltLabSuite/Core/Form/Builder/Field/RadioButton';
+	
 	/**
 	 * @inheritDoc
 	 */
diff --git a/wcfsetup/install/files/lib/system/form/builder/field/RatingFormField.class.php b/wcfsetup/install/files/lib/system/form/builder/field/RatingFormField.class.php
index f254f8cca5..999c43b6a6 100644
--- a/wcfsetup/install/files/lib/system/form/builder/field/RatingFormField.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/field/RatingFormField.class.php
@@ -46,6 +46,11 @@ class RatingFormField extends AbstractFormField implements IImmutableFormField,
 	 */
 	protected $defaultCssClasses = ['fa-star-o'];
 	
+	/**
+	 * @inheritDoc
+	 */
+	protected $javaScriptDataHandlerModule = 'WoltLabSuite/Core/Form/Builder/Field/Value';
+	
 	/**
 	 * @inheritDoc
 	 */
diff --git a/wcfsetup/install/files/lib/system/form/builder/field/SingleSelectionFormField.class.php b/wcfsetup/install/files/lib/system/form/builder/field/SingleSelectionFormField.class.php
index 04543c2a49..eb8540a37d 100644
--- a/wcfsetup/install/files/lib/system/form/builder/field/SingleSelectionFormField.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/field/SingleSelectionFormField.class.php
@@ -13,9 +13,16 @@ use wcf\system\form\builder\field\validation\FormFieldValidationError;
  */
 class SingleSelectionFormField extends AbstractFormField implements IImmutableFormField, IFilterableSelectionFormField, INullableFormField {
 	use TImmutableFormField;
-	use TFilterableSelectionFormField;
+	use TFilterableSelectionFormField {
+		filterable as protected traitFilterable;
+	}
 	use TNullableFormField;
 	
+	/**
+	 * @inheritDoc
+	 */
+	protected $javaScriptDataHandlerModule = 'WoltLabSuite/Core/Form/Builder/Field/Value';
+	
 	/**
 	 * @inheritDoc
 	 */
@@ -32,6 +39,20 @@ class SingleSelectionFormField extends AbstractFormField implements IImmutableFo
 		return parent::getSaveValue();
 	}
 	
+	/**
+	 * @inheritDoc
+	 */
+	public function filterable($filterable = true) {
+		if ($filterable) {
+			$this->javaScriptDataHandlerModule = 'WoltLabSuite/Core/Form/Builder/Field/RadioButton';
+		}
+		else {
+			$this->javaScriptDataHandlerModule = 'WoltLabSuite/Core/Form/Builder/Field/Value';
+		}
+		
+		return $this->traitFilterable($filterable);
+	}
+	
 	/**
 	 * @inheritDoc
 	 */
diff --git a/wcfsetup/install/files/lib/system/form/builder/field/TI18nFormField.class.php b/wcfsetup/install/files/lib/system/form/builder/field/TI18nFormField.class.php
index 7c4d6a2a36..6d26b67d44 100644
--- a/wcfsetup/install/files/lib/system/form/builder/field/TI18nFormField.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/field/TI18nFormField.class.php
@@ -43,6 +43,12 @@ trait TI18nFormField {
 	 */
 	protected $languageItemPattern;
 	
+	/**
+	 * name of the nin-i18n JavaScript data handler module used for Ajax dialogs
+	 * @var	null|string
+	 */
+	protected $nonI18nJavaScriptDataHandlerModule;
+	
 	/**
 	 * Returns additional template variables used to generate the html representation
 	 * of this node.
@@ -165,6 +171,16 @@ trait TI18nFormField {
 	 * @return	II18nFormField			this field
 	 */
 	public function i18n($i18n = true) {
+		if ($this->javaScriptDataHandlerModule) {
+			if ($this->isI18n() && !$i18n) {
+				$this->javaScriptDataHandlerModule = $this->nonI18nJavaScriptDataHandlerModule;
+			}
+			else if (!$this->isI18n() && $i18n) {
+				$this->nonI18nJavaScriptDataHandlerModule = $this->javaScriptDataHandlerModule;
+				$this->javaScriptDataHandlerModule = 'WoltLabSuite/Core/Form/Builder/Field/ValueI18n';
+			}
+		}
+		
 		$this->i18n = $i18n;
 		
 		return $this;
@@ -289,7 +305,7 @@ trait TI18nFormField {
 	 */
 	public function readValue() {
 		if ($this->isI18n()) {
-			I18nHandler::getInstance()->readValues();
+			I18nHandler::getInstance()->readValues($this->getDocument()->getRequestData());
 		}
 		else if ($this->getDocument()->hasRequestData($this->getPrefixedId())) {
 			$value = $this->getDocument()->getRequestData($this->getPrefixedId());
diff --git a/wcfsetup/install/files/lib/system/form/builder/field/TextFormField.class.php b/wcfsetup/install/files/lib/system/form/builder/field/TextFormField.class.php
index 39d4321909..ff2f58caae 100644
--- a/wcfsetup/install/files/lib/system/form/builder/field/TextFormField.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/field/TextFormField.class.php
@@ -23,6 +23,11 @@ class TextFormField extends AbstractFormField implements IAutoFocusFormField, II
 	use TMinimumLengthFormField;
 	use TPlaceholderFormField;
 	
+	/**
+	 * @inheritDoc
+	 */
+	protected $javaScriptDataHandlerModule = 'WoltLabSuite/Core/Form/Builder/Field/Value';
+	
 	/**
 	 * @inheritDoc
 	 */
diff --git a/wcfsetup/install/files/lib/system/form/builder/field/UploadFormField.class.php b/wcfsetup/install/files/lib/system/form/builder/field/UploadFormField.class.php
index 72b43c3800..c078d8aa4c 100644
--- a/wcfsetup/install/files/lib/system/form/builder/field/UploadFormField.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/field/UploadFormField.class.php
@@ -23,6 +23,11 @@ class UploadFormField extends AbstractFormField {
 	}
 	use TMinimumFormField;
 	
+	/**
+	 * @inheritDoc
+	 */
+	protected $javaScriptDataHandlerModule = 'WoltLabSuite/Core/Form/Builder/Field/Value';
+	
 	/**
 	 * This flag indicates whether only images can uploaded via this field.
 	 * <strong>Heads up:</strong> SVG images can contain bad code, therefore do not
diff --git a/wcfsetup/install/files/lib/system/form/builder/field/acl/simple/SimpleAclFormField.class.php b/wcfsetup/install/files/lib/system/form/builder/field/acl/simple/SimpleAclFormField.class.php
index 3d8d6c8ccd..f978359385 100644
--- a/wcfsetup/install/files/lib/system/form/builder/field/acl/simple/SimpleAclFormField.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/field/acl/simple/SimpleAclFormField.class.php
@@ -21,7 +21,12 @@ class SimpleAclFormField extends AbstractFormField {
 	/**
 	 * @inheritDoc
 	 */
-	protected $templateName = 'aclSimple';
+	protected $javaScriptDataHandlerModule = 'WoltLabSuite/Core/Form/Builder/Field/SimpleAcl';
+	
+	/**
+	 * @inheritDoc
+	 */
+	protected $templateName = '__simpleAclFormField';
 	
 	/**
 	 * @inheritDoc
diff --git a/wcfsetup/install/files/lib/system/form/builder/field/label/LabelFormField.class.php b/wcfsetup/install/files/lib/system/form/builder/field/label/LabelFormField.class.php
index 370715683e..c9392315f2 100644
--- a/wcfsetup/install/files/lib/system/form/builder/field/label/LabelFormField.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/field/label/LabelFormField.class.php
@@ -23,6 +23,11 @@ use wcf\system\label\LabelHandler;
 class LabelFormField extends AbstractFormField implements IObjectTypeFormNode {
 	use TObjectTypeFormNode;
 	
+	/**
+	 * @inheritDoc
+	 */
+	protected $javaScriptDataHandlerModule = 'WoltLabSuite/Core/Form/Builder/Field/Value';
+	
 	/**
 	 * label group whose labels can be selected via this form field
 	 * @var	ViewableLabelGroup
diff --git a/wcfsetup/install/files/lib/system/form/builder/field/tag/TagFormField.class.php b/wcfsetup/install/files/lib/system/form/builder/field/tag/TagFormField.class.php
index 25be285577..7cb5323b0b 100644
--- a/wcfsetup/install/files/lib/system/form/builder/field/tag/TagFormField.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/field/tag/TagFormField.class.php
@@ -28,6 +28,11 @@ class TagFormField extends AbstractFormField implements IObjectTypeFormNode {
 	use TDefaultIdFormField;
 	use TObjectTypeFormNode;
 	
+	/**
+	 * @inheritDoc
+	 */
+	protected $javaScriptDataHandlerModule = 'WoltLabSuite/Core/Form/Builder/Field/Tag';
+	
 	/**
 	 * @inheritDoc
 	 */
diff --git a/wcfsetup/install/files/lib/system/form/builder/field/user/UserFormField.class.php b/wcfsetup/install/files/lib/system/form/builder/field/user/UserFormField.class.php
index 7950deb002..fe086e60be 100644
--- a/wcfsetup/install/files/lib/system/form/builder/field/user/UserFormField.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/field/user/UserFormField.class.php
@@ -29,6 +29,11 @@ class UserFormField extends AbstractFormField implements IAutoFocusFormField, II
 	use TMultipleFormField;
 	use TNullableFormField;
 	
+	/**
+	 * @inheritDoc
+	 */
+	protected $javaScriptDataHandlerModule = 'WoltLabSuite/Core/Form/Builder/Field/User';
+	
 	/**
 	 * @inheritDoc
 	 */
diff --git a/wcfsetup/install/files/lib/system/form/builder/field/user/UsernameFormField.class.php b/wcfsetup/install/files/lib/system/form/builder/field/user/UsernameFormField.class.php
index a45ecc4023..90e73faa8b 100644
--- a/wcfsetup/install/files/lib/system/form/builder/field/user/UsernameFormField.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/field/user/UsernameFormField.class.php
@@ -39,6 +39,11 @@ class UsernameFormField extends AbstractFormField implements IAutoFocusFormField
 	use TNullableFormField;
 	use TPlaceholderFormField;
 	
+	/**
+	 * @inheritDoc
+	 */
+	protected $javaScriptDataHandlerModule = 'WoltLabSuite/Core/Form/Builder/Field/Value';
+	
 	/**
 	 * @inheritDoc
 	 */
diff --git a/wcfsetup/install/files/lib/system/form/builder/field/wysiwyg/WysiwygFormField.class.php b/wcfsetup/install/files/lib/system/form/builder/field/wysiwyg/WysiwygFormField.class.php
index 5c2e880e0c..6f7c729acb 100644
--- a/wcfsetup/install/files/lib/system/form/builder/field/wysiwyg/WysiwygFormField.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/field/wysiwyg/WysiwygFormField.class.php
@@ -337,7 +337,7 @@ class WysiwygFormField extends AbstractFormField implements IMaximumLengthFormFi
 	 * @return	boolean
 	 */
 	public function supportsQuotes() {
-		return $this->supportQuotes !== null;
+		return $this->supportQuotes;
 	}
 	
 	/**
diff --git a/wcfsetup/install/files/lib/system/language/I18nHandler.class.php b/wcfsetup/install/files/lib/system/language/I18nHandler.class.php
index eef3c37a39..4bd4dd3a80 100644
--- a/wcfsetup/install/files/lib/system/language/I18nHandler.class.php
+++ b/wcfsetup/install/files/lib/system/language/I18nHandler.class.php
@@ -95,19 +95,23 @@ class I18nHandler extends SingletonFactory {
 	/**
 	 * Reads plain and i18n values from request data.
 	 */
-	public function readValues() {
+	public function readValues(array $requestData = null) {
+		if ($requestData === null) {
+			$requestData = $_POST;
+		}
+		
 		foreach ($this->elementIDs as $elementID) {
-			if (isset($_POST[$elementID])) {
+			if (isset($requestData[$elementID])) {
 				// you should trim the string before using it; prevents unwanted newlines
-				$this->plainValues[$elementID] = StringUtil::unifyNewlines(StringUtil::trim($_POST[$elementID]));
+				$this->plainValues[$elementID] = StringUtil::unifyNewlines(StringUtil::trim($requestData[$elementID]));
 				continue;
 			}
 			
 			$i18nElementID = $elementID . '_i18n';
-			if (isset($_POST[$i18nElementID]) && is_array($_POST[$i18nElementID])) {
+			if (isset($requestData[$i18nElementID]) && is_array($requestData[$i18nElementID])) {
 				$this->i18nValues[$elementID] = [];
 				
-				foreach ($_POST[$i18nElementID] as $languageID => $value) {
+				foreach ($requestData[$i18nElementID] as $languageID => $value) {
 					$this->i18nValues[$elementID][$languageID] = StringUtil::unifyNewlines(StringUtil::trim($value));
 				}
 				
-- 
2.20.1