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

Put inner loop into own method, let's see whether it makes scrutinizer happier

This commit is contained in:
Arthur Schiwon 2014-03-20 11:38:05 +01:00
parent bdc418d1f9
commit 2e5adadad7
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
apps/user_ldap/lib/access.php
View File

@ -794,15 +794,8 @@ class Access extends LDAPUtility {
}
list($sr, $pagedSearchOK) = $search;
foreach($sr as $key => $res) {
$count = $this->ldap->countEntries($cr, $res);
if($count !== false) {
$counter += $count;
}
if($count === $limit) {
$continue = true;
}
}
$count = $this->countEntriesInSearchResults($sr, $limit, $continue);
$counter += $count;
$this->processPagedSearchStatus($sr, $filter, $base, $count, $limit,
$offset, $pagedSearchOK, $skipHandling);
@ -812,6 +805,22 @@ class Access extends LDAPUtility {
return $counter;
}
private function countEntriesInSearchResults($searchResults, $limit,
&$hasHitLimit) {
$cr = $this->connection->getConnectionResource();
$count = 0;
foreach($searchResults as $res) {
$count = intval($this->ldap->countEntries($cr, $res));
$counter += $count;
if($count === $limit) {
$hasHitLimit = true;
}
}
return $counter;
}
/**
* @brief executes an LDAP search
* @param $filter the LDAP filter for the search