Merge pull request #9436 from nupplaphil/task/test_notices

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

diff --git a/src/Module/Admin/Users.php b/src/Module/Admin/Users.php
index f82f9f8c740e996de7b50004eea68d1f4db9cff3..f38c24d979d66781d4382230273dfe3df547ffab 100644 (file)
--- a/src/Module/Admin/Users.php
+++ b/src/Module/Admin/Users.php
@@ -34,7 +34,9 @@ class Users extends BaseAdmin
 {
        public static function post(array $parameters = [])
        {
-               parent::post($parameters);
+               self::checkAdminAccess();
+
+               self::checkFormSecurityTokenRedirectOnError('/admin/users', 'admin_users');
 
                $pending     = $_POST['pending']           ?? [];
                $users       = $_POST['user']              ?? [];
@@ -43,8 +45,6 @@ class Users extends BaseAdmin
                $nu_email    = $_POST['new_user_email']    ?? '';
                $nu_language = DI::config()->get('system', 'language');
 
-               parent::checkFormSecurityTokenRedirectOnError('/admin/users', 'admin_users');
-
                if ($nu_name !== '' && $nu_email !== '' && $nu_nickname !== '') {
                        try {
                                User::createMinimal($nu_name, $nu_email, $nu_nickname, $nu_language);
@@ -58,14 +58,14 @@ class Users extends BaseAdmin
                        foreach ($users as $uid) {
                                User::block($uid);
                        }
-                       notice(DI::l10n()->tt('%s user blocked', '%s users blocked', count($users)));
+                       info(DI::l10n()->tt('%s user blocked', '%s users blocked', count($users)));
                }
 
                if (!empty($_POST['page_users_unblock'])) {
                        foreach ($users as $uid) {
                                User::block($uid, false);
                        }
-                       notice(DI::l10n()->tt('%s user unblocked', '%s users unblocked', count($users)));
+                       info(DI::l10n()->tt('%s user unblocked', '%s users unblocked', count($users)));
                }
 
                if (!empty($_POST['page_users_delete'])) {
@@ -77,21 +77,21 @@ class Users extends BaseAdmin
                                }
                        }
 
-                       notice(DI::l10n()->tt('%s user deleted', '%s users deleted', count($users)));
+                       info(DI::l10n()->tt('%s user deleted', '%s users deleted', count($users)));
                }
 
                if (!empty($_POST['page_users_approve'])) {
                        foreach ($pending as $hash) {
                                User::allow($hash);
                        }
-                       notice(DI::l10n()->tt('%s user approved', '%s users approved', count($pending)));
+                       info(DI::l10n()->tt('%s user approved', '%s users approved', count($pending)));
                }
 
                if (!empty($_POST['page_users_deny'])) {
                        foreach ($pending as $hash) {
                                User::deny($hash);
                        }
-                       notice(DI::l10n()->tt('%s registration revoked', '%s registrations revoked', count($pending)));
+                       info(DI::l10n()->tt('%s registration revoked', '%s registrations revoked', count($pending)));
                }
 
                DI::baseUrl()->redirect('admin/users');
@@ -107,7 +107,7 @@ class Users extends BaseAdmin
                if ($uid) {
                        $user = User::getById($uid, ['username', 'blocked']);
                        if (!DBA::isResult($user)) {
-                               notice('User not found' . EOL);
+                               notice(DI::l10n()->t('User not found'));
                                DI::baseUrl()->redirect('admin/users');
                                return ''; // NOTREACHED
                        }