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 13:58:59 +02:00
parent ae845fccc5
commit 2aea86dc8c
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/langs/en_US/users.lang
View File

@ -47,7 +47,7 @@ RemoveFromGroup=Remove from group
PasswordChangedAndSentTo=Password changed and sent to <b>%s</b>.
PasswordChangeRequest=Request to change password for <b>%s</b>
PasswordChangeRequestSent=Request to change password for <b>%s</b> sent to <b>%s</b>.
IfLoginExistPasswordRequestSent=If this login is a valid account, an email to reset password has been sent.
IfLoginExistPasswordRequestSent=If this login is a valid account (with a valid email), an email to reset password has been sent.
IfEmailExistPasswordRequestSent=If this email is a valid account, an email to reset password has been sent.
ConfirmPasswordReset=Confirm password reset
MenuUsersAndGroups=Users & Groups

7
htdocs/user/passwordforgotten.php
View File

@ -139,7 +139,12 @@ if (empty($reshook)) {
$username = '';
} else {
if (!$edituser->email) {
$message = '<div class="error">'.$langs->trans("ErrorLoginHasNoEmail").'</div>';
//$message = '<div class="error">'.$langs->trans("ErrorLoginHasNoEmail").'</div>';
if (!$isanemail) {
$message .= $langs->trans("IfLoginExistPasswordRequestSent");
} else {
$message .= $langs->trans("IfEmailExistPasswordRequestSent");
}
} else {
$newpassword = $edituser->setPassword($user, '', 1);
if ($newpassword < 0) {