Move PConfig::load() to DI::pConfig()->load()

[friendica.git] / mod / lostpass.php

diff --git a/mod/lostpass.php b/mod/lostpass.php
index 01e84268b4300b7f0a0fe48cf64eae0300817366..81bcad79c97b275576ec91b725dc528575be96ff 100644 (file)
--- 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,7 +77,7 @@ function lostpass_post(App $a)
                'body'     => $body
        ]);
 
-       $a->internalRedirect();
+       DI::baseUrl()->redirect();
 }
 
 function lostpass_content(App $a)
@@ -136,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,
                ]);
@@ -158,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,