composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-17 06:18:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°6357 - Prevent entering same password on change user password

Browse Source
This commit is contained in:
Eric Espie
2023-05-31 17:12:26 +02:00
parent 5e3b813da7
commit 3e7c48d5c6
4 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
datamodels/2.x/itop-portal-base/portal/src/Form/PasswordFormManager.php
View File

@@ -142,6 +142,11 @@ class PasswordFormManager extends FormManager
$aData['valid'] = false;
$aData['messages']['error'] += array('confirm_password' => array(Dict::S('UI:Login:RetypePwdDoesNotMatch')));
}
elseif ($sNewPassword === $sOldPassword)
{
$aData['valid'] = false;
$aData['messages']['error'] += array('new_password' => array(Dict::S('UI:Login:PasswordNotChanged')));
}
else
{
try {

1
dictionaries/en.dictionary.itop.ui.php
View File

@@ -631,6 +631,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
'UI:LogOff:ClickHereToLoginAgain' => 'Click here to login again...',
'UI:ChangePwdMenu' => 'Change Password...',
'UI:Login:PasswordChanged' => 'Password successfully set!',
'UI:Login:PasswordNotChanged' => 'Error Password is the same!',
'UI:AccessRO-All' => ITOP_APPLICATION.' is read-only',
'UI:AccessRO-Users' => ITOP_APPLICATION.' is read-only for end-users',
'UI:ApplicationEnvironment' => 'Application environment: %1$s',

1
dictionaries/fr.dictionary.itop.ui.php
View File

@@ -575,6 +575,7 @@ Nous espérons que vous aimerez cette version autant que nous avons eu du plaisi
'UI:LogOff:ClickHereToLoginAgain' => 'Cliquez ici pour vous reconnecter...',
'UI:ChangePwdMenu' => 'Changer de mot de passe...',
'UI:Login:PasswordChanged' => 'Mot de passe mis à jour !',
'UI:Login:PasswordNotChanged' => 'Erreur : le mot de passe est identique !',
'UI:AccessRO-All' => ITOP_APPLICATION_SHORT.' est en lecture seule',
'UI:AccessRO-Users' => ITOP_APPLICATION_SHORT.' est en lecture seule pour les utilisateurs finaux',
'UI:ApplicationEnvironment' => 'Environnement applicatif: %1$s',

7
templates/pages/login/password/changepwdform.js.twig
View File

@@ -8,11 +8,16 @@ function GoBack()
function DoCheckPwd()
{
if ($('#new_pwd').val() != $('#retype_new_pwd').val())
var new_pwd = $('#new_pwd').val();
if (new_pwd !== $('#retype_new_pwd').val())
{
alert('{{ 'UI:Login:RetypePwdDoesNotMatch'|dict_s }}');
return false;
}
if (new_pwd === $('#old_pwd').val()) {
alert('{{ 'UI:Login:PasswordNotChanged'|dict_s }}');
return false;
}
return true;
}