Merge pull request #8142 from nupplaphil/task/di_config

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

diff --git a/src/Module/Admin/Users.php b/src/Module/Admin/Users.php
index 543562d9da5032b156271887e887ebb99c2e211a..c4a30abd65ebe627c2ee6b5c67e910e58958ab2c 100644 (file)
--- a/src/Module/Admin/Users.php
+++ b/src/Module/Admin/Users.php
@@ -3,8 +3,6 @@
 namespace Friendica\Module\Admin;
 
 use Friendica\Content\Pager;
-use Friendica\Core\Config;
-use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
@@ -25,7 +23,7 @@ class Users extends BaseAdminModule
                $nu_name     = $_POST['new_user_name']     ?? '';
                $nu_nickname = $_POST['new_user_nickname'] ?? '';
                $nu_email    = $_POST['new_user_email']    ?? '';
-               $nu_language = Config::get('system', 'language');
+               $nu_language = DI::config()->get('system', 'language');
 
                parent::checkFormSecurityTokenRedirectOnError('/admin/users', 'admin_users');
 
@@ -75,8 +73,8 @@ class Users extends BaseAdminModule
 
                        Thank you and welcome to %4$s.'));
 
-                       $preamble = sprintf($preamble, $user['username'], Config::get('config', 'sitename'));
-                       $body = sprintf($body, DI::baseUrl()->get(), $user['nickname'], $result['password'], Config::get('config', 'sitename'));
+                       $preamble = sprintf($preamble, $user['username'], DI::config()->get('config', 'sitename'));
+                       $body = sprintf($body, DI::baseUrl()->get(), $user['nickname'], $result['password'], DI::config()->get('config', 'sitename'));
 
                        notification([
                                'type'     => SYSTEM_EMAIL,
@@ -84,7 +82,7 @@ class Users extends BaseAdminModule
                                'to_name'  => $user['username'],
                                'to_email' => $user['email'],
                                'uid'      => $user['uid'],
-                               'subject'  => DI::l10n()->t('Registration details for %s', Config::get('config', 'sitename')),
+                               'subject'  => DI::l10n()->t('Registration details for %s', DI::config()->get('config', 'sitename')),
                                'preamble' => $preamble,
                                'body'     => $body]);
                }
@@ -92,13 +90,13 @@ class Users extends BaseAdminModule
                if (!empty($_POST['page_users_block'])) {
                        // @TODO Move this to Model\User:block($users);
                        DBA::update('user', ['blocked' => 1], ['uid' => $users]);
-                       notice(L10n::tt('%s user blocked', '%s users blocked', count($users)));
+                       notice(DI::l10n()->tt('%s user blocked', '%s users blocked', count($users)));
                }
 
                if (!empty($_POST['page_users_unblock'])) {
                        // @TODO Move this to Model\User:unblock($users);
                        DBA::update('user', ['blocked' => 0], ['uid' => $users]);
-                       notice(L10n::tt('%s user unblocked', '%s users unblocked', count($users)));
+                       notice(DI::l10n()->tt('%s user unblocked', '%s users unblocked', count($users)));
                }
 
                if (!empty($_POST['page_users_delete'])) {
@@ -110,7 +108,7 @@ class Users extends BaseAdminModule
                                }
                        }
 
-                       notice(L10n::tt('%s user deleted', '%s users deleted', count($users)));
+                       notice(DI::l10n()->tt('%s user deleted', '%s users deleted', count($users)));
                }
 
                if (!empty($_POST['page_users_approve'])) {
@@ -215,7 +213,7 @@ class Users extends BaseAdminModule
                );
                $users = DBA::toArray($usersStmt);
 
-               $adminlist = explode(',', str_replace(' ', '', Config::get('config', 'admin_email')));
+               $adminlist = explode(',', str_replace(' ', '', DI::config()->get('config', 'admin_email')));
                $_setup_users = function ($e) use ($adminlist) {
                        $page_types = [
                                User::PAGE_FLAGS_NORMAL    => DI::l10n()->t('Normal Account Page'),