query only for attributes that we need

Author: simonLeary42

resources/lib/UnityLDAP.php

@@ -256,11 +256,11 @@ public function getAllUsers($UnitySQL, $UnityMailer, $UnityRedis, $UnityWebhook,
         }
     }
 
-    public function getAllUsersEntries()
+    public function getAllUsersEntries($attributes = [])
     {
         $include_uids = $this->getAllUsersUIDs();
         $user_entries = $this->baseOU->getChildrenArray(
-            [], // all attributes
+            $attributes,
             true, // recursive
             "objectClass=posixAccount"
         );
@@ -321,7 +321,7 @@ public function getPIGroupGIDsWithMemberUID($uid)
         );
     }
 
-    public function getAllPIGroupOwnerEntries()
+    public function getAllPIGroupOwnerEntries($attributes = [])
     {
         // get the PI groups, filter for just the GIDs, then map the GIDs to owner UIDs
         $owner_uids = array_map(
@@ -331,7 +331,7 @@ public function getAllPIGroupOwnerEntries()
                 $this->pi_groupOU->getChildrenArray(["cn"]),
             ),
         );
-        $owner_entries = $this->getAllUsersEntries();
+        $owner_entries = $this->getAllUsersEntries($attributes);
         foreach ($owner_entries as $i => $entry) {
             if (!in_array($entry["uid"][0], $owner_uids)) {
                 unset($owner_entries[$i]);

webroot/admin/pi-mgmt.php

@@ -110,8 +110,8 @@
     </tr>
 
     <?php
-    $owner_entries = $LDAP->getAllPIGroupOwnerEntries();
-    usort($owner_entries, fn($a, $b) => strcmp($a["cn"][0], $b["cn"][0]));
+    $owner_entries = $LDAP->getAllPIGroupOwnerEntries(["uid", "gecos", "mail"]);
+    usort($owner_entries, fn($a, $b) => strcmp($a["uid"][0], $b["uid"][0]));
     foreach ($owner_entries as $entry) {
         echo "<tr class='expandable'>";
         echo "<td><button class='btnExpand'>&#9654;</button>" . $entry["gecos"][0] . "</td>";

webroot/admin/user-mgmt.php

@@ -38,9 +38,9 @@
 
     <?php
     $UID2PIGIDs = $LDAP->getAllUID2PIGIDs();
-    $user_entries = $LDAP->getAllUsersEntries();
+    $user_entries = $LDAP->getAllUsersEntries(["uid", "gecos", "o", "mail"]);
     usort($user_entries, function ($a, $b) {
-        return strcmp($a["uid"], $b["uid"]);
+        return strcmp($a["uid"][0], $b["uid"][0]);
     });
     foreach ($user_entries as $entry) {
         $uid = $entry["uid"][0];