Merge pull request #8883 from annando/replace-getdetails

[friendica.git] / mod / lostpass.php

diff --git a/mod/lostpass.php b/mod/lostpass.php
index 59426a1af8980f2e39758d53c89d34ef81bea746..211477b0dbd252b12322e2521b7456592194e292 100644 (file)
--- a/mod/lostpass.php
+++ b/mod/lostpass.php
@@ -1,7 +1,22 @@
 <?php
-
 /**
- * @file mod/lostpass.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
 
 use Friendica\App;
@@ -26,10 +41,10 @@ function lostpass_post(App $a)
                DI::baseUrl()->redirect();
        }
 
-       $pwdreset_token = Strings::getRandomName(12) . random_int(1000, 9999);
+       $pwdreset_token = Strings::getRandomHex(32);
 
        $fields = [
-               'pwdreset' => $pwdreset_token,
+               'pwdreset' => hash('sha256', $pwdreset_token),
                'pwdreset_time' => DateTimeFormat::utcNow()
        ];
        $result = DBA::update('user', $fields, ['uid' => $user['uid']]);
@@ -64,17 +79,14 @@ function lostpass_post(App $a)
                Site Location:  %2$s
                Login Name:     %3$s', $resetlink, DI::baseUrl(), $user['nickname']));
 
-       notification([
-               'type'     => SYSTEM_EMAIL,
-               'language' => $user['language'],
-               'to_name'  => $user['username'],
-               'to_email' => $user['email'],
-               'uid'      => $user['uid'],
-               'subject'  => DI::l10n()->t('Password reset requested at %s', $sitename),
-               'preamble' => $preamble,
-               'body'     => $body
-       ]);
+       $email = DI::emailer()
+               ->newSystemMail()
+               ->withMessage(DI::l10n()->t('Password reset requested at %s', $sitename), $preamble, $body)
+               ->forUser($user)
+               ->withRecipient($user['email'])
+               ->build();
 
+       DI::emailer()->send($email);
        DI::baseUrl()->redirect();
 }
 
@@ -83,7 +95,7 @@ function lostpass_content(App $a)
        if ($a->argc > 1) {
                $pwdreset_token = $a->argv[1];
 
-               $user = DBA::selectFirst('user', ['uid', 'username', 'nickname', 'email', 'pwdreset_time', 'language'], ['pwdreset' => $pwdreset_token]);
+               $user = DBA::selectFirst('user', ['uid', 'username', 'nickname', 'email', 'pwdreset_time', 'language'], ['pwdreset' => hash('sha256', $pwdreset_token)]);
                if (!DBA::isResult($user)) {
                        notice(DI::l10n()->t("Request could not be verified. \x28You may have previously submitted it.\x29 Password reset failed."));
 
@@ -159,16 +171,13 @@ function lostpass_generate_password($user)
                        You may change that password from your account settings page after logging in.
                ', DI::baseUrl(), $user['nickname'], $new_password));
 
-               notification([
-                       'type'     => SYSTEM_EMAIL,
-                       'language' => $user['language'],
-                       'to_name'  => $user['username'],
-                       'to_email' => $user['email'],
-                       'uid'      => $user['uid'],
-                       'subject'  => DI::l10n()->t('Your password has been changed at %s', $sitename),
-                       'preamble' => $preamble,
-                       'body'     => $body
-               ]);
+               $email = DI::emailer()
+                       ->newSystemMail()
+                       ->withMessage(DI::l10n()->t('Your password has been changed at %s', $sitename), $preamble, $body)
+                       ->forUser($user)
+                       ->withRecipient($user['email'])
+                       ->build();
+               DI::emailer()->send($email);
        }
 
        return $o;