archive/nextcloud_server
0
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2025-03-12 23:47:25 +00:00
Code Issues Projects Releases Wiki Activity

feat: cs fix run on the changed files and default order by last_login desc. Also last_login sort logic changed

Browse source 
Signed-off-by: yemkareems <yemkareems@gmail.com>
This commit is contained in:
yemkareems 2024-05-06 17:29:56 +05:30
parent 0ee676cd51
commit 87a8013ee3
2 changed files with 6 additions and 6 deletions
apps/provisioning_api/lib/Controller
UsersController.php
lib/private/User
Manager.php

2
apps/provisioning_api/lib/Controller/UsersController.php
View file

@ -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 = [];

10
lib/private/User/Manager.php
View file

@ -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':