getChildren specify attributes

search

update submodule

Author: simonLeary42

resources/lib/UnityLDAP.php

@@ -167,19 +167,19 @@ private function IDNumInUse($id)
         if (($id >= 100 && $id <= 999) || ($id >= 60000 && $id <= 64999)) {
             return true;
         }
-        $users = $this->userOU->getChildrenArray(true);
+        $users = $this->userOU->getChildrenArray([], true);
         foreach ($users as $user) {
             if ($user["uidnumber"][0] == $id) {
                 return true;
             }
         }
-        $pi_groups = $this->pi_groupOU->getChildrenArray(true);
+        $pi_groups = $this->pi_groupOU->getChildrenArray(["gidnumber"], true);
         foreach ($pi_groups as $pi_group) {
             if ($pi_group["gidnumber"][0] == $id) {
                 return true;
             }
         }
-        $groups = $this->groupOU->getChildrenArray(true);
+        $groups = $this->groupOU->getChildrenArray(["gidnumber"], true);
         foreach ($groups as $group) {
             if ($group["gidnumber"][0] == $id) {
                 return true;

resources/lib/phpopenldaper

@@ -35,7 +35,7 @@
 
     // search entire tree, some users created for admin purposes might not be in the normal OU
     echo "waiting for LDAP search (users)...\n";
-    $users = $LDAP->search("objectClass=posixAccount", $CONFIG["ldap"]["basedn"]);
+    $users = $LDAP->search("objectClass=posixAccount", $CONFIG["ldap"]["basedn"], []);
     echo "response received.\n";
     $user_CNs = $LDAP->getUserGroup()->getAttribute("memberuid");
     sort($user_CNs);
@@ -56,7 +56,7 @@
 
     $org_group_ou = new LDAPEntry($LDAP->getConn(), $CONFIG["ldap"]["orggroup_ou"]);
     echo "waiting for LDAP search (org groups)...\n";
-    $org_groups = $org_group_ou->getChildrenArray(true);
+    $org_groups = $org_group_ou->getChildrenArray(["cn", "memberuid"], true);
     echo "response received.\n";
     // phpcs:disable
     $org_group_CNs = array_map(function($x){return $x["cn"][0];}, $org_groups);
@@ -70,7 +70,7 @@
 
     $pi_group_ou = new LDAPEntry($LDAP->getConn(), $CONFIG["ldap"]["pigroup_ou"]);
     echo "waiting for LDAP search (pi groups)...\n";
-    $pi_groups = $pi_group_ou->getChildrenArray(true);
+    $pi_groups = $pi_group_ou->getChildrenArray(["cn", "memberuid"], true);
     echo "response received.\n";
     // phpcs:disable
     $pi_group_CNs = array_map(function($x){return $x["cn"][0];}, $pi_groups);