From 1fd0bd35e51eb8eb001587815bde826729c3317f Mon Sep 17 00:00:00 2001 From: Simon Leary Date: Mon, 7 Apr 2025 12:53:25 -0400 Subject: [PATCH 1/2] rename confusing constant --- resources/lib/UnitySQL.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/resources/lib/UnitySQL.php b/resources/lib/UnitySQL.php index 904ea2fd..16d190c0 100644 --- a/resources/lib/UnitySQL.php +++ b/resources/lib/UnitySQL.php @@ -21,7 +21,8 @@ class UnitySQL private const TABLE_GROUP_JOIN_REQUESTS = "groupJoinRequests"; - private const REQUEST_ADMIN = "admin"; + // FIXME this string should be changed to something more intuitive, requires production sql change + private const REQUEST_BECOME_PI = "admin"; private $conn; @@ -39,7 +40,7 @@ public function getConn() // // requests table methods // - public function addRequest($requestor, $dest = self::REQUEST_ADMIN) + public function addRequest($requestor, $dest = self::REQUEST_BECOME_PI) { if ($this->requestExists($requestor, $dest)) { return; @@ -54,7 +55,7 @@ public function addRequest($requestor, $dest = self::REQUEST_ADMIN) $stmt->execute(); } - public function removeRequest($requestor, $dest = self::REQUEST_ADMIN) + public function removeRequest($requestor, $dest = self::REQUEST_BECOME_PI) { if (!$this->requestExists($requestor, $dest)) { return; @@ -69,7 +70,7 @@ public function removeRequest($requestor, $dest = self::REQUEST_ADMIN) $stmt->execute(); } - public function removeRequests($dest = self::REQUEST_ADMIN) + public function removeRequests($dest = self::REQUEST_BECOME_PI) { $stmt = $this->conn->prepare( "DELETE FROM " . self::TABLE_REQS . " WHERE request_for=:request_for" @@ -79,7 +80,7 @@ public function removeRequests($dest = self::REQUEST_ADMIN) $stmt->execute(); } - public function requestExists($requestor, $dest = self::REQUEST_ADMIN) + public function requestExists($requestor, $dest = self::REQUEST_BECOME_PI) { $stmt = $this->conn->prepare( "SELECT * FROM " . self::TABLE_REQS . " WHERE uid=:uid and request_for=:request_for" @@ -92,7 +93,7 @@ public function requestExists($requestor, $dest = self::REQUEST_ADMIN) return count($stmt->fetchAll()) > 0; } - public function getRequests($dest = self::REQUEST_ADMIN) + public function getRequests($dest = self::REQUEST_BECOME_PI) { $stmt = $this->conn->prepare( "SELECT * FROM " . self::TABLE_REQS . " WHERE request_for=:request_for" From d5691cf4da30d658a6864e8a2320a4dcd50068dd Mon Sep 17 00:00:00 2001 From: Simon Leary Date: Mon, 7 Apr 2025 14:06:11 -0400 Subject: [PATCH 2/2] add comment --- webroot/panel/groups.php | 1 + 1 file changed, 1 insertion(+) diff --git a/webroot/panel/groups.php b/webroot/panel/groups.php index d1b2a013..91d07c1b 100644 --- a/webroot/panel/groups.php +++ b/webroot/panel/groups.php @@ -56,6 +56,7 @@ $req_filtered = array(); foreach ($requests as $request) { + // FIXME "admin" -> UnitySQL::REQUEST_BECOME_PI if ($request["request_for"] != "admin") { // put this in config later for gypsum array_push($req_filtered, $request); }