diff options
| author | yemkareems <yemkareems@gmail.com> | 2024-05-06 17:29:56 +0530 |
|---|---|---|
| committer | yemkareems <yemkareems@gmail.com> | 2024-07-08 15:42:55 +0530 |
| commit | 87a8013ee3d81a3ca8fb300db9fbb8d587c4ed38 (patch) | |
| tree | 2737da200a564db011083e3721724314e7b271c0 | |
| parent | 0ee676cd5123dc13e7f4e31817e02d74d657c51a (diff) | |
| download | nextcloud-server-87a8013ee3d81a3ca8fb300db9fbb8d587c4ed38.tar.gz nextcloud-server-87a8013ee3d81a3ca8fb300db9fbb8d587c4ed38.zip | |
feat: cs fix run on the changed files and default order by last_login desc. Also last_login sort logic changed
Signed-off-by: yemkareems <yemkareems@gmail.com>
| -rw-r--r-- | apps/provisioning_api/lib/Controller/UsersController.php | 2 | ||||
| -rw-r--r-- | lib/private/User/Manager.php | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/apps/provisioning_api/lib/Controller/UsersController.php b/apps/provisioning_api/lib/Controller/UsersController.php index 04bf3a94421..fe8a17a6641 100644 --- a/apps/provisioning_api/lib/Controller/UsersController.php +++ b/apps/provisioning_api/lib/Controller/UsersController.php @@ -137,7 +137,7 @@ class UsersController extends AUserData { * * 200: Users details returned */ - public function getUsersDetails(string $search = '', ?int $limit = null, int $offset = 0, string $orderBy = 'displayName', string $sort = 'ASC'): DataResponse { + public function getUsersDetails(string $search = '', ?int $limit = null, int $offset = 0, string $orderBy = 'last_login', string $sort = 'DESC'): DataResponse { $currentUser = $this->userSession->getUser(); $users = []; diff --git a/lib/private/User/Manager.php b/lib/private/User/Manager.php index 6b0c0dbd1d3..87aa859408d 100644 --- a/lib/private/User/Manager.php +++ b/lib/private/User/Manager.php @@ -280,12 +280,12 @@ class Manager extends PublicEmitter implements IUserManager { break; case 'last_login ASC': uasort($users, function (IUser $a, IUser $b) { - return strcasecmp($a->getLastLogin(), $b->getLastLogin()); + return $a->getLastLogin() - $b->getLastLogin(); }); break; case 'last_login DESC': uasort($users, function (IUser $a, IUser $b) { - return strcasecmp($b->getLastLogin(), $a->getLastLogin()); + return $b->getLastLogin() - $a->getLastLogin(); }); break; case 'displayName ASC': @@ -316,7 +316,7 @@ class Manager extends PublicEmitter implements IUserManager { * @param int $offset * @return IUser[] */ - public function searchDisplayName($pattern, $limit = null, $offset = null, $orderBy = 'displayName', $sort= 'ASC') { + public function searchDisplayName($pattern, $limit = null, $offset = null, $orderBy = 'displayName', $sort = 'ASC') { $users = []; foreach ($this->backends as $backend) { $backendUsers = $backend->getDisplayNames($pattern, $limit, $offset); @@ -340,12 +340,12 @@ class Manager extends PublicEmitter implements IUserManager { break; case 'last_login ASC': uasort($users, function (IUser $a, IUser $b) { - return strcasecmp($a->getLastLogin(), $b->getLastLogin()); + return $a->getLastLogin() - $b->getLastLogin(); }); break; case 'last_login DESC': uasort($users, function (IUser $a, IUser $b) { - return strcasecmp($b->getLastLogin(), $a->getLastLogin()); + return $b->getLastLogin() - $a->getLastLogin(); }); break; case 'displayName DESC': |