Remove unused `use` statements & remove PConfig class

[friendica.git] / src / Model / User.php

diff --git a/src/Model/User.php b/src/Model/User.php
index 22a8b04744c87a17d1e8589ac1898b2cf94cceec..f19ebc03c5ce971201adaaf85f38dcbb39dd0da1 100644 (file)
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -13,7 +13,6 @@ use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
@@ -217,12 +216,12 @@ class User
                // Check if the returned data is valid, otherwise fix it. See issue #6122
 
                // Check for correct url and normalised nurl
-               $url = System::baseUrl() . '/profile/' . $r['nickname'];
+               $url = DI::baseUrl() . '/profile/' . $r['nickname'];
                $repair = ($r['url'] != $url) || ($r['nurl'] != Strings::normaliseLink($r['url']));
 
                if (!$repair) {
                        // Check if "addr" is present and correct
-                       $addr = $r['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3);
+                       $addr = $r['nickname'] . '@' . substr(DI::baseUrl(), strpos(DI::baseUrl(), '://') + 3);
                        $repair = ($addr != $r['addr']);
                }
 
@@ -275,7 +274,7 @@ class User
                $default_group = 0;
 
                if ($network == Protocol::OSTATUS) {
-                       $default_group = PConfig::get($uid, "ostatus", "default_group");
+                       $default_group = DI::pConfig()->get($uid, "ostatus", "default_group");
                }
 
                if ($default_group != 0) {
@@ -326,7 +325,7 @@ class User
        {
                $user = self::getAuthenticationInfo($user_info);
 
-               if ($third_party && PConfig::get($user['uid'], '2fa', 'verified')) {
+               if ($third_party && DI::pConfig()->get($user['uid'], '2fa', 'verified')) {
                        // Third-party apps can't verify two-factor authentication, we use app-specific passwords instead
                        if (AppSpecificPassword::authenticateUser($user['uid'], $password)) {
                                return $user['uid'];
@@ -635,7 +634,7 @@ class User
 
                                $openid = new LightOpenID(DI::baseUrl()->getHostname());
                                $openid->identity = $openid_url;
-                               $openid->returnUrl = System::baseUrl() . '/openid';
+                               $openid->returnUrl = DI::baseUrl() . '/openid';
                                $openid->required = ['namePerson/friendly', 'contact/email', 'namePerson'];
                                $openid->optional = ['namePerson/first', 'media/image/aspect11', 'media/image/default'];
                                try {
@@ -782,8 +781,8 @@ class User
                $insert_result = DBA::insert('profile', [
                        'uid' => $uid,
                        'name' => $username,
-                       'photo' => System::baseUrl() . "/photo/profile/{$uid}.jpg",
-                       'thumb' => System::baseUrl() . "/photo/avatar/{$uid}.jpg",
+                       'photo' => DI::baseUrl() . "/photo/profile/{$uid}.jpg",
+                       'thumb' => DI::baseUrl() . "/photo/avatar/{$uid}.jpg",
                        'publish' => $publish,
                        'is-default' => 1,
                        'net-publish' => $netpublish,