From 1dc1e260d4c91e4d888dccd3dd09358bbc188e25 Mon Sep 17 00:00:00 2001
From: Matthias Schmidt <gravatronics@live.com>
Date: Sat, 19 Dec 2020 13:16:33 +0100
Subject: [PATCH] Add autocomplete support for username form field

---
 com.woltlab.wcf/templates/__usernameFormField.tpl   |  1 +
 .../files/acp/templates/__usernameFormField.tpl     |  1 +
 .../builder/field/user/UsernameFormField.class.php  | 13 ++++++++++++-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/com.woltlab.wcf/templates/__usernameFormField.tpl b/com.woltlab.wcf/templates/__usernameFormField.tpl
index 4df1dfda16..63dc44d048 100644
--- a/com.woltlab.wcf/templates/__usernameFormField.tpl
+++ b/com.woltlab.wcf/templates/__usernameFormField.tpl
@@ -3,6 +3,7 @@
 	*}name="{@$field->getPrefixedId()}" {*
 	*}value="{$field->getValue()}" {*
 	*}class="long"{*
+	*}{if $field->getAutoComplete() !== null} autocomplete="{$field->getAutoComplete()}"{/if}{*
 	*}{if $field->isAutofocused()} autofocus{/if}{*
 	*}{if $field->isRequired()} required{/if}{*
 	*}{if $field->isImmutable()} disabled{/if}{*
diff --git a/wcfsetup/install/files/acp/templates/__usernameFormField.tpl b/wcfsetup/install/files/acp/templates/__usernameFormField.tpl
index 4df1dfda16..63dc44d048 100644
--- a/wcfsetup/install/files/acp/templates/__usernameFormField.tpl
+++ b/wcfsetup/install/files/acp/templates/__usernameFormField.tpl
@@ -3,6 +3,7 @@
 	*}name="{@$field->getPrefixedId()}" {*
 	*}value="{$field->getValue()}" {*
 	*}class="long"{*
+	*}{if $field->getAutoComplete() !== null} autocomplete="{$field->getAutoComplete()}"{/if}{*
 	*}{if $field->isAutofocused()} autofocus{/if}{*
 	*}{if $field->isRequired()} required{/if}{*
 	*}{if $field->isImmutable()} disabled{/if}{*
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 90e73faa8b..b13a86d8d4 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
@@ -1,12 +1,14 @@
 <?php
 namespace wcf\system\form\builder\field\user;
 use wcf\system\form\builder\field\AbstractFormField;
+use wcf\system\form\builder\field\IAutoCompleteFormField;
 use wcf\system\form\builder\field\IAutoFocusFormField;
 use wcf\system\form\builder\field\IImmutableFormField;
 use wcf\system\form\builder\field\IMaximumLengthFormField;
 use wcf\system\form\builder\field\IMinimumLengthFormField;
 use wcf\system\form\builder\field\INullableFormField;
 use wcf\system\form\builder\field\IPlaceholderFormField;
+use wcf\system\form\builder\field\TAutoCompleteFormField;
 use wcf\system\form\builder\field\TAutoFocusFormField;
 use wcf\system\form\builder\field\TDefaultIdFormField;
 use wcf\system\form\builder\field\TImmutableFormField;
@@ -30,7 +32,8 @@ use wcf\util\UserUtil;
  * @package	WoltLabSuite\Core\System\Form\Builder\Field\User
  * @since	5.2
  */
-class UsernameFormField extends AbstractFormField implements IAutoFocusFormField, IImmutableFormField, IMaximumLengthFormField, IMinimumLengthFormField, INullableFormField, IPlaceholderFormField {
+class UsernameFormField extends AbstractFormField implements IAutoCompleteFormField, IAutoFocusFormField, IImmutableFormField, IMaximumLengthFormField, IMinimumLengthFormField, INullableFormField, IPlaceholderFormField {
+	use TAutoCompleteFormField;
 	use TAutoFocusFormField;
 	use TDefaultIdFormField;
 	use TImmutableFormField;
@@ -58,6 +61,14 @@ class UsernameFormField extends AbstractFormField implements IAutoFocusFormField
 		$this->minimumLength(3);
 	}
 	
+	/**
+	 * @inheritDoc
+	 * @since       5.4
+	 */
+	protected function getValidAutoCompleteTokens(): array {
+		return ['username'];
+	}
+	
 	/**
 	 * @inheritDoc
 	 */
-- 
2.20.1