lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX #yogosha12673

Browse Source
This commit is contained in:
Laurent Destailleur 2022-10-20 16:53:18 +02:00
parent 56892e32e8
commit 8c9e5dda1b
1 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
htdocs/user/passwordforgotten.php
View File

@ -128,41 +128,34 @@ if (empty($reshook)) {
$result = $edituser->fetch('', '', '', 1, -1, $username); $result = $edituser->fetch('', '', '', 1, -1, $username);
} }
// Set the message to show (must be the same if login/email exists or not
// to avoid to guess them.
$messagewarning = '<div class="warning paddingtopbottom'.(empty($conf->global->MAIN_LOGIN_BACKGROUND) ? '' : ' backgroundsemitransparent boxshadow').'">';
if (!$isanemail) {
$messagewarning .= $langs->trans("IfLoginExistPasswordRequestSent");
} else {
$messagewarning .= $langs->trans("IfEmailExistPasswordRequestSent");
}
$messagewarning .= '</div>';
if ($result <= 0 && $edituser->error == 'USERNOTFOUND') { if ($result <= 0 && $edituser->error == 'USERNOTFOUND') {
$message = '<div class="warning paddingtopbottom'.(empty($conf->global->MAIN_LOGIN_BACKGROUND) ? '' : ' backgroundsemitransparent boxshadow').'">'; $message .= $messagewarning;
if (!$isanemail) {
$message .= $langs->trans("IfLoginExistPasswordRequestSent");
} else {
$message .= $langs->trans("IfEmailExistPasswordRequestSent");
}
$message .= '</div>';
$username = ''; $username = '';
} else { } else {
if (!$edituser->email) { if (empty($edituser->email)) {
//$message = '<div class="error">'.$langs->trans("ErrorLoginHasNoEmail").'</div>'; $message .= $messagewarning;
if (!$isanemail) {
$message .= $langs->trans("IfLoginExistPasswordRequestSent");
} else {
$message .= $langs->trans("IfEmailExistPasswordRequestSent");
}
} else { } else {
$newpassword = $edituser->setPassword($user, '', 1); $newpassword = $edituser->setPassword($user, '', 1);
if ($newpassword < 0) { if ($newpassword < 0) {
// Failed // Technical failure
$message = '<div class="error">'.$langs->trans("ErrorFailedToChangePassword").'</div>'; $message = '<div class="error">'.$langs->trans("ErrorFailedToChangePassword").'</div>';
} else { } else {
// Success // Success
if ($edituser->send_password($user, $newpassword, 1) > 0) { if ($edituser->send_password($user, $newpassword, 1) > 0) {
$message = '<div class="warning paddingtopbottom'.(empty($conf->global->MAIN_LOGIN_BACKGROUND) ? '' : ' backgroundsemitransparent boxshadow').'">'; $message .= $messagewarning;
if (!$isanemail) {
$message .= $langs->trans("IfLoginExistPasswordRequestSent");
} else {
$message .= $langs->trans("IfEmailExistPasswordRequestSent");
}
//$message .= $langs->trans("PasswordChangeRequestSent", $edituser->login, dolObfuscateEmail($edituser->email));
$message .= '</div>';
$username = ''; $username = '';
} else { } else {
// Technical failure
$message .= '<div class="error">'.$edituser->error.'</div>'; $message .= '<div class="error">'.$edituser->error.'</div>';
} }
} }