From 20a2e6dbf7303ad9de4dc4eb8d823e8acbf68f22 Mon Sep 17 00:00:00 2001 From: Simon Leary Date: Mon, 2 Feb 2026 10:31:30 -0500 Subject: [PATCH 1/2] move logging from higher to lower level function --- resources/lib/UnityGroup.php | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/resources/lib/UnityGroup.php b/resources/lib/UnityGroup.php index 0c374fae0..e5769f1fc 100644 --- a/resources/lib/UnityGroup.php +++ b/resources/lib/UnityGroup.php @@ -196,10 +196,6 @@ public function approveUser(UnityUser $new_user, bool $send_mail = true): void \ensure($new_user->exists()); $this->addMemberUID($new_user->uid); $this->SQL->removeRequest($new_user->uid, $this->gid); - $this->SQL->addLog( - "approved_user", - _json_encode(["user" => $new_user->uid, "group" => $this->gid]), - ); if ($send_mail) { $this->MAILER->sendMail($new_user->getMail(), "group_user_added", [ "group" => $this->gid, @@ -255,10 +251,6 @@ public function removeUser(UnityUser $new_user, bool $send_mail = true): void throw new Exception("Cannot delete group owner from group. Disable group instead"); } $this->removeMemberUID($new_user->uid); - $this->SQL->addLog( - "removed_user", - _json_encode(["user" => $new_user->uid, "group" => $this->gid]), - ); if ($send_mail) { $this->MAILER->sendMail($new_user->getMail(), "group_user_removed", [ "group" => $this->gid, @@ -482,11 +474,18 @@ public function getManagerUIDs(): array return $this->entry->getAttribute("managerUid"); } + public function addMemberUID(string $uid): void + { + $this->SQL->addLog("added_user", _json_encode(["user" => $uid, "group" => $this->gid])); + parent::addMemberUID($uid); + } + public function removeMemberUID(string $uid): void { if ($this->managerUIDExists($uid)) { $this->removeManagerUID($uid); } + $this->SQL->addLog("removed_user", _json_encode(["user" => $uid, "group" => $this->gid])); parent::removeMemberUID($uid); } From f18118a29b15c800d65711e34d3ca5010b493aff Mon Sep 17 00:00:00 2001 From: Simon Leary Date: Mon, 2 Feb 2026 10:32:48 -0500 Subject: [PATCH 2/2] log after --- resources/lib/UnityGroup.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/lib/UnityGroup.php b/resources/lib/UnityGroup.php index e5769f1fc..3b8881aa0 100644 --- a/resources/lib/UnityGroup.php +++ b/resources/lib/UnityGroup.php @@ -476,8 +476,8 @@ public function getManagerUIDs(): array public function addMemberUID(string $uid): void { - $this->SQL->addLog("added_user", _json_encode(["user" => $uid, "group" => $this->gid])); parent::addMemberUID($uid); + $this->SQL->addLog("added_user", _json_encode(["user" => $uid, "group" => $this->gid])); } public function removeMemberUID(string $uid): void @@ -485,8 +485,8 @@ public function removeMemberUID(string $uid): void if ($this->managerUIDExists($uid)) { $this->removeManagerUID($uid); } - $this->SQL->addLog("removed_user", _json_encode(["user" => $uid, "group" => $this->gid])); parent::removeMemberUID($uid); + $this->SQL->addLog("removed_user", _json_encode(["user" => $uid, "group" => $this->gid])); } public function addPlusAddressToMail(string $mail): string