Added type hints

[friendica.git] / src / Module / Admin / Users.php

diff --git a/src/Module/Admin/Users.php b/src/Module/Admin/Users.php
index 592b49495af4ae05a3e7e2a696655a35038da53b..b71f3f7513cb24927d1fef4972a0e5e3d0e69d2e 100644 (file)
--- a/src/Module/Admin/Users.php
+++ b/src/Module/Admin/Users.php
@@ -7,6 +7,7 @@ use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Register;
 use Friendica\Model\User;
 use Friendica\Module\BaseAdminModule;
@@ -15,12 +16,10 @@ use Friendica\Util\Temporal;
 
 class Users extends BaseAdminModule
 {
-       public static function post($parameters)
+       public static function post(array $parameters = [])
        {
                parent::post($parameters);
 
-               $a = self::getApp();
-
                $pending     = $_POST['pending']           ?? [];
                $users       = $_POST['user']              ?? [];
                $nu_name     = $_POST['new_user_name']     ?? '';
@@ -77,7 +76,7 @@ class Users extends BaseAdminModule
                        Thank you and welcome to %4$s.'));
 
                        $preamble = sprintf($preamble, $user['username'], Config::get('config', 'sitename'));
-                       $body = sprintf($body, $a->getBaseURL(), $user['nickname'], $result['password'], Config::get('config', 'sitename'));
+                       $body = sprintf($body, DI::baseUrl()->get(), $user['nickname'], $result['password'], Config::get('config', 'sitename'));
 
                        notification([
                                'type'     => SYSTEM_EMAIL,
@@ -128,14 +127,14 @@ class Users extends BaseAdminModule
                        }
                }
 
-               $a->internalRedirect('admin/users');
+               DI::baseUrl()->redirect('admin/users');
        }
 
-       public static function content($parameters)
+       public static function content(array $parameters = [])
        {
                parent::content($parameters);
 
-               $a = self::getApp();
+               $a = DI::app();
 
                if ($a->argc > 3) {
                        // @TODO: Replace with parameter from router
@@ -144,7 +143,7 @@ class Users extends BaseAdminModule
                        $user = User::getById($uid, ['username', 'blocked']);
                        if (!DBA::isResult($user)) {
                                notice('User not found' . EOL);
-                               $a->internalRedirect('admin/users');
+                               DI::baseUrl()->redirect('admin/users');
                                return ''; // NOTREACHED
                        }
 
@@ -174,13 +173,13 @@ class Users extends BaseAdminModule
                                        break;
                        }
 
-                       $a->internalRedirect('admin/users');
+                       DI::baseUrl()->redirect('admin/users');
                }
 
                /* get pending */
                $pending = Register::getPending();
 
-               $pager = new Pager($a->query_string, 100);
+               $pager = new Pager(DI::args()->getQueryString(), 100);
 
                // @TODO Move below block to Model\User::getUsers($start, $count, $order = 'contact.name', $order_direction = '+')
                $valid_orders = [
@@ -305,7 +304,7 @@ class Users extends BaseAdminModule
                        '$form_security_token' => parent::getFormSecurityToken('admin_users'),
 
                        // values //
-                       '$baseurl' => $a->getBaseURL(true),
+                       '$baseurl' => DI::baseUrl()->get(true),
 
                        '$pending' => $pending,
                        'deleted' => $deleted,