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

---
 .../templates/__userPasswordFormField.tpl           |  1 +
 .../files/acp/templates/__userPasswordFormField.tpl |  1 +
 .../builder/field/user/UserPasswordField.class.php  | 13 ++++++++++++-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/com.woltlab.wcf/templates/__userPasswordFormField.tpl b/com.woltlab.wcf/templates/__userPasswordFormField.tpl
index 23fe7f1f76..a0a4594f1b 100644
--- a/com.woltlab.wcf/templates/__userPasswordFormField.tpl
+++ b/com.woltlab.wcf/templates/__userPasswordFormField.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->getPlaceholder() !== null} placeholder="{$field->getPlaceholder()}"{/if}{*
diff --git a/wcfsetup/install/files/acp/templates/__userPasswordFormField.tpl b/wcfsetup/install/files/acp/templates/__userPasswordFormField.tpl
index 23fe7f1f76..a0a4594f1b 100644
--- a/wcfsetup/install/files/acp/templates/__userPasswordFormField.tpl
+++ b/wcfsetup/install/files/acp/templates/__userPasswordFormField.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->getPlaceholder() !== null} placeholder="{$field->getPlaceholder()}"{/if}{*
diff --git a/wcfsetup/install/files/lib/system/form/builder/field/user/UserPasswordField.class.php b/wcfsetup/install/files/lib/system/form/builder/field/user/UserPasswordField.class.php
index 0dab0ed072..669b068b55 100644
--- a/wcfsetup/install/files/lib/system/form/builder/field/user/UserPasswordField.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/field/user/UserPasswordField.class.php
@@ -1,8 +1,10 @@
 <?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\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\TPlaceholderFormField;
@@ -22,7 +24,8 @@ use wcf\system\WCF;
  * @package     WoltLabSuite\Core\System\Form\Builder\Field\User
  * @since       5.4
  */
-class UserPasswordField extends AbstractFormField implements IAutoFocusFormField, IPlaceholderFormField {
+class UserPasswordField extends AbstractFormField implements IAutoCompleteFormField, IAutoFocusFormField, IPlaceholderFormField {
+	use TAutoCompleteFormField;
 	use TAutoFocusFormField;
 	use TDefaultIdFormField;
 	use TPlaceholderFormField;
@@ -51,6 +54,14 @@ class UserPasswordField extends AbstractFormField implements IAutoFocusFormField
 		return 'password';
 	}
 	
+	/**
+	 * @inheritDoc
+	 * @since       5.4
+	 */
+	protected function getValidAutoCompleteTokens(): array {
+		return ['current-password'];
+	}
+	
 	/**
 	 * @inheritDoc
 	 */
-- 
2.20.1