show unqualified in user-mgmt

Author: simonLeary42

resources/lib/UnityLDAP.php

@@ -190,23 +190,14 @@ private function getAllGIDNumbersInUse(): array
         );
     }
 
-    public function getQualifiedUsersAttributes(
-        array $attributes,
-        array $default_values = [],
-    ): array {
-        $include_uids = $this->userFlagGroups[UserFlag::QUALIFIED->value]->getMemberUIDs();
-        $user_attributes = $this->baseOU->getChildrenArrayStrict(
+    public function getAllUsersAttributes(array $attributes, array $default_values = []): array
+    {
+        return $this->baseOU->getChildrenArrayStrict(
             $attributes,
             true, // recursive
             "(objectClass=posixAccount)",
             $default_values,
         );
-        foreach ($user_attributes as $i => $attributes) {
-            if (!in_array($attributes["uid"][0], $include_uids)) {
-                unset($user_attributes[$i]);
-            }
-        }
-        return array_values($user_attributes); // reindex
     }
 
     public function getAllPIGroups(
@@ -267,11 +258,9 @@ public function getAllPIGroupOwnerUIDs(): array
     /**
      * Returns an associative array where keys are UIDs and values are arrays of PI GIDs
      */
-    public function getQualifiedUID2PIGIDs(): array
+    public function getUID2PIGIDs(): array
     {
-        // initialize output so each UID is a key with an empty array as its value
-        $uids = $this->userFlagGroups[UserFlag::QUALIFIED->value]->getMemberUIDs();
-        $uid2pigids = array_combine($uids, array_fill(0, count($uids), []));
+        $uid2pigids = [];
         // for each PI group, append that GID to the member list for each of its member UIDs
         foreach (
             $this->getAllPIGroupsAttributes(
@@ -282,14 +271,10 @@ public function getQualifiedUID2PIGIDs(): array
         ) {
             $gid = $array["cn"][0];
             foreach ($array["memberuid"] as $uid) {
-                if (array_key_exists($uid, $uid2pigids)) {
-                    array_push($uid2pigids[$uid], $gid);
-                } else {
-                    UnityHTTPD::errorLog(
-                        "warning",
-                        "user '$uid' is a member of a PI group but is not a qualified user!",
-                    );
+                if (!array_key_exists($uid, $uid2pigids)) {
+                    $uid2pigids[$uid] = [];
                 }
+                array_push($uid2pigids[$uid], $gid);
             }
         }
         return $uid2pigids;

webroot/admin/user-mgmt.php

@@ -44,17 +44,15 @@ class="filterSearch"
         <td>Actions</td>
         <?php
         foreach (UserFlag::cases() as $flag) {
-            if ($flag != UserFlag::QUALIFIED) {
-                $value = $flag->value;
-                echo "<td id='$value'><span class='filter'>⫧ </span>$value</td>";
-            }
+            $value = $flag->value;
+            echo "<td id='$value'><span class='filter'>⫧ </span>$value</td>";
         }
         ?>
     </tr>
 
     <?php
-    $UID2PIGIDs = $LDAP->getQualifiedUID2PIGIDs();
-    $user_attributes = $LDAP->getQualifiedUsersAttributes(
+    $UID2PIGIDs = $LDAP->getUID2PIGIDs();
+    $user_attributes = $LDAP->getAllUsersAttributes(
         ["uid", "gecos", "o", "mail"],
         default_values: [
             "gecos" => ["(not found)"],
@@ -64,9 +62,7 @@ class="filterSearch"
     );
     $users_with_flags = [];
     foreach (UserFlag::cases() as $flag) {
-        if ($flag != UserFlag::QUALIFIED) {
-            $users_with_flags[$flag->value] = $LDAP->userFlagGroups[$flag->value]->getMemberUIDs();
-        }
+        $users_with_flags[$flag->value] = $LDAP->userFlagGroups[$flag->value]->getMemberUIDs();
     }
     usort($user_attributes, fn ($a, $b) => strcmp($a["uid"][0], $b["uid"][0]));
     foreach ($user_attributes as $attributes) {
@@ -85,7 +81,7 @@ class="filterSearch"
             </td>
         ";
         echo "<td>";
-        if (count($UID2PIGIDs[$uid]) > 0) {
+        if (array_key_exists($uid, $UID2PIGIDs) && ($UID2PIGIDs[$uid]) > 0) {
             echo "<table>";
             foreach ($UID2PIGIDs[$uid] as $gid) {
                 echo "<tr><td>$gid</td></tr>";
@@ -105,10 +101,8 @@ class="filterSearch"
         echo "</td>";
         foreach (UserFlag::cases() as $flag) {
             echo "<td>";
-            if ($flag != UserFlag::QUALIFIED) {
-                if (in_array($uid, $users_with_flags[$flag->value])) {
-                    echo $flag->value;
-                }
+            if (in_array($uid, $users_with_flags[$flag->value])) {
+                echo $flag->value;
             }
             echo "</td>";
         }