Merge pull request #11041 from tobiasd/2021.12-CHANGELOG

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

diff --git a/src/Module/Admin/BaseUsers.php b/src/Module/Admin/BaseUsers.php
index 97b10f41fbc6d3f866812cd27c8683fa42026ac2..769f114ce56126e5b9f2d4bbc6744b23c08f5d9b 100644 (file)
--- a/src/Module/Admin/BaseUsers.php
+++ b/src/Module/Admin/BaseUsers.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -40,14 +40,15 @@ abstract class BaseUsers extends BaseAdmin
         */
        protected static function getTabsHTML(string $selectedTab)
        {
-               $active = DBA::count('user', ['blocked' => false, 'verified' => true, 'account_removed' => false]);
+               $all     = DBA::count('user', ["`uid` != ?", 0]);
+               $active  = DBA::count('user', ["NOT `blocked` AND `verified` AND NOT `account_removed` AND `uid` != ?", 0]);
                $pending = Register::getPendingCount();
-               $blocked = DBA::count('user', ['blocked' => true, 'verified' => true]);
+               $blocked = DBA::count('user', ['blocked' => true, 'verified' => true, 'account_removed' => false]);
                $deleted = DBA::count('user', ['account_removed' => true]);
 
                $tabs = [
                        [
-                               'label' => DI::l10n()->t('All') . ' (' . DBA::count('user') . ')',
+                               'label' => DI::l10n()->t('All') . ' (' . $all . ')',
                                'url'   => 'admin/users',
                                'sel'   => !$selectedTab || $selectedTab == 'all' ? 'active' : '',
                                'title' => DI::l10n()->t('List of all users'),
@@ -120,7 +121,7 @@ abstract class BaseUsers extends BaseAdmin
                        $user['login_date'] = Temporal::getRelativeDate($user['login_date']);
                        $user['lastitem_date'] = Temporal::getRelativeDate($user['last-item']);
                        $user['is_admin'] = in_array($user['email'], $adminlist);
-                       $user['is_deletable'] = (intval($user['uid']) != local_user());
+                       $user['is_deletable'] = !$user['account_removed'] && intval($user['uid']) != local_user();
                        $user['deleted'] = ($user['account_removed'] ? Temporal::getRelativeDate($user['account_expires_on']) : False);
 
                        return $user;