composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

n°524 - password policy

Browse Source 
bugfix : Enter Password phrase no more lack the userName and is properly displayed
This commit is contained in:
bruno DA SILVA
2019-12-05 09:54:27 +01:00
parent b5b4d70c2d
commit 490eda4f4a
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/loginwebpage.class.inc.php
View File

@@ -267,6 +267,7 @@ class LoginWebPage extends NiceWebPage
else
{
$aVars['bNoUser'] = false;
$aVars['sUserName'] = $oUser->GetFriendlyName();
$oEncryptedToken = $oUser->Get('reset_pwd_token');
if (!$oEncryptedToken->CheckPassword($sToken))
@@ -276,7 +277,6 @@ class LoginWebPage extends NiceWebPage
else
{
$aVars['bBadToken'] = false;
$aVars['sUserName'] = $oUser->GetFriendlyName();
}
}

5
templates/login/password/resetpwdform.html.twig
View File

@@ -12,10 +12,13 @@
{% elseif bBadToken and sErrorMessage is null %}
<p>{{ 'UI:ResetPwd-Error-InvalidToken'|dict_s }}</p>
{% else %}
{% if sUserName is not empty %}
<p>{{ 'UI:ResetPwd-Error-EnterPassword'|dict_format(sUserName) }}</p>
{% endif %}
{% if sErrorMessage is not null %}
<p class="hilite">{{ sErrorMessage|raw }}</p>
{% endif %}
<p>{{ 'UI:ResetPwd-Error-EnterPassword'|dict_format(sUserName) }}</p>
</div>
<div id="login-form">
<form method="post">