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

fix counting when ldapPagingSize is 0

This commit is contained in:
Arthur Schiwon 2014-11-21 14:51:20 +01:00
parent b5e707b1bf
commit c07c338c90
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -813,7 +813,7 @@ class Access extends LDAPUtility implements user\IUserTools {
} }
//check whether paged search should be attempted //check whether paged search should be attempted
$pagedSearchOK = $this->initPagedSearch($filter, $base, $attr, $limit, $offset); $pagedSearchOK = $this->initPagedSearch($filter, $base, $attr, intval($limit), $offset);
$linkResources = array_pad(array(), count($base), $cr); $linkResources = array_pad(array(), count($base), $cr);
$sr = $this->ldap->search($linkResources, $base, $filter, $attr); $sr = $this->ldap->search($linkResources, $base, $filter, $attr);
@ -887,10 +887,9 @@ class Access extends LDAPUtility implements user\IUserTools {
private function count($filter, $base, $attr = null, $limit = null, $offset = null, $skipHandling = false) { private function count($filter, $base, $attr = null, $limit = null, $offset = null, $skipHandling = false) {
\OCP\Util::writeLog('user_ldap', 'Count filter: '.print_r($filter, true), \OCP\Util::DEBUG); \OCP\Util::writeLog('user_ldap', 'Count filter: '.print_r($filter, true), \OCP\Util::DEBUG);
$limitPerPage = (intval($limit) < intval($this->connection->ldapPagingSize)) ? $limitPerPage = intval($this->connection->ldapPagingSize);
intval($limit) : intval($this->connection->ldapPagingSize); if(!is_null($limit) && $limit < $limitPerPage && $limit > 0) {
if(is_null($limit) || $limit <= 0) { $limitPerPage = $limit;
$limitPerPage = intval($this->connection->ldapPagingSize);
} }
$counter = 0; $counter = 0;
@ -1472,7 +1471,7 @@ class Access extends LDAPUtility implements user\IUserTools {
*/ */
private function initPagedSearch($filter, $bases, $attr, $limit, $offset) { private function initPagedSearch($filter, $bases, $attr, $limit, $offset) {
$pagedSearchOK = false; $pagedSearchOK = false;
if($this->connection->hasPagedResultSupport && !is_null($limit)) { if($this->connection->hasPagedResultSupport && ($limit !== 0)) {
$offset = intval($offset); //can be null $offset = intval($offset); //can be null
\OCP\Util::writeLog('user_ldap', \OCP\Util::writeLog('user_ldap',
'initializing paged search for Filter '.$filter.' base '.print_r($bases, true) 'initializing paged search for Filter '.$filter.' base '.print_r($bases, true)