mirrors/easyappointments
1
0
Fork 1
mirror of https://github.com/alextselegidis/easyappointments.git synced 2025-01-04 21:12:26 +03:00
Code Issues Projects Releases Packages Wiki Activity

Move common code into the get_php_mailer function

Browse source
This commit is contained in:
Alex Tselegidis 2024-11-27 12:08:49 +01:00
parent 37553e00b4
commit 3d6e3d8e1c
1 changed files with 25 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
application/libraries/Email_messages.php
View file

@ -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;
}
}