Merge branch 'cherry-pick-aaeffecc' into '1.2-fixes'

Merge branch '5703-sort-entries-in-users-dashboard' into '1.3-dev'

See merge request !57

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;
+    }
+  }
 }
 ?>