fix(ldapfield): only last page of LDAP results rendered

Signed-off-by: Thierry Bugier <[email protected]>
pluginsGLPI · Mar 3, 2021 · 17ac461 · 17ac461
1 parent 4731788
commit 17ac461
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/inc/field/ldapselectfield.class.php b/inc/field/ldapselectfield.class.php
@@ -141,6 +141,7 @@ public function getAvailableValues() {
          ldap_set_option($ds, LDAP_OPT_PROTOCOL_VERSION, 3);
 
          $cookie = '';
+         $id = 0;
          do {
             if (AuthLDAP::isLdapPageSizeAvailable($config_ldap)) {
                // phpcs:ignore Generic.PHP.DeprecatedFunctions
@@ -151,12 +152,12 @@ public function getAvailableValues() {
             $entries = ldap_get_entries($ds, $result);
             array_shift($entries);
 
-            foreach ($entries as $id => $attr) {
-               if (isset($attr[$attribute[0]])
-                  && !in_array($attr[$attribute[0]][0], $tab_values)
-               ) {
-                  $tab_values[$id] = $attr[$attribute[0]][0];
+            foreach ($entries as $attr) {
+               if (!isset($attr[$attribute[0]]) || in_array($attr[$attribute[0]][0], $tab_values)) {
+                  continue;
                }
+               $tab_values[$id] = $attr[$attribute[0]][0];
+               $id++;
             }
 
             if (AuthLDAP::isLdapPageSizeAvailable($config_ldap)) {