X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Flostpass.php;h=81bcad79c97b275576ec91b725dc528575be96ff;hb=86320317f493d0bf26fac7860d2e0c388633ab0c;hp=cb2dd3ca3c9f03e565eb62f1218cba968016de64;hpb=e447375cddb847edbc9d4486be3938674ae66b8c;p=friendica.git

diff --git a/mod/lostpass.php b/mod/lostpass.php
index cb2dd3ca3c..81bcad79c9 100644
--- a/mod/lostpass.php
+++ b/mod/lostpass.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @file mod/lostpass.php
  */
@@ -7,8 +8,8 @@ use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
-use Friendica\Core\System;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\User;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Strings;
@@ -17,17 +18,17 @@ function lostpass_post(App $a)
 {
 	$loginame = Strings::escapeTags(trim($_POST['login-name']));
 	if (!$loginame) {
-		$a->internalRedirect();
+		DI::baseUrl()->redirect();
 	}
 
 	$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(L10n::t('No valid account found.') . EOL);
-		$a->internalRedirect();
+		DI::baseUrl()->redirect();
 	}
 
-	$pwdreset_token = Strings::getRandomName(12) . mt_rand(1000, 9999);
+	$pwdreset_token = Strings::getRandomName(12) . random_int(1000, 9999);
 
 	$fields = [
 		'pwdreset' => $pwdreset_token,
@@ -39,7 +40,7 @@ function lostpass_post(App $a)
 	}
 
 	$sitename = Config::get('config', 'sitename');
-	$resetlink = System::baseUrl() . '/lostpass/' . $pwdreset_token;
+	$resetlink = DI::baseUrl() . '/lostpass/' . $pwdreset_token;
 
 	$preamble = Strings::deindent(L10n::t('
 		Dear %1$s,
@@ -63,7 +64,7 @@ function lostpass_post(App $a)
 		The login details are as follows:
 
 		Site Location:	%2$s
-		Login Name:	%3$s', $resetlink, System::baseUrl(), $user['nickname']));
+		Login Name:	%3$s', $resetlink, DI::baseUrl(), $user['nickname']));
 
 	notification([
 		'type'     => SYSTEM_EMAIL,
@@ -76,12 +77,11 @@ function lostpass_post(App $a)
 		'body'     => $body
 	]);
 
-	$a->internalRedirect();
+	DI::baseUrl()->redirect();
 }
 
 function lostpass_content(App $a)
 {
-	$o = '';
 	if ($a->argc > 1) {
 		$pwdreset_token = $a->argv[1];
 
@@ -127,7 +127,6 @@ function lostpass_form()
 function lostpass_generate_password($user)
 {
 	$o = '';
-	$a = \get_app();
 
 	$new_password = User::generateNewPassword();
 	$result = User::updatePassword($user['uid'], $new_password);
@@ -138,10 +137,9 @@ function lostpass_generate_password($user)
 			'$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'    => '<a href="' . System::baseUrl() . '">' . L10n::t('click here to login') . '</a>.',
+			'$lbl5'    => '<a href="' . DI::baseUrl() . '">' . L10n::t('click here to login') . '</a>.',
 			'$lbl6'    => L10n::t('Your password may be changed from the <em>Settings</em> page after successful login.'),
 			'$newpass' => $new_password,
-			'$baseurl' => System::baseUrl()
 		]);
 
 		info("Your password has been reset." . EOL);
@@ -161,7 +159,7 @@ function lostpass_generate_password($user)
 			Password:	%3$s
 
 			You may change that password from your account settings page after logging in.
-		', System::baseUrl(), $user['nickname'], $new_password));
+		', DI::baseUrl(), $user['nickname'], $new_password));
 
 		notification([
 			'type'     => SYSTEM_EMAIL,