Changing our coding standards slightly:

[isso.git] / Mail.php

diff --git a/Mail.php b/Mail.php
index ce4392e2fd432aa5024155dd72860ce7a37dcd09..a8afc2e0001a19afd41a9157d3b1482e28bcf126 100644 (file)
--- a/Mail.php
+++ b/Mail.php
@@ -242,13 +242,13 @@ class BSMail
                
                // attach additional headers
                $headers = BSFunctions::convert_line_breaks($this->headers, $this->delim);
-               $headers .= ((!preg_match("#{$this->delim}$#", $headers) AND $headers != '') ? "\n" : '') . "From: \"{$fromName}\" <{$from}>" . $this->delim;
+               $headers .= ((!preg_match("#{$this->delim}$#", $headers) && $headers != '') ? "\n" : '') . "From: \"{$fromName}\" <{$from}>" . $this->delim;
                $headers .= "Return-Path: {$from}" . $this->delim;
                $headers .= "X-Mailer: ISSO Mail Framework" . $this->delim;
                $headers .= "MIME-Version: 1.0" . $this->delim;
                
                // see if we need to use mime/multipart
-               if ($sendhtml AND !empty($bodyhtml) == true)
+               if ($sendhtml && !empty($bodyhtml) == true)
                {
                        $boundary = 'ISSO-MULTIPART-' . BSFunctions::Rand(10);
                        $headers .= "Content-Type: multipart/alternative; boundary=\"$boundary\"" . $this->delim;