Merge pull request #8619 from uberbrady/fix_ldap_paging

Fixed #8563 - Clean up AdLdap2 integration to better handle paged result-sets

app/Console/Commands/LdapSync.php

@@ -221,12 +221,11 @@ private function updateCreateUser(AdldapUser $snipeUser): void
  *
  * @since 5.0.0
  *
- * @param int $page The page to get the result set
  */
- private function processLdapUsers(int $page=0): void
+ private function processLdapUsers(): void
  {
  try {
- $ldapUsers = $this->ldap->getLdapUsers($page);
+ $ldapUsers = $this->ldap->getLdapUsers();
  } catch (Exception $e) {
  $this->outputError($e);
  exit($e->getMessage());
@@ -242,15 +241,9 @@ private function processLdapUsers(int $page=0): void
  }
 
  // Process each individual users
- foreach ($ldapUsers as $user) {
+ foreach ($ldapUsers->getResults() as $user) { // AdLdap2's paginate() method is weird, it gets *everything* and ->getResults() returns *everything*
  $this->updateCreateUser($user);
  }
-
- if ($ldapUsers->getCurrentPage() < $ldapUsers->getPages()-1) {
- $current_page = $ldapUsers->getCurrentPage();
- unset($ldapUsers); //deliberately unset the variable so we don't OOM
- $this->processLdapUsers($current_page + 1); //this recursive call means that the $ldapUsers variable is not going to get GC'ed until everything returns. Blech.
- }
  }
 
  /**