From 3d6e3d8e1c5b3fe86d8f34dd606fe78570165282 Mon Sep 17 00:00:00 2001
From: Alex Tselegidis <alextselegidis@gmail.com>
Date: Wed, 27 Nov 2024 12:08:49 +0100
Subject: [PATCH] Move common code into the get_php_mailer function

---
 application/libraries/Email_messages.php | 48 ++++++++++++------------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/application/libraries/Email_messages.php b/application/libraries/Email_messages.php
index b654b6bf..47ae7cb7 100644
--- a/application/libraries/Email_messages.php
+++ b/application/libraries/Email_messages.php
@@ -112,13 +112,7 @@ class Email_messages
             true,
         );
 
-        $php_mailer = $this->get_php_mailer();
-
-        $php_mailer->addAddress($recipient_email);
-
-        $php_mailer->Subject = $subject;
-        $php_mailer->Body = $html;
-        $php_mailer->AltBody = $html;
+        $php_mailer = $this->get_php_mailer($recipient_email, $subject, $html);
 
         $php_mailer->addStringAttachment($ics_stream, 'invitation.ics', PHPMailer::ENCODING_BASE64, 'text/vcalendar');
 
@@ -183,13 +177,7 @@ class Email_messages
 
         $subject = lang('appointment_cancelled_title');
 
-        $php_mailer = $this->get_php_mailer();
-
-        $php_mailer->addAddress($recipient_email);
-
-        $php_mailer->Subject = $subject;
-        $php_mailer->Body = $html;
-        $php_mailer->AltBody = $html;
+        $php_mailer = $this->get_php_mailer($recipient_email, $subject, $html);
 
         $php_mailer->send();
     }
@@ -217,13 +205,7 @@ class Email_messages
 
         $subject = lang('new_account_password');
 
-        $php_mailer = $this->get_php_mailer();
-
-        $php_mailer->addAddress($recipient_email);
-
-        $php_mailer->Subject = $subject;
-        $php_mailer->Body = $html;
-        $php_mailer->AltBody = $html;
+        $php_mailer = $this->get_php_mailer($recipient_email, $subject, $html);
 
         $php_mailer->send();
     }
@@ -231,12 +213,19 @@ class Email_messages
     /**
      * Create PHP Mailer instance based on the email configuration.
      *
+     * @param string|null $recipient_email
+     * @param string|null $subject
+     * @param string|null $html
+     *
      * @return PHPMailer
      *
      * @throws Exception
      */
-    private function get_php_mailer(): PHPMailer
-    {
+    private function get_php_mailer(
+        string $recipient_email = null,
+        string $subject = null,
+        string $html = null,
+    ): PHPMailer {
         $php_mailer = new PHPMailer(true);
 
         $php_mailer->isHTML();
@@ -260,6 +249,19 @@ class Email_messages
         $php_mailer->setFrom($from_address, $from_name);
         $php_mailer->addReplyTo($reply_to_address);
 
+        if ($recipient_email) {
+            $php_mailer->addAddress($recipient_email);
+        }
+
+        if ($subject) {
+            $php_mailer->Subject = $subject;
+        }
+
+        if ($html) {
+            $php_mailer->Body = $html;
+            $php_mailer->AltBody = $html;
+        }
+
         return $php_mailer;
     }
 }