tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-11161-campo-innecesario-y-no-solicitado-al-cambiar-contrasena-de-usuario-3-errores-distintos' into 'develop' 

Ent 11161 campo innecesario y no solicitado al cambiar contrasena de usuario 3 errores distintos

See merge request artica/pandorafms!5887
This commit is contained in:
Diego Muñoz-Reja 2023-07-11 07:56:21 +00:00
parent 93ec27179c 3001cc90ce
commit 3c3889e343
3 changed files with 41 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pandora_console/godmode/users/configure_user.php
View File

@ -683,11 +683,12 @@ if ($update_user) {
$password_new = (string) get_parameter('password_new', '');
$password_confirm = (string) get_parameter('password_confirm', '');
$own_password_confirm = (string) get_parameter('own_password_confirm', '');
$id_user = (string) get_parameter('id_user', '');
if ($password_new != '') {
$correct_password = false;
$user_credentials_check = process_user_login($config['id_user'], $own_password_confirm, true);
$user_credentials_check = process_user_login($id_user, $own_password_confirm, true);
if ($user_credentials_check !== false) {
$correct_password = true;

54
pandora_console/godmode/users/user_management.php
View File

@ -302,25 +302,45 @@ $passwordManageTable->data['fields_repeatpassword'][0] = html_print_input_text_e
true
);
if ($new_user === false) {
if ($new_user === false && users_is_admin() === false) {
$passwordManageTable->data['captions_currentpassword'][0] = __('Current password');
$passwordManageTable->rowclass['fields_currentpassword'] = 'w540px';
$passwordManageTable->data['fields_currentpassword'][0] = html_print_input_text_extended(
'own_password_confirm',
'',
'own_password_confirm',
'',
'20',
'150',
$view_mode,
'',
[
'class' => 'input w100p',
'placeholder' => __('Own password confirmation'),
],
true,
true
);
if ($user_info['id_user'] === $config['id_user']) {
$passwordManageTable->data['fields_currentpassword'][0] = html_print_input_text_extended(
'own_password_confirm',
'',
'own_password_confirm',
'',
'20',
'45',
$view_mode,
'',
[
'class' => 'input w100p',
'placeholder' => __('Own password confirmation'),
],
true,
true
);
} else {
$passwordManageTable->data['fields_currentpassword'][0] = html_print_input_text_extended(
'own_password_confirm',
'',
'own_password_confirm',
'',
'20',
'45',
$view_mode,
'',
[
'class' => 'input w100p',
'placeholder' => __('Third user password confirmation'),
],
true,
true
);
}
}
$userManagementTable->data['passwordManage_table'] = html_print_table($passwordManageTable, true);

4
pandora_console/include/styles/pandora.css
View File

@ -11662,8 +11662,8 @@ p.trademark-copyright {
}
.show-hide-pass {
position: absolute;
right: 12px;
position: relative;
right: 40px;
top: 4px;
border: 0;
outline: none;