diff --git a/plugins/addons/dashboard/class_dashBoardUsers.inc b/plugins/addons/dashboard/class_dashBoardUsers.inc index 1a7aa87e5240a46c142d09fa2679605b98a5a4ce..494db21c72244a0fd1523a0dbb7ce10ccd059f25 100644 --- a/plugins/addons/dashboard/class_dashBoardUsers.inc +++ b/plugins/addons/dashboard/class_dashBoardUsers.inc @@ -167,6 +167,9 @@ class dashboardUsers extends simplePlugin } } + uasort($expired_accounts, array('dashboardUsers','compareUsers')); + uasort($next_expired_accounts, array('dashboardUsers','compareUsers')); + return array( 'columns' => $this->expiredAccountsColumns, 'accounts' => $expired_accounts, @@ -208,5 +211,20 @@ class dashboardUsers extends simplePlugin 'expirationDate' => $human_shadowExpire, ); } + + static function compareUsers ($a, $b) + { + if ($a['expirationDate'] < $b['expirationDate']) { + return -1; + } elseif ($a['expirationDate'] > $b['expirationDate']) { + return 1; + } elseif ($a['uid'] < $b['uid']) { + return -1; + } elseif ($a['uid'] > $b['uid']) { + return 1; + } else { + return 0; + } + } } ?>