diff options
| author | yemkareems <yemkareems@gmail.com> | 2024-06-06 16:35:44 +0530 |
|---|---|---|
| committer | yemkareems <yemkareems@gmail.com> | 2024-07-08 15:42:55 +0530 |
| commit | 4cb85f7c9e37af742d170373602709f8db2d525d (patch) | |
| tree | 8d63eaabb24787cda4afc4c8b44b3914c4351dec /lib/public | |
| parent | 76c875a5882753e37ef39015a1711b68e7ea0d0b (diff) | |
| download | nextcloud-server-4cb85f7c9e37af742d170373602709f8db2d525d.tar.gz nextcloud-server-4cb85f7c9e37af742d170373602709f8db2d525d.zip | |
fix: rebased the branch with master and resolved conflicts
fix: added a new endpoint users/recent and getting users based on last login info in the same. Reverted old code that was breaking LDAP
Signed-off-by: yemkareems <yemkareems@gmail.com>
Diffstat (limited to 'lib/public')
| -rw-r--r-- | lib/public/IConfig.php | 2 | ||||
| -rw-r--r-- | lib/public/IUserManager.php | 1 | ||||
| -rw-r--r-- | lib/public/UserInterface.php | 6 |
3 files changed, 5 insertions, 4 deletions
diff --git a/lib/public/IConfig.php b/lib/public/IConfig.php index b7feabd0ef5..39f9ecff94c 100644 --- a/lib/public/IConfig.php +++ b/lib/public/IConfig.php @@ -249,4 +249,6 @@ interface IConfig { * @since 8.0.0 */ public function getUsersForUserValue($appName, $key, $value); + + public function getLastLoggedInUsers($search, $sortMode, $sortOrder); } diff --git a/lib/public/IUserManager.php b/lib/public/IUserManager.php index b4fb265f6eb..70420dc7c7a 100644 --- a/lib/public/IUserManager.php +++ b/lib/public/IUserManager.php @@ -124,6 +124,7 @@ interface IUserManager { */ public function getDisabledUsers(?int $limit = null, int $offset = 0, string $search = ''): array; + public function getUsersSortedByLastLogin(?int $limit = null, int $offset = 0, $search = '', $sortMode = 'lastLogin', $sortOrder = 'desc'): array; /** * Search known users (from phonebook sync) by displayName * diff --git a/lib/public/UserInterface.php b/lib/public/UserInterface.php index a28e9ffe726..34e7a09feb7 100644 --- a/lib/public/UserInterface.php +++ b/lib/public/UserInterface.php @@ -45,7 +45,7 @@ interface UserInterface { * @return string[] an array of all uids * @since 4.5.0 */ - public function getUsers($search = '', $limit = null, $offset = null, string $sortMode = 'uid', string $sortOrder = 'asc'); + public function getUsers($search = '', $limit = null, $offset = null); /** * check if a user exists @@ -69,12 +69,10 @@ interface UserInterface { * @param string $search * @param int|null $limit * @param int|null $offset - * @param string $sortMode - * @param string $sortOrder * @return array an array of all displayNames (value) and the corresponding uids (key) * @since 4.5.0 */ - public function getDisplayNames($search = '', $limit = null, $offset = null, string $sortMode = 'uid', string $sortOrder = 'asc'); + public function getDisplayNames($search = '', $limit = null, $offset = null); /** * Check if a user list is available or not |