X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Flostpass.php;h=01e0006e9533a42ed993e3e146000e311c4d0b7c;hb=dc842f4f37a5ff9cb787cac23272c38faf2ff892;hp=5856148d7d8427b1de5ca55b407a4d3f84a56684;hpb=6700467ed41d840fca2d5a959c69632fae400994;p=friendica.git

diff --git a/mod/lostpass.php b/mod/lostpass.php
index 5856148d7d..01e0006e95 100644
--- 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;
@@ -22,19 +37,19 @@ function lostpass_post(App $a)
 	$condition = ['(`email` = ? OR `nickname` = ?) AND `verified` = 1 AND `blocked` = 0', $loginame, $loginame];
 	$user = DBA::selectFirst('user', ['uid', 'username', 'nickname', 'email', 'language'], $condition);
 	if (!DBA::isResult($user)) {
-		notice(DI::l10n()->t('No valid account found.') . EOL);
+		notice(DI::l10n()->t('No valid account found.'));
 		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']]);
 	if ($result) {
-		info(DI::l10n()->t('Password reset request issued. Check your email.') . EOL);
+		info(DI::l10n()->t('Password reset request issued. Check your email.'));
 	}
 
 	$sitename = DI::config()->get('config', 'sitename');
@@ -65,11 +80,11 @@ function lostpass_post(App $a)
 		Login Name:	%3$s', $resetlink, DI::baseUrl(), $user['nickname']));
 
 	$email = DI::emailer()
-	           ->newSystemMail((!empty($user['language'])) ? DI::l10n()->withLang($user['language']) : DI::l10n())
-	           ->withMessage(DI::l10n()->t('Password reset requested at %s', $sitename), $preamble, $body)
-	           ->forUser($user['uid'] ?? 0)
-	           ->withRecipient($user['email'])
-	           ->build();
+		->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();
@@ -80,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."));
 
@@ -137,7 +152,7 @@ function lostpass_generate_password($user)
 			'$newpass' => $new_password,
 		]);
 
-		info("Your password has been reset." . EOL);
+		info(DI::l10n()->t("Your password has been reset."));
 
 		$sitename = DI::config()->get('config', 'sitename');
 		$preamble = Strings::deindent(DI::l10n()->t('
@@ -157,9 +172,9 @@ function lostpass_generate_password($user)
 		', DI::baseUrl(), $user['nickname'], $new_password));
 
 		$email = DI::emailer()
-			->newSystemMail((!empty($user['language'])) ? DI::l10n()->withLang($user['language']) : DI::l10n())
+			->newSystemMail()
 			->withMessage(DI::l10n()->t('Your password has been changed at %s', $sitename), $preamble, $body)
-			->forUser($user['uid'] ?? 0)
+			->forUser($user)
 			->withRecipient($user['email'])
 			->build();
 		DI::emailer()->send($email);