extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-31 11:09:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Admin: Add an 'All' account status filter

Browse Source
This commit is contained in:
nathangray 2020-05-19 11:00:21 -06:00
parent dc1518c8d4
commit 10494a0a86
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
admin/inc/class.admin_ui.inc.php
View File

@ -93,6 +93,7 @@ class admin_ui
unset($sel_options['account_primary_group']['']);
$sel_options['filter2'] = array(
'' => 'All',
'enabled' => 'Enabled',
'disabled' => 'Disabled',
'expired' => 'Expired',
@ -337,6 +338,7 @@ class admin_ui
// Make sure active filter give status what it needs
switch($query['filter2'])
{
case '':
case 'disabled':
case 'expired':
case 'not_enabled':
@ -399,10 +401,10 @@ class admin_ui
return $account['account_status'] == 'A';
case 'disabled':
return $account['account_status'] !== 'A';
return $account['account_status'] !== 'A' && $account['account_expires'] == '-1';
case 'expired':
return $account['account_expires'] !== '-1' && $account['account_status'] != 'A';
return $account['account_expires'] !== '-1' && $account['account_expires'] <= time();
case 'expires':
return $account['account_expires'] != '-1' && $account['account_status'] == 'A';