From 90df3de829ffd87213d0eb33546781fe442f109b Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Wed, 11 Apr 2018 12:37:51 -0400 Subject: [PATCH] Allow sending over http if the magic constant is present --- api/BusinessLogic/Emails/MailgunEmailSender.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/api/BusinessLogic/Emails/MailgunEmailSender.php b/api/BusinessLogic/Emails/MailgunEmailSender.php index e46289e1..6231c26c 100644 --- a/api/BusinessLogic/Emails/MailgunEmailSender.php +++ b/api/BusinessLogic/Emails/MailgunEmailSender.php @@ -18,11 +18,11 @@ class MailgunEmailSender extends \BaseClass implements EmailSender { $mailgunArray['to'] = implode(',', $emailBuilder->to); - if ($emailBuilder->cc !== null) { + if ($emailBuilder->cc !== null && count($emailBuilder->cc) > 0) { $mailgunArray['cc'] = implode(',', $emailBuilder->cc); } - if ($emailBuilder->bcc !== null) { + if ($emailBuilder->bcc !== null && count($emailBuilder->bcc) > 0) { $mailgunArray['bcc'] = implode(',', $emailBuilder->bcc); } @@ -55,7 +55,9 @@ class MailgunEmailSender extends \BaseClass implements EmailSender { } private function sendMessage($mailgunArray, $attachments, $modsForHeskSettings) { - $messageClient = new Mailgun($modsForHeskSettings['mailgun_api_key']); + $ssl = !defined('NO_MAILGUN_SSL'); + + $messageClient = new Mailgun($modsForHeskSettings['mailgun_api_key'], 'api.mailgun.net', 'v2', $ssl); $mailgunAttachments = array(); if (count($attachments) > 0) {