jacobemerick / archangel

src/Archangel.php

Braces +28 added lines, -23 removed lines

@@ -227,11 +227,13 @@ 
      */
     public function send()
     {
-      if($this->passed_validation === FALSE)
-        return false;
+      if($this->passed_validation === FALSE) {
+              return false;
+      }
       
-      if(!$this->check_required_fields())
-        return false;
+      if(!$this->check_required_fields()) {
+              return false;
+      }
       
       $to = $this->get_to();
       $subject = $this->subject;
@@ -286,8 +288,9 @@ 
     {
       $message = '';
       
-      if(isset($this->attachment_array) && count($this->attachment_array) > 0)
-        $message .= "--{$this->get_boundary()}" . self::$LINE_BREAK;
+      if(isset($this->attachment_array) && count($this->attachment_array) > 0) {
+              $message .= "--{$this->get_boundary()}" . self::$LINE_BREAK;
+      }
       
       if(
         isset($this->plain_message) && strlen($this->plain_message) > 0 &&
@@ -312,8 +315,7 @@ 
         $message .= self::$LINE_BREAK;
         $message .= "--{$this->get_alternative_boundary()}--" . self::$LINE_BREAK;
         $message .= self::$LINE_BREAK;
-      }
-      else if(isset($this->plain_message) && strlen($this->plain_message))
+      } else if(isset($this->plain_message) && strlen($this->plain_message))
       {
         if(isset($this->attachment_array) && count($this->attachment_array) > 0)
         {
@@ -323,8 +325,7 @@ 
         }
         $message .= $this->plain_message;
         $message .= self::$LINE_BREAK;
-      }
-      else if(isset($this->html_message) && strlen($this->html_message))
+      } else if(isset($this->html_message) && strlen($this->html_message))
       {
         if(isset($this->attachment_array) && count($this->attachment_array) > 0)
         {
@@ -361,8 +362,9 @@ 
     private $boundary;
     private function get_boundary()
     {
-      if(!isset($this->boundary))
-        $this->boundary = sprintf(self::$BOUNDARY_FORMAT, md5(date('r', time()) . self::$BOUNDARY_SALT));
+      if(!isset($this->boundary)) {
+              $this->boundary = sprintf(self::$BOUNDARY_FORMAT, md5(date('r', time()) . self::$BOUNDARY_SALT));
+      }
       return $this->boundary;
     }
 
@@ -375,8 +377,9 @@ 
     private $alternative_boundary;
     private function get_alternative_boundary()
     {
-      if(!isset($this->alternative_boundary))
-        $this->alternative_boundary = sprintf(self::$ALTERNATIVE_BOUNDARY_FORMAT, md5(date('r', time()) . self::$ALTERNATIVE_BOUNDARY_SALT));
+      if(!isset($this->alternative_boundary)) {
+              $this->alternative_boundary = sprintf(self::$ALTERNATIVE_BOUNDARY_FORMAT, md5(date('r', time()) . self::$ALTERNATIVE_BOUNDARY_SALT));
+      }
       return $this->alternative_boundary;
     }
 
@@ -393,21 +396,23 @@ 
         $headers .= "{$key}: {$value}" . self::$LINE_BREAK;
       }
       
-      if(count($this->cc_array) > 0)
-        $headers .= 'CC: ' . implode(', ', $this->cc_array) . self::$LINE_BREAK;
-      if(count($this->bcc_array) > 0)
-        $headers .= 'BCC: ' . implode(', ', $this->bcc_array) . self::$LINE_BREAK;
+      if(count($this->cc_array) > 0) {
+              $headers .= 'CC: ' . implode(', ', $this->cc_array) . self::$LINE_BREAK;
+      }
+      if(count($this->bcc_array) > 0) {
+              $headers .= 'BCC: ' . implode(', ', $this->bcc_array) . self::$LINE_BREAK;
+      }
       
-      if(isset($this->attachment_array) && count($this->attachment_array) > 0)
-        $headers .= "Content-Type: multipart/mixed; boundary=\"{$this->get_boundary()}\"";
-      else if(
+      if(isset($this->attachment_array) && count($this->attachment_array) > 0) {
+              $headers .= "Content-Type: multipart/mixed; boundary=\"{$this->get_boundary()}\"";
+      } else if(
         isset($this->plain_message) && strlen($this->plain_message) > 0 &&
         isset($this->html_message) && strlen($this->html_message) > 0)
       {
         $headers .= "Content-Type: multipart/alternative; boundary=\"{$this->get_alternative_boundary()}\"";
+      } else if(isset($this->html_message) && strlen($this->html_message) > 0) {
+              $headers .= 'Content-type: text/html; charset="iso-8859-1"';
       }
-      else if(isset($this->html_message) && strlen($this->html_message) > 0)
-        $headers .= 'Content-type: text/html; charset="iso-8859-1"';
       
       return $headers;
     }