jacobemerick / archangel

src/Archangel.php

Doc Comments +11 added lines, -11 removed lines

@@ -72,7 +72,7 @@ 
      * @param string $address email address for the recipient
      * @param string $title   name of the recipient (optional)
 
-     * @return object instantiated $this
+     * @return Archangel instantiated $this
      */
     public function addTo($address, $title = '')
     {
@@ -90,7 +90,7 @@ 
      * @param string $address  email address for the cc recipient
      * @param string $title    name of the cc recipient (optional)
      *
-     * @return object instantiated $this
+     * @return Archangel instantiated $this
      */
     public function addCC($address, $title = '')
     {
@@ -105,10 +105,10 @@ 
     /**
      * Setter method for adding bcc recipients
      *
-     * @param string $addres  email address for the bcc recipient
+     * @param string $address  email address for the bcc recipient
      * @param string $title   name of the bcc recipient (optional)
      *
-     * @return object instantiated $this
+     * @return Archangel instantiated $this
      */
     public function addBCC($address, $title = '')
     {
@@ -126,7 +126,7 @@ 
      * @param string $address email address for the sender
      * @param string $title   name of the sender (optional)
      *
-     * @return object instantiated $this
+     * @return Archangel instantiated $this
      */
     public function setFrom($address, $title = '')
     {
@@ -144,7 +144,7 @@ 
      * @param string $address email address for the reply-to
      * @param string $title   name of the reply-to (optional)
      *
-     * @return object instantiated $this
+     * @return Archangel instantiated $this
      */
     public function setReplyTo($address, $title = '')
     {
@@ -161,7 +161,7 @@ 
      *
      * @param string $subject subject for the email
      *
-     * @return object instantiated $this
+     * @return Archangel instantiated $this
      */
     public function setSubject($subject)
     {
@@ -175,7 +175,7 @@ 
      *
      * @param string $message the plain-text message
      *
-     * @return object instantiated $this
+     * @return Archangel instantiated $this
      */
     public function setPlainMessage($message)
     {
@@ -189,7 +189,7 @@ 
      *
      * @param string $message the html message
      *
-     * @return object instantiated $this
+     * @return Archangel instantiated $this
      */
     public function setHTMLMessage($message)
     {
@@ -205,7 +205,7 @@ 
      * @param string $type  mime type of the file
      * @param string $title the title of the attachment (optional)
      *
-     * @return object instantiated $this
+     * @return Archangel instantiated $this
      */
     public function addAttachment($path, $type, $title = '')
     {
@@ -244,7 +244,7 @@ 
     /**
      * Main instantiator for the class
      *
-     * @return  object  instantiated $this
+     * @return  Archangel  instantiated $this
      */
     public static function instance()
     {

Indentation +404 added lines, -405 removed lines

@@ -13,418 +13,417 @@
 class Archangel
 {
 
-    /** @var string $subject */
-    protected $subject;
-
-    /** @var array $to */
-    protected $to = array();
-
-    /** @var array $cc */
-    protected $cc = array();
-
-    /** @var array $bcc */
-    protected $bcc = array();
-
-    /** @var array $headers */
-    protected $headers = array();
-
-    /** @var string $plainMessage */
-    protected $plainMessage;
-
-    /** @var string $htmlMessage */
-    protected $htmlMessage;
-
-    /** @var array $attachments */
-    protected $attachments = array();
-
-    /** @var string MAILER_PATTERN */
-    const MAILER_PATTERN = "PHP/%s";
-
-    /** @var string LINE_BREAK */
-    const LINE_BREAK = "\r\n";
-
-    /** @var string BOUNDARY_PATTERN */
-    const BOUNDARY_PATTERN = "PHP-mixed-%s";
-
-    /** @var string BOUNDARY_SALT */
-    const BOUNDARY_SALT = "Boundary Salt";
-
-    /** @var string ALTERNATIVE_BOUNDARY_PATTERN */
-    const ALTERNATIVE_BOUNDARY_PATTERN = "PHP-alternative-%s";
-
-    /** @var string ALTERNATIVE_BOUNDARY_SALT */
-    const ALTERNATIVE_BOUNDARY_SALT = "Alternative Boundary Salt";
-
-    /**
-     * @param string $mailer
-     */
-    public function __construct($mailer = null)
-    {
-        if (is_null($mailer)) {
-            $mailer = sprintf(self::MAILER_PATTERN, phpversion());
-        }
-        $this->headers['X-Mailer'] = $mailer;
-    }
-
-    /**
-     * Setter method for adding recipients
-     *
-     * @param string $address email address for the recipient
-     * @param string $title   name of the recipient (optional)
-
-     * @return object instantiated $this
-     */
-    public function addTo($address, $title = '')
-    {
-        if (!empty($title)) {
-            $address = sprintf('"%s" <%s>', $title, $address);
-        }
-        array_push($this->to, $address);
-
-        return $this;
-    }
-
-    /**
-     * Setter method for adding cc recipients
-     *
-     * @param string $address  email address for the cc recipient
-     * @param string $title    name of the cc recipient (optional)
-     *
-     * @return object instantiated $this
-     */
-    public function addCC($address, $title = '')
-    {
-        if (!empty($title)) {
-            $address = sprintf('"%s" <%s>', $title, $address);
-        }
-        array_push($this->cc, $address);
-
-        return $this;
-    }
-
-    /**
-     * Setter method for adding bcc recipients
-     *
-     * @param string $addres  email address for the bcc recipient
-     * @param string $title   name of the bcc recipient (optional)
-     *
-     * @return object instantiated $this
-     */
-    public function addBCC($address, $title = '')
-    {
-        if (!empty($title)) {
-            $address = sprintf('"%s" <%s>', $title, $address);
-        }
-        array_push($this->bcc, $address);
-
-        return $this;
-    }
-
-    /**
-     * Setter method for setting the single 'from' field
-     *
-     * @param string $address email address for the sender
-     * @param string $title   name of the sender (optional)
-     *
-     * @return object instantiated $this
-     */
-    public function setFrom($address, $title = '')
-    {
-        if (!empty($title)) {
-            $address = sprintf('"%s" <%s>', $title, $address);
-        }
-        $this->headers['From'] = $address;
-
-        return $this;
-    }
-
-    /**
-     * Setter method for setting the single 'reply-to' field
-     *
-     * @param string $address email address for the reply-to
-     * @param string $title   name of the reply-to (optional)
-     *
-     * @return object instantiated $this
-     */
-    public function setReplyTo($address, $title = '')
-    {
-        if (!empty($title)) {
-            $address = sprintf('"%s" <%s>', $title, $address);
-        }
-        $this->headers['Reply-To'] = $address;
-
-        return $this;
-    }
-
-    /**
-     * Setter method for setting a subject
-     *
-     * @param string $subject subject for the email
-     *
-     * @return object instantiated $this
-     */
-    public function setSubject($subject)
-    {
-        $this->subject = $subject;
-
-        return $this;
-    }
-
-    /**
-     * Setter method for the plain text message
-     *
-     * @param string $message the plain-text message
-     *
-     * @return object instantiated $this
-     */
-    public function setPlainMessage($message)
-    {
-        $this->plainMessage = $message;
-
-        return $this;
-    }
-
-    /**
-     * Setter method for the html message
-     *
-     * @param string $message the html message
-     *
-     * @return object instantiated $this
-     */
-    public function setHTMLMessage($message)
-    {
-        $this->htmlMessage = $message;
-
-        return $this;
-    }
-
-    /**
-     * Setter method for adding attachments
-     *
-     * @param string $path  the full path of the attachment
-     * @param string $type  mime type of the file
-     * @param string $title the title of the attachment (optional)
-     *
-     * @return object instantiated $this
-     */
-    public function addAttachment($path, $type, $title = '')
-    {
-        array_push($this->attachments, array(
-          'path' => $path,
-          'type' => $type,
-          'title' => $title,
-        ));
-
-        return $this;
-    }
-
-    /**
-     * The executing step, the actual sending of the email
-     * First checks to make sure the minimum fields are set (returns false if they are not)
-     * Second it attempts to send the mail with php's mail() (returns false if it fails)
-     *
-     * return boolean whether or not the email was valid & sent
-     */
-    public function send()
-    {
-      if($this->passed_validation === FALSE)
-        return false;
+	/** @var string $subject */
+	protected $subject;
+
+	/** @var array $to */
+	protected $to = array();
+
+	/** @var array $cc */
+	protected $cc = array();
+
+	/** @var array $bcc */
+	protected $bcc = array();
+
+	/** @var array $headers */
+	protected $headers = array();
+
+	/** @var string $plainMessage */
+	protected $plainMessage;
+
+	/** @var string $htmlMessage */
+	protected $htmlMessage;
+
+	/** @var array $attachments */
+	protected $attachments = array();
+
+	/** @var string MAILER_PATTERN */
+	const MAILER_PATTERN = "PHP/%s";
+
+	/** @var string LINE_BREAK */
+	const LINE_BREAK = "\r\n";
+
+	/** @var string BOUNDARY_PATTERN */
+	const BOUNDARY_PATTERN = "PHP-mixed-%s";
+
+	/** @var string BOUNDARY_SALT */
+	const BOUNDARY_SALT = "Boundary Salt";
+
+	/** @var string ALTERNATIVE_BOUNDARY_PATTERN */
+	const ALTERNATIVE_BOUNDARY_PATTERN = "PHP-alternative-%s";
+
+	/** @var string ALTERNATIVE_BOUNDARY_SALT */
+	const ALTERNATIVE_BOUNDARY_SALT = "Alternative Boundary Salt";
+
+	/**
+	 * @param string $mailer
+	 */
+	public function __construct($mailer = null)
+	{
+		if (is_null($mailer)) {
+			$mailer = sprintf(self::MAILER_PATTERN, phpversion());
+		}
+		$this->headers['X-Mailer'] = $mailer;
+	}
+
+	/**
+	 * Setter method for adding recipients
+	 *
+	 * @param string $address email address for the recipient
+	 * @param string $title   name of the recipient (optional)
+	 * @return object instantiated $this
+	 */
+	public function addTo($address, $title = '')
+	{
+		if (!empty($title)) {
+			$address = sprintf('"%s" <%s>', $title, $address);
+		}
+		array_push($this->to, $address);
+
+		return $this;
+	}
+
+	/**
+	 * Setter method for adding cc recipients
+	 *
+	 * @param string $address  email address for the cc recipient
+	 * @param string $title    name of the cc recipient (optional)
+	 *
+	 * @return object instantiated $this
+	 */
+	public function addCC($address, $title = '')
+	{
+		if (!empty($title)) {
+			$address = sprintf('"%s" <%s>', $title, $address);
+		}
+		array_push($this->cc, $address);
+
+		return $this;
+	}
+
+	/**
+	 * Setter method for adding bcc recipients
+	 *
+	 * @param string $addres  email address for the bcc recipient
+	 * @param string $title   name of the bcc recipient (optional)
+	 *
+	 * @return object instantiated $this
+	 */
+	public function addBCC($address, $title = '')
+	{
+		if (!empty($title)) {
+			$address = sprintf('"%s" <%s>', $title, $address);
+		}
+		array_push($this->bcc, $address);
+
+		return $this;
+	}
+
+	/**
+	 * Setter method for setting the single 'from' field
+	 *
+	 * @param string $address email address for the sender
+	 * @param string $title   name of the sender (optional)
+	 *
+	 * @return object instantiated $this
+	 */
+	public function setFrom($address, $title = '')
+	{
+		if (!empty($title)) {
+			$address = sprintf('"%s" <%s>', $title, $address);
+		}
+		$this->headers['From'] = $address;
+
+		return $this;
+	}
+
+	/**
+	 * Setter method for setting the single 'reply-to' field
+	 *
+	 * @param string $address email address for the reply-to
+	 * @param string $title   name of the reply-to (optional)
+	 *
+	 * @return object instantiated $this
+	 */
+	public function setReplyTo($address, $title = '')
+	{
+		if (!empty($title)) {
+			$address = sprintf('"%s" <%s>', $title, $address);
+		}
+		$this->headers['Reply-To'] = $address;
+
+		return $this;
+	}
+
+	/**
+	 * Setter method for setting a subject
+	 *
+	 * @param string $subject subject for the email
+	 *
+	 * @return object instantiated $this
+	 */
+	public function setSubject($subject)
+	{
+		$this->subject = $subject;
+
+		return $this;
+	}
+
+	/**
+	 * Setter method for the plain text message
+	 *
+	 * @param string $message the plain-text message
+	 *
+	 * @return object instantiated $this
+	 */
+	public function setPlainMessage($message)
+	{
+		$this->plainMessage = $message;
+
+		return $this;
+	}
+
+	/**
+	 * Setter method for the html message
+	 *
+	 * @param string $message the html message
+	 *
+	 * @return object instantiated $this
+	 */
+	public function setHTMLMessage($message)
+	{
+		$this->htmlMessage = $message;
+
+		return $this;
+	}
+
+	/**
+	 * Setter method for adding attachments
+	 *
+	 * @param string $path  the full path of the attachment
+	 * @param string $type  mime type of the file
+	 * @param string $title the title of the attachment (optional)
+	 *
+	 * @return object instantiated $this
+	 */
+	public function addAttachment($path, $type, $title = '')
+	{
+		array_push($this->attachments, array(
+		  'path' => $path,
+		  'type' => $type,
+		  'title' => $title,
+		));
+
+		return $this;
+	}
+
+	/**
+	 * The executing step, the actual sending of the email
+	 * First checks to make sure the minimum fields are set (returns false if they are not)
+	 * Second it attempts to send the mail with php's mail() (returns false if it fails)
+	 *
+	 * return boolean whether or not the email was valid & sent
+	 */
+	public function send()
+	{
+	  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;
-      $message = $this->get_message();
-      $additional_headers = $this->get_additional_headers();
+	  $to = $this->get_to();
+	  $subject = $this->subject;
+	  $message = $this->get_message();
+	  $additional_headers = $this->get_additional_headers();
       
-      return mail($to, $subject, $message, $additional_headers);
-    }
-
-    /**
-     * Main instantiator for the class
-     *
-     * @return  object  instantiated $this
-     */
-    public static function instance()
-    {
-      return new Archangel();
-    }
-
-    /**
-     * Private call to check the minimum required fields
-     *
-     * @return  boolean whether or not the email meets the minimum required fields
-     */
-    private function check_required_fields()
-    {
-      return (
-        count($this->to_array) > 0 &&
-        (isset($this->subject) && strlen($this->subject) > 0) &&
-        (
-          (isset($this->plain_message) && strlen($this->plain_message) > 0) ||
-          (isset($this->html_message) && strlen($this->html_message) > 0) ||
-          (isset($this->attachment_array) && count($this->attachment_array) > 0)));
-    }
-
-    /**
-     * Private function to collect the recipients from to_array
-     *
-     * @return  string  comma-separated lit of recipients
-     */
-    private function get_to()
-    {
-      return implode(', ', $this->to_array);
-    }
-
-    /**
-     * Long, nasty creater of the actual message, with all the multipart logic you'd never want to see
-     *
-     * @return  string  email message
-     */
-    private function get_message()
-    {
-      $message = '';
+	  return mail($to, $subject, $message, $additional_headers);
+	}
+
+	/**
+	 * Main instantiator for the class
+	 *
+	 * @return  object  instantiated $this
+	 */
+	public static function instance()
+	{
+	  return new Archangel();
+	}
+
+	/**
+	 * Private call to check the minimum required fields
+	 *
+	 * @return  boolean whether or not the email meets the minimum required fields
+	 */
+	private function check_required_fields()
+	{
+	  return (
+		count($this->to_array) > 0 &&
+		(isset($this->subject) && strlen($this->subject) > 0) &&
+		(
+		  (isset($this->plain_message) && strlen($this->plain_message) > 0) ||
+		  (isset($this->html_message) && strlen($this->html_message) > 0) ||
+		  (isset($this->attachment_array) && count($this->attachment_array) > 0)));
+	}
+
+	/**
+	 * Private function to collect the recipients from to_array
+	 *
+	 * @return  string  comma-separated lit of recipients
+	 */
+	private function get_to()
+	{
+	  return implode(', ', $this->to_array);
+	}
+
+	/**
+	 * Long, nasty creater of the actual message, with all the multipart logic you'd never want to see
+	 *
+	 * @return  string  email message
+	 */
+	private function get_message()
+	{
+	  $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 &&
-        isset($this->html_message) && strlen($this->html_message) > 0)
-      {
-        if(isset($this->attachment_array) && count($this->attachment_array) > 0)
-        {
-          $message .= "Content-Type: multipart/alternative; boundary={$this->get_alternative_boundary()}" . self::$LINE_BREAK;
-          $message .= self::$LINE_BREAK;
-        }
-        $message .= "--{$this->get_alternative_boundary()}" . self::$LINE_BREAK;
-        $message .= 'Content-Type: text/plain; charset="iso-8859"' . self::$LINE_BREAK;
-        $message .= 'Content-Transfer-Encoding: 7bit' . self::$LINE_BREAK;
-        $message .= self::$LINE_BREAK;
-        $message .= $this->plain_message;
-        $message .= self::$LINE_BREAK;
-        $message .= "--{$this->get_alternative_boundary()}" . self::$LINE_BREAK;
-        $message .= 'Content-Type: text/html; charset="iso-8859-1"' . self::$LINE_BREAK;
-        $message .= 'Content-Transfer-Encoding: 7bit' . self::$LINE_BREAK;
-        $message .= self::$LINE_BREAK;
-        $message .= $this->html_message;
-        $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))
-      {
-        if(isset($this->attachment_array) && count($this->attachment_array) > 0)
-        {
-          $message .= 'Content-Type: text/plain; charset="iso-8859"' . self::$LINE_BREAK;
-          $message .= 'Content-Transfer-Encoding: 7bit' . self::$LINE_BREAK;
-          $message .= self::$LINE_BREAK;
-        }
-        $message .= $this->plain_message;
-        $message .= self::$LINE_BREAK;
-      }
-      else if(isset($this->html_message) && strlen($this->html_message))
-      {
-        if(isset($this->attachment_array) && count($this->attachment_array) > 0)
-        {
-          $message .= 'Content-Type: text/html; charset="iso-8859-1"' . self::$LINE_BREAK;
-          $message .= 'Content-Transfer-Encoding: 7bit' . self::$LINE_BREAK;
-          $message .= self::$LINE_BREAK;
-        }
-        $message .= $this->html_message;
-        $message .= self::$LINE_BREAK;
-      }
-      if(isset($this->attachment_array) && count($this->attachment_array) > 0)
-      {
-        foreach($this->attachment_array as $attachment)
-        {
-          $message .= "--{$this->get_boundary()}" . self::$LINE_BREAK;
-          $message .= "Content-Type: {$attachment->type}; name=\"{$attachment->title}\"" . self::$LINE_BREAK;
-          $message .= 'Content-Transfer-Encoding: base64' . self::$LINE_BREAK;
-          $message .= 'Content-Disposition: attachment' . self::$LINE_BREAK;
-          $message .= self::$LINE_BREAK;
-          $message .= $this->get_attachment_content($attachment);
-          $message .= self::$LINE_BREAK;
-        }
-        $message .= "--{$this->get_boundary()}--" . self::$LINE_BREAK;
-      }
-      return $message;
-    }
-
-    /**
-     * Private holder for the boundry logic
-     * Not called/created unless it's needed
-     *
-     * @return  string  boundary
-     */
-    private $boundary;
-    private function get_boundary()
-    {
-      if(!isset($this->boundary))
-        $this->boundary = sprintf(self::$BOUNDARY_FORMAT, md5(date('r', time()) . self::$BOUNDARY_SALT));
-      return $this->boundary;
-    }
-
-    /**
-     * Private holder for the alternative boundry logic
-     * Not called/created unless it's needed
-     *
-     * @return  string  alternative boundary
-     */
-    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));
-      return $this->alternative_boundary;
-    }
-
-    /**
-     * Fetcher for the additional headers needed for multipart emails
-     *
-     * @return  string  headers needed for multipart
-     */
-    private function get_additional_headers()
-    {
-      $headers = '';
-      foreach($this->header_array as $key => $value)
-      {
-        $headers .= "{$key}: {$value}" . self::$LINE_BREAK;
-      }
+	  if(
+		isset($this->plain_message) && strlen($this->plain_message) > 0 &&
+		isset($this->html_message) && strlen($this->html_message) > 0)
+	  {
+		if(isset($this->attachment_array) && count($this->attachment_array) > 0)
+		{
+		  $message .= "Content-Type: multipart/alternative; boundary={$this->get_alternative_boundary()}" . self::$LINE_BREAK;
+		  $message .= self::$LINE_BREAK;
+		}
+		$message .= "--{$this->get_alternative_boundary()}" . self::$LINE_BREAK;
+		$message .= 'Content-Type: text/plain; charset="iso-8859"' . self::$LINE_BREAK;
+		$message .= 'Content-Transfer-Encoding: 7bit' . self::$LINE_BREAK;
+		$message .= self::$LINE_BREAK;
+		$message .= $this->plain_message;
+		$message .= self::$LINE_BREAK;
+		$message .= "--{$this->get_alternative_boundary()}" . self::$LINE_BREAK;
+		$message .= 'Content-Type: text/html; charset="iso-8859-1"' . self::$LINE_BREAK;
+		$message .= 'Content-Transfer-Encoding: 7bit' . self::$LINE_BREAK;
+		$message .= self::$LINE_BREAK;
+		$message .= $this->html_message;
+		$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))
+	  {
+		if(isset($this->attachment_array) && count($this->attachment_array) > 0)
+		{
+		  $message .= 'Content-Type: text/plain; charset="iso-8859"' . self::$LINE_BREAK;
+		  $message .= 'Content-Transfer-Encoding: 7bit' . self::$LINE_BREAK;
+		  $message .= self::$LINE_BREAK;
+		}
+		$message .= $this->plain_message;
+		$message .= self::$LINE_BREAK;
+	  }
+	  else if(isset($this->html_message) && strlen($this->html_message))
+	  {
+		if(isset($this->attachment_array) && count($this->attachment_array) > 0)
+		{
+		  $message .= 'Content-Type: text/html; charset="iso-8859-1"' . self::$LINE_BREAK;
+		  $message .= 'Content-Transfer-Encoding: 7bit' . self::$LINE_BREAK;
+		  $message .= self::$LINE_BREAK;
+		}
+		$message .= $this->html_message;
+		$message .= self::$LINE_BREAK;
+	  }
+	  if(isset($this->attachment_array) && count($this->attachment_array) > 0)
+	  {
+		foreach($this->attachment_array as $attachment)
+		{
+		  $message .= "--{$this->get_boundary()}" . self::$LINE_BREAK;
+		  $message .= "Content-Type: {$attachment->type}; name=\"{$attachment->title}\"" . self::$LINE_BREAK;
+		  $message .= 'Content-Transfer-Encoding: base64' . self::$LINE_BREAK;
+		  $message .= 'Content-Disposition: attachment' . self::$LINE_BREAK;
+		  $message .= self::$LINE_BREAK;
+		  $message .= $this->get_attachment_content($attachment);
+		  $message .= self::$LINE_BREAK;
+		}
+		$message .= "--{$this->get_boundary()}--" . self::$LINE_BREAK;
+	  }
+	  return $message;
+	}
+
+	/**
+	 * Private holder for the boundry logic
+	 * Not called/created unless it's needed
+	 *
+	 * @return  string  boundary
+	 */
+	private $boundary;
+	private function get_boundary()
+	{
+	  if(!isset($this->boundary))
+		$this->boundary = sprintf(self::$BOUNDARY_FORMAT, md5(date('r', time()) . self::$BOUNDARY_SALT));
+	  return $this->boundary;
+	}
+
+	/**
+	 * Private holder for the alternative boundry logic
+	 * Not called/created unless it's needed
+	 *
+	 * @return  string  alternative boundary
+	 */
+	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));
+	  return $this->alternative_boundary;
+	}
+
+	/**
+	 * Fetcher for the additional headers needed for multipart emails
+	 *
+	 * @return  string  headers needed for multipart
+	 */
+	private function get_additional_headers()
+	{
+	  $headers = '';
+	  foreach($this->header_array as $key => $value)
+	  {
+		$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(
-        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"';
+	  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"';
       
-      return $headers;
-    }
-
-    /**
-     * File reader for attachments
-     *
-     * @return  string  binary representation of file, base64'd
-     */
-    private function get_attachment_content($attachment)
-    {
-      $handle = fopen($attachment->path, 'r');
-      $contents = fread($handle, filesize($attachment->path));
-      fclose($handle);
+	  return $headers;
+	}
+
+	/**
+	 * File reader for attachments
+	 *
+	 * @return  string  binary representation of file, base64'd
+	 */
+	private function get_attachment_content($attachment)
+	{
+	  $handle = fopen($attachment->path, 'r');
+	  $contents = fread($handle, filesize($attachment->path));
+	  fclose($handle);
       
-      $contents = base64_encode($contents);
-      $contents = chunk_split($contents);
-      return $contents;
-    }
+	  $contents = base64_encode($contents);
+	  $contents = chunk_split($contents);
+	  return $contents;
+	}
 }

Spacing +19 added lines, -19 removed lines

@@ -227,10 +227,10 @@ 
      */
     public function send()
     {
-      if($this->passed_validation === FALSE)
+      if ($this->passed_validation === FALSE)
         return false;
       
-      if(!$this->check_required_fields())
+      if (!$this->check_required_fields())
         return false;
       
       $to = $this->get_to();
@@ -286,14 +286,14 @@ 
     {
       $message = '';
       
-      if(isset($this->attachment_array) && count($this->attachment_array) > 0)
+      if (isset($this->attachment_array) && count($this->attachment_array) > 0)
         $message .= "--{$this->get_boundary()}" . self::$LINE_BREAK;
       
-      if(
+      if (
         isset($this->plain_message) && strlen($this->plain_message) > 0 &&
         isset($this->html_message) && strlen($this->html_message) > 0)
       {
-        if(isset($this->attachment_array) && count($this->attachment_array) > 0)
+        if (isset($this->attachment_array) && count($this->attachment_array) > 0)
         {
           $message .= "Content-Type: multipart/alternative; boundary={$this->get_alternative_boundary()}" . self::$LINE_BREAK;
           $message .= self::$LINE_BREAK;
@@ -313,9 +313,9 @@ 
         $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)
+        if (isset($this->attachment_array) && count($this->attachment_array) > 0)
         {
           $message .= 'Content-Type: text/plain; charset="iso-8859"' . self::$LINE_BREAK;
           $message .= 'Content-Transfer-Encoding: 7bit' . self::$LINE_BREAK;
@@ -324,9 +324,9 @@ 
         $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)
+        if (isset($this->attachment_array) && count($this->attachment_array) > 0)
         {
           $message .= 'Content-Type: text/html; charset="iso-8859-1"' . self::$LINE_BREAK;
           $message .= 'Content-Transfer-Encoding: 7bit' . self::$LINE_BREAK;
@@ -335,9 +335,9 @@ 
         $message .= $this->html_message;
         $message .= self::$LINE_BREAK;
       }
-      if(isset($this->attachment_array) && count($this->attachment_array) > 0)
+      if (isset($this->attachment_array) && count($this->attachment_array) > 0)
       {
-        foreach($this->attachment_array as $attachment)
+        foreach ($this->attachment_array as $attachment)
         {
           $message .= "--{$this->get_boundary()}" . self::$LINE_BREAK;
           $message .= "Content-Type: {$attachment->type}; name=\"{$attachment->title}\"" . self::$LINE_BREAK;
@@ -361,7 +361,7 @@ 
     private $boundary;
     private function get_boundary()
     {
-      if(!isset($this->boundary))
+      if (!isset($this->boundary))
         $this->boundary = sprintf(self::$BOUNDARY_FORMAT, md5(date('r', time()) . self::$BOUNDARY_SALT));
       return $this->boundary;
     }
@@ -375,7 +375,7 @@ 
     private $alternative_boundary;
     private function get_alternative_boundary()
     {
-      if(!isset($this->alternative_boundary))
+      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;
     }
@@ -388,25 +388,25 @@ 
     private function get_additional_headers()
     {
       $headers = '';
-      foreach($this->header_array as $key => $value)
+      foreach ($this->header_array as $key => $value)
       {
         $headers .= "{$key}: {$value}" . self::$LINE_BREAK;
       }
       
-      if(count($this->cc_array) > 0)
+      if (count($this->cc_array) > 0)
         $headers .= 'CC: ' . implode(', ', $this->cc_array) . self::$LINE_BREAK;
-      if(count($this->bcc_array) > 0)
+      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)
+      if (isset($this->attachment_array) && count($this->attachment_array) > 0)
         $headers .= "Content-Type: multipart/mixed; boundary=\"{$this->get_boundary()}\"";
-      else if(
+      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)
+      else if (isset($this->html_message) && strlen($this->html_message) > 0)
         $headers .= 'Content-type: text/html; charset="iso-8859-1"';
       
       return $headers;

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;
     }