move deleteRequestsByUser into UnityUser

simonLeary42 · simonLeary42 · commit f3092febe3b1 · 2025-12-12T10:15:05.000-05:00
diff --git a/resources/lib/UnityUser.php b/resources/lib/UnityUser.php
@@ -372,6 +372,7 @@ public function getPIGroupGIDs(): array
      */
     public function requestAccountDeletion(): void
     {
+        $this->SQL->deleteRequestsByUser($this->uid);
         $this->SQL->addAccountDeletionRequest($this->uid);
         $this->MAILER->sendMail("admin", "account_deletion_request_admin", [
             "user" => $this->uid,
diff --git a/webroot/panel/account.php b/webroot/panel/account.php
@@ -86,7 +86,6 @@
             if ($hasGroups) {
                 break;
             }
-            $SQL->deleteRequestsByUser($USER->uid);
             if (!$SQL->accDeletionRequestExists($USER->uid)) {
                 $USER->requestAccountDeletion();
             }

Original file line number	Diff line number	Diff line change
`@@ -372,6 +372,7 @@ public function getPIGroupGIDs(): array`
`372`	`372`	`*/`
`373`	`373`	`public function requestAccountDeletion(): void`
`374`	`374`	`{`
	`375`	`+ $this->SQL->deleteRequestsByUser($this->uid);`
`375`	`376`	`$this->SQL->addAccountDeletionRequest($this->uid);`
`376`	`377`	`$this->MAILER->sendMail("admin", "account_deletion_request_admin", [`
`377`	`378`	`"user" => $this->uid,`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,6 @@`
`86`	`86`	`if ($hasGroups) {`
`87`	`87`	`break;`
`88`	`88`	`}`
`89`		`- $SQL->deleteRequestsByUser($USER->uid);`
`90`	`89`	`if (!$SQL->accDeletionRequestExists($USER->uid)) {`
`91`	`90`	`$USER->requestAccountDeletion();`
`92`	`91`	`}`