Skip to content

move logging from higher to lower level function #600

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
simonLeary42 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

move logging from higher to lower level function #600

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20a2e6d
move logging from higher to lower level function
simonLeary42 Feb 2, 2026
f18118a
log after
simonLeary42 Feb 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions resources/lib/UnityGroup.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -482,12 +474,19 @@ public function getManagerUIDs(): array
return $this->entry->getAttribute("managerUid");
}

public function addMemberUID(string $uid): void
{
parent::addMemberUID($uid);
$this->SQL->addLog("added_user", _json_encode(["user" => $uid, "group" => $this->gid]));
}

public function removeMemberUID(string $uid): void
{
if ($this->managerUIDExists($uid)) {
$this->removeManagerUID($uid);
}
parent::removeMemberUID($uid);
$this->SQL->addLog("removed_user", _json_encode(["user" => $uid, "group" => $this->gid]));
}

public function addPlusAddressToMail(string $mail): string
Expand Down