tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Do not use page control unless explicitly announced 

refs #8490
This commit is contained in:
Matthias Jentsch 2015-02-27 17:08:11 +01:00
parent 65821863fa
commit 36d2d31035
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
library/Icinga/Protocol/Ldap/Connection.php
View File

@ -299,7 +299,9 @@ class Connection
*/ */
protected function pageControlAvailable(Query $query) protected function pageControlAvailable(Query $query)
{ {
return $query->getUsePagedResults() && version_compare(PHP_VERSION, '5.4.0') >= 0; return $this->capabilities->hasPagedResult() &&
$query->getUsePagedResults() &&
version_compare(PHP_VERSION, '5.4.0') >= 0;
} }
/** /**
@ -336,8 +338,8 @@ class Connection
$cookie = ''; $cookie = '';
$entries = array(); $entries = array();
do { do {
// do not set controlPageResult as a critical extension, since there is still the possibillity that the // do not set controlPageResult as a critical extension, since we still want the
// server returns an answer in case the pagination extension is missing. // possibillity server to return an answer in case the pagination extension is missing.
ldap_control_paged_result($this->ds, $pageSize, false, $cookie); ldap_control_paged_result($this->ds, $pageSize, false, $cookie);
$results = @ldap_search($this->ds, $base, $queryString, $fields, 0, $limit ? $offset + $limit : 0); $results = @ldap_search($this->ds, $base, $queryString, $fields, 0, $limit ? $offset + $limit : 0);