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

diff --git a/mod/lostpass.php b/mod/lostpass.php
index ecab0982c8..81bcad79c9 100644
--- a/mod/lostpass.php
+++ b/mod/lostpass.php
@@ -8,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;
@@ -18,14 +18,14 @@ 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) . random_int(1000, 9999);
@@ -40,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,
@@ -64,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,
@@ -77,7 +77,7 @@ function lostpass_post(App $a)
 		'body'     => $body
 	]);
 
-	$a->internalRedirect();
+	DI::baseUrl()->redirect();
 }
 
 function lostpass_content(App $a)
@@ -137,7 +137,7 @@ 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,
 		]);
@@ -159,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,