sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LDAP: adjust usersInGroup to updated interface

remotes/origin/stable45
Arthur Schiwon 2012-08-14 14:30:03 +07:00
parent 3c1380b093
commit 62e4f55f72
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
apps/user_ldap/group_ldap.php
Unescape Escape View File

@ -133,12 +133,17 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
* @brief get a list of all users in a group
* @returns array with user ids
*/
public function usersInGroup($gid) {
public function usersInGroup($gid, $search = '', $limit = -1, $offset = 0) {
if(!$this->enabled) {
return array();
}
$this->groupSearch = $search;
if($this->connection->isCached('usersInGroup'.$gid)) {
return $this->connection->getFromCache('usersInGroup'.$gid);
$groupUsers = $this->connection->getFromCache('usersInGroup'.$gid);
if(!empty($this->groupSearch)) {
$groupUsers = array_filter($groupUsers, array($this, 'groupMatchesFilter'));
}
return array_slice($groupUsers, $offset, $limit);
}
$groupDN = $this->groupname2dn($gid);
@ -176,7 +181,11 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
$groupUsers = array_unique($result, SORT_LOCALE_STRING);
$this->connection->writeToCache('usersInGroup'.$gid, $groupUsers);
return $groupUsers;
if(!empty($this->groupSearch)) {
$groupUsers = array_filter($groupUsers, array($this, 'groupMatchesFilter'));
}
return array_slice($groupUsers, $offset, $limit);
}
/**