FIX #yogosha12673
This commit is contained in:
parent
56892e32e8
commit
8c9e5dda1b
@ -128,41 +128,34 @@ if (empty($reshook)) {
|
||||
$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') {
|
||||
$message = '<div class="warning paddingtopbottom'.(empty($conf->global->MAIN_LOGIN_BACKGROUND) ? '' : ' backgroundsemitransparent boxshadow').'">';
|
||||
if (!$isanemail) {
|
||||
$message .= $langs->trans("IfLoginExistPasswordRequestSent");
|
||||
} else {
|
||||
$message .= $langs->trans("IfEmailExistPasswordRequestSent");
|
||||
}
|
||||
$message .= '</div>';
|
||||
$message .= $messagewarning;
|
||||
$username = '';
|
||||
} else {
|
||||
if (!$edituser->email) {
|
||||
//$message = '<div class="error">'.$langs->trans("ErrorLoginHasNoEmail").'</div>';
|
||||
if (!$isanemail) {
|
||||
$message .= $langs->trans("IfLoginExistPasswordRequestSent");
|
||||
} else {
|
||||
$message .= $langs->trans("IfEmailExistPasswordRequestSent");
|
||||
}
|
||||
if (empty($edituser->email)) {
|
||||
$message .= $messagewarning;
|
||||
} else {
|
||||
$newpassword = $edituser->setPassword($user, '', 1);
|
||||
if ($newpassword < 0) {
|
||||
// Failed
|
||||
// Technical failure
|
||||
$message = '<div class="error">'.$langs->trans("ErrorFailedToChangePassword").'</div>';
|
||||
} else {
|
||||
// Success
|
||||
if ($edituser->send_password($user, $newpassword, 1) > 0) {
|
||||
$message = '<div class="warning paddingtopbottom'.(empty($conf->global->MAIN_LOGIN_BACKGROUND) ? '' : ' backgroundsemitransparent boxshadow').'">';
|
||||
if (!$isanemail) {
|
||||
$message .= $langs->trans("IfLoginExistPasswordRequestSent");
|
||||
} else {
|
||||
$message .= $langs->trans("IfEmailExistPasswordRequestSent");
|
||||
}
|
||||
//$message .= $langs->trans("PasswordChangeRequestSent", $edituser->login, dolObfuscateEmail($edituser->email));
|
||||
$message .= '</div>';
|
||||
$message .= $messagewarning;
|
||||
$username = '';
|
||||
} else {
|
||||
// Technical failure
|
||||
$message .= '<div class="error">'.$edituser->error.'</div>';
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user