Ensure compatibility with SSP 1.x and 2.x by inlining arrayize

Author: thijskh

lib/Auth/Ldap.php

@@ -351,7 +351,7 @@ public function searchfordn(
         string $scope = 'subtree'
     ): ?string {
         // Traverse all search bases, returning DN if found
-        $bases = Utils\Arrays::arrayize($base);
+        $bases = is_array($base) ? $base : [$base];
         foreach ($bases as $current) {
             try {
                 // Single base search
@@ -373,8 +373,9 @@ public function searchfordn(
             return null;
         } else {
             // Zero hits not allowed
+            $attributes = is_array($attribute) ? $attribute : [$attribute];
             throw $this->makeException('Library - LDAP searchfordn(): LDAP search returned zero entries for' .
-                ' filter \'(' . join(' | ', Utils\Arrays::arrayize($attribute)) .
+                ' filter \'(' . join(' | ', $attributes) .
                 ' = ' . $value . ')\' on base(s) \'(' . join(' & ', $bases) . ')\'', 2);
         }
     }
@@ -435,7 +436,7 @@ public function searchformultiple(
             throw $this->makeException('ldap:LdapConnection->search_manual : No base DNs were passed', ERR_INTERNAL);
         }
 
-        $attributes = Utils\Arrays::arrayize($attributes);
+        $attributes = is_array($attributes) ? $attributes : [$attributes];
 
         // Search each base until result is found
         $result = false;
@@ -755,7 +756,7 @@ public function validate(array $config, string $username, string $password = nul
     public static function escapeFilterValue($values = [], bool $singleValue = true)
     {
         // Parameter validation
-        $values = Utils\Arrays::arrayize($values);
+        $values = is_array($values) ? $values : [$values];
 
         foreach ($values as $key => $val) {
             if ($val === null) {

lib/Auth/Process/AttributeAddUsersGroups.php

@@ -349,7 +349,7 @@ protected function searchActiveDirectory(string $dn): array
             ' Member Attribute: ' . $map['member'] .
             ' Type Attribute: ' . $map['type'] .
             ' Type Value: ' . $this->type_map['group'] .
-            ' Base: ' . implode('; ', Arrays::Arrayize($this->base_dn))
+            ' Base: ' . implode('; ', is_array($this->base_dn) ? $this->base_dn : [$this->base_dn]);
         );
 
         // AD connections should have this set