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

Neutral message if login / email exists #yohosha4542

Browse Source
This commit is contained in:
Laurent Destailleur 2020-09-19 18:40:00 +02:00
parent 673e1fe5aa
commit 14aa9c01da
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,6 +46,8 @@ RemoveFromGroup=Remove from group
PasswordChangedAndSentTo=Password changed and sent to <b>%s</b>. PasswordChangedAndSentTo=Password changed and sent to <b>%s</b>.
PasswordChangeRequest=Request to change password for <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>. 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.
IfEmailExistPasswordRequestSent=If this email is a valid account, an email to reset password has been sent.
ConfirmPasswordReset=Confirm password reset ConfirmPasswordReset=Confirm password reset
MenuUsersAndGroups=Users & Groups MenuUsersAndGroups=Users & Groups
LastGroupsCreated=Latest %s groups created LastGroupsCreated=Latest %s groups created

21
htdocs/user/passwordforgotten.php
View File

@ -100,16 +100,24 @@ if ($action == 'buildnewpassword' && $username)
{ {
$message = '<div class="error">'.$langs->trans("ErrorBadValueForCode").'</div>'; $message = '<div class="error">'.$langs->trans("ErrorBadValueForCode").'</div>';
} else { } else {
$isanemail = preg_match('/@/', $username);
$edituser = new User($db); $edituser = new User($db);
$result = $edituser->fetch('', $username, '', 1); $result = $edituser->fetch('', $username, '', 1);
if ($result == 0 && preg_match('/@/', $username)) if ($result == 0 && $isanemail)
{ {
$result = $edituser->fetch('', '', '', 1, -1, $username); $result = $edituser->fetch('', '', '', 1, -1, $username);
} }
if ($result <= 0 && $edituser->error == 'USERNOTFOUND') if ($result <= 0 && $edituser->error == 'USERNOTFOUND')
{ {
$message = '<div class="error">'.$langs->trans("ErrorLoginDoesNotExists", $username).'</div>'; $message = '<div class="warning paddingtopbottom'.(empty($conf->global->MAIN_LOGIN_BACKGROUND) ? '' : ' backgroundsemitransparent').'">';
if (! $isanemail) {
$message .= $langs->trans("IfLoginExistPasswordRequestSent");
} else {
$message .= $langs->trans("IfEmailExistPasswordRequestSent");
}
$message .= '</div>';
$username = ''; $username = '';
} else { } else {
if (!$edituser->email) if (!$edituser->email)
@ -125,7 +133,14 @@ if ($action == 'buildnewpassword' && $username)
// Success // Success
if ($edituser->send_password($user, $newpassword, 1) > 0) if ($edituser->send_password($user, $newpassword, 1) > 0)
{ {
$message = '<div class="ok'.(empty($conf->global->MAIN_LOGIN_BACKGROUND) ? '' : ' backgroundsemitransparent').'">'.$langs->trans("PasswordChangeRequestSent", $edituser->login, dolObfuscateEmail($edituser->email)).'</div>'; $message = '<div class="warning paddingtopbottom'.(empty($conf->global->MAIN_LOGIN_BACKGROUND) ? '' : ' backgroundsemitransparent').'">';
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 {
$message .= '<div class="error">'.$edituser->error.'</div>'; $message .= '<div class="error">'.$edituser->error.'</div>';