Skip to content

Migrate login form to a form builder form #6139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BurntimeX merged 2 commits into from
Dec 18, 2024
Merged

Migrate login form to a form builder form #6139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9af3a0a
Migrate login form to a form builder form
BurntimeX Dec 7, 2024
720c312
Simplified the login logic for the email fallback
dtdesign Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 1 addition & 62 deletions com.woltlab.wcf/templates/login.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,67 +8,6 @@
<woltlab-core-notice type="info">{lang}wcf.user.login.forceLogin{/lang}</woltlab-core-notice>
{/if}

{if !$errorField|empty && $errorField == 'cookie'}
<woltlab-core-notice type="error">{lang}wcf.user.login.error.cookieRequired{/lang}</woltlab-core-notice>
{else}
{include file='shared_formError'}
{/if}

<form id="loginForm" method="post" action="{$loginController}">
<dl{if $errorField == 'username'} class="formError"{/if}>
<dt>
<label for="username">{lang}wcf.user.usernameOrEmail{/lang}</label> <span class="formFieldRequired">*</span>
</dt>
<dd>
<input type="text" id="username" name="username" value="{$username}" required autofocus class="long" autocomplete="username">
{if $errorField == 'username'}
<small class="innerError">
{if $errorType == 'empty'}
{lang}wcf.global.form.error.empty{/lang}
{else}
{lang}wcf.user.username.error.{@$errorType}{/lang}
{/if}
</small>
{/if}
</dd>
</dl>

<dl{if $errorField == 'password'} class="formError"{/if}>
<dt>
<label for="password">{lang}wcf.user.password{/lang}</label> <span class="formFieldRequired">*</span>
</dt>
<dd>
<input type="password" id="password" name="password" value="{$password}" required class="long" autocomplete="current-password">
{if $errorField == 'password'}
<small class="innerError">
{if $errorType == 'empty'}
{lang}wcf.global.form.error.empty{/lang}
{else}
{lang}wcf.user.password.error.{@$errorType}{/lang}
{/if}
</small>
{/if}
{if $__userAuthConfig->canChangePassword}
<small><a href="{link controller='LostPassword'}{/link}">{lang}wcf.user.lostPassword{/lang}</a></small>
{/if}
</dd>
</dl>

{event name='fields'}

{include file='shared_captcha' supportsAsyncCaptcha=true}

<div class="formSubmit">
<input type="submit" value="{lang}wcf.user.button.login{/lang}" accesskey="s">
{csrfToken}
</div>

{include file='thirdPartySsoButtons'}
</form>

<p class="formFieldRequiredNotice">
<span class="formFieldRequired">*</span>
{lang}wcf.global.form.required{/lang}
</p>
{unsafe:$form->getHtml()}

{include file='authFlowFooter'}
56 changes: 1 addition & 55 deletions wcfsetup/install/files/acp/templates/login.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,60 +6,6 @@
</div>
</header>

{if !$errorField|empty && $errorField == 'cookie'}
<woltlab-core-notice type="error">{lang}wcf.user.login.error.cookieRequired{/lang}</woltlab-core-notice>
{else}
{include file='shared_formError'}
{/if}

<form id="loginForm" method="post" action="{$loginController}">
<dl{if $errorField == 'username'} class="formError"{/if}>
<dt>
<label for="username">{lang}wcf.user.usernameOrEmail{/lang}</label> <span class="formFieldRequired">*</span>
</dt>
<dd>
<input type="text" id="username" name="username" value="{$username}" required autofocus class="long" autocomplete="username">
{if $errorField == 'username'}
<small class="innerError">
{if $errorType == 'empty'}
{lang}wcf.global.form.error.empty{/lang}
{else}
{lang}wcf.user.username.error.{@$errorType}{/lang}
{/if}
</small>
{/if}
</dd>
</dl>

<dl{if $errorField == 'password'} class="formError"{/if}>
<dt>
<label for="password">{lang}wcf.user.password{/lang}</label> <span class="formFieldRequired">*</span>
</dt>
<dd>
<input type="password" id="password" name="password" value="{$password}" required class="long" autocomplete="current-password">
{if $errorField == 'password'}
<small class="innerError">
{if $errorType == 'empty'}
{lang}wcf.global.form.error.empty{/lang}
{else}
{lang}wcf.user.password.error.{@$errorType}{/lang}
{/if}
</small>
{/if}
</dd>
</dl>

{include file='shared_captcha' supportsAsyncCaptcha=true}

<div class="formSubmit">
<input type="submit" value="{lang}wcf.user.button.login{/lang}" accesskey="s">
{csrfToken}
</div>
</form>

<p class="formFieldRequiredNotice">
<span class="formFieldRequired">*</span>
{lang}wcf.global.form.required{/lang}
</p>
{unsafe:$form->getHtml()}

{include file='footer'}
Loading