setSubject

Author: simonLeary42

resources/lib/UnityMailer.php

@@ -39,7 +39,7 @@ public function __construct()
         ]);
         $this->twig = new \Twig\Environment($this->loader, ["strict_variables" => true]);
         $functions = [
-            new TwigFunction("setSubject", fn($x) => ($this->Subject = $x)),
+            new TwigFunction("setSubject", fn($mailer, $subject) => ($mailer->Subject = $subject)),
             new TwigFunction("getRelativeHyperlink", getRelativeHyperlink(...)),
             new TwigFunction("formatHyperlink", formatHyperlink(...)),
             new TwigFunction("throw", fn($x) => throw new Exception($x)),
@@ -105,6 +105,7 @@ public function sendMail(string|array $recipients, string $template, ?array $dat
     {
         $data ??= [];
         $mailer = $this->constructPHPMailer();
+        $data["mailer"] = $mailer;
         $mailer->setFrom($this->MSG_SENDER_EMAIL, $this->MSG_SENDER_NAME);
         $mailer->addReplyTo($this->MSG_SUPPORT_EMAIL, $this->MSG_SUPPORT_NAME);
 

resources/mail/group_created.html.twig

@@ -1,4 +1,4 @@
-{% do setSubject('PI Account Approved') %}
+{% do setSubject(mailer, 'PI Account Approved') %}
 
 <p>Hello,</p>
 

resources/mail/group_denied.html.twig

@@ -1,4 +1,4 @@
-{% do setSubject('PI Account Denied') %}
+{% do setSubject(mailer, 'PI Account Denied') %}
 
 <p>Hello,</p>
 

resources/mail/group_disabled.html.twig

@@ -1,4 +1,4 @@
-{% do setSubject('PI Group Disabled') %}
+{% do setSubject(mailer, 'PI Group Disabled') %}
 
 <p>Hello,</p>
 

resources/mail/group_join_request_cancelled.html.twig

@@ -1,4 +1,4 @@
-{% do setSubject("Unity PI Membership Request Cancelled: '" ~ uid ~ "'") %}
+{% do setSubject(mailer, "Unity PI Membership Request Cancelled: '" ~ uid ~ "'") %}
 <p>Hello,</p>
 <p>The user '{{ uid }}' has cancelled their request to join your PI group.</p>
 {{ include('footer.html.twig') }}

resources/mail/group_reenabled.html.twig

@@ -1,4 +1,4 @@
-{% do setSubject('PI Group Re-Enabled') %}
+{% do setSubject(mailer, 'PI Group Re-Enabled') %}
 
 <p>Hello,</p>
 

resources/mail/group_request.html.twig

@@ -1,4 +1,4 @@
-{% do setSubject('PI Account Requested') %}
+{% do setSubject(mailer, 'PI Account Requested') %}
 
 <p>Hello,</p>
 

resources/mail/group_request_admin.html.twig

@@ -1,4 +1,4 @@
-{% do setSubject('PI Group Request') %}
+{% do setSubject(mailer, 'PI Group Request') %}
 
 <p>Hello,</p>
 

resources/mail/group_request_cancelled.html.twig

@@ -1,4 +1,4 @@
-{% do setSubject("PI Request Cancelled: '" ~ uid ~ "'") %}
+{% do setSubject(mailer, "PI Request Cancelled: '" ~ uid ~ "'") %}
 <p>Hello,</p>
 <p>The user '{{ uid }}' has cancelled their request to become a PI.</p>
 {{ include('footer.html.twig') }}

resources/mail/group_user_added.html.twig

@@ -1,4 +1,4 @@
-{% do setSubject('Group Request Approved') %}
+{% do setSubject(mailer, 'Group Request Approved') %}
 
 <p>Hello,</p>