diff --git a/src/Module/Admin/BaseUsers.php b/src/Module/Admin/BaseUsers.php index 5dd347027..fb6ce1389 100644 --- a/src/Module/Admin/BaseUsers.php +++ b/src/Module/Admin/BaseUsers.php @@ -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, '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'), diff --git a/src/Module/Admin/Users/Active.php b/src/Module/Admin/Users/Active.php index b5596c65f..7b9d53bef 100644 --- a/src/Module/Admin/Users/Active.php +++ b/src/Module/Admin/Users/Active.php @@ -128,7 +128,7 @@ class Active extends BaseUsers $th_users = array_map(null, [DI::l10n()->t('Name'), DI::l10n()->t('Email'), DI::l10n()->t('Register date'), DI::l10n()->t('Last login'), DI::l10n()->t('Last public item'), DI::l10n()->t('Type')], $valid_orders); - $count = DBA::count('user', ['blocked' => false, 'account_removed' => false]); + $count = DBA::count('user', ["NOT `blocked` AND `verified` AND NOT `account_removed` AND `uid` != ?", 0]); $t = Renderer::getMarkupTemplate('admin/users/active.tpl'); return self::getTabsHTML('active') . Renderer::replaceMacros($t, [ diff --git a/src/Module/Admin/Users/Index.php b/src/Module/Admin/Users/Index.php index c74071562..7cdd67441 100644 --- a/src/Module/Admin/Users/Index.php +++ b/src/Module/Admin/Users/Index.php @@ -141,7 +141,7 @@ class Index extends BaseUsers $th_users = array_map(null, [DI::l10n()->t('Name'), DI::l10n()->t('Email'), DI::l10n()->t('Register date'), DI::l10n()->t('Last login'), DI::l10n()->t('Last public item'), DI::l10n()->t('Type')], $valid_orders); - $count = DBA::count('user'); + $count = DBA::count('user', ["`uid` != ?", 0]); $t = Renderer::getMarkupTemplate('admin/users/index.tpl'); return self::getTabsHTML('all') . Renderer::replaceMacros($t, [