rename "arrays" to "attributes", make attribute getters consistent

Author: simonLeary42

resources/lib/UnityLDAP.php

@@ -257,20 +257,20 @@ public function getAllUsers($UnitySQL, $UnityMailer, $UnityRedis, $UnityWebhook,
         return $out;
     }
 
-    public function getAllUsersArrays($attributes = [])
+    public function getAllUsersAttributes($attributes = [])
     {
-        $include_uids = $this->getAllUsersUIDs();
-        $user_arrays = $this->baseOU->getChildrenArray(
+        $include_uids = $this->getAllUsersAttributes();
+        $user_attributes = $this->baseOU->getChildrenArray(
             $attributes,
             true, // recursive
             "objectClass=posixAccount"
         );
-        foreach ($user_arrays as $i => $array) {
-            if (!in_array($array["uid"][0], $include_uids)) {
-                unset($user_arrays[$i]);
+        foreach ($user_attributes as $i => $attributes) {
+            if (!in_array($attributes["uid"][0], $include_uids)) {
+                unset($user_attributes[$i]);
             }
         }
-        return $user_arrays;
+        return $user_attributes;
     }
 
     public function getAllPIGroups($UnitySQL, $UnityMailer, $UnityRedis, $UnityWebhook, $ignorecache = false)
@@ -305,9 +305,9 @@ public function getAllPIGroups($UnitySQL, $UnityMailer, $UnityRedis, $UnityWebho
         return $out;
     }
 
-    public function getAllPIGroupsArrays()
+    public function getAllPIGroupsAttributes($attributes = [])
     {
-        return $this->pi_groupOU->getChildrenArray([], true);
+        return $this->pi_groupOU->getChildrenArray($attributes);
     }
 
     public function getPIGroupGIDsWithMemberUID($uid)
@@ -322,7 +322,7 @@ public function getPIGroupGIDsWithMemberUID($uid)
         );
     }
 
-    public function getAllPIGroupOwnerArrays($attributes = [])
+    public function getAllPIGroupOwnerAttributes($attributes = [])
     {
         // get the PI groups, filter for just the GIDs, then map the GIDs to owner UIDs
         $owner_uids = array_map(
@@ -332,13 +332,13 @@ public function getAllPIGroupOwnerArrays($attributes = [])
                 $this->pi_groupOU->getChildrenArray(["cn"]),
             ),
         );
-        $owner_arrays = $this->getAllUsersArrays($attributes);
-        foreach ($owner_arrays as $i => $array) {
-            if (!in_array($array["uid"][0], $owner_uids)) {
-                unset($owner_arrays[$i]);
+        $owner_attributes = $this->getAllUsersAttributes($attributes);
+        foreach ($owner_attributes as $i => $attributes) {
+            if (!in_array($attributes["uid"][0], $owner_uids)) {
+                unset($owner_attributes[$i]);
             }
         }
-        return $owner_arrays;
+        return $owner_attributes;
     }
 
     /** Returns an assosiative array where keys are UIDs and values are arrays of PI GIDs */
@@ -348,7 +348,7 @@ public function getAllUID2PIGIDs()
         $uids = $this->getAllUsersUIDs();
         $uid2pigids = array_combine($uids, array_fill(0, count($uids), []));
         // for each PI group, append that GID to the member list for each of its member UIDs
-        foreach ($this->getAllPIGroupsArrays() as $array) {
+        foreach ($this->getAllPIGroupsAttributes(["cn", "memberuid"]) as $array) {
             $gid = $array["cn"][0];
             foreach ($array["memberuid"] as $uid) {
                 array_push($uid2pigids[$uid], $gid);
@@ -388,9 +388,9 @@ public function getAllOrgGroups($UnitySQL, $UnityMailer, $UnityRedis, $UnityWebh
         return $out;
     }
 
-    public function getAllOrgGroupsArrays()
+    public function getAllOrgGroupsAttributes($attributes = [])
     {
-        return $this->org_groupOU->getChildrenArray([], true);
+        return $this->org_groupOU->getChildrenArray($attributes, true);
     }
 
     public function getUserEntry($uid)

webroot/admin/pi-mgmt.php

@@ -108,13 +108,13 @@
     </tr>
 
     <?php
-    $owner_arrays = $LDAP->getAllPIGroupOwnerArrays(["uid", "gecos", "mail"]);
-    usort($owner_arrays, fn($a, $b) => strcmp($a["uid"][0], $b["uid"][0]));
-    foreach ($owner_arrays as $array) {
+    $owner_attributes = $LDAP->getAllPIGroupOwnerAttributes(["uid", "gecos", "mail"]);
+    usort($owner_attributes, fn($a, $b) => strcmp($a["uid"][0], $b["uid"][0]));
+    foreach ($owner_attributes as $attributes) {
         echo "<tr class='expandable'>";
-        echo "<td><button class='btnExpand'>&#9654;</button>" . $array["gecos"][0] . "</td>";
-        echo "<td>" . UnityGroup::getPIUIDfromUID($array["uid"][0]) . "</td>";
-        echo "<td><a href='mailto:" . $array["mail"][0] . "'>" . $array["mail"][0] . "</a></td>";
+        echo "<td><button class='btnExpand'>&#9654;</button>" . $attributes["gecos"][0] . "</td>";
+        echo "<td>" . UnityGroup::getPIUIDfromUID($attributes["uid"][0]) . "</td>";
+        echo "<td><a href='mailto:" . $attributes["mail"][0] . "'>" . $attributes["mail"][0] . "</a></td>";
         echo "</tr>";
     }
     ?>

webroot/admin/user-mgmt.php

@@ -38,19 +38,19 @@
 
     <?php
     $UID2PIGIDs = $LDAP->getAllUID2PIGIDs();
-    $user_arrays = $LDAP->getAllUsersArrays(["uid", "gecos", "o", "mail"]);
-    usort($user_arrays, fn ($a, $b) => strcmp($a["uid"][0], $b["uid"][0]));
-    foreach ($user_arrays as $array) {
-        $uid = $array["uid"][0];
+    $user_attributes = $LDAP->getAllUsersAttributes(["uid", "gecos", "o", "mail"]);
+    usort($user_attributes, fn ($a, $b) => strcmp($a["uid"][0], $b["uid"][0]));
+    foreach ($user_attributes as $attributes) {
+        $uid = $attributes["uid"][0];
         if ($SQL->accDeletionRequestExists($uid)) {
             echo "<tr style='color:grey; font-style: italic'>";
         } else {
             echo "<tr>";
         }
-        echo "<td>" . $array["gecos"][0] . "</td>";
+        echo "<td>" . $attributes["gecos"][0] . "</td>";
         echo "<td>" . $uid . "</td>";
-        echo "<td>" . $array["o"][0] . "</td>";
-        echo "<td><a href='mailto:" . $array["mail"][0] . "'>" . $array["mail"][0] . "</a></td>";
+        echo "<td>" . $attributes["o"][0] . "</td>";
+        echo "<td><a href='mailto:" . $attributes["mail"][0] . "'>" . $attributes["mail"][0] . "</a></td>";
         echo "<td>";
         foreach ($UID2PIGIDs[$uid] as $gid) {
             echo "<p>$gid</p>";