Do not apply server side sorting for paged search requests

Revert this prior start working on #10147 refs #10147
Icinga · Oct 1, 2015 · 57f30b1 · 57f30b1
1 parent 50e6681
commit 57f30b1
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/library/Icinga/Protocol/Ldap/LdapConnection.php b/library/Icinga/Protocol/Ldap/LdapConnection.php
@@ -808,7 +808,7 @@ protected function runPagedQuery(LdapQuery $query, array $fields = null, $pageSi
 
         $ds = $this->getConnection();
 
-        $serverSorting = $this->getCapabilities()->hasOid(LdapCapabilities::LDAP_SERVER_SORT_OID);
+        $serverSorting = false;//$this->getCapabilities()->hasOid(LdapCapabilities::LDAP_SERVER_SORT_OID);
         if (! $serverSorting && $query->hasOrder()) {
             foreach ($query->getOrder() as $rule) {
                 if (! in_array($rule[0], $fields)) {

diff --git a/library/Icinga/Protocol/Ldap/LdapQuery.php b/library/Icinga/Protocol/Ldap/LdapQuery.php
@@ -48,7 +48,7 @@ class LdapQuery extends SimpleQuery
     protected function init()
     {
         $this->filters = array();
-        $this->usePagedResults = true;
+        $this->usePagedResults = false;
     }
 
     /**

diff --git a/modules/setup/application/forms/AdminAccountPage.php b/modules/setup/application/forms/AdminAccountPage.php
@@ -291,11 +291,15 @@ protected function getUsername()
     protected function fetchUsers()
     {
         try {
-            return $this
+            $query = $this
                 ->createUserBackend()
                 ->select(array('user_name'))
-                ->order('user_name', 'asc', true)
-                ->fetchColumn();
+                ->order('user_name', 'asc', true);
+            if (in_array($this->backendConfig['backend'], array('ldap', 'msldap'))) {
+                $query->getQuery()->setUsePagedResults();
+            }
+
+            return $query->fetchColumn();
         } catch (Exception $_) {
             // No need to handle anything special here. Error means no users found.
             return array();
@@ -346,10 +350,14 @@ protected function createUserBackend()
     protected function fetchGroups()
     {
         try {
-            return $this
+            $query = $this
                 ->createUserGroupBackend()
-                ->select(array('group_name'))
-                ->fetchColumn();
+                ->select(array('group_name'));
+            if (in_array($this->backendConfig['backend'], array('ldap', 'msldap'))) {
+                $query->getQuery()->setUsePagedResults();
+            }
+
+            return $query->fetchColumn();
         } catch (Exception $_) {
             // No need to handle anything special here. Error means no groups found.
             return array();