mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix counting found results in search op 

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
This commit is contained in:
Arthur Schiwon 2017-09-11 15:30:44 +02:00
parent 816f1ba53f
commit e9a853aa2a
No known key found for this signature in database
GPG Key ID: 7424F1874854DF23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/user_ldap/lib/Access.php
View File

@ -927,7 +927,7 @@ class Access extends LDAPUtility implements IUserTools {
* @param array $sr the array containing the LDAP search resources
* @param string $filter the LDAP filter for the search
* @param array $base an array containing the LDAP subtree(s) that shall be searched
* @param int $iFoundItems number of results in the search operation
* @param int $iFoundItems number of results in the single search operation
* @param int $limit maximum results to be counted
* @param int $offset a starting point
* @param bool $pagedSearchOK whether a paged search has been executed
@ -1077,15 +1077,18 @@ class Access extends LDAPUtility implements IUserTools {
return array();
}
$iFoundItems = 0;
foreach($sr as $res) {
$findings = array_merge($findings, $this->invokeLDAPMethod('getEntries', $cr, $res));
$iFoundItems = max($iFoundItems, $findings['count']);
unset($findings['count']);
}
$continue = $this->processPagedSearchStatus($sr, $filter, $base, $findings['count'],
$continue = $this->processPagedSearchStatus($sr, $filter, $base, $iFoundItems,
$limitPerPage, $offset, $pagedSearchOK,
$skipHandling);
$offset += $limitPerPage;
} while ($continue && $pagedSearchOK && ($limit === null || $findings['count'] < $limit));
} while ($continue && $pagedSearchOK && ($limit === null || count($findings) < $limit));
// reseting offset
$offset = $savedoffset;