wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

getGroups(): fix overall max search limit for paged searches

Browse source
This commit is contained in:
root 2014-03-04 21:12:47 +01:00
parent eb1e361824
commit 4645d0a93a
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/user_ldap/group_ldap.php
View file

@ -344,7 +344,6 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
* (active directory has a limit of 1000 by default)
*/
public function getGroups($search = '', $limit = -1, $offset = 0) {
$max_groups = 100000; // limit max results (just for safety reasons)
if(!$this->enabled) {
return array();
}
@ -353,10 +352,11 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
|| empty($pagingsize)) {
return $this->getGroupsChunk($search, $limit, $offset);
}
$max_groups = 100000; // limit max results (just for safety reasons)
if ($limit > -1) {
$overall_limit = min($limit, 100000);
$overall_limit = min($limit, $max_groups);
} else {
$overall_limit = 100000;
$overall_limit = $max_groups;
}
$chunk_offset = $offset;
$all_groups = array();