- Updates mailers to use HTML and/or TEXT body

lib/Mailer/API/AmazonSES.php

@@ -31,16 +31,21 @@ class AmazonSES {
   }
 
   function getBody($newsletter, $subscriber) {
-    return array(
+    $body = array(
       'Action' => 'SendEmail',
       'Version' => '2010-12-01',
       'Source' => $this->from,
       'Destination.ToAddresses.member.1' => $subscriber,
       'Message.Subject.Data' => $newsletter['subject'],
-      'Message.Body.Html.Data' => $newsletter['body']['html'],
-      'Message.Body.Text.Data' => $newsletter['body']['text'],
       'ReturnPath' => $this->from
     );
+    if(!empty($newsletter['body']['html'])) {
+      $body['Message.Body.Html.Data'] = $newsletter['body']['html'];
+    }
+    if(!empty($newsletter['body']['text'])) {
+      $body['Message.Body.Text.Data'] = $newsletter['body']['text'];
+    }
+    return $body;
   }
 
   function request($newsletter, $subscriber) {

lib/Mailer/API/ElasticEmail.php

@@ -22,15 +22,20 @@ class ElasticEmail {
   }
 
   function getBody($newsletter, $subscriber) {
-    return array(
+    $body = array(
       'api_key' => $this->apiKey,
       'from' => $this->fromEmail,
       'from_name' => $this->fromName,
       'to' => $subscriber,
-      'subject' => $newsletter['subject'],
-      'body_html' => $newsletter['body']['html'],
-      'body_text' => $newsletter['body']['text']
+      'subject' => $newsletter['subject']
     );
+    if(!empty($newsletter['body']['html'])) {
+      $body['body_html'] = $newsletter['body']['html'];
+    }
+    if(!empty($newsletter['body']['text'])) {
+      $body['body_text'] = $newsletter['body']['text'];
+    }
+    return $body;
   }
 
   function request($newsletter, $subscriber) {

lib/Mailer/API/MailGun.php

@@ -22,13 +22,18 @@ class MailGun {
   }
 
   function getBody($newsletter, $subscriber) {
-    return array(
+    $body = array(
       'from' => $this->from,
       'to' => $subscriber,
-      'subject' => $newsletter['subject'],
-      'html' => $newsletter['body']['html'],
-      'text' => $newsletter['body']['text']
+      'subject' => $newsletter['subject']
     );
+    if(!empty($newsletter['body']['html'])) {
+      $body['html'] = $newsletter['body']['html'];
+    }
+    if(!empty($newsletter['body']['text'])) {
+      $body['text'] = $newsletter['body']['text'];
+    }
+    return $body;
   }
 
   function auth() {

lib/Mailer/API/Mandrill.php

@@ -37,18 +37,23 @@ class Mandrill {
   }
   
   function getBody($newsletter, $subscriber) {
-    return array(
+    $body = array(
       'key' => $this->apiKey,
       'message' => array(
         'from_email' => $this->fromEmail,
         'from_name' => $this->fromName,
         'to' => array($subscriber),
-        'subject' => $newsletter['subject'],
-        'html' => $newsletter['body']['html'],
-        'text' => $newsletter['body']['text']
+        'subject' => $newsletter['subject']
       ),
       'async' => false,
     );
+    if(!empty($newsletter['body']['html'])) {
+      $body['message']['html'] = $newsletter['body']['html'];
+    }
+    if(!empty($newsletter['body']['text'])) {
+      $body['message']['text'] = $newsletter['body']['text'];
+    }
+    return $body;
   }
   
   function request($newsletter, $subscriber) {

lib/Mailer/API/SendGrid.php

@@ -25,14 +25,19 @@ class SendGrid {
   }
 
   function getBody($newsletter, $subscriber) {
-    return array(
+    $body = array(
       'to' => $subscriber,
       'from' => $this->fromEmail,
       'fromname' => $this->fromName,
-      'subject' => $newsletter['subject'],
-      'html' => $newsletter['body']['html'],
-      'text' => $newsletter['body']['text']
+      'subject' => $newsletter['subject']
     );
+    if(!empty($newsletter['body']['html'])) {
+      $body['html'] = $newsletter['body']['html'];
+    }
+    if(!empty($newsletter['body']['text'])) {
+      $body['text'] = $newsletter['body']['text'];
+    }
+    return $body;
   }
 
   function auth() {

lib/Mailer/MailPoet.php

@@ -47,11 +47,9 @@ class MailPoet {
       )),
       'subject' => $newsletter['subject']
     );
-
     if(!empty($newsletter['body']['html'])) {
       $body['html'] = $newsletter['body']['html'];
     }
-
     if(!empty($newsletter['body']['text'])) {
       $body['text'] = $newsletter['body']['text'];
     }

lib/Mailer/SMTP.php

@@ -39,12 +39,17 @@ class SMTP {
 
 
   function createMessage($newsletter, $subscriber) {
-    return \Swift_Message::newInstance()
+    $message = \Swift_Message::newInstance()
       ->setFrom(array($this->fromEmail => $this->fromName))
       ->setTo($this->processSubscriber($subscriber))
-      ->setSubject($newsletter['subject'])
-      ->setBody($newsletter['body']['html'], 'text/html')
-      ->addPart($newsletter['body']['text'], 'text/plain');
+      ->setSubject($newsletter['subject']);
+    if(!empty($newsletter['body']['html'])) {
+      $message = $message->setBody($newsletter['body']['html'], 'text/html');
+    }
+    if(!empty($newsletter['body']['text'])) {
+      $message = $message->addPart($newsletter['body']['text'], 'text/plain');
+    }
+    return $message;
   }
 
   function processSubscriber($subscriber) {

lib/Mailer/WPMail.php

@@ -51,7 +51,10 @@ class WPMail {
 
   function send($newsletter, $subscriber) {
     $this->addFilters();
-    $result = wp_mail($subscriber, $newsletter['subject'], $newsletter['body']['html']);
+    $result = wp_mail(
+      $subscriber, $newsletter['subject'],
+      (!empty($newsletter['body']['html'])) ? $newsletter['body']['html'] : $newsletter['body']['text']
+    );
     $this->removeFilters();
     return ($result === true);
   }