mirror of
https://github.com/alextselegidis/easyappointments.git
synced 2025-01-06 22:12:25 +03:00
Move common code into the get_php_mailer function
This commit is contained in:
parent
37553e00b4
commit
3d6e3d8e1c
1 changed files with 25 additions and 23 deletions
|
@ -112,13 +112,7 @@ class Email_messages
|
||||||
true,
|
true,
|
||||||
);
|
);
|
||||||
|
|
||||||
$php_mailer = $this->get_php_mailer();
|
$php_mailer = $this->get_php_mailer($recipient_email, $subject, $html);
|
||||||
|
|
||||||
$php_mailer->addAddress($recipient_email);
|
|
||||||
|
|
||||||
$php_mailer->Subject = $subject;
|
|
||||||
$php_mailer->Body = $html;
|
|
||||||
$php_mailer->AltBody = $html;
|
|
||||||
|
|
||||||
$php_mailer->addStringAttachment($ics_stream, 'invitation.ics', PHPMailer::ENCODING_BASE64, 'text/vcalendar');
|
$php_mailer->addStringAttachment($ics_stream, 'invitation.ics', PHPMailer::ENCODING_BASE64, 'text/vcalendar');
|
||||||
|
|
||||||
|
@ -183,13 +177,7 @@ class Email_messages
|
||||||
|
|
||||||
$subject = lang('appointment_cancelled_title');
|
$subject = lang('appointment_cancelled_title');
|
||||||
|
|
||||||
$php_mailer = $this->get_php_mailer();
|
$php_mailer = $this->get_php_mailer($recipient_email, $subject, $html);
|
||||||
|
|
||||||
$php_mailer->addAddress($recipient_email);
|
|
||||||
|
|
||||||
$php_mailer->Subject = $subject;
|
|
||||||
$php_mailer->Body = $html;
|
|
||||||
$php_mailer->AltBody = $html;
|
|
||||||
|
|
||||||
$php_mailer->send();
|
$php_mailer->send();
|
||||||
}
|
}
|
||||||
|
@ -217,13 +205,7 @@ class Email_messages
|
||||||
|
|
||||||
$subject = lang('new_account_password');
|
$subject = lang('new_account_password');
|
||||||
|
|
||||||
$php_mailer = $this->get_php_mailer();
|
$php_mailer = $this->get_php_mailer($recipient_email, $subject, $html);
|
||||||
|
|
||||||
$php_mailer->addAddress($recipient_email);
|
|
||||||
|
|
||||||
$php_mailer->Subject = $subject;
|
|
||||||
$php_mailer->Body = $html;
|
|
||||||
$php_mailer->AltBody = $html;
|
|
||||||
|
|
||||||
$php_mailer->send();
|
$php_mailer->send();
|
||||||
}
|
}
|
||||||
|
@ -231,12 +213,19 @@ class Email_messages
|
||||||
/**
|
/**
|
||||||
* Create PHP Mailer instance based on the email configuration.
|
* Create PHP Mailer instance based on the email configuration.
|
||||||
*
|
*
|
||||||
|
* @param string|null $recipient_email
|
||||||
|
* @param string|null $subject
|
||||||
|
* @param string|null $html
|
||||||
|
*
|
||||||
* @return PHPMailer
|
* @return PHPMailer
|
||||||
*
|
*
|
||||||
* @throws Exception
|
* @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 = new PHPMailer(true);
|
||||||
|
|
||||||
$php_mailer->isHTML();
|
$php_mailer->isHTML();
|
||||||
|
@ -260,6 +249,19 @@ class Email_messages
|
||||||
$php_mailer->setFrom($from_address, $from_name);
|
$php_mailer->setFrom($from_address, $from_name);
|
||||||
$php_mailer->addReplyTo($reply_to_address);
|
$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;
|
return $php_mailer;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue