X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=mod%2Flostpass.php;h=166da25fc24b56b494ac60eea109dcf40e8725a0;hb=1ec5c6b2840cedbe21e089f4ef4404d22a65031e;hp=3453a0db4334a8d06957473a20ed82adf8da8aa8;hpb=4e7a5dc56ebb8d99ed06b0b303c4ee24460ae6a8;p=friendica.git
diff --git a/mod/lostpass.php b/mod/lostpass.php
index 3453a0db43..166da25fc2 100644
--- a/mod/lostpass.php
+++ b/mod/lostpass.php
@@ -1,127 +1,181 @@
$pwdreset_token,
+ 'pwdreset_time' => DateTimeFormat::utcNow()
+ ];
+ $result = DBA::update('user', $fields, ['uid' => $user['uid']]);
+ if ($result) {
+ info(L10n::t('Password reset request issued. Check your email.') . EOL);
+ }
- $email = notags(trim($_POST['login-name']));
- if(! $email)
- goaway($a->get_baseurl());
+ $sitename = Config::get('config', 'sitename');
+ $resetlink = System::baseUrl() . '/lostpass/' . $pwdreset_token;
- $r = q("SELECT * FROM `user` WHERE ( `email` = '%s' OR `nickname` = '%s' ) AND `verified` = 1 AND `blocked` = 0 LIMIT 1",
- dbesc($email),
- dbesc($email)
- );
+ $preamble = deindent(L10n::t('
+ Dear %1$s,
+ A request was recently received at "%2$s" to reset your account
+ password. In order to confirm this request, please select the verification link
+ below or paste it into your web browser address bar.
- if(! count($r)) {
- notice( t('No valid account found.') . EOL);
- goaway($a->get_baseurl());
- }
+ If you did NOT request this change, please DO NOT follow the link
+ provided and ignore and/or delete this email, the request will expire shortly.
- $uid = $r[0]['uid'];
- $username = $r[0]['username'];
+ Your password will not be changed unless we can verify that you
+ issued this request.', $user['username'], $sitename));
+ $body = deindent(L10n::t('
+ Follow this link soon to verify your identity:
- $new_password = autoname(12) . mt_rand(100,9999);
- $new_password_encoded = hash('whirlpool',$new_password);
+ %1$s
- $r = q("UPDATE `user` SET `pwdreset` = '%s' WHERE `uid` = %d LIMIT 1",
- dbesc($new_password_encoded),
- intval($uid)
- );
- if($r)
- info( t('Password reset request issued. Check your email.') . EOL);
+ You will then receive a follow-up message containing the new password.
+ You may change that password from your account settings page after logging in.
- $email_tpl = get_intltext_template("lostpass_eml.tpl");
- $email_tpl = replace_macros($email_tpl, array(
- '$sitename' => $a->config['sitename'],
- '$siteurl' => $a->get_baseurl(),
- '$username' => $username,
- '$email' => $email,
- '$reset_link' => $a->get_baseurl() . '/lostpass?verify=' . $new_password
- ));
+ The login details are as follows:
- $res = mail($email, sprintf( t('Password reset requested at %s'),$a->config['sitename']),
- $email_tpl,
- 'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
- . 'Content-type: text/plain; charset=UTF-8' . "\n"
- . 'Content-transfer-encoding: 8bit' );
+ Site Location: %2$s
+ Login Name: %3$s', $resetlink, System::baseUrl(), $user['email']));
+ notification([
+ 'type' => SYSTEM_EMAIL,
+ 'language' => $user['language'],
+ 'to_name' => $user['username'],
+ 'to_email' => $user['email'],
+ 'uid' => $user['uid'],
+ 'subject' => L10n::t('Password reset requested at %s', $sitename),
+ 'preamble' => $preamble,
+ 'body' => $body
+ ]);
- goaway($a->get_baseurl());
+ goaway(System::baseUrl());
}
+function lostpass_content(App $a)
+{
+ $o = '';
+ if ($a->argc > 1) {
+ $pwdreset_token = $a->argv[1];
-function lostpass_content(&$a) {
+ $user = DBA::selectFirst('user', ['uid', 'username', 'email', 'pwdreset_time', 'language'], ['pwdreset' => $pwdreset_token]);
+ if (!DBA::isResult($user)) {
+ notice(L10n::t("Request could not be verified. \x28You may have previously submitted it.\x29 Password reset failed."));
+ return lostpass_form();
+ }
- if(x($_GET,'verify')) {
- $verify = $_GET['verify'];
- $hash = hash('whirlpool', $verify);
+ // Password reset requests expire in 60 minutes
+ if ($user['pwdreset_time'] < DateTimeFormat::utc('now - 1 hour')) {
+ $fields = [
+ 'pwdreset' => null,
+ 'pwdreset_time' => null
+ ];
+ DBA::update('user', $fields, ['uid' => $user['uid']]);
- $r = q("SELECT * FROM `user` WHERE `pwdreset` = '%s' LIMIT 1",
- dbesc($hash)
- );
- if(! count($r)) {
- notice( t("Request could not be verified. \x28You may have previously submitted it.\x29 Password reset failed.") . EOL);
- goaway($a->get_baseurl());
- return;
- }
- $uid = $r[0]['uid'];
- $username = $r[0]['username'];
- $email = $r[0]['email'];
-
- $new_password = autoname(6) . mt_rand(100,9999);
- $new_password_encoded = hash('whirlpool',$new_password);
-
- $r = q("UPDATE `user` SET `password` = '%s', `pwdreset` = '' WHERE `uid` = %d LIMIT 1",
- dbesc($new_password_encoded),
- intval($uid)
- );
- if($r) {
- $tpl = get_markup_template('pwdreset.tpl');
- $o .= replace_macros($tpl,array(
- '$lbl1' => t('Password Reset'),
- '$lbl2' => t('Your password has been reset as requested.'),
- '$lbl3' => t('Your new password is'),
- '$lbl4' => t('Save or copy your new password - and then'),
- '$lbl5' => '' . t('click here to login') . '.',
- '$lbl6' => t('Your password may be changed from the Settings page after successful login.'),
- '$newpass' => $new_password,
- '$baseurl' => $a->get_baseurl()
-
- ));
- info("Your password has been reset." . EOL);
-
-
-
- $email_tpl = get_intltext_template("passchanged_eml.tpl");
- $email_tpl = replace_macros($email_tpl, array(
- '$sitename' => $a->config['sitename'],
- '$siteurl' => $a->get_baseurl(),
- '$username' => $username,
- '$email' => $email,
- '$new_password' => $new_password,
- '$uid' => $newuid ));
-
- $res = mail($email,"Your password has changed at {$a->config['sitename']}",$email_tpl,
- 'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
- . 'Content-type: text/plain; charset=UTF-8' . "\n"
- . 'Content-transfer-encoding: 8bit' );
-
- return $o;
+ notice(L10n::t('Request has expired, please make a new one.'));
+
+ return lostpass_form();
}
-
+
+ return lostpass_generate_password($user);
+ } else {
+ return lostpass_form();
}
- else {
- $tpl = get_markup_template('lostpass.tpl');
+}
- $o .= replace_macros($tpl,array(
- '$title' => t('Forgot your Password?'),
- '$desc' => t('Enter your email address and submit to have your password reset. Then check your email for further instructions.'),
- '$name' => t('Nickname or Email: '),
- '$submit' => t('Reset')
- ));
+function lostpass_form()
+{
+ $tpl = get_markup_template('lostpass.tpl');
+ $o = replace_macros($tpl, [
+ '$title' => L10n::t('Forgot your Password?'),
+ '$desc' => L10n::t('Enter your email address and submit to have your password reset. Then check your email for further instructions.'),
+ '$name' => L10n::t('Nickname or Email: '),
+ '$submit' => L10n::t('Reset')
+ ]);
+
+ return $o;
+}
- return $o;
+function lostpass_generate_password($user)
+{
+ $o = '';
+ $a = get_app();
+
+ $new_password = User::generateNewPassword();
+ $result = User::updatePassword($user['uid'], $new_password);
+ if (DBA::isResult($result)) {
+ $tpl = get_markup_template('pwdreset.tpl');
+ $o .= replace_macros($tpl, [
+ '$lbl1' => L10n::t('Password Reset'),
+ '$lbl2' => L10n::t('Your password has been reset as requested.'),
+ '$lbl3' => L10n::t('Your new password is'),
+ '$lbl4' => L10n::t('Save or copy your new password - and then'),
+ '$lbl5' => '' . L10n::t('click here to login') . '.',
+ '$lbl6' => L10n::t('Your password may be changed from the Settings page after successful login.'),
+ '$newpass' => $new_password,
+ '$baseurl' => System::baseUrl()
+ ]);
+
+ info("Your password has been reset." . EOL);
+
+ $sitename = Config::get('config', 'sitename');
+ $preamble = deindent(L10n::t('
+ Dear %1$s,
+ Your password has been changed as requested. Please retain this
+ information for your records ' . "\x28" . 'or change your password immediately to
+ something that you will remember' . "\x29" . '.
+ ', $user['username']));
+ $body = deindent(L10n::t('
+ Your login details are as follows:
+
+ Site Location: %1$s
+ Login Name: %2$s
+ Password: %3$s
+
+ You may change that password from your account settings page after logging in.
+ ', System::baseUrl(), $user['email'], $new_password));
+
+ notification([
+ 'type' => SYSTEM_EMAIL,
+ 'language' => $user['language'],
+ 'to_name' => $user['username'],
+ 'to_email' => $user['email'],
+ 'uid' => $user['uid'],
+ 'subject' => L10n::t('Your password has been changed at %s', $sitename),
+ 'preamble' => $preamble,
+ 'body' => $body
+ ]);
}
+ return $o;
}