BurningFlipside / CommonCode

Email/class.Email.php

Spacing +37 added lines, -37 removed lines

@@ -62,7 +62,7 @@ 
      */
     public function getFromAddress()
     {
-        if($this->sender === false)
+        if ($this->sender === false)
         {
             return 'Burning Flipside <webmaster@burningflipside.com>';
         }
@@ -106,7 +106,7 @@ 
      */
     public function getReplyTo()
     {
-        if($this->replyTo === false)
+        if ($this->replyTo === false)
         {
             return $this->getFromAddress();
         }
@@ -149,10 +149,10 @@ 
      * @param string $email The email address to send from
      * @param string $name  The name to associate with the from address
      */
-    public function setFromAddress($email, $name=false)
+    public function setFromAddress($email, $name = false)
     {
         $address = $email;
-        if($name !== false)
+        if ($name !== false)
         {
             $address = $name.' <'.$email.'>';
         }
@@ -165,7 +165,7 @@ 
      * @param string $email The email address to send to
      * @param string $name  The name to associate with the address
      */
-    public function addToAddress($email, $name=false)
+    public function addToAddress($email, $name = false)
     {
         $this->addAddress($this->to, $email, $name);
     }
@@ -176,7 +176,7 @@ 
      * @param string $email The email address to send to
      * @param string $name  The name to associate with the address
      */
-    public function addCCAddress($email, $name=false)
+    public function addCCAddress($email, $name = false)
     {
         $this->addAddress($this->cc, $email, $name);
     }
@@ -187,7 +187,7 @@ 
      * @param string $email The email address to send to
      * @param string $name  The name to associate with the address
      */
-    public function addBCCAddress($email, $name=false)
+    public function addBCCAddress($email, $name = false)
     {
         $this->addAddress($this->bcc, $email, $name);
     }
@@ -199,10 +199,10 @@ 
      * @param string $email The email address to send to
      * @param string $name  The name to associate with the address
      */
-    protected function addAddress(&$list, $email, $name=false)
+    protected function addAddress(&$list, $email, $name = false)
     {
         $address = $email;
-        if($name !== false)
+        if ($name !== false)
         {
             $address = $name.' <'.$email.'>';
         }
@@ -215,10 +215,10 @@ 
      * @param string $email The email address to reply to
      * @param string $name  The name to associate with the from address
      */
-    public function setReplyTo($email, $name=false)
+    public function setReplyTo($email, $name = false)
     {
         $address = $email;
-        if($name !== false)
+        if ($name !== false)
         {
             $address = $name.' <'.$email.'>';
         }
@@ -262,7 +262,7 @@ 
      */
     public function appendToHTMLBody($body)
     {
-        $this->htmlBody.= $body;
+        $this->htmlBody .= $body;
     }
 
     /**
@@ -272,7 +272,7 @@ 
      */
     public function appendToTextBody($body)
     {
-        $this->textBody.= $body;
+        $this->textBody .= $body;
     }
 
     /**
@@ -295,17 +295,17 @@ 
      */
     public function addAttachmentFromFile($filename, $name = false)
     {
-        if($name === false)
+        if ($name === false)
         {
             $name = basename($filename);
         }
         $finfo = finfo_open(FILEINFO_MIME_TYPE);
         $mimeType = finfo_file($finfo, $filename);
-        if($mimeType === false)
+        if ($mimeType === false)
         {
             $mimeType = 'application/octet-stream';
         }
-        if(file_exists($filename) && is_file($filename) && is_readable($filename))
+        if (file_exists($filename) && is_file($filename) && is_readable($filename))
         {
             $this->addAttachmentFromBuffer($name, file_get_contents($filename), $mimeType);
         }
@@ -331,18 +331,18 @@ 
         $boundary = uniqid(rand(), true);
         $rawMessage = 'To: '.$this->encodeRecipients($this->getToAddresses())."\n";
         $from = $this->getFromAddress();
-        if($from === false)
+        if ($from === false)
         {
             throw new \Exception('Message must have a from address');
         }
-        $rawMessage.= 'From: '.$this->encodeRecipients($from)."\n";
-        if(!empty($this->cc))
+        $rawMessage .= 'From: '.$this->encodeRecipients($from)."\n";
+        if (!empty($this->cc))
         {
-            $rawMessage.= 'CC: '. $this->encodeRecipients($this->getCCAddresses())."\n";
+            $rawMessage .= 'CC: '.$this->encodeRecipients($this->getCCAddresses())."\n";
         }
-        if(!empty($this->bcc))
+        if (!empty($this->bcc))
         {
-            $rawMessage.= 'BCC: '. $this->encodeRecipients($this->getBCCAddresses())."\n";
+            $rawMessage .= 'BCC: '.$this->encodeRecipients($this->getBCCAddresses())."\n";
         }
         $rawMessage .= 'Subject: '.$this->getSubject()."\n";
         $rawMessage .= 'MIME-Version: 1.0'."\n";
@@ -350,27 +350,27 @@ 
         $rawMessage .= "\n--{$boundary}\n";
         $rawMessage .= 'Content-type: Multipart/Alternative; boundary="alt-'.$boundary.'"'."\n";
         $textBody    = $this->getTextBody();
-        if($textBody !== false && strlen($textBody) > 0)
+        if ($textBody !== false && strlen($textBody) > 0)
         {
-            $rawMessage.= "\n--alt-{$boundary}\n";
-            $rawMessage.= "Content-Type: text/plain\n\n";
-            $rawMessage.= $textBody."\n";
+            $rawMessage .= "\n--alt-{$boundary}\n";
+            $rawMessage .= "Content-Type: text/plain\n\n";
+            $rawMessage .= $textBody."\n";
         }
-        $htmlBody    = $this->getHTMLBody();
-        if($htmlBody !== false && strlen($htmlBody) > 0)
+        $htmlBody = $this->getHTMLBody();
+        if ($htmlBody !== false && strlen($htmlBody) > 0)
         {
             $rawMessage .= "\n--alt-{$boundary}\n";
             $rawMessage .= 'Content-Type: text/html; charset="UTF-8"'."\n\n";
             $rawMessage .= $htmlBody."\n";
         }
-        $rawMessage.= "\n--alt-{$boundary}--\n";
-        foreach($this->attachments as $attachment)
+        $rawMessage .= "\n--alt-{$boundary}--\n";
+        foreach ($this->attachments as $attachment)
         {
-            $rawMessage.= "\n--{$boundary}\n";
-            $rawMessage.= 'Content-Type: '. $attachment['mimeType'].'; name="'.$attachment['name']."\"\n";
-            $rawMessage.= 'Content-Disposition: attachment'."\n";
-            $rawMessage.= 'Content-Transfer-Encoding: base64'."\n\n";
-            $rawMessage.= chunk_split(base64_encode($attachment['data']), 76, "\n")."\n";
+            $rawMessage .= "\n--{$boundary}\n";
+            $rawMessage .= 'Content-Type: '.$attachment['mimeType'].'; name="'.$attachment['name']."\"\n";
+            $rawMessage .= 'Content-Disposition: attachment'."\n";
+            $rawMessage .= 'Content-Transfer-Encoding: base64'."\n\n";
+            $rawMessage .= chunk_split(base64_encode($attachment['data']), 76, "\n")."\n";
         }
         $rawMessage .= "\n--{$boundary}--\n";
         return $rawMessage;
@@ -385,11 +385,11 @@ 
      */
     public function encodeRecipients($recipient)
     {
-        if(is_array($recipient))
+        if (is_array($recipient))
         {
             return join(', ', array_map(array($this, 'encodeRecipients'), $recipient));
         }
-        if(preg_match("/(.*)<(.*)>/", $recipient, $regs))
+        if (preg_match("/(.*)<(.*)>/", $recipient, $regs))
         {
             $recipient = '=?UTF-8?B?'.base64_encode($regs[1]).'?= <'.$regs[2].'>';
         }