dbxe/DBXE
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

Removed old phpmailer 2.1 and migrated sending process to SystemMailer

Browse Source
This commit is contained in:
Xenomporio
2022-06-25 16:49:03 +02:00
parent 1e0df65ba7
commit 2a56b14fa8
31 changed files with 91 additions and 5443 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Modules/SystemMailer/SystemMailer.php
+22 -7
View File
@@ -57,7 +57,7 @@ final class SystemMailer
*
* @return bool success
*/
public function send(EmailMessage $email, EmailBackupAccount $account): bool
public function send(EmailMessage $email, EmailBackupAccount $account, &$mailerror_text): bool
{
$transport = $this->factory->createMailerTransport($account);
$email = $this->cleaner->cleanEmailBody($email);
@@ -65,19 +65,26 @@ final class SystemMailer
try {
$success = $mailer->send($email);
$this->emailLog->logOutgoingMail($email, $account, $transport->getStatus());
if ($transport->hasErrors()) {
$this->logger->error('Error while sending email.', ['error' => $transport->getErrorMessages()]);
if ($transport->hasErrors()) {
$errors = ['error' => $transport->getErrorMessages()];
$this->logger->error('Error while sending email.', $errors);
$mailerror_text = 'Error while sending email. '.implode(', ',$errors['error']);
}
} catch (MailerTransportException $e) {
$this->logger->error($e->getMessage(), ['dump' => $transport->getErrorMessages()]);
$errors = ['error' => $transport->getErrorMessages()];
$this->logger->error('Error while sending email.', $errors);
$mailerror_text = 'Error while sending email. '.implode(', ',$errors['error']);
return false;
} catch (AuthorizationExpiredException $e) {
$this->logger->error(
'Sending Email Failed: Google authorization expired',
'Error while sending email. Google authorization expired',
['exception' => $e]
);
$mailerror_text = 'Error while sending email. Google authorization expired';
return false;
}
@@ -106,15 +113,18 @@ final class SystemMailer
$body,
$attachFiles = [],
$ccs = [],
$bccs = []
$bccs = [],
&$mailerror_text
): bool {
//cannot use Mailer component if no emailbackup account exists
$account = null;
try {
$account = $this->accountGateway->getAccountByEmail($senderEmail);
} catch (Exception $e) {
$account = null;
$this->logger->error($e->getMessage(), ['exception' => $e]);
$mailerror_text = 'Error while sending email: Account not found.';
}
if ($account === null) {
@@ -144,7 +154,12 @@ final class SystemMailer
->withDisplayName($senderName);
//send email with new Mailer component
return $this->send($email, $account);
$mailerror_text = "";
$result = $this->send($email, $account, $mailerror_text);
return ($result);
}
/**