replace getAllPIGroupOwnerAttributes with (getAllPIGroupOwnerGIDs + getUsersAttributes) (#435)

Author: simonLeary42

resources/lib/UnityLDAP.php

@@ -256,33 +256,12 @@ public function getPIGroupGIDsWithMemberUID(string $uid): array
         );
     }
 
-    public function getAllPIGroupOwnerAttributes(
-        array $attributes,
-        array $default_values = [],
-    ): array {
-        // get the PI groups, filter for just the GIDs, then map the GIDs to owner UIDs
-        $owner_uids = array_map(
-            fn($x) => UnityGroup::GID2OwnerUID($x),
-            array_map(fn($x) => $x["cn"][0], $this->pi_groupOU->getChildrenArrayStrict(["cn"])),
-        );
-        $owner_attributes = $this->getQualifiedUsersAttributes($attributes, $default_values);
-        foreach ($owner_attributes as $i => $attributes) {
-            if (!in_array($attributes["uid"][0], $owner_uids)) {
-                unset($owner_attributes[$i]);
-            }
-        }
-        $owner_attributes = array_values($owner_attributes); // reindex
-        $owners_not_found = array_diff(
-            $owner_uids,
-            array_map(fn($x) => $x["uid"][0], $owner_attributes),
+    public function getAllPIGroupOwnerUIDs(): array
+    {
+        return array_map(
+            fn($x) => UnityGroup::GID2OwnerUID($x["cn"][0]),
+            $this->pi_groupOU->getChildrenArrayStrict(["cn"]),
         );
-        if (count($owners_not_found) > 0) {
-            UnityHTTPD::errorLog(
-                "warning",
-                "PI group owners not found: " . \jsonEncode($owners_not_found) . "\n",
-            );
-        }
-        return $owner_attributes;
     }
 
     /**

webroot/admin/pi-mgmt.php

@@ -115,7 +115,9 @@ class="filterSearch"
     </tr>
 
     <?php
-    $owner_attributes = $LDAP->getAllPIGroupOwnerAttributes(
+    $owner_uids = $LDAP->getAllPIGroupOwnerUIDs();
+    $owner_attributes = $LDAP->getUsersAttributes(
+        $owner_uids,
         ["uid", "gecos", "mail"],
         default_values: ["gecos" => "(not found)", "mail" => "(not found)"]
     );