jacobemerick / archangel

src/Archangel.php

Braces +16 added lines, -15 removed lines

@@ -273,8 +273,9 @@ 
     {
       $message = '';
       
-      if(isset($this->attachments) && count($this->attachments) > 0)
-        $message .= "--{$this->getBoundary()}" . self::LINE_BREAK;
+      if(isset($this->attachments) && count($this->attachments) > 0) {
+              $message .= "--{$this->getBoundary()}" . self::LINE_BREAK;
+      }
       
       if(
         isset($this->plainMessage) && strlen($this->plainMessage) > 0 &&
@@ -299,8 +300,7 @@ 
         $message .= self::LINE_BREAK;
         $message .= "--{$this->getAlternativeBoundary()}--" . self::LINE_BREAK;
         $message .= self::LINE_BREAK;
-      }
-      else if(isset($this->plainMessage) && strlen($this->plainMessage))
+      } else if(isset($this->plainMessage) && strlen($this->plainMessage))
       {
         if(isset($this->attachments) && count($this->attachments) > 0)
         {
@@ -310,8 +310,7 @@ 
         }
         $message .= $this->plainMessage;
         $message .= self::LINE_BREAK;
-      }
-      else if(isset($this->htmlMessage) && strlen($this->htmlMessage))
+      } else if(isset($this->htmlMessage) && strlen($this->htmlMessage))
       {
         if(isset($this->attachments) && count($this->attachments) > 0)
         {
@@ -380,21 +379,23 @@ 
         $headers .= "{$key}: {$value}" . self::LINE_BREAK;
       }
       
-      if(count($this->cc) > 0)
-        $headers .= 'CC: ' . implode(', ', $this->cc) . self::LINE_BREAK;
-      if(count($this->bcc) > 0)
-        $headers .= 'BCC: ' . implode(', ', $this->bcc) . self::LINE_BREAK;
+      if(count($this->cc) > 0) {
+              $headers .= 'CC: ' . implode(', ', $this->cc) . self::LINE_BREAK;
+      }
+      if(count($this->bcc) > 0) {
+              $headers .= 'BCC: ' . implode(', ', $this->bcc) . self::LINE_BREAK;
+      }
       
-      if(isset($this->attachments) && count($this->attachments) > 0)
-        $headers .= "Content-Type: multipart/mixed; boundary=\"{$this->getBoundary()}\"";
-      else if(
+      if(isset($this->attachments) && count($this->attachments) > 0) {
+              $headers .= "Content-Type: multipart/mixed; boundary=\"{$this->getBoundary()}\"";
+      } else if(
         isset($this->plainMessage) && strlen($this->plainMessage) > 0 &&
         isset($this->htmlMessage) && strlen($this->htmlMessage) > 0)
       {
         $headers .= "Content-Type: multipart/alternative; boundary=\"{$this->getAlternativeBoundary()}\"";
+      } else if(isset($this->htmlMessage) && strlen($this->htmlMessage) > 0) {
+              $headers .= 'Content-type: text/html; charset="iso-8859-1"';
       }
-      else if(isset($this->htmlMessage) && strlen($this->htmlMessage) > 0)
-        $headers .= 'Content-type: text/html; charset="iso-8859-1"';
       
       return $headers;
     }