more stuff

Author: simonLeary42

resources/lib/UnityLDAP.php

@@ -166,7 +166,7 @@ private function getIDNumsInUse()
             range(100, 999), // reserved for debian packages
             range(6000, 64999), // reserved for debian packages
             array_map(fn($x) => $x["uidnumber"][0], $this->getAllUsersAttributes(["uidnumber"])),
-            array_map(fn($x) => $x["gidnumber"][0], $this->pi_groupOU->getChildrenArray(true)),
+            array_map(fn($x) => $x["gidnumber"][0], $this->pi_groupOU->getChildrenArray(["gidnumber"], true)),
         );
     }
 
@@ -203,7 +203,7 @@ public function getUnassignedID($uid, $UnitySQL)
   //
   // Functions that return user/group objects
   //
-    public function getAllUsers($UnitySQL, $UnityMailer, $UnityRedis, $UnityWebhook, $ignorecache = false)
+    public function getUnityUsers($UnitySQL, $UnityMailer, $UnityRedis, $UnityWebhook, $ignorecache = false)
     {
         $out = array();
 
@@ -218,7 +218,7 @@ public function getAllUsers($UnitySQL, $UnityMailer, $UnityRedis, $UnityWebhook,
             }
         }
 
-        $users = array_map(fn($x) => $x["cn"][0], $this->getAllUsersAttributes(["cn"]));
+        $users = array_map(fn($x) => $x["cn"][0], $this->getUnityUsersAttributes(["cn"]));
         sort($users);
         foreach ($users as $user) {
             $params = array($user, $this, $UnitySQL, $UnityMailer, $UnityRedis, $UnityWebhook);
@@ -228,13 +228,18 @@ public function getAllUsers($UnitySQL, $UnityMailer, $UnityRedis, $UnityWebhook,
         return $out;
     }
 
-    public function getAllUsersAttributes($attributes)
+    private function getAllUsersAttributes($attributes)
     {
-        // some LDAP users might be unity users but not be in the users OU
-        $users = $this->baseOU->getChildrenArray(true, "objectClass=posixAccount");
-        // some LDAP users might not be unity users at all
-        $unityuser_CNs = $this->getUserGroup()->getAttribute("memberuid");
-        return array_filter($users, fn($x) => in_array($x["cn"], $unityuser_CNs));
+        array_push($attributes, "cn");
+        return $this->baseOU->getChildrenArray($attributes, true, "objectClass=posixAccount");
+    }
+
+    private function getUnityUsersAttributes($attributes)
+    {
+        return array_filter(
+            getAllUsersAttributes($attributes),
+            fn($x) => in_array($x["cn"], $unityuser_CNs)
+        );
     }
 
     public function getAllPIGroups($UnitySQL, $UnityMailer, $UnityRedis, $UnityWebhook, $ignorecache = false)

resources/lib/phpopenldaper

@@ -37,9 +37,9 @@
     </tr>
 
     <?php
-    $users = $LDAP->getAllUsers($SQL, $MAILER, $REDIS, $WEBHOOK);
+    $users = $LDAP->getUnityUsers($SQL, $MAILER, $REDIS, $WEBHOOK);
 
-    usort($users, function ($a, $b) {
+    sort($users, function ($a, $b) {
         return strcmp($a->getUID(), $b->getUID());
     });