From dff8bd9d46532613d1ee2ae3b63da33ae971a07e Mon Sep 17 00:00:00 2001 From: Matthias Schmidt Date: Wed, 23 Dec 2020 16:16:16 +0100 Subject: [PATCH] Use `size` field attribute in `multifactor\email\CodeFormField` --- .../templates/__multifactorEmailCodeField.tpl | 17 ----------------- .../templates/__multifactorEmailCodeField.tpl | 17 ----------------- .../multifactor/email/CodeFormField.class.php | 6 +----- 3 files changed, 1 insertion(+), 39 deletions(-) delete mode 100644 com.woltlab.wcf/templates/__multifactorEmailCodeField.tpl delete mode 100644 wcfsetup/install/files/acp/templates/__multifactorEmailCodeField.tpl diff --git a/com.woltlab.wcf/templates/__multifactorEmailCodeField.tpl b/com.woltlab.wcf/templates/__multifactorEmailCodeField.tpl deleted file mode 100644 index d2173c2b17..0000000000 --- a/com.woltlab.wcf/templates/__multifactorEmailCodeField.tpl +++ /dev/null @@ -1,17 +0,0 @@ -getFieldClasses()|empty}class="{implode from=$field->getFieldClasses() item='class' glue=' '}{$class}{/implode}" {/if}{* - *}{if $field->getMaximumLength() !== null}size="{$field->getMaximumLength()}" {/if}{* - *}{if $field->getInputMode() !== null} inputmode="{$field->getInputMode()}"{/if}{* - *}{if $field->getAutoComplete() !== null} autocomplete="{$field->getAutoComplete()}"{/if}{* - *}{if $field->getPattern() !== null} pattern="{$field->getPattern()}"{/if}{* - *}{if $field->isAutofocused()} autofocus{/if}{* - *}{if $field->isRequired()} required{/if}{* - *}{if $field->isImmutable()} disabled{/if}{* - *}{if $field->getMinimumLength() !== null} minlength="{$field->getMinimumLength()}"{/if}{* - *}{if $field->getMaximumLength() !== null} maxlength="{$field->getMaximumLength()}"{/if}{* - *}{if $field->getPlaceholder() !== null} placeholder="{$field->getPlaceholder()}"{/if}{* - *}{if $field->getDocument()->isAjax()} data-dialog-submit-on-enter="true"{/if}{* -*}> diff --git a/wcfsetup/install/files/acp/templates/__multifactorEmailCodeField.tpl b/wcfsetup/install/files/acp/templates/__multifactorEmailCodeField.tpl deleted file mode 100644 index d2173c2b17..0000000000 --- a/wcfsetup/install/files/acp/templates/__multifactorEmailCodeField.tpl +++ /dev/null @@ -1,17 +0,0 @@ -getFieldClasses()|empty}class="{implode from=$field->getFieldClasses() item='class' glue=' '}{$class}{/implode}" {/if}{* - *}{if $field->getMaximumLength() !== null}size="{$field->getMaximumLength()}" {/if}{* - *}{if $field->getInputMode() !== null} inputmode="{$field->getInputMode()}"{/if}{* - *}{if $field->getAutoComplete() !== null} autocomplete="{$field->getAutoComplete()}"{/if}{* - *}{if $field->getPattern() !== null} pattern="{$field->getPattern()}"{/if}{* - *}{if $field->isAutofocused()} autofocus{/if}{* - *}{if $field->isRequired()} required{/if}{* - *}{if $field->isImmutable()} disabled{/if}{* - *}{if $field->getMinimumLength() !== null} minlength="{$field->getMinimumLength()}"{/if}{* - *}{if $field->getMaximumLength() !== null} maxlength="{$field->getMaximumLength()}"{/if}{* - *}{if $field->getPlaceholder() !== null} placeholder="{$field->getPlaceholder()}"{/if}{* - *}{if $field->getDocument()->isAjax()} data-dialog-submit-on-enter="true"{/if}{* -*}> diff --git a/wcfsetup/install/files/lib/system/user/multifactor/email/CodeFormField.class.php b/wcfsetup/install/files/lib/system/user/multifactor/email/CodeFormField.class.php index b91d017d0d..ab9ce933e3 100644 --- a/wcfsetup/install/files/lib/system/user/multifactor/email/CodeFormField.class.php +++ b/wcfsetup/install/files/lib/system/user/multifactor/email/CodeFormField.class.php @@ -17,14 +17,10 @@ use wcf\system\user\multifactor\Helper; class CodeFormField extends TextFormField { use TDefaultIdFormField; - /** - * @inheritDoc - */ - protected $templateName = '__multifactorEmailCodeField'; - public function __construct() { $this->minimumLength(EmailMultifactorMethod::LENGTH); $this->maximumLength(EmailMultifactorMethod::LENGTH); + $this->fieldAttribute('size', EmailMultifactorMethod::LENGTH); $this->addFieldClass('multifactorEmailCode'); $this->autoComplete('off'); $this->inputMode('numeric'); -- 2.20.1