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

Merge pull request #15731 from hregis/fix_add_passwordforgotten_hook

Browse Source 
NEW add doAction hook in passwordforgotten page
This commit is contained in:
Laurent Destailleur 2020-12-12 19:51:38 +01:00 committed by GitHub
commit 681dc88188
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 89 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

170
htdocs/user/passwordforgotten.php
View File

@ -64,91 +64,99 @@ if (GETPOST('dol_use_jmobile', 'alpha') || !empty($_SESSION['dol_use_jmobile']))
* Actions * Actions
*/ */
// Validate new password $parameters = array('username' => $username);
if ($action == 'validatenewpassword' && $username && $passwordhash) $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
{ if ($reshook < 0) {
$edituser = new User($db); $message = $hookmanager->error;
$result = $edituser->fetch('', $_GET["username"]);
if ($result < 0)
{
$message = '<div class="error">'.dol_escape_htmltag($langs->trans("ErrorLoginDoesNotExists", $username)).'</div>';
} else {
if (dol_verifyHash($edituser->pass_temp, $passwordhash))
{
// Clear session
unset($_SESSION['dol_login']);
$_SESSION['dol_loginmesg'] = $langs->trans('NewPasswordValidated'); // Save message for the session page
$newpassword = $edituser->setPassword($user, $edituser->pass_temp, 0);
dol_syslog("passwordforgotten.php new password for user->id=".$edituser->id." validated in database");
header("Location: ".DOL_URL_ROOT.'/');
exit;
} else {
$langs->load("errors");
$message = '<div class="error">'.$langs->trans("ErrorFailedToValidatePasswordReset").'</div>';
}
}
} }
// Action modif mot de passe
if ($action == 'buildnewpassword' && $username)
{
$sessionkey = 'dol_antispam_value';
$ok = (array_key_exists($sessionkey, $_SESSION) === true && (strtolower($_SESSION[$sessionkey]) == strtolower($_POST['code'])));
// Verify code if (empty($reshook)) {
if (!$ok) // Validate new password
{ if ($action == 'validatenewpassword' && $username && $passwordhash)
$message = '<div class="error">'.$langs->trans("ErrorBadValueForCode").'</div>'; {
} else { $edituser = new User($db);
$isanemail = preg_match('/@/', $username); $result = $edituser->fetch('', $_GET["username"]);
if ($result < 0)
{
$message = '<div class="error">'.dol_escape_htmltag($langs->trans("ErrorLoginDoesNotExists", $username)).'</div>';
} else {
if (dol_verifyHash($edituser->pass_temp, $passwordhash))
{
// Clear session
unset($_SESSION['dol_login']);
$_SESSION['dol_loginmesg'] = $langs->trans('NewPasswordValidated'); // Save message for the session page
$edituser = new User($db); $newpassword = $edituser->setPassword($user, $edituser->pass_temp, 0);
$result = $edituser->fetch('', $username, '', 1); dol_syslog("passwordforgotten.php new password for user->id=".$edituser->id." validated in database");
if ($result == 0 && $isanemail) header("Location: ".DOL_URL_ROOT.'/');
{ exit;
$result = $edituser->fetch('', '', '', 1, -1, $username); } else {
} $langs->load("errors");
$message = '<div class="error">'.$langs->trans("ErrorFailedToValidatePasswordReset").'</div>';
}
}
}
// Action modif mot de passe
if ($action == 'buildnewpassword' && $username)
{
$sessionkey = 'dol_antispam_value';
$ok = (array_key_exists($sessionkey, $_SESSION) === true && (strtolower($_SESSION[$sessionkey]) == strtolower($_POST['code'])));
if ($result <= 0 && $edituser->error == 'USERNOTFOUND') // Verify code
{ if (!$ok)
$message = '<div class="warning paddingtopbottom'.(empty($conf->global->MAIN_LOGIN_BACKGROUND) ? '' : ' backgroundsemitransparent').'">'; {
if (!$isanemail) { $message = '<div class="error">'.$langs->trans("ErrorBadValueForCode").'</div>';
$message .= $langs->trans("IfLoginExistPasswordRequestSent"); } else {
} else { $isanemail = preg_match('/@/', $username);
$message .= $langs->trans("IfEmailExistPasswordRequestSent");
} $edituser = new User($db);
$message .= '</div>'; $result = $edituser->fetch('', $username, '', 1);
$username = ''; if ($result == 0 && $isanemail)
} else { {
if (!$edituser->email) $result = $edituser->fetch('', '', '', 1, -1, $username);
{ }
$message = '<div class="error">'.$langs->trans("ErrorLoginHasNoEmail").'</div>';
} else { if ($result <= 0 && $edituser->error == 'USERNOTFOUND')
$newpassword = $edituser->setPassword($user, '', 1); {
if ($newpassword < 0) $message = '<div class="warning paddingtopbottom'.(empty($conf->global->MAIN_LOGIN_BACKGROUND) ? '' : ' backgroundsemitransparent').'">';
{ if (!$isanemail) {
// Failed $message .= $langs->trans("IfLoginExistPasswordRequestSent");
$message = '<div class="error">'.$langs->trans("ErrorFailedToChangePassword").'</div>'; } else {
} else { $message .= $langs->trans("IfEmailExistPasswordRequestSent");
// Success }
if ($edituser->send_password($user, $newpassword, 1) > 0) $message .= '</div>';
{ $username = '';
$message = '<div class="warning paddingtopbottom'.(empty($conf->global->MAIN_LOGIN_BACKGROUND) ? '' : ' backgroundsemitransparent').'">'; } else {
if (!$isanemail) { if (!$edituser->email)
$message .= $langs->trans("IfLoginExistPasswordRequestSent"); {
} else { $message = '<div class="error">'.$langs->trans("ErrorLoginHasNoEmail").'</div>';
$message .= $langs->trans("IfEmailExistPasswordRequestSent"); } else {
} $newpassword = $edituser->setPassword($user, '', 1);
//$message .= $langs->trans("PasswordChangeRequestSent", $edituser->login, dolObfuscateEmail($edituser->email)); if ($newpassword < 0)
$message .= '</div>'; {
$username = ''; // Failed
} else { $message = '<div class="error">'.$langs->trans("ErrorFailedToChangePassword").'</div>';
$message .= '<div class="error">'.$edituser->error.'</div>'; } else {
} // Success
} if ($edituser->send_password($user, $newpassword, 1) > 0)
} {
} $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 = '';
} else {
$message .= '<div class="error">'.$edituser->error.'</div>';
}
}
}
}
}
}
} }