franzz/spot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Avoid PHPMailer boiler plate repetition

Browse Source
This commit is contained in:
Franzz
2021-08-30 21:27:07 +02:00
parent 0da78509a7
commit 1b02d26fe0
1 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
inc/Email.php
View File

@@ -44,7 +44,6 @@ class Email extends PhpObject {
} }
public function send() { public function send() {
foreach($this->asDests as $asDest) {
$oPHPMailer = new PHPMailer(true); $oPHPMailer = new PHPMailer(true);
//Server settings //Server settings
@@ -61,6 +60,7 @@ class Email extends PhpObject {
$oPHPMailer->setFrom(Settings::MAIL_FROM, 'Spotty'); $oPHPMailer->setFrom(Settings::MAIL_FROM, 'Spotty');
$oPHPMailer->addReplyTo(Settings::MAIL_FROM, 'Spotty'); $oPHPMailer->addReplyTo(Settings::MAIL_FROM, 'Spotty');
foreach($this->asDests as $asDest) {
//Message //Message
$this->oTemplate->setLanguage($asDest['language'], Spot::DEFAULT_LANG); $this->oTemplate->setLanguage($asDest['language'], Spot::DEFAULT_LANG);
$this->oTemplate->setTimezone($asDest['timezone']); $this->oTemplate->setTimezone($asDest['timezone']);
@@ -77,7 +77,12 @@ class Email extends PhpObject {
$sPlainMessage = strip_tags(str_replace('<br />', "\n", $sHtmlMessage)); $sPlainMessage = strip_tags(str_replace('<br />', "\n", $sHtmlMessage));
//Recipients //Recipients
try {
$oPHPMailer->addAddress($asDest['email'], $asDest['name']); $oPHPMailer->addAddress($asDest['email'], $asDest['name']);
} catch (Exception $oError) {
$this->addError('Invalid address skipped: '.$asDest['email'].' ('.$asDest['name'].')');
continue;
}
//Content //Content
$oPHPMailer->isHTML(true); $oPHPMailer->isHTML(true);
@@ -85,13 +90,18 @@ class Email extends PhpObject {
$oPHPMailer->Body = $sHtmlMessage; $oPHPMailer->Body = $sHtmlMessage;
$oPHPMailer->AltBody = $sPlainMessage; $oPHPMailer->AltBody = $sPlainMessage;
$bSuccess = true;
try { try {
$oPHPMailer->send(); $bSuccess = $bSuccess && $oPHPMailer->send();
} }
catch (Exception $e) { catch (Exception $oError) {
$this->addError('Message could not be sent to "'.$asDest['email'].'". Mailer Error: '.$oPHPMailer->ErrorInfo); $this->addError('Message could not be sent to "'.$asDest['email'].'". Mailer Error: '.$oPHPMailer->ErrorInfo);
$oPHPMailer->getSMTPInstance()->reset();
} }
$oPHPMailer->clearAddresses();
$oPHPMailer->clearCustomHeaders();
} }
return $bSuccess;
} }
private static function getTimeZoneCity($sTimeZone) { private static function getTimeZoneCity($sTimeZone) {