From 29d74a3689f1a2645dfb589ee203393e6ceef15f Mon Sep 17 00:00:00 2001
From: Simon Leary <simon.leary42@proton.me>
Date: Sun, 6 Jul 2025 20:45:39 -0400
Subject: [PATCH 1/6] cleanup2

---
 resources/lib/UnityGroup.php                  | 91 ++++++++-----------
 resources/lib/UnityUser.php                   |  4 +-
 test/functional/NewUserTest.php               | 14 +--
 test/functional/PIMemberRequestTest.php       |  2 +-
 test/functional/PiMemberApproveTest.php       | 27 +++---
 test/functional/PiMemberDenyTest.php          |  8 +-
 webroot/admin/ajax/get_group_members.php      | 14 +--
 webroot/admin/pi-mgmt.php                     | 14 +--
 webroot/admin/user-mgmt.php                   |  2 +-
 webroot/js/tables.js                          |  4 +-
 webroot/panel/ajax/get_group_members.php      |  4 +-
 webroot/panel/groups.php                      | 24 ++---
 webroot/panel/modal/pi_search.php             |  2 +-
 webroot/panel/new_account.php                 | 56 ++++++------
 workers/group_user_request_owner_reminder.php |  6 +-
 15 files changed, 132 insertions(+), 140 deletions(-)

diff --git a/resources/lib/UnityGroup.php b/resources/lib/UnityGroup.php
index 9fac0191..ba6be5d4 100644
--- a/resources/lib/UnityGroup.php
+++ b/resources/lib/UnityGroup.php
@@ -11,7 +11,7 @@ class UnityGroup
 {
     public const PI_PREFIX = "pi_";
 
-    private $pi_uid;
+    public $gid;
 
     // Services
     private $LDAP;
@@ -23,13 +23,13 @@ class UnityGroup
     /**
      * Constructor for the object
      *
-     * @param string $pi_uid PI UID in the format <PI_PREFIX><OWNER_UID>
+     * @param string $gid PI UID in the format <PI_PREFIX><OWNER_UID>
      * @param LDAP $LDAP LDAP Connection
      * @param SQL $SQL SQL Connection
      */
-    public function __construct($pi_uid, $LDAP, $SQL, $MAILER, $REDIS, $WEBHOOK)
+    public function __construct($gid, $LDAP, $SQL, $MAILER, $REDIS, $WEBHOOK)
     {
-        $this->pi_uid = $pi_uid;
+        $this->gid = $gid;
 
         $this->LDAP = $LDAP;
         $this->SQL = $SQL;
@@ -44,22 +44,12 @@ public function equals($other_group)
             throw new Exception("Unable to check equality because the parameter is not a " . self::class . " object");
         }
 
-        return $this->getPIUID() == $other_group->getPIUID();
+        return $this->gid == $other_group->gid;
     }
 
     public function __toString()
     {
-        return $this->getPIUID();
-    }
-
-    /**
-     * Returns this group's PI UID
-     *
-     * @return string PI UID of the group
-     */
-    public function getPIUID()
-    {
-        return $this->pi_uid;
+        return $this->gid;
     }
 
     /**
@@ -235,7 +225,7 @@ public function cancelGroupJoinRequest($user, $send_mail = true)
             return;
         }
 
-        $this->SQL->removeRequest($user->getUID(), $this->pi_uid);
+        $this->SQL->removeRequest($user->getUID(), $this->gid);
 
         if ($send_mail) {
             // send email to requestor
@@ -254,7 +244,7 @@ public function cancelGroupJoinRequest($user, $send_mail = true)
     // {
     //     // remove any pending requests
     //     // this will silently fail if the request doesn't exist (which is what we want)
-    //     $this->SQL->removeRequests($this->pi_uid);
+    //     $this->SQL->removeRequests($this->gid);
 
     //     // we don't need to do anything extra if the group is already deleted
     //     if (!$this->exists()) {
@@ -268,9 +258,9 @@ public function cancelGroupJoinRequest($user, $send_mail = true)
     //     $ldapPiGroupEntry = $this->getLDAPPiGroup();
     //     if ($ldapPiGroupEntry->exists()) {
     //         $ldapPiGroupEntry->delete();
-    //         $this->REDIS->removeCacheArray("sorted_groups", "", $this->getPIUID());
+    //         $this->REDIS->removeCacheArray("sorted_groups", "", $this->gid);
     //         foreach ($users as $user) {
-    //             $this->REDIS->removeCacheArray($user->getUID(), "groups", $this->getPIUID());
+    //             $this->REDIS->removeCacheArray($user->getUID(), "groups", $this->gid);
     //         }
     //     }
 
@@ -280,7 +270,7 @@ public function cancelGroupJoinRequest($user, $send_mail = true)
     //             $this->MAILER->sendMail(
     //                 $user->getMail(),
     //                 "group_disband",
-    //                 array("group_name" => $this->pi_uid)
+    //                 array("group_name" => $this->gid)
     //             );
     //         }
     //     }
@@ -292,8 +282,7 @@ public function cancelGroupJoinRequest($user, $send_mail = true)
     public function approveUser($new_user, $send_mail = true)
     {
         $uid = $new_user->getUID();
-        $gid = $this->getPIUID();
-        $request = $this->SQL->getRequest($uid, $gid);
+        $request = $this->SQL->getRequest($uid, $this->gid);
         // check if user exists
         if (!$new_user->exists()) {
             $new_user->init(
@@ -307,7 +296,7 @@ public function approveUser($new_user, $send_mail = true)
         // add user to the LDAP object
         $this->addUserToGroup($new_user);
 
-        $this->SQL->removeRequest($new_user->getUID(), $this->pi_uid);
+        $this->SQL->removeRequest($new_user->getUID(), $this->gid);
 
         // send email to the requestor
         if ($send_mail) {
@@ -315,14 +304,14 @@ public function approveUser($new_user, $send_mail = true)
             $this->MAILER->sendMail(
                 $new_user->getMail(),
                 "group_user_added",
-                array("group" => $this->pi_uid)
+                array("group" => $this->gid)
             );
             // send email to the PI
             $this->MAILER->sendMail(
                 $this->getOwner()->getMail(),
                 "group_user_added_owner",
                 array(
-                    "group" => $this->pi_uid,
+                    "group" => $this->gid,
                     "user" => $new_user->getUID(),
                     "name" => $request["firstname"] . " " . $request["lastname"],
                     "email" => $request["email"],
@@ -335,18 +324,17 @@ public function approveUser($new_user, $send_mail = true)
     public function denyUser($new_user, $send_mail = true)
     {
         $uid = $new_user->getUID();
-        $gid = $this->getPIUID();
-        $request = $this->SQL->getRequest($uid, $gid);
+        $request = $this->SQL->getRequest($uid, $this->gid);
 
         // remove request, this will fail silently if the request doesn't exist
-        $this->SQL->removeRequest($new_user->getUID(), $this->pi_uid);
+        $this->SQL->removeRequest($new_user->getUID(), $this->gid);
 
         if ($send_mail) {
             // send email to the user
             $this->MAILER->sendMail(
                 $new_user->getMail(),
                 "group_user_denied",
-                array("group" => $this->pi_uid)
+                array("group" => $this->gid)
             );
 
             // send email to the PI
@@ -354,7 +342,7 @@ public function denyUser($new_user, $send_mail = true)
                 $this->getOwner()->getMail(),
                 "group_user_denied_owner",
                 array(
-                    "group" => $this->pi_uid,
+                    "group" => $this->gid,
                     "user" => $new_user->getUID(),
                     "name" => $new_user->getFullName(),
                     "email" => $new_user->getMail(),
@@ -382,7 +370,7 @@ public function removeUser($new_user, $send_mail = true)
             $this->MAILER->sendMail(
                 $new_user->getMail(),
                 "group_user_removed",
-                array("group" => $this->pi_uid)
+                array("group" => $this->gid)
             );
 
             // send email to the PI
@@ -390,7 +378,7 @@ public function removeUser($new_user, $send_mail = true)
                 $this->getOwner()->getMail(),
                 "group_user_removed_owner",
                 array(
-                    "group" => $this->pi_uid,
+                    "group" => $this->gid,
                     "user" => $new_user->getUID(),
                     "name" => $new_user->getFullName(),
                     "email" => $new_user->getMail(),
@@ -424,7 +412,7 @@ public function newUserRequest($new_user, $firstname, $lastname, $email, $org, $
             $this->MAILER->sendMail(
                 $email,
                 "group_user_request",
-                array("group" => $this->pi_uid)
+                array("group" => $this->gid)
             );
 
             // send email to PI
@@ -432,7 +420,7 @@ public function newUserRequest($new_user, $firstname, $lastname, $email, $org, $
                 $this->getOwner()->getMail(),
                 "group_user_request_owner",
                 array(
-                    "group" => $this->pi_uid,
+                    "group" => $this->gid,
                     "user" => $new_user->getUID(),
                     "name" => "$firstname $lastname",
                     "email" => $email,
@@ -444,7 +432,7 @@ public function newUserRequest($new_user, $firstname, $lastname, $email, $org, $
 
     public function getRequests()
     {
-        $requests = $this->SQL->getRequests($this->pi_uid);
+        $requests = $this->SQL->getRequests($this->gid);
 
         $out = array();
         foreach ($requests as $request) {
@@ -494,7 +482,7 @@ public function getGroupMembers($ignorecache = false)
     public function getGroupMemberUIDs($ignorecache = false)
     {
         if (!$ignorecache) {
-            $cached_val = $this->REDIS->getCache($this->getPIUID(), "members");
+            $cached_val = $this->REDIS->getCache($this->gid, "members");
             if (!is_null($cached_val)) {
                 $members = $cached_val;
             }
@@ -507,7 +495,7 @@ public function getGroupMemberUIDs($ignorecache = false)
         }
         if (!$ignorecache && $updatecache) {
             sort($members);
-            $this->REDIS->setCache($this->getPIUID(), "members", $members);
+            $this->REDIS->setCache($this->gid, "members", $members);
         }
         return $members;
     }
@@ -547,7 +535,7 @@ private function init()
             $ldapPiGroupEntry->write();
         }
 
-        $this->REDIS->appendCacheArray("sorted_groups", "", $this->getPIUID());
+        $this->REDIS->appendCacheArray("sorted_groups", "", $this->gid);
 
         // TODO if we ever make this project based, we need to update the cache here with the memberuid
     }
@@ -558,8 +546,8 @@ private function addUserToGroup($new_user)
         $pi_group = $this->getLDAPPiGroup();
         $pi_group->appendAttribute("memberuid", $new_user->getUID());
         $pi_group->write();
-        $this->REDIS->appendCacheArray($this->getPIUID(), "members", $new_user->getUID());
-        $this->REDIS->appendCacheArray($new_user->getUID(), "groups", $this->getPIUID());
+        $this->REDIS->appendCacheArray($this->gid, "members", $new_user->getUID());
+        $this->REDIS->appendCacheArray($new_user->getUID(), "groups", $this->gid);
     }
 
     private function removeUserFromGroup($old_user)
@@ -568,8 +556,8 @@ private function removeUserFromGroup($old_user)
         $pi_group = $this->getLDAPPiGroup();
         $pi_group->removeAttributeEntryByValue("memberuid", $old_user->getUID());
         $pi_group->write();
-        $this->REDIS->removeCacheArray($this->getPIUID(), "members", $old_user->getUID());
-        $this->REDIS->removeCacheArray($old_user->getUID(), "groups", $this->getPIUID());
+        $this->REDIS->removeCacheArray($this->gid, "members", $old_user->getUID());
+        $this->REDIS->removeCacheArray($old_user->getUID(), "groups", $this->gid);
     }
 
     public function userExists($user)
@@ -579,7 +567,7 @@ public function userExists($user)
 
     private function addRequest($uid, $firstname, $lastname, $email, $org)
     {
-        $this->SQL->addRequest($uid, $firstname, $lastname, $email, $org, $this->pi_uid);
+        $this->SQL->addRequest($uid, $firstname, $lastname, $email, $org, $this->gid);
     }
 
     //
@@ -589,7 +577,7 @@ private function addRequest($uid, $firstname, $lastname, $email, $org)
     public function getOwner()
     {
         return new UnityUser(
-            self::getUIDfromPIUID($this->pi_uid),
+            self::GID2OwnerUID($this->gid),
             $this->LDAP,
             $this->SQL,
             $this->MAILER,
@@ -600,20 +588,19 @@ public function getOwner()
 
     public function getLDAPPiGroup()
     {
-        return $this->LDAP->getPIGroupEntry($this->pi_uid);
+        return $this->LDAP->getPIGroupEntry($this->gid);
     }
 
-    public static function getPIUIDfromUID($uid)
+    public static function ownerUID2GID($uid)
     {
         return self::PI_PREFIX . $uid;
     }
 
-    public static function getUIDfromPIUID($pi_uid)
+    public static function GID2OwnerUID($gid)
     {
-        if (substr($pi_uid, 0, strlen(self::PI_PREFIX)) == self::PI_PREFIX) {
-            return substr($pi_uid, strlen(self::PI_PREFIX));
-        } else {
-            throw new Exception("PI netid doesn't have the correct prefix.");
+        if (substr($gid, 0, strlen(self::PI_PREFIX)) != self::PI_PREFIX) {
+            throw new Exception("PI group GID doesn't have the correct prefix.");
         }
+        return substr($gid, strlen(self::PI_PREFIX));
     }
 }
diff --git a/resources/lib/UnityUser.php b/resources/lib/UnityUser.php
index 983e2a5f..cedc9061 100644
--- a/resources/lib/UnityUser.php
+++ b/resources/lib/UnityUser.php
@@ -583,7 +583,7 @@ public function isPI()
     public function getPIGroup()
     {
         return new UnityGroup(
-            UnityGroup::getPIUIDfromUID($this->uid),
+            UnityGroup::ownerUID2GID($this->uid),
             $this->LDAP,
             $this->SQL,
             $this->MAILER,
@@ -639,7 +639,7 @@ public function getGroups($ignorecache = false)
         foreach ($all_pi_groups as $pi_group) {
             if (in_array($this->getUID(), $pi_group->getGroupMemberUIDs())) {
                 array_push($out, $pi_group);
-                array_push($cache_arr, $pi_group->getPIUID());
+                array_push($cache_arr, $pi_group->gid);
             }
         }
 
diff --git a/test/functional/NewUserTest.php b/test/functional/NewUserTest.php
index b0f0fb23..43ece84b 100644
--- a/test/functional/NewUserTest.php
+++ b/test/functional/NewUserTest.php
@@ -114,7 +114,7 @@ public function testCreateUserByJoinGoup()
         global $USER, $SSO, $LDAP, $SQL, $MAILER, $REDIS, $WEBHOOK;
         switchUser(...getUserIsPIHasNoMembersNoMemberRequests());
         $pi_group = $USER->getPIGroup();
-        $gid = $pi_group->getPIUID();
+        $gid = $pi_group->gid;
         switchUser(...getNonExistentUser());
         $this->assertTrue(!$USER->exists());
         $newOrg = new UnityOrg($SSO["org"], $LDAP, $SQL, $MAILER, $REDIS, $WEBHOOK);
@@ -123,12 +123,12 @@ public function testCreateUserByJoinGoup()
         $this->assertTrue(!$pi_group->userExists($USER));
         $this->assertRequestedMembership(false, $gid);
         try {
-            $this->requestGroupMembership($pi_group->getPIUID());
+            $this->requestGroupMembership($pi_group->gid);
             $this->assertRequestedMembership(true, $gid);
 
             // $second_request_failed = false;
             // try {
-                $this->requestGroupMembership($pi_group->getPIUID());
+            $this->requestGroupMembership($pi_group->gid);
             // } catch(Exception) {
             //     $second_request_failed = true;
             // }
@@ -138,7 +138,7 @@ public function testCreateUserByJoinGoup()
             $this->cancelAllRequests();
             $this->assertRequestedMembership(false, $gid);
 
-            $this->requestGroupMembership($pi_group->getPIUID());
+            $this->requestGroupMembership($pi_group->gid);
             $this->assertTrue($pi_group->requestExists($USER));
             $this->assertRequestedMembership(true, $gid);
 
@@ -153,7 +153,7 @@ public function testCreateUserByJoinGoup()
 
             // $third_request_failed = false;
             // try {
-                $this->requestGroupMembership($pi_group->getPIUID());
+            $this->requestGroupMembership($pi_group->gid);
             // } catch(Exception) {
             //     $third_request_failed = true;
             // }
@@ -182,7 +182,7 @@ public function testCreateUserByCreateGroup()
 
             // $second_request_failed = false;
             // try {
-                $this->requestGroupCreation();
+            $this->requestGroupCreation();
             // } catch(Exception) {
             //     $second_request_failed = true;
             // }
@@ -205,7 +205,7 @@ public function testCreateUserByCreateGroup()
 
             // $third_request_failed = false;
             // try {
-                $this->requestGroupCreation();
+            $this->requestGroupCreation();
             // } catch(Exception) {
             //     $third_request_failed = true;
             // }
diff --git a/test/functional/PIMemberRequestTest.php b/test/functional/PIMemberRequestTest.php
index ec4cff71..37e29082 100644
--- a/test/functional/PIMemberRequestTest.php
+++ b/test/functional/PIMemberRequestTest.php
@@ -28,7 +28,7 @@ public function testRequestMembership()
         switchUser(...getUserIsPIHasNoMembersNoMemberRequests());
         $pi = $USER;
         $pi_group = $USER->getPIGroup();
-        $gid = $pi_group->getPIUID();
+        $gid = $pi_group->gid;
         $this->assertTrue($USER->isPI());
         $this->assertTrue($pi_group->exists());
         $this->assertTrue(arraysAreEqualUnOrdered([$pi], $pi_group->getGroupMembers()));
diff --git a/test/functional/PiMemberApproveTest.php b/test/functional/PiMemberApproveTest.php
index 94ee6af8..b283a5fc 100644
--- a/test/functional/PiMemberApproveTest.php
+++ b/test/functional/PiMemberApproveTest.php
@@ -6,18 +6,19 @@
 use UnityWebPortal\lib\UnityGroup;
 use UnityWebPortal\lib\UnitySSO;
 
-class PiMemberApproveTest extends TestCase {
-        static $userWithRequestSwitchArgs;
-        static $userWithoutRequestSwitchArgs;
-        static $piSwitchArgs;
-        static $pi;
-        static $userWithRequestUID;
-        static $userWithoutRequestUID;
-        static $piUID;
-        static $userWithRequest;
-        static $userWithoutRequest;
-        static $piGroup;
-        static $piGroupGID;
+class PiMemberApproveTest extends TestCase
+{
+    static $userWithRequestSwitchArgs;
+    static $userWithoutRequestSwitchArgs;
+    static $piSwitchArgs;
+    static $pi;
+    static $userWithRequestUID;
+    static $userWithoutRequestUID;
+    static $piUID;
+    static $userWithRequest;
+    static $userWithoutRequest;
+    static $piGroup;
+    static $piGroupGID;
 
     private function approveUser(string $uid)
     {
@@ -62,7 +63,7 @@ public function testApproveRequest()
         $this->assertEmpty($piGroup->getRequests());
         try {
             switchUser(...$userSwitchArgs);
-            $this->requestJoinPI($piGroup->getPIUID());
+            $this->requestJoinPI($piGroup->gid);
             $this->assertFalse($piGroup->userExists($user));
 
             switchUser(...$piSwitchArgs);
diff --git a/test/functional/PiMemberDenyTest.php b/test/functional/PiMemberDenyTest.php
index 4278a1d5..454b9bd8 100644
--- a/test/functional/PiMemberDenyTest.php
+++ b/test/functional/PiMemberDenyTest.php
@@ -4,10 +4,12 @@
 use PHPUnit\Framework\Attributes\DataProvider;
 use UnityWebPortal\lib\UnityUser;
 
-class PiMemberDenyTest extends TestCase {
+class PiMemberDenyTest extends TestCase
+{
     static $requestUid;
 
-    public static function setUpBeforeClass(): void{
+    public static function setUpBeforeClass(): void
+    {
         global $USER;
         switchUser(...getNormalUser());
         self::$requestUid = $USER->getUID();
@@ -56,7 +58,7 @@ public function testDenyRequest()
             );
             $this->assertFalse($piGroup->userExists($requestedUser));
         } finally {
-            $SQL->removeRequest(self::$requestUid, $piGroup->getPIUID());
+            $SQL->removeRequest(self::$requestUid, $piGroup->gid);
         }
     }
 }
diff --git a/webroot/admin/ajax/get_group_members.php b/webroot/admin/ajax/get_group_members.php
index e3e56759..be2f2c31 100644
--- a/webroot/admin/ajax/get_group_members.php
+++ b/webroot/admin/ajax/get_group_members.php
@@ -9,11 +9,11 @@
     UnitySite::forbidden("not an admin");
 }
 
-if (!isset($_GET["pi_uid"])) {
+if (!isset($_GET["gid"])) {
     UnitySite::badRequest("PI UID not set");
 }
 
-$group = new UnityGroup($_GET["pi_uid"], $LDAP, $SQL, $MAILER, $REDIS, $WEBHOOK);
+$group = new UnityGroup($_GET["gid"], $LDAP, $SQL, $MAILER, $REDIS, $WEBHOOK);
 $members = $group->getGroupMembers();
 $requests = $group->getRequests();
 
@@ -35,11 +35,11 @@
     echo "<td><a href='mailto:" . $member->getMail() . "'>" . $member->getMail() . "</a></td>";
     echo "<td>";
     echo
-    "<form action='' method='POST' onsubmit='return confirm(\"Are you sure you want to remove " .
-    $member->getUID() . " from this group?\");'>
+        "<form action='' method='POST' onsubmit='return confirm(\"Are you sure you want to remove " .
+        $member->getUID() . " from this group?\");'>
     <input type='hidden' name='form_type' value='remUserChild'>
     <input type='hidden' name='uid' value='" . $member->getUID() . "'>
-    <input type='hidden' name='pi' value='" . $group->getPIUID() . "'>
+    <input type='hidden' name='pi' value='" . $group->gid . "'>
     <input type='submit' value='Remove'>
     </form>";
     echo "</td>";
@@ -60,11 +60,11 @@
     echo "<td><a href='mailto:" . $email . "'>" . $email . "</a></td>";
     echo "<td>";
     echo
-    "<form action='' method='POST' 
+        "<form action='' method='POST'
     onsubmit='return confirm(\"Are you sure you want to approve " . $uid . "?\");'>
     <input type='hidden' name='form_type' value='reqChild'>
     <input type='hidden' name='uid' value='" . $uid . "'>
-    <input type='hidden' name='pi' value='" . $group->getPIUID() . "'>
+    <input type='hidden' name='pi' value='" . $group->gid . "'>
     <input type='submit' name='action' value='Approve'>
     <input type='submit' name='action' value='Deny'></form>";
     echo "</td>";
diff --git a/webroot/admin/pi-mgmt.php b/webroot/admin/pi-mgmt.php
index c546704b..2826bc3c 100644
--- a/webroot/admin/pi-mgmt.php
+++ b/webroot/admin/pi-mgmt.php
@@ -83,7 +83,7 @@
         echo "<td>" . date("jS F, Y", strtotime($request['timestamp'])) . "</td>";
         echo "<td>";
         echo
-        "<form action='' method='POST'>
+            "<form action='' method='POST'>
         <input type='hidden' name='form_type' value='req'>
         <input type='hidden' name='uid' value='" . $request["uid"] . "'>
         <input type='submit' name='action' value='Approve'
@@ -109,11 +109,11 @@
         <td>Actions</td>
     </tr>
 
-<?php
+    <?php
     $accounts = $LDAP->getAllPIGroups($SQL, $MAILER, $REDIS, $WEBHOOK);
 
     usort($accounts, function ($a, $b) {
-        return strcmp($a->getPIUID(), $b->getPIUID());
+        return strcmp($a->gid, $b->gid);
     });
 
     foreach ($accounts as $pi_group) {
@@ -121,8 +121,8 @@
 
         echo "<tr class='expandable'>";
         echo "<td><button class='btnExpand'>&#9654;</button>" . $pi_user->getFirstname() .
-        " " . $pi_user->getLastname() . "</td>";
-        echo "<td>" . $pi_group->getPIUID() . "</td>";
+            " " . $pi_user->getLastname() . "</td>";
+        echo "<td>" . $pi_group->gid . "</td>";
         echo "<td><a href='mailto:" . $pi_user->getMail() . "'>" . $pi_user->getMail() . "</a></td>";
         echo "</tr>";
     }
@@ -132,7 +132,7 @@
 <script>
     $("table tr.tr-pichild").hide(); // Hide the children first (and then the women)
 
-    $("table tr").click(function() {
+    $("table tr").click(function () {
         if (!$(this).hasClass("tr-pichild")) {
             var current = $(this).next();
             while (current.hasClass("tr-pichild")) {
@@ -146,7 +146,7 @@
         }
     });
 
-    var ajax_url = "<?php echo $CONFIG["site"]["prefix"]; ?>/admin/ajax/get_group_members.php?pi_uid=";
+    var ajax_url = "<?php echo $CONFIG["site"]["prefix"]; ?>/admin/ajax/get_group_members.php?gid=";
 </script>
 
 <?php
diff --git a/webroot/admin/user-mgmt.php b/webroot/admin/user-mgmt.php
index e27725c2..809d3c27 100644
--- a/webroot/admin/user-mgmt.php
+++ b/webroot/admin/user-mgmt.php
@@ -56,7 +56,7 @@
         echo "<td>";
         $cur_user_groups = $user->getGroups();
         foreach ($cur_user_groups as $cur_group) {
-            echo "<a href='mailto:" . $cur_group->getOwner()->getMail() . "'>" . $cur_group->getPIUID() . "</a>";
+            echo "<a href='mailto:" . $cur_group->getOwner()->getMail() . "'>" . $cur_group->gid . "</a>";
             if ($cur_group !== array_key_last($cur_user_groups)) {
                 echo '<br>';
             }
diff --git a/webroot/js/tables.js b/webroot/js/tables.js
index ed0de340..a749b43e 100644
--- a/webroot/js/tables.js
+++ b/webroot/js/tables.js
@@ -13,7 +13,7 @@ $("button.btnExpand").click(function() {
     var pi_wrapper = $(this).parent();  // parent column (td)
     var piRow = pi_wrapper.parent();  // parent row (tr)
     var piTree = piRow.parent();  // parent table (table)
-    var pi_uid = pi_wrapper.next().html();
+    var gid = pi_wrapper.next().html();
 
     if ($(this).hasClass("btnExpanded")) {
         // already expanded
@@ -32,7 +32,7 @@ $("button.btnExpand").click(function() {
         $("button.btnExpanded").trigger("click");
         // not expanded
         $.ajax({
-            url: ajax_url + pi_uid,
+            url: ajax_url + gid,
             success: function(result) {
                 console.log(result);
                 piRow.after(result);
diff --git a/webroot/panel/ajax/get_group_members.php b/webroot/panel/ajax/get_group_members.php
index 222c2e25..3d1e9e69 100644
--- a/webroot/panel/ajax/get_group_members.php
+++ b/webroot/panel/ajax/get_group_members.php
@@ -5,11 +5,11 @@
 use UnityWebPortal\lib\UnityGroup;
 use UnityWebPortal\lib\UnitySite;
 
-if (!isset($_GET["pi_uid"])) {
+if (!isset($_GET["gid"])) {
     UnitySite::badRequest("PI UID not set");
 }
 
-$group = new UnityGroup($_GET["pi_uid"], $LDAP, $SQL, $MAILER, $REDIS, $WEBHOOK);
+$group = new UnityGroup($_GET["gid"], $LDAP, $SQL, $MAILER, $REDIS, $WEBHOOK);
 if (!$group->userExists($USER)) {
     UnitySite::forbidden("not a group member");
 }
diff --git a/webroot/panel/groups.php b/webroot/panel/groups.php
index ed5b8ba4..cfd88523 100644
--- a/webroot/panel/groups.php
+++ b/webroot/panel/groups.php
@@ -35,7 +35,7 @@
                     $sso_user = $SSO["user"];
                     UnitySite::badRequest(
                         "cannot request due to uid mismatch: " .
-                            "USER='{$USER->getUID()}' SSO[user]='$sso_user'"
+                        "USER='{$USER->getUID()}' SSO[user]='$sso_user'"
                     );
                 }
 
@@ -83,12 +83,12 @@
         $requested_owner = $requested_account->getOwner();
         echo "<tr class='pending_request'>";
         echo "<td>" . $requested_owner->getFirstname() . " " . $requested_owner->getLastname() . "</td>";
-        echo "<td>" . $requested_account->getPIUID() . "</td>";
+        echo "<td>" . $requested_account->gid . "</td>";
         echo "<td><a href='mailto:" . $requested_owner->getMail() . "'>" . $requested_owner->getMail() . "</a></td>";
         echo "<td>" . date("jS F, Y", strtotime($request['timestamp'])) . "</td>";
         echo "<td>";
         echo "<form action='' method='POST' id='cancelPI'>
-            <input type='hidden' name='pi' value='{$requested_account->getPIUID()}'>
+            <input type='hidden' name='pi' value='{$requested_account->gid}'>
             <input type='hidden' name='form_type' value='cancelPIForm'>
             <input name='cancel' style='margin-top: 10px;' type='submit' value='Cancel Request'/>
             </form>";
@@ -112,7 +112,7 @@
 if (count($groups) == 0) {
     echo "You are not a member of any groups. Request to join a PI using the button below,
     or request your own PI account on the <a href='" . $CONFIG["site"]["prefix"] .
-    "/panel/account.php'>account settings</a> page";
+        "/panel/account.php'>account settings</a> page";
 }
 
 echo "<table>";
@@ -126,16 +126,16 @@
 
     echo "<tr class='expandable'>";
     echo
-    "<td>
+        "<td>
     <button class='btnExpand'>&#9654;</button>" . $owner->getFirstname() . " " . $owner->getLastname() . "</td>";
-    echo "<td>" . $group->getPIUID() . "</td>";
+    echo "<td>" . $group->gid . "</td>";
     echo "<td><a href='mailto:" . $owner->getMail() . "'>" . $owner->getMail() . "</a></td>";
     echo
-    "<td>
+        "<td>
     <form action='' method='POST'
-    onsubmit='return confirm(\"Are you sure you want to leave the PI group " . $group->getPIUID() . "?\")'>
+    onsubmit='return confirm(\"Are you sure you want to leave the PI group " . $group->gid . "?\")'>
     <input type='hidden' name='form_type' value='removePIForm'>
-    <input type='hidden' name='pi' value='" . $group->getPIUID() . "'>
+    <input type='hidden' name='pi' value='" . $group->gid . "'>
     <input type='submit' value='Leave Group'>
     </form>
     </td>";
@@ -161,7 +161,7 @@
 </style>
 
 <script>
-    $("button.btnAddPI").click(function() {
+    $("button.btnAddPI").click(function () {
         openModal("Add New PI", "<?php echo $CONFIG["site"]["prefix"]; ?>/panel/modal/new_pi.php");
     });
 
@@ -174,12 +174,12 @@
         }
 
         echo "openModal('Add New PI', '" .
-        $CONFIG["site"]["prefix"] . "/panel/modal/new_pi.php', '" . $errorHTML . "');";
+            $CONFIG["site"]["prefix"] . "/panel/modal/new_pi.php', '" . $errorHTML . "');";
     }
     ?>
 
     // tables.js uses ajax_url to populate expandable tables
-    var ajax_url = "<?php echo $CONFIG["site"]["prefix"]; ?>/panel/ajax/get_group_members.php?pi_uid=";
+    var ajax_url = "<?php echo $CONFIG["site"]["prefix"]; ?>/panel/ajax/get_group_members.php?gid=";
 </script>
 
 <style>
diff --git a/webroot/panel/modal/pi_search.php b/webroot/panel/modal/pi_search.php
index aeb90773..a57a462d 100644
--- a/webroot/panel/modal/pi_search.php
+++ b/webroot/panel/modal/pi_search.php
@@ -16,7 +16,7 @@
 
 $out = array();
 foreach ($assocs as $assoc_obj) {
-    $assoc = $assoc_obj->getPIUID();
+    $assoc = $assoc_obj->gid;
     // loop through each association
     if (strpos($assoc, $search_query) !== false) {
         array_push($out, $assoc);
diff --git a/webroot/panel/new_account.php b/webroot/panel/new_account.php
index 7a31b3e0..e5316e2e 100644
--- a/webroot/panel/new_account.php
+++ b/webroot/panel/new_account.php
@@ -54,7 +54,7 @@
                 $USER->getPIGroup()->cancelGroupRequest();
             } else {
                 $pi_group = new UnityGroup($request["request_for"], $LDAP, $SQL, $MAILER, $REDIS, $WEBHOOK);
-                $pi_group->cancelGroupJoinRequest($user=$USER);
+                $pi_group->cancelGroupJoinRequest($user = $USER);
             }
         }
     }
@@ -68,27 +68,29 @@
 <?php if (count($pending_requests) > 0) : ?>
     <p>You have pending account activation requests:</p>
     <?php foreach ($pending_requests as $request) : ?>
-        <ul><li>
-        <?php
-        $pi_uid = $request["request_for"];
-        if ($pi_uid == UnitySQL::REQUEST_BECOME_PI) {
-            $group_uid = $USER->getPIGroup()->getPIUID();
-            echo "<p>Ownership of PI Account/Group: <code>$group_uid</code> </p>";
-        } else {
-            $owner_uid = UnityGroup::getUIDfromPIUID($pi_uid);
-            echo "<p>Membership in PI Group owned by: <code>$owner_uid</code></p>";
-        }
-        ?>
-        </li></ul>
+        <ul>
+            <li>
+                <?php
+                $gid = $request["request_for"];
+                if ($gid == UnitySQL::REQUEST_BECOME_PI) {
+                    $group_uid = $USER->getPIGroup()->gid;
+                    echo "<p>Ownership of PI Account/Group: <code>$group_uid</code> </p>";
+                } else {
+                    $owner_uid = UnityGroup::GID2OwnerUID($gid);
+                    echo "<p>Membership in PI Group owned by: <code>$owner_uid</code></p>";
+                }
+                ?>
+            </li>
+        </ul>
         <hr>
         <p><strong>Requesting Ownership of PI Account/Group</strong></p>
         <p>You will receive an email when your account has been approved.</p>
         <p>
-        <?php
-        $addr = $CONFIG['mail']['support'];
-        $name = $CONFIG['mail']['support_name'];
-        echo "Email <a href='mailto:$addr'>$name</a> if you have not heard back in one business day.";
-        ?>
+            <?php
+            $addr = $CONFIG['mail']['support'];
+            $name = $CONFIG['mail']['support_name'];
+            echo "Email <a href='mailto:$addr'>$name</a> if you have not heard back in one business day.";
+            ?>
         </p>
         <br>
         <p><strong>Requesting Membership in a PI Group</strong></p>
@@ -96,7 +98,7 @@
         <p>You may need to remind them.</p>
         <hr>
         <form action="" method="POST">
-            <input name="cancel" style='margin-top: 10px;' type='submit' value='Cancel Request'/>
+            <input name="cancel" style='margin-top: 10px;' type='submit' value='Cancel Request' />
         </form>
     <?php endforeach; ?>
 <?php else : ?>
@@ -124,9 +126,9 @@
         <hr>
 
         <div style='position: relative;display: none;' id='piConfirmWrapper'>
-        <label><input type='checkbox' id='chk_pi' name='confirm_pi' value='agree'>
-           I have read the PI <a href="<?php echo $CONFIG["site"]["account_policy_url"]; ?>">
-            account policy</a> guidelines. </label>
+            <label><input type='checkbox' id='chk_pi' name='confirm_pi' value='agree'>
+                I have read the PI <a href="<?php echo $CONFIG["site"]["account_policy_url"]; ?>">
+                    account policy</a> guidelines. </label>
         </div>
         <br>
 
@@ -140,7 +142,7 @@
 <?php endif; ?>
 
 <script>
-    $('input[type=radio][name=new_user_sel]').change(function() {
+    $('input[type=radio][name=new_user_sel]').change(function () {
         let pi_cnf_text = $('#piConfirmWrapper');
         let pi_sel_text = $('#piSearchWrapper');
         if (this.value == 'not_pi') {
@@ -156,11 +158,11 @@
         }
     });
 
-    $("input[type=text][name=pi]").keyup(function() {
+    $("input[type=text][name=pi]").keyup(function () {
         var searchWrapper = $("div.searchWrapper");
         $.ajax({
             url: "<?php echo $CONFIG["site"]["prefix"]; ?>/panel/modal/pi_search.php?search=" + $(this).val(),
-            success: function(result) {
+            success: function (result) {
                 searchWrapper.html(result);
 
                 if (result == "") {
@@ -172,7 +174,7 @@
         });
     });
 
-    $("div.searchWrapper").on("click", "span", function(event) {
+    $("div.searchWrapper").on("click", "span", function (event) {
         var textBox = $("input[type=text][name=pi]");
         textBox.val($(this).html());
     });
@@ -180,7 +182,7 @@
     /**
      * Hides the searchresult box on click anywhere
      */
-    $(document).click(function() {
+    $(document).click(function () {
         $("div.searchWrapper").hide();
     });
 </script>
diff --git a/workers/group_user_request_owner_reminder.php b/workers/group_user_request_owner_reminder.php
index a77f820e..d53a372e 100644
--- a/workers/group_user_request_owner_reminder.php
+++ b/workers/group_user_request_owner_reminder.php
@@ -18,7 +18,7 @@
         $daysDifference = ($today - $request_date) / (60 * 60 * 24);
         if ($daysDifference > 34) {
             // No interface in UnityGroup for this, so use DB directly
-            $SQL->removeRequest($request[0]->getUID(), $pi_group->getPIUID());
+            $SQL->removeRequest($request[0]->getUID(), $pi_group->gid);
         } elseif ($daysDifference > 1 && $daysDifference % 7 == 0) {
             $new_user = $request[0];
             // send email to PI
@@ -26,12 +26,12 @@
                 $pi_user->getMail(),
                 "group_user_request_owner",
                 array(
-                    "group" => $pi_group->getPIUID(),
+                    "group" => $pi_group->gid,
                     "user" => $new_user->getUID(),
                     "name" => $new_user->getFullName(),
                     "email" => $new_user->getMail(),
                     "org" => $new_user->getOrg()
-                    )
+                )
             );
         }
     }

From bab6f45f28c0c58b99dcbb00ba4c41ffb510443e Mon Sep 17 00:00:00 2001
From: Simon Leary <simon.leary42@proton.me>
Date: Sun, 6 Jul 2025 20:49:03 -0400
Subject: [PATCH 2/6] UnityOrg as well

---
 resources/lib/UnityOrg.php | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/resources/lib/UnityOrg.php b/resources/lib/UnityOrg.php
index c965d628..d8f9f318 100644
--- a/resources/lib/UnityOrg.php
+++ b/resources/lib/UnityOrg.php
@@ -6,7 +6,7 @@
 
 class UnityOrg
 {
-    private $orgid;
+    public $gid;
 
     private $MAILER;
     private $SQL;
@@ -14,9 +14,9 @@ class UnityOrg
     private $REDIS;
     private $WEBHOOK;
 
-    public function __construct($orgid, $LDAP, $SQL, $MAILER, $REDIS, $WEBHOOK)
+    public function __construct($gid, $LDAP, $SQL, $MAILER, $REDIS, $WEBHOOK)
     {
-        $this->orgid = $orgid;
+        $this->gid = $gid;
 
         $this->LDAP = $LDAP;
         $this->SQL = $SQL;
@@ -37,7 +37,7 @@ public function init()
             $org_group->write();
         }
 
-        $this->REDIS->appendCacheArray("sorted_orgs", "", $this->getOrgID());
+        $this->REDIS->appendCacheArray("sorted_orgs", "", $this->gid);
     }
 
     public function exists()
@@ -47,12 +47,7 @@ public function exists()
 
     public function getLDAPOrgGroup()
     {
-        return $this->LDAP->getOrgGroupEntry($this->orgid);
-    }
-
-    public function getOrgID()
-    {
-        return $this->orgid;
+        return $this->LDAP->getOrgGroupEntry($this->gid);
     }
 
     public function inOrg($user, $ignorecache = false)
@@ -82,7 +77,7 @@ public function getOrgMembers($ignorecache = false)
     public function getOrgMemberUIDs($ignorecache = false)
     {
         if (!$ignorecache) {
-            $cached_val = $this->REDIS->getCache($this->getOrgID(), "members");
+            $cached_val = $this->REDIS->getCache($this->gid, "members");
             if (!is_null($cached_val)) {
                 $members = $cached_val;
             }
@@ -95,7 +90,7 @@ public function getOrgMemberUIDs($ignorecache = false)
         }
         if (!$ignorecache && $updatecache) {
             sort($members);
-            $this->REDIS->setCache($this->getOrgID(), "members", $members);
+            $this->REDIS->setCache($this->gid, "members", $members);
         }
         return $members;
     }
@@ -105,7 +100,7 @@ public function addUser($user)
         $org_group = $this->getLDAPOrgGroup();
         $org_group->appendAttribute("memberuid", $user->getUID());
         $org_group->write();
-        $this->REDIS->appendCacheArray($this->getOrgID(), "members", $user->getUID());
+        $this->REDIS->appendCacheArray($this->gid, "members", $user->getUID());
     }
 
     public function removeUser($user)
@@ -113,6 +108,6 @@ public function removeUser($user)
         $org_group = $this->getLDAPOrgGroup();
         $org_group->removeAttributeEntryByValue("memberuid", $user->getUID());
         $org_group->write();
-        $this->REDIS->removeCacheArray($this->getOrgID(), "members", $user->getUID());
+        $this->REDIS->removeCacheArray($this->gid, "members", $user->getUID());
     }
 }

From a59ecf15e95b3239c6785ef3593d3ad86308608f Mon Sep 17 00:00:00 2001
From: Simon Leary <simon.leary42@proton.me>
Date: Sun, 6 Jul 2025 20:57:13 -0400
Subject: [PATCH 3/6] UnityUser as well

---
 resources/init.php                            |   4 +-
 resources/lib/UnityGroup.php                  | 104 +++++++++---------
 resources/lib/UnityOrg.php                    |  30 ++---
 resources/lib/UnitySQL.php                    |   8 +-
 resources/lib/UnityUser.php                   |  88 +++++++--------
 .../functional/AccountDeletionRequestTest.php |  10 +-
 test/functional/NewUserTest.php               |  14 +--
 test/functional/PIMemberRequestTest.php       |   2 +-
 test/functional/PiBecomeRequestTest.php       |  12 +-
 test/functional/PiMemberApproveTest.php       |   8 +-
 test/functional/PiMemberDenyTest.php          |   6 +-
 test/functional/PiRemoveUserTest.php          |  13 ++-
 test/functional/ViewAsUserTest.php            |  10 +-
 webroot/admin/ajax/get_group_members.php      |  10 +-
 webroot/admin/user-mgmt.php                   |   8 +-
 webroot/panel/account.php                     |  42 +++----
 webroot/panel/ajax/get_group_members.php      |   6 +-
 webroot/panel/groups.php                      |  10 +-
 webroot/panel/new_account.php                 |   6 +-
 webroot/panel/pi.php                          |  16 +--
 workers/group_user_request_owner_reminder.php |   4 +-
 21 files changed, 201 insertions(+), 210 deletions(-)

diff --git a/resources/init.php b/resources/init.php
index b34df57a..6bc098de 100644
--- a/resources/init.php
+++ b/resources/init.php
@@ -119,10 +119,10 @@
     $SEND_PIMESG_TO_ADMINS = $CONFIG["mail"]["send_pimesg_to_admins"];
 
     $SQL->addLog(
-        $OPERATOR->getUID(),
+        $OPERATOR->uid,
         $_SERVER['REMOTE_ADDR'],
         "user_login",
-        $OPERATOR->getUID()
+        $OPERATOR->uid
     );
 
     if (!$_SESSION["user_exists"]) {
diff --git a/resources/lib/UnityGroup.php b/resources/lib/UnityGroup.php
index ba6be5d4..2f54af24 100644
--- a/resources/lib/UnityGroup.php
+++ b/resources/lib/UnityGroup.php
@@ -74,11 +74,11 @@ public function requestGroup($firstname, $lastname, $email, $org, $send_mail_to_
         }
 
         // check if account deletion request already exists
-        if ($this->SQL->accDeletionRequestExists($this->getOwner()->getUID())) {
+        if ($this->SQL->accDeletionRequestExists($this->getOwner()->uid)) {
             return;
         }
 
-        $this->SQL->addRequest($this->getOwner()->getUID(), $firstname, $lastname, $email, $org);
+        $this->SQL->addRequest($this->getOwner()->uid, $firstname, $lastname, $email, $org);
 
         if ($send_mail) {
             // send email to requestor
@@ -90,7 +90,7 @@ public function requestGroup($firstname, $lastname, $email, $org, $send_mail_to_
             $this->WEBHOOK->sendWebhook(
                 "group_request_admin",
                 array(
-                    "user" => $this->getOwner()->getUID(),
+                    "user" => $this->getOwner()->uid,
                     "org" => $org,
                     "name" => "$firstname $lastname",
                     "email" => $email
@@ -102,7 +102,7 @@ public function requestGroup($firstname, $lastname, $email, $org, $send_mail_to_
                     "admin",
                     "group_request_admin",
                     array(
-                        "user" => $this->getOwner()->getUID(),
+                        "user" => $this->getOwner()->uid,
                         "org" => $org,
                         "name" => "$firstname $lastname",
                         "email" => $email
@@ -114,7 +114,7 @@ public function requestGroup($firstname, $lastname, $email, $org, $send_mail_to_
                 "pi_approve",
                 "group_request_admin",
                 array(
-                    "user" => $this->getOwner()->getUID(),
+                    "user" => $this->getOwner()->uid,
                     "org" => $org,
                     "name" => "$firstname $lastname",
                     "email" => $email
@@ -128,7 +128,7 @@ public function requestGroup($firstname, $lastname, $email, $org, $send_mail_to_
      */
     public function approveGroup($operator = null, $send_mail = true)
     {
-        $uid = $this->getOwner()->getUID();
+        $uid = $this->getOwner()->uid;
         $request = $this->SQL->getRequest($uid, UnitySQL::REQUEST_BECOME_PI);
 
         // check for edge cases...
@@ -152,15 +152,15 @@ public function approveGroup($operator = null, $send_mail = true)
 
         // remove the request from the sql table
         // this will silently fail if the request doesn't exist
-        $this->SQL->removeRequest($this->getOwner()->getUID());
+        $this->SQL->removeRequest($this->getOwner()->uid);
 
-        $operator = is_null($operator) ? $this->getOwner()->getUID() : $operator->getUID();
+        $operator = is_null($operator) ? $this->getOwner()->uid : $operator->uid;
 
         $this->SQL->addLog(
             $operator,
             $_SERVER['REMOTE_ADDR'],
             "approved_group",
-            $this->getOwner()->getUID()
+            $this->getOwner()->uid
         );
 
         // send email to the newly approved PI
@@ -178,19 +178,19 @@ public function approveGroup($operator = null, $send_mail = true)
     public function denyGroup($operator = null, $send_mail = true)
     {
         // remove request - this will fail silently if the request doesn't exist
-        $this->SQL->removeRequest($this->getOwner()->getUID());
+        $this->SQL->removeRequest($this->getOwner()->uid);
 
         if ($this->exists()) {
             return;
         }
 
-        $operator = is_null($operator) ? $this->getOwner()->getUID() : $operator->getUID();
+        $operator = is_null($operator) ? $this->getOwner()->uid : $operator->uid;
 
         $this->SQL->addLog(
             $operator,
             $_SERVER['REMOTE_ADDR'],
             "denied_group",
-            $this->getOwner()->getUID()
+            $this->getOwner()->uid
         );
 
         // send email to the requestor
@@ -204,17 +204,17 @@ public function denyGroup($operator = null, $send_mail = true)
 
     public function cancelGroupRequest($send_mail = true)
     {
-        if (!$this->SQL->requestExists($this->getOwner()->getUID())) {
+        if (!$this->SQL->requestExists($this->getOwner()->uid)) {
             return;
         }
 
-        $this->SQL->removeRequest($this->getOwner()->getUID());
+        $this->SQL->removeRequest($this->getOwner()->uid);
 
         if ($send_mail) {
             $this->MAILER->sendMail(
                 "admin",
                 "group_request_cancelled",
-                ["uid" => $this->getOwner()->getUID()],
+                ["uid" => $this->getOwner()->uid],
             );
         }
     }
@@ -225,14 +225,14 @@ public function cancelGroupJoinRequest($user, $send_mail = true)
             return;
         }
 
-        $this->SQL->removeRequest($user->getUID(), $this->gid);
+        $this->SQL->removeRequest($user->uid, $this->gid);
 
         if ($send_mail) {
             // send email to requestor
             $this->MAILER->sendMail(
                 $this->getOwner()->getMail(),
                 "group_join_request_cancelled",
-                ["uid" => $user->getUID()]
+                ["uid" => $user->uid]
             );
         }
     }
@@ -260,7 +260,7 @@ public function cancelGroupJoinRequest($user, $send_mail = true)
     //         $ldapPiGroupEntry->delete();
     //         $this->REDIS->removeCacheArray("sorted_groups", "", $this->gid);
     //         foreach ($users as $user) {
-    //             $this->REDIS->removeCacheArray($user->getUID(), "groups", $this->gid);
+    //             $this->REDIS->removeCacheArray($user->uid, "groups", $this->gid);
     //         }
     //     }
 
@@ -281,7 +281,7 @@ public function cancelGroupJoinRequest($user, $send_mail = true)
      */
     public function approveUser($new_user, $send_mail = true)
     {
-        $uid = $new_user->getUID();
+        $uid = $new_user->uid;
         $request = $this->SQL->getRequest($uid, $this->gid);
         // check if user exists
         if (!$new_user->exists()) {
@@ -296,7 +296,7 @@ public function approveUser($new_user, $send_mail = true)
         // add user to the LDAP object
         $this->addUserToGroup($new_user);
 
-        $this->SQL->removeRequest($new_user->getUID(), $this->gid);
+        $this->SQL->removeRequest($new_user->uid, $this->gid);
 
         // send email to the requestor
         if ($send_mail) {
@@ -312,22 +312,22 @@ public function approveUser($new_user, $send_mail = true)
                 "group_user_added_owner",
                 array(
                     "group" => $this->gid,
-                    "user" => $new_user->getUID(),
+                    "user" => $new_user->uid,
                     "name" => $request["firstname"] . " " . $request["lastname"],
                     "email" => $request["email"],
                     "org" => $request["org"],
-                    )
+                )
             );
         }
     }
 
     public function denyUser($new_user, $send_mail = true)
     {
-        $uid = $new_user->getUID();
+        $uid = $new_user->uid;
         $request = $this->SQL->getRequest($uid, $this->gid);
 
         // remove request, this will fail silently if the request doesn't exist
-        $this->SQL->removeRequest($new_user->getUID(), $this->gid);
+        $this->SQL->removeRequest($new_user->uid, $this->gid);
 
         if ($send_mail) {
             // send email to the user
@@ -343,11 +343,11 @@ public function denyUser($new_user, $send_mail = true)
                 "group_user_denied_owner",
                 array(
                     "group" => $this->gid,
-                    "user" => $new_user->getUID(),
+                    "user" => $new_user->uid,
                     "name" => $new_user->getFullName(),
                     "email" => $new_user->getMail(),
                     "org" => $new_user->getOrg()
-                    )
+                )
             );
         }
     }
@@ -358,7 +358,7 @@ public function removeUser($new_user, $send_mail = true)
             return;
         }
 
-        if ($new_user->getUID() == $this->getOwner()->getUID()) {
+        if ($new_user->uid == $this->getOwner()->uid) {
             throw new Exception("Cannot delete group owner from group. Disband group instead");
         }
 
@@ -379,11 +379,11 @@ public function removeUser($new_user, $send_mail = true)
                 "group_user_removed_owner",
                 array(
                     "group" => $this->gid,
-                    "user" => $new_user->getUID(),
+                    "user" => $new_user->uid,
                     "name" => $new_user->getFullName(),
                     "email" => $new_user->getMail(),
                     "org" => $new_user->getOrg()
-                    )
+                )
             );
         }
     }
@@ -400,12 +400,12 @@ public function newUserRequest($new_user, $firstname, $lastname, $email, $org, $
             return;
         }
 
-        if ($this->SQL->accDeletionRequestExists($new_user->getUID())) {
+        if ($this->SQL->accDeletionRequestExists($new_user->uid)) {
             throw new Exception("user '$new_user' requested account deletion");
             return;
         }
 
-        $this->addRequest($new_user->getUID(), $firstname, $lastname, $email, $org);
+        $this->addRequest($new_user->uid, $firstname, $lastname, $email, $org);
 
         if ($send_mail) {
             // send email to user
@@ -421,11 +421,11 @@ public function newUserRequest($new_user, $firstname, $lastname, $email, $org, $
                 "group_user_request_owner",
                 array(
                     "group" => $this->gid,
-                    "user" => $new_user->getUID(),
+                    "user" => $new_user->uid,
                     "name" => "$firstname $lastname",
                     "email" => $email,
                     "org" => $org,
-                    )
+                )
             );
         }
     }
@@ -464,17 +464,17 @@ public function getGroupMembers($ignorecache = false)
     {
         $members = $this->getGroupMemberUIDs($ignorecache);
         $out = array();
-        $owner_uid = $this->getOwner()->getUID();
+        $owner_uid = $this->getOwner()->uid;
         foreach ($members as $member) {
-                $user_obj = new UnityUser(
-                    $member,
-                    $this->LDAP,
-                    $this->SQL,
-                    $this->MAILER,
-                    $this->REDIS,
-                    $this->WEBHOOK
-                );
-                array_push($out, $user_obj);
+            $user_obj = new UnityUser(
+                $member,
+                $this->LDAP,
+                $this->SQL,
+                $this->MAILER,
+                $this->REDIS,
+                $this->WEBHOOK
+            );
+            array_push($out, $user_obj);
         }
         return $out;
     }
@@ -505,7 +505,7 @@ public function requestExists($user)
         $requesters = $this->getRequests();
         if (count($requesters) > 0) {
             foreach ($requesters as $requester) {
-                if ($requester[0]->getUID() == $user->getUID()) {
+                if ($requester[0]->uid == $user->uid) {
                     return true;
                 }
             }
@@ -531,7 +531,7 @@ private function init()
 
             $ldapPiGroupEntry->setAttribute("objectclass", UnityLDAP::POSIX_GROUP_CLASS);
             $ldapPiGroupEntry->setAttribute("gidnumber", strval($nextGID));
-            $ldapPiGroupEntry->setAttribute("memberuid", array($owner->getUID()));
+            $ldapPiGroupEntry->setAttribute("memberuid", array($owner->uid));
             $ldapPiGroupEntry->write();
         }
 
@@ -544,25 +544,25 @@ private function addUserToGroup($new_user)
     {
         // Add to LDAP Group
         $pi_group = $this->getLDAPPiGroup();
-        $pi_group->appendAttribute("memberuid", $new_user->getUID());
+        $pi_group->appendAttribute("memberuid", $new_user->uid);
         $pi_group->write();
-        $this->REDIS->appendCacheArray($this->gid, "members", $new_user->getUID());
-        $this->REDIS->appendCacheArray($new_user->getUID(), "groups", $this->gid);
+        $this->REDIS->appendCacheArray($this->gid, "members", $new_user->uid);
+        $this->REDIS->appendCacheArray($new_user->uid, "groups", $this->gid);
     }
 
     private function removeUserFromGroup($old_user)
     {
         // Remove from LDAP Group
         $pi_group = $this->getLDAPPiGroup();
-        $pi_group->removeAttributeEntryByValue("memberuid", $old_user->getUID());
+        $pi_group->removeAttributeEntryByValue("memberuid", $old_user->uid);
         $pi_group->write();
-        $this->REDIS->removeCacheArray($this->gid, "members", $old_user->getUID());
-        $this->REDIS->removeCacheArray($old_user->getUID(), "groups", $this->gid);
+        $this->REDIS->removeCacheArray($this->gid, "members", $old_user->uid);
+        $this->REDIS->removeCacheArray($old_user->uid, "groups", $this->gid);
     }
 
     public function userExists($user)
     {
-        return in_array($user->getUID(), $this->getGroupMemberUIDs());
+        return in_array($user->uid, $this->getGroupMemberUIDs());
     }
 
     private function addRequest($uid, $firstname, $lastname, $email, $org)
diff --git a/resources/lib/UnityOrg.php b/resources/lib/UnityOrg.php
index d8f9f318..658a463c 100644
--- a/resources/lib/UnityOrg.php
+++ b/resources/lib/UnityOrg.php
@@ -52,24 +52,24 @@ public function getLDAPOrgGroup()
 
     public function inOrg($user, $ignorecache = false)
     {
-        return in_array($user->getUID(), $this->getOrgMemberUIDs($ignorecache));
+        return in_array($user->uid, $this->getOrgMemberUIDs($ignorecache));
     }
 
     public function getOrgMembers($ignorecache = false)
     {
         $members = $this->getGroupMemberUIDs($ignorecache);
         $out = array();
-        $owner_uid = $this->getOwner()->getUID();
+        $owner_uid = $this->getOwner()->uid;
         foreach ($members as $member) {
-                $user_obj = new UnityUser(
-                    $member,
-                    $this->LDAP,
-                    $this->SQL,
-                    $this->MAILER,
-                    $this->REDIS,
-                    $this->WEBHOOK
-                );
-                array_push($out, $user_obj);
+            $user_obj = new UnityUser(
+                $member,
+                $this->LDAP,
+                $this->SQL,
+                $this->MAILER,
+                $this->REDIS,
+                $this->WEBHOOK
+            );
+            array_push($out, $user_obj);
         }
         return $out;
     }
@@ -98,16 +98,16 @@ public function getOrgMemberUIDs($ignorecache = false)
     public function addUser($user)
     {
         $org_group = $this->getLDAPOrgGroup();
-        $org_group->appendAttribute("memberuid", $user->getUID());
+        $org_group->appendAttribute("memberuid", $user->uid);
         $org_group->write();
-        $this->REDIS->appendCacheArray($this->gid, "members", $user->getUID());
+        $this->REDIS->appendCacheArray($this->gid, "members", $user->uid);
     }
 
     public function removeUser($user)
     {
         $org_group = $this->getLDAPOrgGroup();
-        $org_group->removeAttributeEntryByValue("memberuid", $user->getUID());
+        $org_group->removeAttributeEntryByValue("memberuid", $user->uid);
         $org_group->write();
-        $this->REDIS->removeCacheArray($this->gid, "members", $user->getUID());
+        $this->REDIS->removeCacheArray($this->gid, "members", $user->uid);
     }
 }
diff --git a/resources/lib/UnitySQL.php b/resources/lib/UnitySQL.php
index 26721a6c..2ecc0233 100644
--- a/resources/lib/UnitySQL.php
+++ b/resources/lib/UnitySQL.php
@@ -107,7 +107,7 @@ public function requestExists($requestor, $dest = self::REQUEST_BECOME_PI)
         try {
             $this->getRequest($requestor, $dest);
             return true;
-        // FIXME use a specific exception
+            // FIXME use a specific exception
         } catch (\Exception) {
             return false;
         }
@@ -165,7 +165,7 @@ public function addNotice($title, $date, $content, $operator)
 
         $stmt->execute();
 
-        $operator = $operator->getUID();
+        $operator = $operator->uid;
 
         $this->addLog(
             $operator,
@@ -252,7 +252,7 @@ public function editPage($id, $content, $operator)
 
         $stmt->execute();
 
-        $operator = $operator->getUID();
+        $operator = $operator->uid;
 
         $this->addLog(
             $operator,
@@ -266,7 +266,7 @@ public function editPage($id, $content, $operator)
     public function addLog($operator, $operator_ip, $action_type, $recipient)
     {
         $stmt = $this->conn->prepare(
-            "INSERT INTO " . self::TABLE_AUDIT_LOG . " (operator, operator_ip, action_type, recipient) 
+            "INSERT INTO " . self::TABLE_AUDIT_LOG . " (operator, operator_ip, action_type, recipient)
             VALUE (:operator, :operator_ip, :action_type, :recipient)"
         );
         $stmt->bindParam(":operator", $operator);
diff --git a/resources/lib/UnityUser.php b/resources/lib/UnityUser.php
index cedc9061..77639a81 100644
--- a/resources/lib/UnityUser.php
+++ b/resources/lib/UnityUser.php
@@ -9,7 +9,7 @@ class UnityUser
 {
     private const HOME_DIR = "/home/";
 
-    private $uid;
+    public $uid;
 
     // service stack
     private $LDAP;
@@ -35,7 +35,7 @@ public function equals($other_user)
             throw new Exception("Unable to check equality because the parameter is not a " . self::class . " object");
         }
 
-        return $this->getUID() == $other_user->getUID();
+        return $this->uid == $other_user->uid;
     }
 
     public function __toString()
@@ -59,7 +59,7 @@ public function init($firstname, $lastname, $email, $org, $send_mail = true)
         // Create LDAP group
         //
         $ldapGroupEntry = $this->getLDAPGroup();
-        $id = $this->LDAP->getUnassignedID($this->getUID(), $this->SQL);
+        $id = $this->LDAP->getUnassignedID($this->uid, $this->SQL);
 
         if (!$ldapGroupEntry->exists()) {
             $ldapGroupEntry->setAttribute("objectclass", UnityLDAP::POSIX_GROUP_CLASS);
@@ -113,20 +113,20 @@ public function init($firstname, $lastname, $email, $org, $send_mail = true)
         }
 
         // add to user group as well as user OU
-        $this->LDAP->getUserGroup()->appendAttribute("memberuid", $this->getUID());
+        $this->LDAP->getUserGroup()->appendAttribute("memberuid", $this->uid);
         $this->LDAP->getUserGroup()->write();
 
         // add user to cache
-        $this->REDIS->appendCacheArray("sorted_users", "", $this->getUID());
+        $this->REDIS->appendCacheArray("sorted_users", "", $this->uid);
 
         //
         // add to audit log
         //
         $this->SQL->addLog(
-            $this->getUID(),
+            $this->uid,
             $_SERVER['REMOTE_ADDR'],
             "user_added",
-            $this->getUID()
+            $this->uid
         );
 
         //
@@ -170,16 +170,6 @@ public function exists()
     // User Attribute Functions
     //
 
-    /**
-     * Get method for NetID
-     *
-     * @return string Net ID of user
-     */
-    public function getUID()
-    {
-        return $this->uid;
-    }
-
     public function setOrg($org)
     {
         $ldap_user = $this->getLDAPUser();
@@ -192,7 +182,7 @@ public function getOrg($ignorecache = false)
     {
         assert($this->exists());
         if (!$ignorecache) {
-            $cached_val = $this->REDIS->getCache($this->getUID(), "org");
+            $cached_val = $this->REDIS->getCache($this->uid, "org");
             if (!is_null($cached_val)) {
                 return $cached_val;
             }
@@ -202,7 +192,7 @@ public function getOrg($ignorecache = false)
             $org = $this->getLDAPUser()->getAttribute("o")[0];
 
             if (!$ignorecache) {
-                $this->REDIS->setCache($this->getUID(), "org", $org);
+                $this->REDIS->setCache($this->uid, "org", $org);
             }
 
             return $this->getLDAPUser()->getAttribute("o")[0];
@@ -220,13 +210,13 @@ public function setFirstname($firstname, $operator = null)
     {
         $ldap_user = $this->getLDAPUser();
         $ldap_user->setAttribute("givenname", $firstname);
-        $operator = is_null($operator) ? $this->getUID() : $operator->getUID();
+        $operator = is_null($operator) ? $this->uid : $operator->uid;
 
         $this->SQL->addLog(
             $operator,
             $_SERVER['REMOTE_ADDR'],
             "firstname_changed",
-            $this->getUID()
+            $this->uid
         );
 
         $ldap_user->write();
@@ -242,7 +232,7 @@ public function getFirstname($ignorecache = false)
     {
         assert($this->exists());
         if (!$ignorecache) {
-            $cached_val = $this->REDIS->getCache($this->getUID(), "firstname");
+            $cached_val = $this->REDIS->getCache($this->uid, "firstname");
             if (!is_null($cached_val)) {
                 return $cached_val;
             }
@@ -252,7 +242,7 @@ public function getFirstname($ignorecache = false)
             $firstname = $this->getLDAPUser()->getAttribute("givenname")[0];
 
             if (!$ignorecache) {
-                $this->REDIS->setCache($this->getUID(), "firstname", $firstname);
+                $this->REDIS->setCache($this->uid, "firstname", $firstname);
             }
 
             return $firstname;
@@ -270,13 +260,13 @@ public function setLastname($lastname, $operator = null)
     {
         $ldap_user = $this->getLDAPUser();
         $ldap_user->setAttribute("sn", $lastname);
-        $operator = is_null($operator) ? $this->getUID() : $operator->getUID();
+        $operator = is_null($operator) ? $this->uid : $operator->uid;
 
         $this->SQL->addLog(
             $operator,
             $_SERVER['REMOTE_ADDR'],
             "lastname_changed",
-            $this->getUID()
+            $this->uid
         );
 
         $this->getLDAPUser()->write();
@@ -292,7 +282,7 @@ public function getLastname($ignorecache = false)
     {
         assert($this->exists());
         if (!$ignorecache) {
-            $cached_val = $this->REDIS->getCache($this->getUID(), "lastname");
+            $cached_val = $this->REDIS->getCache($this->uid, "lastname");
             if (!is_null($cached_val)) {
                 return $cached_val;
             }
@@ -302,7 +292,7 @@ public function getLastname($ignorecache = false)
             $lastname = $this->getLDAPUser()->getAttribute("sn")[0];
 
             if (!$ignorecache) {
-                $this->REDIS->setCache($this->getUID(), "lastname", $lastname);
+                $this->REDIS->setCache($this->uid, "lastname", $lastname);
             }
 
             return $lastname;
@@ -326,13 +316,13 @@ public function setMail($email, $operator = null)
     {
         $ldap_user = $this->getLDAPUser();
         $ldap_user->setAttribute("mail", $email);
-        $operator = is_null($operator) ? $this->getUID() : $operator->getUID();
+        $operator = is_null($operator) ? $this->uid : $operator->uid;
 
         $this->SQL->addLog(
             $operator,
             $_SERVER['REMOTE_ADDR'],
             "email_changed",
-            $this->getUID()
+            $this->uid
         );
 
         $this->getLDAPUser()->write();
@@ -348,7 +338,7 @@ public function getMail($ignorecache = false)
     {
         assert($this->exists());
         if (!$ignorecache) {
-            $cached_val = $this->REDIS->getCache($this->getUID(), "mail");
+            $cached_val = $this->REDIS->getCache($this->uid, "mail");
             if (!is_null($cached_val)) {
                 return $cached_val;
             }
@@ -358,7 +348,7 @@ public function getMail($ignorecache = false)
             $mail = $this->getLDAPUser()->getAttribute("mail")[0];
 
             if (!$ignorecache) {
-                $this->REDIS->setCache($this->getUID(), "mail", $mail);
+                $this->REDIS->setCache($this->uid, "mail", $mail);
             }
 
             return $mail;
@@ -375,7 +365,7 @@ public function getMail($ignorecache = false)
     public function setSSHKeys($keys, $operator = null, $send_mail = true)
     {
         $ldapUser = $this->getLDAPUser();
-        $operator = is_null($operator) ? $this->getUID() : $operator->getUID();
+        $operator = is_null($operator) ? $this->uid : $operator->uid;
         $keys_filt = array_values(array_unique($keys));
         if ($ldapUser->exists()) {
             $ldapUser->setAttribute("sshpublickey", $keys_filt);
@@ -391,7 +381,7 @@ public function setSSHKeys($keys, $operator = null, $send_mail = true)
             $operator,
             $_SERVER['REMOTE_ADDR'],
             "sshkey_modify",
-            $this->getUID()
+            $this->uid
         );
 
         if ($send_mail) {
@@ -412,7 +402,7 @@ public function getSSHKeys($ignorecache = false)
     {
         assert($this->exists());
         if (!$ignorecache) {
-            $cached_val = $this->REDIS->getCache($this->getUID(), "sshkeys");
+            $cached_val = $this->REDIS->getCache($this->uid, "sshkeys");
             if (!is_null($cached_val)) {
                 return $cached_val;
             }
@@ -428,7 +418,7 @@ public function getSSHKeys($ignorecache = false)
             }
 
             if (!$ignorecache) {
-                $this->REDIS->setCache($this->getUID(), "sshkeys", $keys);
+                $this->REDIS->setCache($this->uid, "sshkeys", $keys);
             }
 
             return $keys;
@@ -460,13 +450,13 @@ public function setLoginShell($shell, $operator = null, $send_mail = true)
             $ldapUser->write();
         }
 
-        $operator = is_null($operator) ? $this->getUID() : $operator->getUID();
+        $operator = is_null($operator) ? $this->uid : $operator->uid;
 
         $this->SQL->addLog(
             $operator,
             $_SERVER['REMOTE_ADDR'],
             "loginshell_changed",
-            $this->getUID()
+            $this->uid
         );
 
         $this->REDIS->setCache($this->uid, "loginshell", $shell);
@@ -489,7 +479,7 @@ public function getLoginShell($ignorecache = false)
     {
         assert($this->exists());
         if (!$ignorecache) {
-            $cached_val = $this->REDIS->getCache($this->getUID(), "loginshell");
+            $cached_val = $this->REDIS->getCache($this->uid, "loginshell");
             if (!is_null($cached_val)) {
                 return $cached_val;
             }
@@ -501,7 +491,7 @@ public function getLoginShell($ignorecache = false)
             $loginshell = $ldapUser->getAttribute("loginshell")[0];
 
             if (!$ignorecache) {
-                $this->REDIS->setCache($this->getUID(), "loginshell", $loginshell);
+                $this->REDIS->setCache($this->uid, "loginshell", $loginshell);
             }
 
             return $loginshell;
@@ -516,13 +506,13 @@ public function setHomeDir($home, $operator = null)
         if ($ldapUser->exists()) {
             $ldapUser->setAttribute("homedirectory", $home);
             $ldapUser->write();
-            $operator = is_null($operator) ? $this->getUID() : $operator->getUID();
+            $operator = is_null($operator) ? $this->uid : $operator->uid;
 
             $this->SQL->addLog(
                 $operator,
                 $_SERVER['REMOTE_ADDR'],
                 "homedir_changed",
-                $this->getUID()
+                $this->uid
             );
 
             $this->REDIS->setCache($this->uid, "homedir", $home);
@@ -538,7 +528,7 @@ public function getHomeDir($ignorecache = false)
     {
         assert($this->exists());
         if (!$ignorecache) {
-            $cached_val = $this->REDIS->getCache($this->getUID(), "homedir");
+            $cached_val = $this->REDIS->getCache($this->uid, "homedir");
             if (!is_null($cached_val)) {
                 return $cached_val;
             }
@@ -550,7 +540,7 @@ public function getHomeDir($ignorecache = false)
             $homedir = $ldapUser->getAttribute("homedirectory");
 
             if (!$ignorecache) {
-                $this->REDIS->setCache($this->getUID(), "homedir", $homedir);
+                $this->REDIS->setCache($this->uid, "homedir", $homedir);
             }
 
             return $homedir;
@@ -613,7 +603,7 @@ public function getGroups($ignorecache = false)
         $out = array();
 
         if (!$ignorecache) {
-            $cached_val = $this->REDIS->getCache($this->getUID(), "groups");
+            $cached_val = $this->REDIS->getCache($this->uid, "groups");
             if (!is_null($cached_val)) {
                 $groups = $cached_val;
                 foreach ($groups as $group) {
@@ -637,14 +627,14 @@ public function getGroups($ignorecache = false)
         $cache_arr = array();
 
         foreach ($all_pi_groups as $pi_group) {
-            if (in_array($this->getUID(), $pi_group->getGroupMemberUIDs())) {
+            if (in_array($this->uid, $pi_group->getGroupMemberUIDs())) {
                 array_push($out, $pi_group);
                 array_push($cache_arr, $pi_group->gid);
             }
         }
 
         if (!$ignorecache) {
-            $this->REDIS->setCache($this->getUID(), "groups", $cache_arr);
+            $this->REDIS->setCache($this->uid, "groups", $cache_arr);
         }
 
         return $out;
@@ -655,12 +645,12 @@ public function getGroups($ignorecache = false)
      */
     public function requestAccountDeletion()
     {
-        $this->SQL->addAccountDeletionRequest($this->getUID());
+        $this->SQL->addAccountDeletionRequest($this->uid);
         $this->MAILER->sendMail(
             "admin",
             "account_deletion_request_admin",
             array(
-                "user" => $this->getUID(),
+                "user" => $this->uid,
                 "name" => $this->getFullname(),
                 "email" => $this->getMail()
             )
@@ -674,7 +664,7 @@ public function requestAccountDeletion()
      */
     public function hasRequestedAccountDeletion()
     {
-        return $this->SQL->accDeletionRequestExists($this->getUID());
+        return $this->SQL->accDeletionRequestExists($this->uid);
     }
 
     /**
diff --git a/test/functional/AccountDeletionRequestTest.php b/test/functional/AccountDeletionRequestTest.php
index 08eb2af4..e6fae600 100644
--- a/test/functional/AccountDeletionRequestTest.php
+++ b/test/functional/AccountDeletionRequestTest.php
@@ -9,10 +9,10 @@ private function assertNumberAccountDeletionRequests(int $x)
         global $USER, $SQL;
         if ($x == 0) {
             $this->assertFalse($USER->hasRequestedAccountDeletion());
-            $this->assertFalse($SQL->accDeletionRequestExists($USER->getUID()));
+            $this->assertFalse($SQL->accDeletionRequestExists($USER->uid));
         } elseif ($x > 0) {
             $this->assertTrue($USER->hasRequestedAccountDeletion());
-            $this->assertTrue($SQL->accDeletionRequestExists($USER->getUID()));
+            $this->assertTrue($SQL->accDeletionRequestExists($USER->uid));
         } else {
             throw new RuntimeError("x must not be negative");
         }
@@ -25,7 +25,7 @@ private function getNumberAccountDeletionRequests()
         $stmt = $SQL->getConn()->prepare(
             "SELECT * FROM account_deletion_requests WHERE uid=:uid"
         );
-        $uid = $USER->getUID();
+        $uid = $USER->uid;
         $stmt->bindParam(":uid", $uid);
         $stmt->execute();
         return count($stmt->fetchAll());
@@ -49,7 +49,7 @@ public function testRequestAccountDeletionUserHasNoGroups()
             );
             $this->assertNumberAccountDeletionRequests(1);
         } finally {
-            $SQL->deleteAccountDeletionRequest($USER->getUID());
+            $SQL->deleteAccountDeletionRequest($USER->uid);
             $this->assertNumberAccountDeletionRequests(0);
         }
     }
@@ -68,7 +68,7 @@ public function testRequestAccountDeletionUserHasGroup()
             );
             $this->assertNumberAccountDeletionRequests(0);
         } finally {
-            $SQL->deleteAccountDeletionRequest($USER->getUID());
+            $SQL->deleteAccountDeletionRequest($USER->uid);
             $this->assertNumberAccountDeletionRequests(0);
         }
     }
diff --git a/test/functional/NewUserTest.php b/test/functional/NewUserTest.php
index 43ece84b..4da13cce 100644
--- a/test/functional/NewUserTest.php
+++ b/test/functional/NewUserTest.php
@@ -13,7 +13,7 @@ private function assertRequestedPIGroup(bool $expected)
         global $USER, $SQL;
         $this->assertEquals(
             $expected,
-            $SQL->requestExists($USER->getUID(), UnitySQL::REQUEST_BECOME_PI)
+            $SQL->requestExists($USER->uid, UnitySQL::REQUEST_BECOME_PI)
         );
     }
 
@@ -22,7 +22,7 @@ private function assertRequestedMembership(bool $expected, string $gid)
         global $USER, $SQL;
         $this->assertEquals(
             $expected,
-            $SQL->requestExists($USER->getUID(), $gid)
+            $SQL->requestExists($USER->uid, $gid)
         );
     }
 
@@ -58,7 +58,7 @@ private function cancelAllRequests()
     private function ensureUserDoesNotExist()
     {
         global $USER, $SQL, $LDAP;
-        $SQL->deleteRequestsByUser($USER->getUID());
+        $SQL->deleteRequestsByUser($USER->uid);
         if ($USER->exists()) {
             $org = $USER->getOrgGroup();
             if ($org->exists() and $org->inOrg($USER)) {
@@ -70,14 +70,14 @@ private function ensureUserDoesNotExist()
         }
         $all_users_group = $LDAP->getUserGroup();
         $all_member_uids = $all_users_group->getAttribute("memberuid");
-        $new_uids = array_diff($all_member_uids, [$USER->getUID()]);
-        if (in_array($USER->getUID(), $all_member_uids)) {
+        $new_uids = array_diff($all_member_uids, [$USER->uid]);
+        if (in_array($USER->uid, $all_member_uids)) {
             $all_users_group->setAttribute(
                 "memberuid",
-                array_diff($all_member_uids, [$USER->getUID()])
+                array_diff($all_member_uids, [$USER->uid])
             );
             $all_users_group->write();
-            assert(!in_array($USER->getUID(), $all_users_group->getAttribute("memberuid")));
+            assert(!in_array($USER->uid, $all_users_group->getAttribute("memberuid")));
         }
     }
 
diff --git a/test/functional/PIMemberRequestTest.php b/test/functional/PIMemberRequestTest.php
index 37e29082..51e76e79 100644
--- a/test/functional/PIMemberRequestTest.php
+++ b/test/functional/PIMemberRequestTest.php
@@ -34,7 +34,7 @@ public function testRequestMembership()
         $this->assertTrue(arraysAreEqualUnOrdered([$pi], $pi_group->getGroupMembers()));
         $this->assertEquals([], $SQL->getRequests($gid));
         switchUser(...getUserNotPiNotRequestedBecomePi());
-        $uid = $USER->getUID();
+        $uid = $USER->uid;
         $this->assertFalse($USER->isPI());
         $this->assertFalse($SQL->requestExists($uid, UnitySQL::REQUEST_BECOME_PI));
         $this->assertFalse($pi_group->userExists($USER));
diff --git a/test/functional/PiBecomeRequestTest.php b/test/functional/PiBecomeRequestTest.php
index 6c1bb3ba..abd446a1 100644
--- a/test/functional/PiBecomeRequestTest.php
+++ b/test/functional/PiBecomeRequestTest.php
@@ -9,9 +9,9 @@ private function assertNumberPiBecomeRequests(int $x)
     {
         global $USER, $SQL;
         if ($x == 0) {
-            $this->assertFalse($SQL->requestExists($USER->getUID()));
+            $this->assertFalse($SQL->requestExists($USER->uid));
         } elseif ($x > 0) {
-            $this->assertTrue($SQL->requestExists($USER->getUID()));
+            $this->assertTrue($SQL->requestExists($USER->uid));
         } else {
             throw new RuntimeError("x must not be negative");
         }
@@ -26,7 +26,7 @@ private function getNumberPiBecomeRequests()
         $stmt = $SQL->getConn()->prepare(
             "SELECT * FROM requests WHERE uid=:uid and request_for='admin'"
         );
-        $uid = $USER->getUID();
+        $uid = $USER->uid;
         $stmt->bindParam(":uid", $uid);
         $stmt->execute();
         return count($stmt->fetchAll());
@@ -61,7 +61,7 @@ public function testRequestBecomePi()
             $this->assertNumberPiBecomeRequests(1);
         } finally {
             if ($SQL->requestExists($USER, UnitySQL::REQUEST_BECOME_PI)) {
-                $SQL->removeRequest($USER->getUID(), UnitySQL::REQUEST_BECOME_PI);
+                $SQL->removeRequest($USER->uid, UnitySQL::REQUEST_BECOME_PI);
             }
         }
     }
@@ -72,7 +72,7 @@ public function testRequestBecomePiUserRequestedAccountDeletion()
         switchUser(...getUserNotPiNotRequestedBecomePiRequestedAccountDeletion());
         $this->assertFalse($USER->isPI());
         $this->assertNumberPiBecomeRequests(0);
-        $this->assertTrue($SQL->accDeletionRequestExists($USER->getUID()));
+        $this->assertTrue($SQL->accDeletionRequestExists($USER->uid));
         try {
             http_post(
                 __DIR__ . "/../../webroot/panel/account.php",
@@ -81,7 +81,7 @@ public function testRequestBecomePiUserRequestedAccountDeletion()
             $this->assertNumberPiBecomeRequests(0);
         } finally {
             if ($SQL->requestExists($USER, UnitySQL::REQUEST_BECOME_PI)) {
-                $SQL->removeRequest($USER->getUID(), UnitySQL::REQUEST_BECOME_PI);
+                $SQL->removeRequest($USER->uid, UnitySQL::REQUEST_BECOME_PI);
             }
         }
     }
diff --git a/test/functional/PiMemberApproveTest.php b/test/functional/PiMemberApproveTest.php
index b283a5fc..e4328b2a 100644
--- a/test/functional/PiMemberApproveTest.php
+++ b/test/functional/PiMemberApproveTest.php
@@ -53,9 +53,9 @@ public function testApproveRequest()
         $piSwitchArgs = getUserIsPIHasNoMembersNoMemberRequests();
         switchUser(...$userSwitchArgs);
         $user = $USER;
-        $uid = $USER->getUID();
+        $uid = $USER->uid;
         switchUser(...$piSwitchArgs);
-        $piUID = $USER->getUID();
+        $piUID = $USER->uid;
         $piGroup = $USER->getPIGroup();
 
         $this->assertTrue($piGroup->exists());
@@ -87,9 +87,9 @@ public function testApproveNonexistentRequest()
         global $USER;
         switchUser(...getNormalUser2());
         $user = $USER;
-        $uid = $USER->getUID();
+        $uid = $USER->uid;
         switchUser(...getUserIsPIHasNoMembersNoMemberRequests());
-        $piUID = $USER->getUID();
+        $piUID = $USER->uid;
         $piGroup = $USER->getPIGroup();
 
         $this->assertTrue($piGroup->exists());
diff --git a/test/functional/PiMemberDenyTest.php b/test/functional/PiMemberDenyTest.php
index 454b9bd8..5660a9c2 100644
--- a/test/functional/PiMemberDenyTest.php
+++ b/test/functional/PiMemberDenyTest.php
@@ -12,7 +12,7 @@ public static function setUpBeforeClass(): void
     {
         global $USER;
         switchUser(...getNormalUser());
-        self::$requestUid = $USER->getUID();
+        self::$requestUid = $USER->uid;
     }
 
     private function denyUser(string $uid)
@@ -32,7 +32,7 @@ public function testDenyRequest()
         $this->assertTrue($piGroup->exists());
         $this->assertTrue(
             arraysAreEqualUnOrdered(
-                [$pi->getUID()],
+                [$pi->uid],
                 $piGroup->getGroupMemberUIDs()
             )
         );
@@ -52,7 +52,7 @@ public function testDenyRequest()
             $this->assertEmpty($piGroup->getRequests());
             $this->assertTrue(
                 arraysAreEqualUnOrdered(
-                    [$pi->getUID()],
+                    [$pi->uid],
                     $piGroup->getGroupMemberUIDs()
                 )
             );
diff --git a/test/functional/PiRemoveUserTest.php b/test/functional/PiRemoveUserTest.php
index 1d7dd72f..21ab26bc 100644
--- a/test/functional/PiRemoveUserTest.php
+++ b/test/functional/PiRemoveUserTest.php
@@ -4,7 +4,8 @@
 use PHPUnit\Framework\Attributes\DataProvider;
 use UnityWebPortal\lib\UnityUser;
 
-class PiRemoveUserTest extends TestCase {
+class PiRemoveUserTest extends TestCase
+{
     private function removeUser(string $uid)
     {
         http_post(
@@ -18,7 +19,7 @@ public function testRemoveUser()
         global $USER, $LDAP, $SQL, $MAILER, $REDIS, $WEBHOOK;
         switchUser(...getUserIsPIHasAtLeastOneMember());
         $pi = $USER;
-        $piUid = $USER->getUID();
+        $piUid = $USER->uid;
         $piGroup = $USER->getPIGroup();
         $this->assertTrue($piGroup->exists());
         $memberUIDs = $piGroup->getGroupMemberUIDs();
@@ -36,10 +37,10 @@ public function testRemoveUser()
                 break;
             }
         }
-        $this->assertNotEquals($pi->getUID(), $memberToDelete->getUID());
+        $this->assertNotEquals($pi->uid, $memberToDelete->uid);
         $this->assertTrue($piGroup->userExists($memberToDelete));
         try {
-            $this->removeUser($memberToDelete->getUID());
+            $this->removeUser($memberToDelete->uid);
             $this->assertFalse($piGroup->userExists($memberToDelete));
         } finally {
             if (!$piGroup->userExists($memberToDelete)) {
@@ -65,7 +66,7 @@ public function testRemovePIFromTheirOwnGroup()
         $this->assertTrue($piGroup->userExists($pi));
         $this->expectException(Exception::class);
         try {
-            $this->removeUser($pi->getUID());
+            $this->removeUser($pi->uid);
             $this->assertTrue($piGroup->userExists($pi));
         } finally {
             if (!$piGroup->userExists($pi)) {
@@ -78,6 +79,6 @@ public function testRemovePIFromTheirOwnGroup()
                 );
                 $piGroup->approveUser($pi);
             }
-       }
+        }
     }
 }
diff --git a/test/functional/ViewAsUserTest.php b/test/functional/ViewAsUserTest.php
index 8d5be3c4..9c298586 100644
--- a/test/functional/ViewAsUserTest.php
+++ b/test/functional/ViewAsUserTest.php
@@ -10,10 +10,10 @@ public function _testViewAsUser(array $beforeUser, array $afterUser)
     {
         global $USER;
         switchUser(...$afterUser);
-        $afterUid = $USER->getUID();
+        $afterUid = $USER->uid;
         switchUser(...$beforeUser);
         // $this->assertTrue($USER->isAdmin());
-        $beforeUid = $USER->getUID();
+        $beforeUid = $USER->uid;
         // $this->assertNotEquals($afterUid, $beforeUid);
         http_post(
             __DIR__ . "/../../webroot/admin/user-mgmt.php",
@@ -28,7 +28,7 @@ public function _testViewAsUser(array $beforeUser, array $afterUser)
         session_write_close();
         http_get(__DIR__ . "/../../resources/init.php");
         // now we should be new user
-        $this->assertEquals($afterUid, $USER->getUID());
+        $this->assertEquals($afterUid, $USER->uid);
         // $this->assertTrue($_SESSION["user_exists"]);
         http_post(
             __DIR__ . "/../../resources/templates/header.php",
@@ -40,7 +40,7 @@ public function _testViewAsUser(array $beforeUser, array $afterUser)
         session_write_close();
         http_get(__DIR__ . "/../../resources/init.php");
         // now we should be back to original user
-        $this->assertEquals($beforeUid, $USER->getUID());
+        $this->assertEquals($beforeUid, $USER->uid);
     }
 
     public function testViewAsUser()
@@ -62,7 +62,7 @@ public function testNonAdminViewAsAdmin()
     {
         global $USER;
         switchUser(...getAdminUser());
-        $adminUid = $USER->getUID();
+        $adminUid = $USER->uid;
         $this->assertTrue($USER->isAdmin());
         switchUser(...getNormalUser());
         http_post(
diff --git a/webroot/admin/ajax/get_group_members.php b/webroot/admin/ajax/get_group_members.php
index be2f2c31..9f6c3cb0 100644
--- a/webroot/admin/ajax/get_group_members.php
+++ b/webroot/admin/ajax/get_group_members.php
@@ -20,7 +20,7 @@
 $i = 0;
 $count = count($members) + count($requests);
 foreach ($members as $member) {
-    if ($member->getUID() == $group->getOwner()->getUID()) {
+    if ($member->uid == $group->getOwner()->uid) {
         continue;
     }
 
@@ -31,14 +31,14 @@
     }
 
     echo "<td>" . $member->getFullname() . "</td>";
-    echo "<td>" . $member->getUID() . "</td>";
+    echo "<td>" . $member->uid . "</td>";
     echo "<td><a href='mailto:" . $member->getMail() . "'>" . $member->getMail() . "</a></td>";
     echo "<td>";
     echo
         "<form action='' method='POST' onsubmit='return confirm(\"Are you sure you want to remove " .
-        $member->getUID() . " from this group?\");'>
+        $member->uid . " from this group?\");'>
     <input type='hidden' name='form_type' value='remUserChild'>
-    <input type='hidden' name='uid' value='" . $member->getUID() . "'>
+    <input type='hidden' name='uid' value='" . $member->uid . "'>
     <input type='hidden' name='pi' value='" . $group->gid . "'>
     <input type='submit' value='Remove'>
     </form>";
@@ -54,7 +54,7 @@
     } else {
         echo "<tr class='expanded $i'>";
     }
-    $uid = $user->getUID();
+    $uid = $user->uid;
     echo "<td>" . $firstname . " " . $lastname . "</td>";
     echo "<td>" . $uid . "</td>";
     echo "<td><a href='mailto:" . $email . "'>" . $email . "</a></td>";
diff --git a/webroot/admin/user-mgmt.php b/webroot/admin/user-mgmt.php
index 809d3c27..9d3878bd 100644
--- a/webroot/admin/user-mgmt.php
+++ b/webroot/admin/user-mgmt.php
@@ -40,7 +40,7 @@
     $users = $LDAP->getAllUsers($SQL, $MAILER, $REDIS, $WEBHOOK);
 
     usort($users, function ($a, $b) {
-        return strcmp($a->getUID(), $b->getUID());
+        return strcmp($a->uid, $b->uid);
     });
 
     foreach ($users as $user) {
@@ -50,7 +50,7 @@
             echo "<tr>";
         }
         echo "<td>" . $user->getFirstname() . " " . $user->getLastname() . "</td>";
-        echo "<td>" . $user->getUID() . "</td>";
+        echo "<td>" . $user->uid . "</td>";
         echo "<td>" . $user->getOrg() . "</td>";
         echo "<td><a href='mailto:" . $user->getMail() . "'>" . $user->getMail() . "</a></td>";
         echo "<td>";
@@ -64,9 +64,9 @@
         echo "</td>";
         echo "<td>";
         echo "<form class='viewAsUserForm' action='' method='POST'
-        onsubmit='return confirm(\"Are you sure you want to switch to the user " . $user->getUID() . "?\");'>
+        onsubmit='return confirm(\"Are you sure you want to switch to the user " . $user->uid . "?\");'>
         <input type='hidden' name='form_type' value='viewAsUser'>
-        <input type='hidden' name='uid' value='" . $user->getUID() . "'>
+        <input type='hidden' name='uid' value='" . $user->uid . "'>
         <input type='submit' name='action' value='Access'>
         </form>";
         echo "</td>";
diff --git a/webroot/panel/account.php b/webroot/panel/account.php
index f63a1f7a..5133bfc7 100644
--- a/webroot/panel/account.php
+++ b/webroot/panel/account.php
@@ -57,13 +57,13 @@
             if ($USER->isPI()) {
                 UnitySite::badRequest("already a PI");
             }
-            if ($SQL->requestExists($USER->getUID())) {
+            if ($SQL->requestExists($USER->uid)) {
                 UnitySite::badRequest("already requested to be PI");
             }
-            if ($USER->getUID() != $SSO["user"]) {
+            if ($USER->uid != $SSO["user"]) {
                 UnitySite::badRequest(
                     "cannot request due to uid mismatch: " .
-                        "USER='{$USER->getUID()}' SSO[user]='$sso_user'"
+                    "USER='{$USER->uid}' SSO[user]='$sso_user'"
                 );
             }
             $USER->getPIGroup()->requestGroup(
@@ -82,7 +82,7 @@
             if ($hasGroups) {
                 break;
             }
-            if (!$SQL->accDeletionRequestExists($USER->getUID())) {
+            if (!$SQL->accDeletionRequestExists($USER->uid)) {
                 $USER->requestAccountDeletion();
             }
             break;
@@ -99,7 +99,7 @@
 <table>
     <tr>
         <th>Username</th>
-        <td><code><?php echo $USER->getUID(); ?></code></td>
+        <td><code><?php echo $USER->uid; ?></code></td>
     </tr>
     <tr>
         <th>Organization</th>
@@ -145,7 +145,7 @@
             id='piReq'
         >
     ";
-    if ($SQL->accDeletionRequestExists($USER->getUID())) {
+    if ($SQL->accDeletionRequestExists($USER->uid)) {
         echo "<input type='submit' value='Request PI Account' disabled />";
         echo "
             <label style='margin-left: 10px'>
@@ -153,7 +153,7 @@
             </label>
         ";
     } else {
-        if ($SQL->requestExists($USER->getUID())) {
+        if ($SQL->requestExists($USER->uid)) {
             $prompt = "onclick='return confirm(\"Are you sure you want to cancel this request?\")";
             echo "<input type='submit' value='Cancel PI Account Request' $prompt'/>";
             echo "
@@ -184,7 +184,7 @@
 
 for ($i = 0; $sshPubKeys != null && $i < count($sshPubKeys); $i++) {  // loop through keys
     echo
-    "<div class='key-box'>
+        "<div class='key-box'>
         <textarea spellcheck='false' readonly>" . $sshPubKeys[$i] . "</textarea>
         <form
             action='' id='del-" . $i . "'
@@ -206,16 +206,16 @@
 <h5>Login Shell</h5>
 
 <form action="" method="POST">
-<input type="hidden" name="form_type" value="loginshell" />
-<select id="loginSelector" class="code" name="shellSelect">
-<?php
-foreach ($CONFIG["loginshell"]["shell"] as $shell) {
-    echo "<option>$shell</option>";
-}
-?>
-</select>
-<br>
-<input id='submitLoginShell' type='submit' value='Set Login Shell' />
+    <input type="hidden" name="form_type" value="loginshell" />
+    <select id="loginSelector" class="code" name="shellSelect">
+        <?php
+        foreach ($CONFIG["loginshell"]["shell"] as $shell) {
+            echo "<option>$shell</option>";
+        }
+        ?>
+    </select>
+    <br>
+    <input id='submitLoginShell' type='submit' value='Set Login Shell' />
 </form>
 
 <hr>
@@ -236,7 +236,7 @@
         >
         <input type='hidden' name='form_type' value='account_deletion_request' />
     ";
-    if ($SQL->accDeletionRequestExists($USER->getUID())) {
+    if ($SQL->accDeletionRequestExists($USER->uid)) {
         echo "<input type='submit' value='Request Account Deletion' disabled />";
         echo "<label style='margin-left: 10px'>Your request has been submitted and is currently pending</label>";
     } else {
@@ -251,11 +251,11 @@
     const sitePrefix = '<?php echo $CONFIG["site"]["prefix"]; ?>';
     const ldapLoginShell = '<?php echo $USER->getLoginShell(); ?>';
 
-    $("button.btnAddKey").click(function() {
+    $("button.btnAddKey").click(function () {
         openModal("Add New Key", `${sitePrefix}/panel/modal/new_key.php`);
     });
 
-    $("#loginSelector option").each(function(i, e) {
+    $("#loginSelector option").each(function (i, e) {
         if ($(this).val() == ldapLoginShell) {
             $(this).prop("selected", true);
         }
diff --git a/webroot/panel/ajax/get_group_members.php b/webroot/panel/ajax/get_group_members.php
index 3d1e9e69..8b8c74dd 100644
--- a/webroot/panel/ajax/get_group_members.php
+++ b/webroot/panel/ajax/get_group_members.php
@@ -16,7 +16,7 @@
 $members = $group->getGroupMembers();
 $count = count($members);
 foreach ($members as $key => $member) {
-    if ($member->getUID() == $group->getOwner()->getUID()) {
+    if ($member->uid == $group->getOwner()->uid) {
         continue;
     }
 
@@ -27,8 +27,8 @@
     }
 
     echo "<td>" . $member->getFullname() . "</td>";
-    echo "<td>" . $member->getUID() . "</td>";
+    echo "<td>" . $member->uid . "</td>";
     echo "<td><a href='mailto:" . $member->getMail() . "'>" . $member->getMail() . "</a></td>";
-    echo "<td><input type='hidden' name='uid' value='" . $member->getUID() . "'></td>";
+    echo "<td><input type='hidden' name='uid' value='" . $member->uid . "'></td>";
     echo "</tr>";
 }
diff --git a/webroot/panel/groups.php b/webroot/panel/groups.php
index cfd88523..2cfbb9af 100644
--- a/webroot/panel/groups.php
+++ b/webroot/panel/groups.php
@@ -31,11 +31,11 @@
                     array_push($modalErrors, "You\'re already in this PI group");
                 }
 
-                if ($USER->getUID() != $SSO["user"]) {
+                if ($USER->uid != $SSO["user"]) {
                     $sso_user = $SSO["user"];
                     UnitySite::badRequest(
                         "cannot request due to uid mismatch: " .
-                        "USER='{$USER->getUID()}' SSO[user]='$sso_user'"
+                        "USER='{$USER->uid}' SSO[user]='$sso_user'"
                     );
                 }
 
@@ -65,7 +65,7 @@
 <?php
 $groups = $USER->getGroups();
 
-$requests = $SQL->getRequestsByUser($USER->getUID());
+$requests = $SQL->getRequestsByUser($USER->uid);
 
 $req_filtered = array();
 foreach ($requests as $request) {
@@ -120,7 +120,7 @@
 foreach ($groups as $group) {
     $owner = $group->getOwner();
 
-    if ($USER->getUID() == $owner->getUID()) {
+    if ($USER->uid == $owner->uid) {
         continue;
     }
 
@@ -146,7 +146,7 @@
 ?>
 
 <?php
-if ($SQL->accDeletionRequestExists($USER->getUID())) {
+if ($SQL->accDeletionRequestExists($USER->uid)) {
     echo "<button type='button' class='plusBtn btnAddPI' disabled><span>&#43;</span></button>";
     echo "<label>You cannot join a PI while you have requested account deletion.</label>";
 } else {
diff --git a/webroot/panel/new_account.php b/webroot/panel/new_account.php
index e5316e2e..9a4876d4 100644
--- a/webroot/panel/new_account.php
+++ b/webroot/panel/new_account.php
@@ -10,17 +10,17 @@
     UnitySite::redirect($CONFIG["site"]["prefix"] . "/panel/account.php");
 }
 
-$pending_requests = $SQL->getRequestsByUser($USER->getUID());
+$pending_requests = $SQL->getRequestsByUser($USER->uid);
 
 if ($_SERVER["REQUEST_METHOD"] == "POST") {
     if (isset($_POST["new_user_sel"])) {
         if (!isset($_POST["eula"]) || $_POST["eula"] != "agree") {
             UnitySite::badRequest("user did not agree to EULA");
         }
-        if ($USER->getUID() != $SSO["user"]) {
+        if ($USER->uid != $SSO["user"]) {
             $sso_user = $SSO["user"];
             UnitySite::badRequest(
-                "cannot request due to uid mismatch: USER='{$USER->getUID()}' SSO[user]='$sso_user'"
+                "cannot request due to uid mismatch: USER='{$USER->uid}' SSO[user]='$sso_user'"
             );
         }
         if ($_POST["new_user_sel"] == "not_pi") {
diff --git a/webroot/panel/pi.php b/webroot/panel/pi.php
index f86b43ff..675733ad 100644
--- a/webroot/panel/pi.php
+++ b/webroot/panel/pi.php
@@ -46,7 +46,7 @@
 if (count($requests) + count($assocs) == 1) {
     echo "<p>You do not have any users attached to your PI account.
     Ask your users to request to join your account on the <a href='" . $CONFIG["site"]["prefix"] .
-    "/panel/groups.php'>My PIs</a> page.</p>";
+        "/panel/groups.php'>My PIs</a> page.</p>";
 }
 
 if (count($requests) > 0) {
@@ -54,7 +54,7 @@
     echo "<table>";
 
     foreach ($requests as [$user, $timestamp, $firstname, $lastname, $email, $org]) {
-        $uid = $user->getUID();
+        $uid = $user->uid;
         $date = date("jS F, Y", strtotime($timestamp));
         echo "<tr>";
         echo "<td>" . $firstname . " " . $lastname . "</td>";
@@ -63,7 +63,7 @@
         echo "<td>" . $date . "</td>";
         echo "<td>";
         echo
-        "<form action='' method='POST'>
+            "<form action='' method='POST'>
         <input type='hidden' name='form_type' value='userReq'>
         <input type='hidden' name='uid' value='" . $uid . "'>
         <input type='submit' name='action' value='Approve'
@@ -86,22 +86,22 @@
 echo "<table>";
 
 foreach ($assocs as $assoc) {
-    if ($assoc->getUID() == $USER->getUID()) {
+    if ($assoc->uid == $USER->uid) {
         continue;
     }
 
     echo "<tr>";
     echo "<td>";
     echo
-    "<form action='' method='POST'>
+        "<form action='' method='POST'>
     <input type='hidden' name='form_type' value='remUser'>
-    <input type='hidden' name='uid' value='" . $assoc->getUID() . "'>
+    <input type='hidden' name='uid' value='" . $assoc->uid . "'>
     <input type='submit' value='Remove'
-    onclick='return confirm(\"Are you sure you want to remove " . $assoc->getUID() . " from your PI group?\")'>
+    onclick='return confirm(\"Are you sure you want to remove " . $assoc->uid . " from your PI group?\")'>
     </form>";
     echo "</td>";
     echo "<td>" . $assoc->getFirstname() . " " . $assoc->getLastname() . "</td>";
-    echo "<td>" . $assoc->getUID() . "</td>";
+    echo "<td>" . $assoc->uid . "</td>";
     echo "<td><a href='mailto:" . $assoc->getMail() . "'>" . $assoc->getMail() . "</a></td>";
     echo "</tr>";
 }
diff --git a/workers/group_user_request_owner_reminder.php b/workers/group_user_request_owner_reminder.php
index d53a372e..6b84c735 100644
--- a/workers/group_user_request_owner_reminder.php
+++ b/workers/group_user_request_owner_reminder.php
@@ -18,7 +18,7 @@
         $daysDifference = ($today - $request_date) / (60 * 60 * 24);
         if ($daysDifference > 34) {
             // No interface in UnityGroup for this, so use DB directly
-            $SQL->removeRequest($request[0]->getUID(), $pi_group->gid);
+            $SQL->removeRequest($request[0]->uid, $pi_group->gid);
         } elseif ($daysDifference > 1 && $daysDifference % 7 == 0) {
             $new_user = $request[0];
             // send email to PI
@@ -27,7 +27,7 @@
                 "group_user_request_owner",
                 array(
                     "group" => $pi_group->gid,
-                    "user" => $new_user->getUID(),
+                    "user" => $new_user->uid,
                     "name" => $new_user->getFullName(),
                     "email" => $new_user->getMail(),
                     "org" => $new_user->getOrg()

From 01e486ebaabaaf9d9fd43af444f03b696abec852 Mon Sep 17 00:00:00 2001
From: Simon Leary <simon.leary42@proton.me>
Date: Sun, 6 Jul 2025 21:12:53 -0400
Subject: [PATCH 4/6] cleaner

---
 resources/lib/UnityGroup.php | 7 ++-----
 resources/lib/UnityOrg.php   | 1 -
 resources/lib/UnitySQL.php   | 8 ++------
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/resources/lib/UnityGroup.php b/resources/lib/UnityGroup.php
index 2f54af24..4a79b444 100644
--- a/resources/lib/UnityGroup.php
+++ b/resources/lib/UnityGroup.php
@@ -281,8 +281,7 @@ public function cancelGroupJoinRequest($user, $send_mail = true)
      */
     public function approveUser($new_user, $send_mail = true)
     {
-        $uid = $new_user->uid;
-        $request = $this->SQL->getRequest($uid, $this->gid);
+        $request = $this->SQL->getRequest($new_user->uid, $this->gid);
         // check if user exists
         if (!$new_user->exists()) {
             $new_user->init(
@@ -323,8 +322,7 @@ public function approveUser($new_user, $send_mail = true)
 
     public function denyUser($new_user, $send_mail = true)
     {
-        $uid = $new_user->uid;
-        $request = $this->SQL->getRequest($uid, $this->gid);
+        $request = $this->SQL->getRequest($new_user->uid, $this->gid);
 
         // remove request, this will fail silently if the request doesn't exist
         $this->SQL->removeRequest($new_user->uid, $this->gid);
@@ -464,7 +462,6 @@ public function getGroupMembers($ignorecache = false)
     {
         $members = $this->getGroupMemberUIDs($ignorecache);
         $out = array();
-        $owner_uid = $this->getOwner()->uid;
         foreach ($members as $member) {
             $user_obj = new UnityUser(
                 $member,
diff --git a/resources/lib/UnityOrg.php b/resources/lib/UnityOrg.php
index 658a463c..3f3ad111 100644
--- a/resources/lib/UnityOrg.php
+++ b/resources/lib/UnityOrg.php
@@ -59,7 +59,6 @@ public function getOrgMembers($ignorecache = false)
     {
         $members = $this->getGroupMemberUIDs($ignorecache);
         $out = array();
-        $owner_uid = $this->getOwner()->uid;
         foreach ($members as $member) {
             $user_obj = new UnityUser(
                 $member,
diff --git a/resources/lib/UnitySQL.php b/resources/lib/UnitySQL.php
index 2ecc0233..db004c50 100644
--- a/resources/lib/UnitySQL.php
+++ b/resources/lib/UnitySQL.php
@@ -165,10 +165,8 @@ public function addNotice($title, $date, $content, $operator)
 
         $stmt->execute();
 
-        $operator = $operator->uid;
-
         $this->addLog(
-            $operator,
+            $operator->uid,
             $_SERVER['REMOTE_ADDR'],
             "added_cluster_notice",
             $operator
@@ -252,10 +250,8 @@ public function editPage($id, $content, $operator)
 
         $stmt->execute();
 
-        $operator = $operator->uid;
-
         $this->addLog(
-            $operator,
+            $operator->uid,
             $_SERVER['REMOTE_ADDR'],
             "edited_page",
             $operator

From 8e1e28e016b44de4357720a55a46d2498bd204a5 Mon Sep 17 00:00:00 2001
From: Simon Leary <simon.leary42@proton.me>
Date: Sun, 6 Jul 2025 21:16:04 -0400
Subject: [PATCH 5/6] keep original bad styling

---
 test/functional/PiMemberApproveTest.php | 25 ++++++++++++-------------
 test/functional/PiMemberDenyTest.php    |  6 ++----
 test/functional/PiRemoveUserTest.php    |  5 ++---
 3 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/test/functional/PiMemberApproveTest.php b/test/functional/PiMemberApproveTest.php
index e4328b2a..cfb9e80f 100644
--- a/test/functional/PiMemberApproveTest.php
+++ b/test/functional/PiMemberApproveTest.php
@@ -6,19 +6,18 @@
 use UnityWebPortal\lib\UnityGroup;
 use UnityWebPortal\lib\UnitySSO;
 
-class PiMemberApproveTest extends TestCase
-{
-    static $userWithRequestSwitchArgs;
-    static $userWithoutRequestSwitchArgs;
-    static $piSwitchArgs;
-    static $pi;
-    static $userWithRequestUID;
-    static $userWithoutRequestUID;
-    static $piUID;
-    static $userWithRequest;
-    static $userWithoutRequest;
-    static $piGroup;
-    static $piGroupGID;
+class PiMemberApproveTest extends TestCase {
+        static $userWithRequestSwitchArgs;
+        static $userWithoutRequestSwitchArgs;
+        static $piSwitchArgs;
+        static $pi;
+        static $userWithRequestUID;
+        static $userWithoutRequestUID;
+        static $piUID;
+        static $userWithRequest;
+        static $userWithoutRequest;
+        static $piGroup;
+        static $piGroupGID;
 
     private function approveUser(string $uid)
     {
diff --git a/test/functional/PiMemberDenyTest.php b/test/functional/PiMemberDenyTest.php
index 5660a9c2..a3738bc6 100644
--- a/test/functional/PiMemberDenyTest.php
+++ b/test/functional/PiMemberDenyTest.php
@@ -4,12 +4,10 @@
 use PHPUnit\Framework\Attributes\DataProvider;
 use UnityWebPortal\lib\UnityUser;
 
-class PiMemberDenyTest extends TestCase
-{
+class PiMemberDenyTest extends TestCase {
     static $requestUid;
 
-    public static function setUpBeforeClass(): void
-    {
+    public static function setUpBeforeClass(): void{
         global $USER;
         switchUser(...getNormalUser());
         self::$requestUid = $USER->uid;
diff --git a/test/functional/PiRemoveUserTest.php b/test/functional/PiRemoveUserTest.php
index 21ab26bc..ab1de450 100644
--- a/test/functional/PiRemoveUserTest.php
+++ b/test/functional/PiRemoveUserTest.php
@@ -4,8 +4,7 @@
 use PHPUnit\Framework\Attributes\DataProvider;
 use UnityWebPortal\lib\UnityUser;
 
-class PiRemoveUserTest extends TestCase
-{
+class PiRemoveUserTest extends TestCase {
     private function removeUser(string $uid)
     {
         http_post(
@@ -79,6 +78,6 @@ public function testRemovePIFromTheirOwnGroup()
                 );
                 $piGroup->approveUser($pi);
             }
-        }
+       }
     }
 }

From bd0f2e2f0dea931e0752b52483ccbed6d8537e39 Mon Sep 17 00:00:00 2001
From: Simon Leary <simon.leary42@proton.me>
Date: Sun, 6 Jul 2025 21:19:00 -0400
Subject: [PATCH 6/6] keep original bad styling

---
 webroot/panel/account.php     | 26 ++++++++--------
 webroot/panel/new_account.php | 56 +++++++++++++++++------------------
 2 files changed, 40 insertions(+), 42 deletions(-)

diff --git a/webroot/panel/account.php b/webroot/panel/account.php
index 5133bfc7..192ca3e5 100644
--- a/webroot/panel/account.php
+++ b/webroot/panel/account.php
@@ -184,7 +184,7 @@
 
 for ($i = 0; $sshPubKeys != null && $i < count($sshPubKeys); $i++) {  // loop through keys
     echo
-        "<div class='key-box'>
+    "<div class='key-box'>
         <textarea spellcheck='false' readonly>" . $sshPubKeys[$i] . "</textarea>
         <form
             action='' id='del-" . $i . "'
@@ -206,16 +206,16 @@
 <h5>Login Shell</h5>
 
 <form action="" method="POST">
-    <input type="hidden" name="form_type" value="loginshell" />
-    <select id="loginSelector" class="code" name="shellSelect">
-        <?php
-        foreach ($CONFIG["loginshell"]["shell"] as $shell) {
-            echo "<option>$shell</option>";
-        }
-        ?>
-    </select>
-    <br>
-    <input id='submitLoginShell' type='submit' value='Set Login Shell' />
+<input type="hidden" name="form_type" value="loginshell" />
+<select id="loginSelector" class="code" name="shellSelect">
+<?php
+foreach ($CONFIG["loginshell"]["shell"] as $shell) {
+    echo "<option>$shell</option>";
+}
+?>
+</select>
+<br>
+<input id='submitLoginShell' type='submit' value='Set Login Shell' />
 </form>
 
 <hr>
@@ -251,11 +251,11 @@
     const sitePrefix = '<?php echo $CONFIG["site"]["prefix"]; ?>';
     const ldapLoginShell = '<?php echo $USER->getLoginShell(); ?>';
 
-    $("button.btnAddKey").click(function () {
+    $("button.btnAddKey").click(function() {
         openModal("Add New Key", `${sitePrefix}/panel/modal/new_key.php`);
     });
 
-    $("#loginSelector option").each(function (i, e) {
+    $("#loginSelector option").each(function(i, e) {
         if ($(this).val() == ldapLoginShell) {
             $(this).prop("selected", true);
         }
diff --git a/webroot/panel/new_account.php b/webroot/panel/new_account.php
index 9a4876d4..aed4c87a 100644
--- a/webroot/panel/new_account.php
+++ b/webroot/panel/new_account.php
@@ -54,7 +54,7 @@
                 $USER->getPIGroup()->cancelGroupRequest();
             } else {
                 $pi_group = new UnityGroup($request["request_for"], $LDAP, $SQL, $MAILER, $REDIS, $WEBHOOK);
-                $pi_group->cancelGroupJoinRequest($user = $USER);
+                $pi_group->cancelGroupJoinRequest($user=$USER);
             }
         }
     }
@@ -68,29 +68,27 @@
 <?php if (count($pending_requests) > 0) : ?>
     <p>You have pending account activation requests:</p>
     <?php foreach ($pending_requests as $request) : ?>
-        <ul>
-            <li>
-                <?php
-                $gid = $request["request_for"];
-                if ($gid == UnitySQL::REQUEST_BECOME_PI) {
-                    $group_uid = $USER->getPIGroup()->gid;
-                    echo "<p>Ownership of PI Account/Group: <code>$group_uid</code> </p>";
-                } else {
-                    $owner_uid = UnityGroup::GID2OwnerUID($gid);
-                    echo "<p>Membership in PI Group owned by: <code>$owner_uid</code></p>";
-                }
-                ?>
-            </li>
-        </ul>
+        <ul><li>
+        <?php
+        $pi_uid = $request["request_for"];
+        if ($pi_uid == UnitySQL::REQUEST_BECOME_PI) {
+            $group_uid = $USER->getPIGroup()->getPIUID();
+            echo "<p>Ownership of PI Account/Group: <code>$group_uid</code> </p>";
+        } else {
+            $owner_uid = UnityGroup::getUIDfromPIUID($pi_uid);
+            echo "<p>Membership in PI Group owned by: <code>$owner_uid</code></p>";
+        }
+        ?>
+        </li></ul>
         <hr>
         <p><strong>Requesting Ownership of PI Account/Group</strong></p>
         <p>You will receive an email when your account has been approved.</p>
         <p>
-            <?php
-            $addr = $CONFIG['mail']['support'];
-            $name = $CONFIG['mail']['support_name'];
-            echo "Email <a href='mailto:$addr'>$name</a> if you have not heard back in one business day.";
-            ?>
+        <?php
+        $addr = $CONFIG['mail']['support'];
+        $name = $CONFIG['mail']['support_name'];
+        echo "Email <a href='mailto:$addr'>$name</a> if you have not heard back in one business day.";
+        ?>
         </p>
         <br>
         <p><strong>Requesting Membership in a PI Group</strong></p>
@@ -98,7 +96,7 @@
         <p>You may need to remind them.</p>
         <hr>
         <form action="" method="POST">
-            <input name="cancel" style='margin-top: 10px;' type='submit' value='Cancel Request' />
+            <input name="cancel" style='margin-top: 10px;' type='submit' value='Cancel Request'/>
         </form>
     <?php endforeach; ?>
 <?php else : ?>
@@ -126,9 +124,9 @@
         <hr>
 
         <div style='position: relative;display: none;' id='piConfirmWrapper'>
-            <label><input type='checkbox' id='chk_pi' name='confirm_pi' value='agree'>
-                I have read the PI <a href="<?php echo $CONFIG["site"]["account_policy_url"]; ?>">
-                    account policy</a> guidelines. </label>
+        <label><input type='checkbox' id='chk_pi' name='confirm_pi' value='agree'>
+           I have read the PI <a href="<?php echo $CONFIG["site"]["account_policy_url"]; ?>">
+            account policy</a> guidelines. </label>
         </div>
         <br>
 
@@ -142,7 +140,7 @@
 <?php endif; ?>
 
 <script>
-    $('input[type=radio][name=new_user_sel]').change(function () {
+    $('input[type=radio][name=new_user_sel]').change(function() {
         let pi_cnf_text = $('#piConfirmWrapper');
         let pi_sel_text = $('#piSearchWrapper');
         if (this.value == 'not_pi') {
@@ -158,11 +156,11 @@
         }
     });
 
-    $("input[type=text][name=pi]").keyup(function () {
+    $("input[type=text][name=pi]").keyup(function() {
         var searchWrapper = $("div.searchWrapper");
         $.ajax({
             url: "<?php echo $CONFIG["site"]["prefix"]; ?>/panel/modal/pi_search.php?search=" + $(this).val(),
-            success: function (result) {
+            success: function(result) {
                 searchWrapper.html(result);
 
                 if (result == "") {
@@ -174,7 +172,7 @@
         });
     });
 
-    $("div.searchWrapper").on("click", "span", function (event) {
+    $("div.searchWrapper").on("click", "span", function(event) {
         var textBox = $("input[type=text][name=pi]");
         textBox.val($(this).html());
     });
@@ -182,7 +180,7 @@
     /**
      * Hides the searchresult box on click anywhere
      */
-    $(document).click(function () {
+    $(document).click(function() {
         $("div.searchWrapper").hide();
     });
 </script>