From ecf7f40704ee7fd2cf181dbe47aca05cb16ab225 Mon Sep 17 00:00:00 2001
From: nupplaPhil <admin+github@philipp.info>
Date: Fri, 21 Feb 2020 23:50:17 +0100
Subject: [PATCH] Admin page improvements

---
 src/Module/Admin/Users.php | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/Module/Admin/Users.php b/src/Module/Admin/Users.php
index a264f129c9..73a11e65a8 100644
--- a/src/Module/Admin/Users.php
+++ b/src/Module/Admin/Users.php
@@ -56,14 +56,14 @@ class Users extends BaseAdmin
 
 		if (!empty($_POST['page_users_block'])) {
 			foreach ($users as $uid) {
-				User::block(Register::getPendingForUser($uid)['hash'] ?? '');
+				User::block($uid);
 			}
 			notice(DI::l10n()->tt('%s user blocked', '%s users blocked', count($users)));
 		}
 
 		if (!empty($_POST['page_users_unblock'])) {
 			foreach ($users as $uid) {
-				User::block(Register::getPendingForUser($uid)['hash'] ?? '', false);
+				User::block($uid, false);
 			}
 			notice(DI::l10n()->tt('%s user unblocked', '%s users unblocked', count($users)));
 		}
@@ -82,18 +82,16 @@ class Users extends BaseAdmin
 
 		if (!empty($_POST['page_users_approve'])) {
 			foreach ($pending as $hash) {
-				if (User::allow($hash)) {
-					info(DI::l10n()->t('Account approved.'));
-				}
+				User::allow($hash);
 			}
+			notice(DI::l10n()->tt('%s user approved', '%s users approved', count($pending)));
 		}
 
 		if (!empty($_POST['page_users_deny'])) {
 			foreach ($pending as $hash) {
-				if (User::deny($hash)) {
-					notice(DI::l10n()->t('Registration revoked'));
-				}
+				User::deny($hash);
 			}
+			notice(DI::l10n()->tt('%s registration revoked', '%s registrations revoked', count($pending)));
 		}
 
 		DI::baseUrl()->redirect('admin/users');