xpressengine / xe-core

libs/phpmailer/phpmailer.php

Doc Comments +10 added lines

@@ -892,6 +892,7 @@ 
   /**
    * Creates recipient headers.
    * @access public
+   * @param string $type
    * @return string
    */
   public function AddrAppend($type, $addr) {
@@ -1259,6 +1260,9 @@ 
   /**
    * Returns the start of a message boundary.
    * @access private
+   * @param string $charSet
+   * @param string $contentType
+   * @param string $encoding
    */
   private function GetBoundary($boundary, $charSet, $contentType, $encoding) {
     $result = '';
@@ -1312,6 +1316,7 @@ 
   /**
    *  Returns a formatted header line.
    * @access public
+   * @param string $name
    * @return string
    */
   public function HeaderLine($name, $value) {
@@ -1321,6 +1326,7 @@ 
   /**
    * Returns a formatted mail line.
    * @access public
+   * @param string $value
    * @return string
    */
   public function TextLine($value) {
@@ -1517,6 +1523,7 @@ 
   /**
    * Encode a header string to best (shortest) of Q, B, quoted or none.
    * @access public
+   * @param string $str
    * @return string
    */
   public function EncodeHeader ($str, $position = 'text') {
@@ -1902,6 +1909,7 @@ 
   /**
    * Adds the error message to the error container.
    * @access protected
+   * @param string $msg
    * @return void
    */
   protected function SetError($msg) {
@@ -1951,6 +1959,7 @@ 
   /**
    * Returns a message in the appropriate language.
    * @access private
+   * @param string $key
    * @return string
    */
   private function Lang($key) {
@@ -1998,6 +2007,7 @@ 
   /**
    * Evaluates the message and returns modifications for inline images and backgrounds
    * @access public
+   * @param string $message
    * @return $message
    */
   public function MsgHTML($message,$basedir='') {

Braces +9 added lines, -4 removed lines

@@ -38,7 +38,9 @@ 
  * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
  */
 
-if (version_compare(PHP_VERSION, '5.0.0', '<') ) exit("Sorry, this version of PHPMailer will only run on PHP version 5 or greater!\n");
+if (version_compare(PHP_VERSION, '5.0.0', '<') ) {
+	exit("Sorry, this version of PHPMailer will only run on PHP version 5 or greater!\n");
+}
 
 class PHPMailer {
 
@@ -1498,8 +1500,9 @@ 
       case '8bit':
         $encoded = $this->FixEOL($str);
         //Make sure it ends with a line break
-        if (substr($encoded, -(strlen($this->LE))) != $this->LE)
-          $encoded .= $this->LE;
+        if (substr($encoded, -(strlen($this->LE))) != $this->LE) {
+                  $encoded .= $this->LE;
+        }
         break;
       case 'binary':
         $encoded = $str;
@@ -2249,7 +2252,9 @@ 
    * @param string $body Message Body
    */
   public function DKIM_BodyC($body) {
-    if ($body == '') return "\r\n";
+    if ($body == '') {
+    	return "\r\n";
+    }
     // stabilize line endings
     $body=str_replace("\r\n","\n",$body);
     $body=str_replace("\n","\r\n",$body);

Indentation +1309 added lines, -1309 removed lines

@@ -251,9 +251,9 @@ 
   public $SingleToArray = array();
 
  /**
-   * Provides the ability to change the line ending
-   * @var string
-   */
+  * Provides the ability to change the line ending
+  * @var string
+  */
   public $LE              = "\n";
 
   /**
@@ -340,7 +340,7 @@ 
    * @param boolean $exceptions Should we throw external exceptions?
    */
   public function __construct($exceptions = false) {
-    $this->exceptions = ($exceptions == true);
+	$this->exceptions = ($exceptions == true);
   }
 
   /**
@@ -349,11 +349,11 @@ 
    * @return void
    */
   public function IsHTML($ishtml = true) {
-    if ($ishtml) {
-      $this->ContentType = 'text/html';
-    } else {
-      $this->ContentType = 'text/plain';
-    }
+	if ($ishtml) {
+	  $this->ContentType = 'text/html';
+	} else {
+	  $this->ContentType = 'text/plain';
+	}
   }
 
   /**
@@ -361,7 +361,7 @@ 
    * @return void
    */
   public function IsSMTP() {
-    $this->Mailer = 'smtp';
+	$this->Mailer = 'smtp';
   }
 
   /**
@@ -369,7 +369,7 @@ 
    * @return void
    */
   public function IsMail() {
-    $this->Mailer = 'mail';
+	$this->Mailer = 'mail';
   }
 
   /**
@@ -377,10 +377,10 @@ 
    * @return void
    */
   public function IsSendmail() {
-    if (!stristr(ini_get('sendmail_path'), 'sendmail')) {
-      $this->Sendmail = '/var/qmail/bin/sendmail';
-    }
-    $this->Mailer = 'sendmail';
+	if (!stristr(ini_get('sendmail_path'), 'sendmail')) {
+	  $this->Sendmail = '/var/qmail/bin/sendmail';
+	}
+	$this->Mailer = 'sendmail';
   }
 
   /**
@@ -388,10 +388,10 @@ 
    * @return void
    */
   public function IsQmail() {
-    if (stristr(ini_get('sendmail_path'), 'qmail')) {
-    $this->Sendmail = '/var/qmail/bin/sendmail';
-    }
-    $this->Mailer   = 'sendmail';
+	if (stristr(ini_get('sendmail_path'), 'qmail')) {
+	$this->Sendmail = '/var/qmail/bin/sendmail';
+	}
+	$this->Mailer   = 'sendmail';
   }
 
   /////////////////////////////////////////////////
@@ -405,7 +405,7 @@ 
    * @return boolean true on success, false if address already used
    */
   public function AddAddress($address, $name = '') {
-    return $this->AddAnAddress('to', $address, $name);
+	return $this->AddAnAddress('to', $address, $name);
   }
 
   /**
@@ -416,7 +416,7 @@ 
    * @return boolean true on success, false if address already used
    */
   public function AddCC($address, $name = '') {
-    return $this->AddAnAddress('cc', $address, $name);
+	return $this->AddAnAddress('cc', $address, $name);
   }
 
   /**
@@ -427,7 +427,7 @@ 
    * @return boolean true on success, false if address already used
    */
   public function AddBCC($address, $name = '') {
-    return $this->AddAnAddress('bcc', $address, $name);
+	return $this->AddAnAddress('bcc', $address, $name);
   }
 
   /**
@@ -437,7 +437,7 @@ 
    * @return boolean
    */
   public function AddReplyTo($address, $name = '') {
-    return $this->AddAnAddress('ReplyTo', $address, $name);
+	return $this->AddAnAddress('ReplyTo', $address, $name);
   }
 
   /**
@@ -450,31 +450,31 @@ 
    * @access private
    */
   private function AddAnAddress($kind, $address, $name = '') {
-    if (!preg_match('/^(to|cc|bcc|ReplyTo)$/', $kind)) {
-      echo 'Invalid recipient array: ' . kind;
-      return false;
-    }
-    $address = trim($address);
-    $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
-    if (!self::ValidateAddress($address)) {
-      $this->SetError($this->Lang('invalid_address').': '. $address);
-      if ($this->exceptions) {
-        throw new phpmailerException($this->Lang('invalid_address').': '.$address);
-      }
-      echo $this->Lang('invalid_address').': '.$address;
-      return false;
-    }
-    if ($kind != 'ReplyTo') {
-      if (!isset($this->all_recipients[strtolower($address)])) {
-        array_push($this->$kind, array($address, $name));
-        $this->all_recipients[strtolower($address)] = true;
-        return true;
-      }
-    } else {
-      if (!array_key_exists(strtolower($address), $this->ReplyTo)) {
-        $this->ReplyTo[strtolower($address)] = array($address, $name);
-      return true;
-    }
+	if (!preg_match('/^(to|cc|bcc|ReplyTo)$/', $kind)) {
+	  echo 'Invalid recipient array: ' . kind;
+	  return false;
+	}
+	$address = trim($address);
+	$name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
+	if (!self::ValidateAddress($address)) {
+	  $this->SetError($this->Lang('invalid_address').': '. $address);
+	  if ($this->exceptions) {
+		throw new phpmailerException($this->Lang('invalid_address').': '.$address);
+	  }
+	  echo $this->Lang('invalid_address').': '.$address;
+	  return false;
+	}
+	if ($kind != 'ReplyTo') {
+	  if (!isset($this->all_recipients[strtolower($address)])) {
+		array_push($this->$kind, array($address, $name));
+		$this->all_recipients[strtolower($address)] = true;
+		return true;
+	  }
+	} else {
+	  if (!array_key_exists(strtolower($address), $this->ReplyTo)) {
+		$this->ReplyTo[strtolower($address)] = array($address, $name);
+	  return true;
+	}
   }
   return false;
 }
@@ -486,27 +486,27 @@ 
  * @return boolean
  */
   public function SetFrom($address, $name = '',$auto=1) {
-    $address = trim($address);
-    $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
-    if (!self::ValidateAddress($address)) {
-      $this->SetError($this->Lang('invalid_address').': '. $address);
-      if ($this->exceptions) {
-        throw new phpmailerException($this->Lang('invalid_address').': '.$address);
-      }
-      echo $this->Lang('invalid_address').': '.$address;
-      return false;
-    }
-    $this->From = $address;
-    $this->FromName = $name;
-    if ($auto) {
-      if (empty($this->ReplyTo)) {
-        $this->AddAnAddress('ReplyTo', $address, $name);
-      }
-      if (empty($this->Sender)) {
-        $this->Sender = $address;
-      }
-    }
-    return true;
+	$address = trim($address);
+	$name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
+	if (!self::ValidateAddress($address)) {
+	  $this->SetError($this->Lang('invalid_address').': '. $address);
+	  if ($this->exceptions) {
+		throw new phpmailerException($this->Lang('invalid_address').': '.$address);
+	  }
+	  echo $this->Lang('invalid_address').': '.$address;
+	  return false;
+	}
+	$this->From = $address;
+	$this->FromName = $name;
+	if ($auto) {
+	  if (empty($this->ReplyTo)) {
+		$this->AddAnAddress('ReplyTo', $address, $name);
+	  }
+	  if (empty($this->Sender)) {
+		$this->Sender = $address;
+	  }
+	}
+	return true;
   }
 
   /**
@@ -521,15 +521,15 @@ 
    * @access public
    */
   public static function ValidateAddress($address) {
-    if (function_exists('filter_var')) { //Introduced in PHP 5.2
-      if(filter_var($address, FILTER_VALIDATE_EMAIL) === FALSE) {
-        return false;
-      } else {
-        return true;
-      }
-    } else {
-      return preg_match('/^(?:[\w\!\#\$\%\&\'\*\+\-\/\=\?\^\`\{\|\}\~]+\.)*[\w\!\#\$\%\&\'\*\+\-\/\=\?\^\`\{\|\}\~]+@(?:(?:(?:[a-zA-Z0-9_](?:[a-zA-Z0-9_\-](?!\.)){0,61}[a-zA-Z0-9_-]?\.)+[a-zA-Z0-9_](?:[a-zA-Z0-9_\-](?!$)){0,61}[a-zA-Z0-9_]?)|(?:\[(?:(?:[01]?\d{1,2}|2[0-4]\d|25[0-5])\.){3}(?:[01]?\d{1,2}|2[0-4]\d|25[0-5])\]))$/', $address);
-    }
+	if (function_exists('filter_var')) { //Introduced in PHP 5.2
+	  if(filter_var($address, FILTER_VALIDATE_EMAIL) === FALSE) {
+		return false;
+	  } else {
+		return true;
+	  }
+	} else {
+	  return preg_match('/^(?:[\w\!\#\$\%\&\'\*\+\-\/\=\?\^\`\{\|\}\~]+\.)*[\w\!\#\$\%\&\'\*\+\-\/\=\?\^\`\{\|\}\~]+@(?:(?:(?:[a-zA-Z0-9_](?:[a-zA-Z0-9_\-](?!\.)){0,61}[a-zA-Z0-9_-]?\.)+[a-zA-Z0-9_](?:[a-zA-Z0-9_\-](?!$)){0,61}[a-zA-Z0-9_]?)|(?:\[(?:(?:[01]?\d{1,2}|2[0-4]\d|25[0-5])\.){3}(?:[01]?\d{1,2}|2[0-4]\d|25[0-5])\]))$/', $address);
+	}
   }
 
   /////////////////////////////////////////////////
@@ -543,49 +543,49 @@ 
    * @return bool
    */
   public function Send() {
-    try {
-    if((count($this->to) + count($this->cc) + count($this->bcc)) < 1) {
-        throw new phpmailerException($this->Lang('provide_address'), self::STOP_CRITICAL);
-    }
-
-      // Set whether the message is multipart/alternative
-    if(!empty($this->AltBody)) {
-      $this->ContentType = 'multipart/alternative';
-    }
-
-    $this->error_count = 0; // reset errors
-    $this->SetMessageType();
-      $header = $this->CreateHeader();
-    $body = $this->CreateBody();
-
-      if (empty($this->Body)) {
-        throw new phpmailerException($this->Lang('empty_message'), self::STOP_CRITICAL);
-      }
-
-      // digitally sign with DKIM if enabled
-      if ($this->DKIM_domain && $this->DKIM_private) {
-        $header_dkim = $this->DKIM_Add($header,$this->Subject,$body);
-        $header = str_replace("\r\n","\n",$header_dkim) . $header;
-    }
-
-      // Choose the mailer and send through it
-    switch($this->Mailer) {
-      case 'sendmail':
-          return $this->SendmailSend($header, $body);
-      case 'smtp':
-          return $this->SmtpSend($header, $body);
-      default:
-          return $this->MailSend($header, $body);
-    }
-
-    } catch (phpmailerException $e) {
-      $this->SetError($e->getMessage());
-      if ($this->exceptions) {
-        throw $e;
-      }
-      echo $e->getMessage()."\n";
-      return false;
-    }
+	try {
+	if((count($this->to) + count($this->cc) + count($this->bcc)) < 1) {
+		throw new phpmailerException($this->Lang('provide_address'), self::STOP_CRITICAL);
+	}
+
+	  // Set whether the message is multipart/alternative
+	if(!empty($this->AltBody)) {
+	  $this->ContentType = 'multipart/alternative';
+	}
+
+	$this->error_count = 0; // reset errors
+	$this->SetMessageType();
+	  $header = $this->CreateHeader();
+	$body = $this->CreateBody();
+
+	  if (empty($this->Body)) {
+		throw new phpmailerException($this->Lang('empty_message'), self::STOP_CRITICAL);
+	  }
+
+	  // digitally sign with DKIM if enabled
+	  if ($this->DKIM_domain && $this->DKIM_private) {
+		$header_dkim = $this->DKIM_Add($header,$this->Subject,$body);
+		$header = str_replace("\r\n","\n",$header_dkim) . $header;
+	}
+
+	  // Choose the mailer and send through it
+	switch($this->Mailer) {
+	  case 'sendmail':
+		  return $this->SendmailSend($header, $body);
+	  case 'smtp':
+		  return $this->SmtpSend($header, $body);
+	  default:
+		  return $this->MailSend($header, $body);
+	}
+
+	} catch (phpmailerException $e) {
+	  $this->SetError($e->getMessage());
+	  if ($this->exceptions) {
+		throw $e;
+	  }
+	  echo $e->getMessage()."\n";
+	  return false;
+	}
   }
 
   /**
@@ -596,42 +596,42 @@ 
    * @return bool
    */
   protected function SendmailSend($header, $body) {
-    if ($this->Sender != '') {
-      $sendmail = sprintf("%s -oi -f %s -t", escapeshellcmd($this->Sendmail), escapeshellarg($this->Sender));
-    } else {
-      $sendmail = sprintf("%s -oi -t", escapeshellcmd($this->Sendmail));
-    }
-    if ($this->SingleTo === true) {
-      foreach ($this->SingleToArray as $key => $val) {
-    if(!@$mail = popen($sendmail, 'w')) {
-          throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
-    }
-        fputs($mail, "To: " . $val . "\n");
-    fputs($mail, $header);
-    fputs($mail, $body);
-    $result = pclose($mail);
-        // implement call back function if it exists
-        $isSent = ($result == 0) ? 1 : 0;
-        $this->doCallback($isSent,$val,$this->cc,$this->bcc,$this->Subject,$body);
-        if($result != 0) {
-          throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
-        }
-      }
-    } else {
-      if(!@$mail = popen($sendmail, 'w')) {
-        throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
-    }
-      fputs($mail, $header);
-      fputs($mail, $body);
-      $result = pclose($mail);
-      // implement call back function if it exists
-      $isSent = ($result == 0) ? 1 : 0;
-      $this->doCallback($isSent,$this->to,$this->cc,$this->bcc,$this->Subject,$body);
-    if($result != 0) {
-        throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
-      }
-    }
-    return true;
+	if ($this->Sender != '') {
+	  $sendmail = sprintf("%s -oi -f %s -t", escapeshellcmd($this->Sendmail), escapeshellarg($this->Sender));
+	} else {
+	  $sendmail = sprintf("%s -oi -t", escapeshellcmd($this->Sendmail));
+	}
+	if ($this->SingleTo === true) {
+	  foreach ($this->SingleToArray as $key => $val) {
+	if(!@$mail = popen($sendmail, 'w')) {
+		  throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+	}
+		fputs($mail, "To: " . $val . "\n");
+	fputs($mail, $header);
+	fputs($mail, $body);
+	$result = pclose($mail);
+		// implement call back function if it exists
+		$isSent = ($result == 0) ? 1 : 0;
+		$this->doCallback($isSent,$val,$this->cc,$this->bcc,$this->Subject,$body);
+		if($result != 0) {
+		  throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+		}
+	  }
+	} else {
+	  if(!@$mail = popen($sendmail, 'w')) {
+		throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+	}
+	  fputs($mail, $header);
+	  fputs($mail, $body);
+	  $result = pclose($mail);
+	  // implement call back function if it exists
+	  $isSent = ($result == 0) ? 1 : 0;
+	  $this->doCallback($isSent,$this->to,$this->cc,$this->bcc,$this->Subject,$body);
+	if($result != 0) {
+		throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+	  }
+	}
+	return true;
   }
 
   /**
@@ -642,51 +642,51 @@ 
    * @return bool
    */
   protected function MailSend($header, $body) {
-    $toArr = array();
-    foreach($this->to as $t) {
-      $toArr[] = $this->AddrFormat($t);
-    }
-    $to = implode(', ', $toArr);
-
-    $params = sprintf("-oi -f %s", $this->Sender);
-    if ($this->Sender != '' && strlen(ini_get('safe_mode'))< 1) {
-      $old_from = ini_get('sendmail_from');
-      ini_set('sendmail_from', $this->Sender);
-      if ($this->SingleTo === true && count($toArr) > 1) {
-        foreach ($toArr as $key => $val) {
-          $rt = @mail($val, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
-          // implement call back function if it exists
-          $isSent = ($rt == 1) ? 1 : 0;
-          $this->doCallback($isSent,$val,$this->cc,$this->bcc,$this->Subject,$body);
-        }
-      } else {
-        $rt = @mail($to, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
-        // implement call back function if it exists
-        $isSent = ($rt == 1) ? 1 : 0;
-        $this->doCallback($isSent,$to,$this->cc,$this->bcc,$this->Subject,$body);
-      }
-    } else {
-      if ($this->SingleTo === true && count($toArr) > 1) {
-        foreach ($toArr as $key => $val) {
-          $rt = @mail($val, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
-          // implement call back function if it exists
-          $isSent = ($rt == 1) ? 1 : 0;
-          $this->doCallback($isSent,$val,$this->cc,$this->bcc,$this->Subject,$body);
-        }
-      } else {
-        $rt = @mail($to, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header);
-        // implement call back function if it exists
-        $isSent = ($rt == 1) ? 1 : 0;
-        $this->doCallback($isSent,$to,$this->cc,$this->bcc,$this->Subject,$body);
-      }
-    }
-    if (isset($old_from)) {
-      ini_set('sendmail_from', $old_from);
-    }
-    if(!$rt) {
-      throw new phpmailerException($this->Lang('instantiate'), self::STOP_CRITICAL);
-    }
-    return true;
+	$toArr = array();
+	foreach($this->to as $t) {
+	  $toArr[] = $this->AddrFormat($t);
+	}
+	$to = implode(', ', $toArr);
+
+	$params = sprintf("-oi -f %s", $this->Sender);
+	if ($this->Sender != '' && strlen(ini_get('safe_mode'))< 1) {
+	  $old_from = ini_get('sendmail_from');
+	  ini_set('sendmail_from', $this->Sender);
+	  if ($this->SingleTo === true && count($toArr) > 1) {
+		foreach ($toArr as $key => $val) {
+		  $rt = @mail($val, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
+		  // implement call back function if it exists
+		  $isSent = ($rt == 1) ? 1 : 0;
+		  $this->doCallback($isSent,$val,$this->cc,$this->bcc,$this->Subject,$body);
+		}
+	  } else {
+		$rt = @mail($to, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
+		// implement call back function if it exists
+		$isSent = ($rt == 1) ? 1 : 0;
+		$this->doCallback($isSent,$to,$this->cc,$this->bcc,$this->Subject,$body);
+	  }
+	} else {
+	  if ($this->SingleTo === true && count($toArr) > 1) {
+		foreach ($toArr as $key => $val) {
+		  $rt = @mail($val, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
+		  // implement call back function if it exists
+		  $isSent = ($rt == 1) ? 1 : 0;
+		  $this->doCallback($isSent,$val,$this->cc,$this->bcc,$this->Subject,$body);
+		}
+	  } else {
+		$rt = @mail($to, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header);
+		// implement call back function if it exists
+		$isSent = ($rt == 1) ? 1 : 0;
+		$this->doCallback($isSent,$to,$this->cc,$this->bcc,$this->Subject,$body);
+	  }
+	}
+	if (isset($old_from)) {
+	  ini_set('sendmail_from', $old_from);
+	}
+	if(!$rt) {
+	  throw new phpmailerException($this->Lang('instantiate'), self::STOP_CRITICAL);
+	}
+	return true;
   }
 
   /**
@@ -699,67 +699,67 @@ 
    * @return bool
    */
   protected function SmtpSend($header, $body) {
-    require_once $this->PluginDir . 'smtp.php';
-    $bad_rcpt = array();
-
-    if(!$this->SmtpConnect()) {
-      throw new phpmailerException($this->Lang('smtp_connect_failed'), self::STOP_CRITICAL);
-    }
-    $smtp_from = ($this->Sender == '') ? $this->From : $this->Sender;
-    if(!$this->smtp->Mail($smtp_from)) {
-      throw new phpmailerException($this->Lang('from_failed') . $smtp_from, self::STOP_CRITICAL);
-    }
-
-    // Attempt to send attach all recipients
-    foreach($this->to as $to) {
-      if (!$this->smtp->Recipient($to[0])) {
-        $bad_rcpt[] = $to[0];
-        // implement call back function if it exists
-        $isSent = 0;
-        $this->doCallback($isSent,$to[0],'','',$this->Subject,$body);
-      } else {
-        // implement call back function if it exists
-        $isSent = 1;
-        $this->doCallback($isSent,$to[0],'','',$this->Subject,$body);
-      }
-    }
-    foreach($this->cc as $cc) {
-      if (!$this->smtp->Recipient($cc[0])) {
-        $bad_rcpt[] = $cc[0];
-        // implement call back function if it exists
-        $isSent = 0;
-        $this->doCallback($isSent,'',$cc[0],'',$this->Subject,$body);
-      } else {
-        // implement call back function if it exists
-        $isSent = 1;
-        $this->doCallback($isSent,'',$cc[0],'',$this->Subject,$body);
-      }
-    }
-    foreach($this->bcc as $bcc) {
-      if (!$this->smtp->Recipient($bcc[0])) {
-        $bad_rcpt[] = $bcc[0];
-        // implement call back function if it exists
-        $isSent = 0;
-        $this->doCallback($isSent,'','',$bcc[0],$this->Subject,$body);
-      } else {
-        // implement call back function if it exists
-        $isSent = 1;
-        $this->doCallback($isSent,'','',$bcc[0],$this->Subject,$body);
-      }
-    }
-
-
-    if (count($bad_rcpt) > 0 ) { //Create error message for any bad addresses
-      $badaddresses = implode(', ', $bad_rcpt);
-      throw new phpmailerException($this->Lang('recipients_failed') . $badaddresses);
-    }
-    if(!$this->smtp->Data($header . $body)) {
-      throw new phpmailerException($this->Lang('data_not_accepted'), self::STOP_CRITICAL);
-    }
-    if($this->SMTPKeepAlive == true) {
-      $this->smtp->Reset();
-    }
-    return true;
+	require_once $this->PluginDir . 'smtp.php';
+	$bad_rcpt = array();
+
+	if(!$this->SmtpConnect()) {
+	  throw new phpmailerException($this->Lang('smtp_connect_failed'), self::STOP_CRITICAL);
+	}
+	$smtp_from = ($this->Sender == '') ? $this->From : $this->Sender;
+	if(!$this->smtp->Mail($smtp_from)) {
+	  throw new phpmailerException($this->Lang('from_failed') . $smtp_from, self::STOP_CRITICAL);
+	}
+
+	// Attempt to send attach all recipients
+	foreach($this->to as $to) {
+	  if (!$this->smtp->Recipient($to[0])) {
+		$bad_rcpt[] = $to[0];
+		// implement call back function if it exists
+		$isSent = 0;
+		$this->doCallback($isSent,$to[0],'','',$this->Subject,$body);
+	  } else {
+		// implement call back function if it exists
+		$isSent = 1;
+		$this->doCallback($isSent,$to[0],'','',$this->Subject,$body);
+	  }
+	}
+	foreach($this->cc as $cc) {
+	  if (!$this->smtp->Recipient($cc[0])) {
+		$bad_rcpt[] = $cc[0];
+		// implement call back function if it exists
+		$isSent = 0;
+		$this->doCallback($isSent,'',$cc[0],'',$this->Subject,$body);
+	  } else {
+		// implement call back function if it exists
+		$isSent = 1;
+		$this->doCallback($isSent,'',$cc[0],'',$this->Subject,$body);
+	  }
+	}
+	foreach($this->bcc as $bcc) {
+	  if (!$this->smtp->Recipient($bcc[0])) {
+		$bad_rcpt[] = $bcc[0];
+		// implement call back function if it exists
+		$isSent = 0;
+		$this->doCallback($isSent,'','',$bcc[0],$this->Subject,$body);
+	  } else {
+		// implement call back function if it exists
+		$isSent = 1;
+		$this->doCallback($isSent,'','',$bcc[0],$this->Subject,$body);
+	  }
+	}
+
+
+	if (count($bad_rcpt) > 0 ) { //Create error message for any bad addresses
+	  $badaddresses = implode(', ', $bad_rcpt);
+	  throw new phpmailerException($this->Lang('recipients_failed') . $badaddresses);
+	}
+	if(!$this->smtp->Data($header . $body)) {
+	  throw new phpmailerException($this->Lang('data_not_accepted'), self::STOP_CRITICAL);
+	}
+	if($this->SMTPKeepAlive == true) {
+	  $this->smtp->Reset();
+	}
+	return true;
   }
 
   /**
@@ -770,61 +770,61 @@ 
    * @return bool
    */
   public function SmtpConnect() {
-    if(is_null($this->smtp)) {
-      $this->smtp = new SMTP();
-    }
-
-    $this->smtp->do_debug = $this->SMTPDebug;
-    $hosts = explode(';', $this->Host);
-    $index = 0;
-    $connection = $this->smtp->Connected();
-
-    // Retry while there is no connection
-    try {
-      while($index < count($hosts) && !$connection) {
-      $hostinfo = array();
-        if (preg_match('/^(.+):([0-9]+)$/', $hosts[$index], $hostinfo)) {
-        $host = $hostinfo[1];
-        $port = $hostinfo[2];
-      } else {
-        $host = $hosts[$index];
-        $port = $this->Port;
-      }
-
-      $tls = ($this->SMTPSecure == 'tls');
-      $ssl = ($this->SMTPSecure == 'ssl');
-
-      if($this->smtp->Connect(($ssl ? 'ssl://':'').$host, $port, $this->Timeout)) {
-
-        $hello = ($this->Helo != '' ? $this->Helo : $this->ServerHostname());
-        $this->smtp->Hello($hello);
-
-        if($tls) {
-          if(!$this->smtp->StartTLS()) {
-              throw new phpmailerException($this->Lang('tls'));
-          }
-
-            //We must resend HELO after tls negotiation
-          $this->smtp->Hello($hello);
-        }
-
-        $connection = true;
-        if($this->SMTPAuth) {
-          if(!$this->smtp->Authenticate($this->Username, $this->Password)) {
-              throw new phpmailerException($this->Lang('authenticate'));
-          }
-        }
-      }
-      $index++;
-    if(!$connection) {
-          throw new phpmailerException($this->Lang('connect_host'));
-    }
-      }
-    } catch (phpmailerException $e) {
-      $this->smtp->Reset();
-      throw $e;
-    }
-    return true;
+	if(is_null($this->smtp)) {
+	  $this->smtp = new SMTP();
+	}
+
+	$this->smtp->do_debug = $this->SMTPDebug;
+	$hosts = explode(';', $this->Host);
+	$index = 0;
+	$connection = $this->smtp->Connected();
+
+	// Retry while there is no connection
+	try {
+	  while($index < count($hosts) && !$connection) {
+	  $hostinfo = array();
+		if (preg_match('/^(.+):([0-9]+)$/', $hosts[$index], $hostinfo)) {
+		$host = $hostinfo[1];
+		$port = $hostinfo[2];
+	  } else {
+		$host = $hosts[$index];
+		$port = $this->Port;
+	  }
+
+	  $tls = ($this->SMTPSecure == 'tls');
+	  $ssl = ($this->SMTPSecure == 'ssl');
+
+	  if($this->smtp->Connect(($ssl ? 'ssl://':'').$host, $port, $this->Timeout)) {
+
+		$hello = ($this->Helo != '' ? $this->Helo : $this->ServerHostname());
+		$this->smtp->Hello($hello);
+
+		if($tls) {
+		  if(!$this->smtp->StartTLS()) {
+			  throw new phpmailerException($this->Lang('tls'));
+		  }
+
+			//We must resend HELO after tls negotiation
+		  $this->smtp->Hello($hello);
+		}
+
+		$connection = true;
+		if($this->SMTPAuth) {
+		  if(!$this->smtp->Authenticate($this->Username, $this->Password)) {
+			  throw new phpmailerException($this->Lang('authenticate'));
+		  }
+		}
+	  }
+	  $index++;
+	if(!$connection) {
+		  throw new phpmailerException($this->Lang('connect_host'));
+	}
+	  }
+	} catch (phpmailerException $e) {
+	  $this->smtp->Reset();
+	  throw $e;
+	}
+	return true;
   }
 
   /**
@@ -832,57 +832,57 @@ 
    * @return void
    */
   public function SmtpClose() {
-    if(!is_null($this->smtp)) {
-      if($this->smtp->Connected()) {
-        $this->smtp->Quit();
-        $this->smtp->Close();
-      }
-    }
+	if(!is_null($this->smtp)) {
+	  if($this->smtp->Connected()) {
+		$this->smtp->Quit();
+		$this->smtp->Close();
+	  }
+	}
   }
 
   /**
-  * Sets the language for all class error messages.
-  * Returns false if it cannot load the language file.  The default language is English.
-  * @param string $langcode ISO 639-1 2-character language code (e.g. Portuguese: "br")
+   * Sets the language for all class error messages.
+   * Returns false if it cannot load the language file.  The default language is English.
+   * @param string $langcode ISO 639-1 2-character language code (e.g. Portuguese: "br")
    * @param string $lang_path Path to the language file directory
    * @access public
    */
   function SetLanguage($langcode = 'en', $lang_path = 'language/') {
-    //Define full set of translatable strings
-    $PHPMAILER_LANG = array(
-      'provide_address' => 'You must provide at least one recipient email address.',
-      'mailer_not_supported' => ' mailer is not supported.',
-      'execute' => 'Could not execute: ',
-      'instantiate' => 'Could not instantiate mail function.',
-      'authenticate' => 'SMTP Error: Could not authenticate.',
-      'from_failed' => 'The following From address failed: ',
-      'recipients_failed' => 'SMTP Error: The following recipients failed: ',
-      'data_not_accepted' => 'SMTP Error: Data not accepted.',
-      'connect_host' => 'SMTP Error: Could not connect to SMTP host.',
-      'file_access' => 'Could not access file: ',
-      'file_open' => 'File Error: Could not open file: ',
-      'encoding' => 'Unknown encoding: ',
-      'signing' => 'Signing Error: ',
-      'smtp_error' => 'SMTP server error: ',
-      'empty_message' => 'Message body empty',
-      'invalid_address' => 'Invalid address',
-      'variable_set' => 'Cannot set or reset variable: '
-    );
-    //Overwrite language-specific strings. This way we'll never have missing translations - no more "language string failed to load"!
-    $l = true;
-    if ($langcode != 'en') { //There is no English translation file
-      $l = @include $lang_path.'phpmailer.lang-'.$langcode.'.php';
-    }
-    $this->language = $PHPMAILER_LANG;
-    return ($l == true); //Returns false if language not found
-  }
-
-  /**
-  * Return the current array of language strings
-  * @return array
-  */
+	//Define full set of translatable strings
+	$PHPMAILER_LANG = array(
+	  'provide_address' => 'You must provide at least one recipient email address.',
+	  'mailer_not_supported' => ' mailer is not supported.',
+	  'execute' => 'Could not execute: ',
+	  'instantiate' => 'Could not instantiate mail function.',
+	  'authenticate' => 'SMTP Error: Could not authenticate.',
+	  'from_failed' => 'The following From address failed: ',
+	  'recipients_failed' => 'SMTP Error: The following recipients failed: ',
+	  'data_not_accepted' => 'SMTP Error: Data not accepted.',
+	  'connect_host' => 'SMTP Error: Could not connect to SMTP host.',
+	  'file_access' => 'Could not access file: ',
+	  'file_open' => 'File Error: Could not open file: ',
+	  'encoding' => 'Unknown encoding: ',
+	  'signing' => 'Signing Error: ',
+	  'smtp_error' => 'SMTP server error: ',
+	  'empty_message' => 'Message body empty',
+	  'invalid_address' => 'Invalid address',
+	  'variable_set' => 'Cannot set or reset variable: '
+	);
+	//Overwrite language-specific strings. This way we'll never have missing translations - no more "language string failed to load"!
+	$l = true;
+	if ($langcode != 'en') { //There is no English translation file
+	  $l = @include $lang_path.'phpmailer.lang-'.$langcode.'.php';
+	}
+	$this->language = $PHPMAILER_LANG;
+	return ($l == true); //Returns false if language not found
+  }
+
+  /**
+   * Return the current array of language strings
+   * @return array
+   */
   public function GetTranslations() {
-    return $this->language;
+	return $this->language;
   }
 
   /////////////////////////////////////////////////
@@ -895,15 +895,15 @@ 
    * @return string
    */
   public function AddrAppend($type, $addr) {
-    $addr_str = $type . ': ';
-    $addresses = array();
-    foreach ($addr as $a) {
-      $addresses[] = $this->AddrFormat($a);
-    }
-    $addr_str .= implode(', ', $addresses);
-    $addr_str .= $this->LE;
+	$addr_str = $type . ': ';
+	$addresses = array();
+	foreach ($addr as $a) {
+	  $addresses[] = $this->AddrFormat($a);
+	}
+	$addr_str .= implode(', ', $addresses);
+	$addr_str .= $this->LE;
 
-    return $addr_str;
+	return $addr_str;
   }
 
   /**
@@ -912,11 +912,11 @@ 
    * @return string
    */
   public function AddrFormat($addr) {
-    if(empty($addr[1])) {
-      return $this->SecureHeader($addr[0]);
-    } else {
-      return $this->EncodeHeader($this->SecureHeader($addr[1]), 'phrase') . " <" . $this->SecureHeader($addr[0]) . ">";
-    }
+	if(empty($addr[1])) {
+	  return $this->SecureHeader($addr[0]);
+	} else {
+	  return $this->EncodeHeader($this->SecureHeader($addr[1]), 'phrase') . " <" . $this->SecureHeader($addr[0]) . ">";
+	}
   }
 
   /**
@@ -930,76 +930,76 @@ 
    * @return string
    */
   public function WrapText($message, $length, $qp_mode = false) {
-    $soft_break = ($qp_mode) ? sprintf(" =%s", $this->LE) : $this->LE;
-    // If utf-8 encoding is used, we will need to make sure we don't
-    // split multibyte characters when we wrap
-    $is_utf8 = (strtolower($this->CharSet) == "utf-8");
-
-    $message = $this->FixEOL($message);
-    if (substr($message, -1) == $this->LE) {
-      $message = substr($message, 0, -1);
-    }
-
-    $line = explode($this->LE, $message);
-    $message = '';
-    for ($i=0 ;$i < count($line); $i++) {
-      $line_part = explode(' ', $line[$i]);
-      $buf = '';
-      for ($e = 0; $e<count($line_part); $e++) {
-        $word = $line_part[$e];
-        if ($qp_mode and (strlen($word) > $length)) {
-          $space_left = $length - strlen($buf) - 1;
-          if ($e != 0) {
-            if ($space_left > 20) {
-              $len = $space_left;
-              if ($is_utf8) {
-                $len = $this->UTF8CharBoundary($word, $len);
-              } elseif (substr($word, $len - 1, 1) == "=") {
-                $len--;
-              } elseif (substr($word, $len - 2, 1) == "=") {
-                $len -= 2;
-              }
-              $part = substr($word, 0, $len);
-              $word = substr($word, $len);
-              $buf .= ' ' . $part;
-              $message .= $buf . sprintf("=%s", $this->LE);
-            } else {
-              $message .= $buf . $soft_break;
-            }
-            $buf = '';
-          }
-          while (strlen($word) > 0) {
-            $len = $length;
-            if ($is_utf8) {
-              $len = $this->UTF8CharBoundary($word, $len);
-            } elseif (substr($word, $len - 1, 1) == "=") {
-              $len--;
-            } elseif (substr($word, $len - 2, 1) == "=") {
-              $len -= 2;
-            }
-            $part = substr($word, 0, $len);
-            $word = substr($word, $len);
-
-            if (strlen($word) > 0) {
-              $message .= $part . sprintf("=%s", $this->LE);
-            } else {
-              $buf = $part;
-            }
-          }
-        } else {
-          $buf_o = $buf;
-          $buf .= ($e == 0) ? $word : (' ' . $word);
-
-          if (strlen($buf) > $length and $buf_o != '') {
-            $message .= $buf_o . $soft_break;
-            $buf = $word;
-          }
-        }
-      }
-      $message .= $buf . $this->LE;
-    }
-
-    return $message;
+	$soft_break = ($qp_mode) ? sprintf(" =%s", $this->LE) : $this->LE;
+	// If utf-8 encoding is used, we will need to make sure we don't
+	// split multibyte characters when we wrap
+	$is_utf8 = (strtolower($this->CharSet) == "utf-8");
+
+	$message = $this->FixEOL($message);
+	if (substr($message, -1) == $this->LE) {
+	  $message = substr($message, 0, -1);
+	}
+
+	$line = explode($this->LE, $message);
+	$message = '';
+	for ($i=0 ;$i < count($line); $i++) {
+	  $line_part = explode(' ', $line[$i]);
+	  $buf = '';
+	  for ($e = 0; $e<count($line_part); $e++) {
+		$word = $line_part[$e];
+		if ($qp_mode and (strlen($word) > $length)) {
+		  $space_left = $length - strlen($buf) - 1;
+		  if ($e != 0) {
+			if ($space_left > 20) {
+			  $len = $space_left;
+			  if ($is_utf8) {
+				$len = $this->UTF8CharBoundary($word, $len);
+			  } elseif (substr($word, $len - 1, 1) == "=") {
+				$len--;
+			  } elseif (substr($word, $len - 2, 1) == "=") {
+				$len -= 2;
+			  }
+			  $part = substr($word, 0, $len);
+			  $word = substr($word, $len);
+			  $buf .= ' ' . $part;
+			  $message .= $buf . sprintf("=%s", $this->LE);
+			} else {
+			  $message .= $buf . $soft_break;
+			}
+			$buf = '';
+		  }
+		  while (strlen($word) > 0) {
+			$len = $length;
+			if ($is_utf8) {
+			  $len = $this->UTF8CharBoundary($word, $len);
+			} elseif (substr($word, $len - 1, 1) == "=") {
+			  $len--;
+			} elseif (substr($word, $len - 2, 1) == "=") {
+			  $len -= 2;
+			}
+			$part = substr($word, 0, $len);
+			$word = substr($word, $len);
+
+			if (strlen($word) > 0) {
+			  $message .= $part . sprintf("=%s", $this->LE);
+			} else {
+			  $buf = $part;
+			}
+		  }
+		} else {
+		  $buf_o = $buf;
+		  $buf .= ($e == 0) ? $word : (' ' . $word);
+
+		  if (strlen($buf) > $length and $buf_o != '') {
+			$message .= $buf_o . $soft_break;
+			$buf = $word;
+		  }
+		}
+	  }
+	  $message .= $buf . $this->LE;
+	}
+
+	return $message;
   }
 
   /**
@@ -1012,35 +1012,35 @@ 
    * @return int
    */
   public function UTF8CharBoundary($encodedText, $maxLength) {
-    $foundSplitPos = false;
-    $lookBack = 3;
-    while (!$foundSplitPos) {
-      $lastChunk = substr($encodedText, $maxLength - $lookBack, $lookBack);
-      $encodedCharPos = strpos($lastChunk, "=");
-      if ($encodedCharPos !== false) {
-        // Found start of encoded character byte within $lookBack block.
-        // Check the encoded byte value (the 2 chars after the '=')
-        $hex = substr($encodedText, $maxLength - $lookBack + $encodedCharPos + 1, 2);
-        $dec = hexdec($hex);
-        if ($dec < 128) { // Single byte character.
-          // If the encoded char was found at pos 0, it will fit
-          // otherwise reduce maxLength to start of the encoded char
-          $maxLength = ($encodedCharPos == 0) ? $maxLength :
-          $maxLength - ($lookBack - $encodedCharPos);
-          $foundSplitPos = true;
-        } elseif ($dec >= 192) { // First byte of a multi byte character
-          // Reduce maxLength to split at start of character
-          $maxLength = $maxLength - ($lookBack - $encodedCharPos);
-          $foundSplitPos = true;
-        } elseif ($dec < 192) { // Middle byte of a multi byte character, look further back
-          $lookBack += 3;
-        }
-      } else {
-        // No encoded character found
-        $foundSplitPos = true;
-      }
-    }
-    return $maxLength;
+	$foundSplitPos = false;
+	$lookBack = 3;
+	while (!$foundSplitPos) {
+	  $lastChunk = substr($encodedText, $maxLength - $lookBack, $lookBack);
+	  $encodedCharPos = strpos($lastChunk, "=");
+	  if ($encodedCharPos !== false) {
+		// Found start of encoded character byte within $lookBack block.
+		// Check the encoded byte value (the 2 chars after the '=')
+		$hex = substr($encodedText, $maxLength - $lookBack + $encodedCharPos + 1, 2);
+		$dec = hexdec($hex);
+		if ($dec < 128) { // Single byte character.
+		  // If the encoded char was found at pos 0, it will fit
+		  // otherwise reduce maxLength to start of the encoded char
+		  $maxLength = ($encodedCharPos == 0) ? $maxLength :
+		  $maxLength - ($lookBack - $encodedCharPos);
+		  $foundSplitPos = true;
+		} elseif ($dec >= 192) { // First byte of a multi byte character
+		  // Reduce maxLength to split at start of character
+		  $maxLength = $maxLength - ($lookBack - $encodedCharPos);
+		  $foundSplitPos = true;
+		} elseif ($dec < 192) { // Middle byte of a multi byte character, look further back
+		  $lookBack += 3;
+		}
+	  } else {
+		// No encoded character found
+		$foundSplitPos = true;
+	  }
+	}
+	return $maxLength;
   }
 
 
@@ -1050,19 +1050,19 @@ 
    * @return void
    */
   public function SetWordWrap() {
-    if($this->WordWrap < 1) {
-      return;
-    }
+	if($this->WordWrap < 1) {
+	  return;
+	}
 
-    switch($this->message_type) {
-      case 'alt':
-      case 'alt_attachments':
-        $this->AltBody = $this->WrapText($this->AltBody, $this->WordWrap);
-        break;
-      default:
-        $this->Body = $this->WrapText($this->Body, $this->WordWrap);
-        break;
-    }
+	switch($this->message_type) {
+	  case 'alt':
+	  case 'alt_attachments':
+		$this->AltBody = $this->WrapText($this->AltBody, $this->WordWrap);
+		break;
+	  default:
+		$this->Body = $this->WrapText($this->Body, $this->WordWrap);
+		break;
+	}
   }
 
   /**
@@ -1071,81 +1071,81 @@ 
    * @return string The assembled header
    */
   public function CreateHeader() {
-    $result = '';
-
-    // Set the boundaries
-    $uniq_id = md5(uniqid(time()));
-    $this->boundary[1] = 'b1_' . $uniq_id;
-    $this->boundary[2] = 'b2_' . $uniq_id;
-
-    $result .= $this->HeaderLine('Date', self::RFCDate());
-    if($this->Sender == '') {
-      $result .= $this->HeaderLine('Return-Path', trim($this->From));
-    } else {
-      $result .= $this->HeaderLine('Return-Path', trim($this->Sender));
-    }
-
-    // To be created automatically by mail()
-    if($this->Mailer != 'mail') {
-      if ($this->SingleTo === true) {
-        foreach($this->to as $t) {
-          $this->SingleToArray[] = $this->AddrFormat($t);
-        }
-      } else {
-      if(count($this->to) > 0) {
-        $result .= $this->AddrAppend('To', $this->to);
-      } elseif (count($this->cc) == 0) {
-        $result .= $this->HeaderLine('To', 'undisclosed-recipients:;');
-      }
-    }
-    }
-
-    $from = array();
-    $from[0][0] = trim($this->From);
-    $from[0][1] = $this->FromName;
-    $result .= $this->AddrAppend('From', $from);
-
-    // sendmail and mail() extract Cc from the header before sending
-    if(count($this->cc) > 0) {
-      $result .= $this->AddrAppend('Cc', $this->cc);
-    }
-
-    // sendmail and mail() extract Bcc from the header before sending
-    if((($this->Mailer == 'sendmail') || ($this->Mailer == 'mail')) && (count($this->bcc) > 0)) {
-      $result .= $this->AddrAppend('Bcc', $this->bcc);
-    }
-
-    if(count($this->ReplyTo) > 0) {
-      $result .= $this->AddrAppend('Reply-to', $this->ReplyTo);
-    }
-
-    // mail() sets the subject itself
-    if($this->Mailer != 'mail') {
-      $result .= $this->HeaderLine('Subject', $this->EncodeHeader($this->SecureHeader($this->Subject)));
-    }
-
-    if($this->MessageID != '') {
-      $result .= $this->HeaderLine('Message-ID',$this->MessageID);
-    } else {
-      $result .= sprintf("Message-ID: <%s@%s>%s", $uniq_id, $this->ServerHostname(), $this->LE);
-    }
-    $result .= $this->HeaderLine('X-Priority', $this->Priority);
-    $result .= $this->HeaderLine('X-Mailer', 'PHPMailer '.$this->Version.' (phpmailer.sourceforge.net)');
-
-    if($this->ConfirmReadingTo != '') {
-      $result .= $this->HeaderLine('Disposition-Notification-To', '<' . trim($this->ConfirmReadingTo) . '>');
-    }
-
-    // Add custom headers
-    for($index = 0; $index < count($this->CustomHeader); $index++) {
-      $result .= $this->HeaderLine(trim($this->CustomHeader[$index][0]), $this->EncodeHeader(trim($this->CustomHeader[$index][1])));
-    }
-    if (!$this->sign_key_file) {
-      $result .= $this->HeaderLine('MIME-Version', '1.0');
-      $result .= $this->GetMailMIME();
-    }
-
-    return $result;
+	$result = '';
+
+	// Set the boundaries
+	$uniq_id = md5(uniqid(time()));
+	$this->boundary[1] = 'b1_' . $uniq_id;
+	$this->boundary[2] = 'b2_' . $uniq_id;
+
+	$result .= $this->HeaderLine('Date', self::RFCDate());
+	if($this->Sender == '') {
+	  $result .= $this->HeaderLine('Return-Path', trim($this->From));
+	} else {
+	  $result .= $this->HeaderLine('Return-Path', trim($this->Sender));
+	}
+
+	// To be created automatically by mail()
+	if($this->Mailer != 'mail') {
+	  if ($this->SingleTo === true) {
+		foreach($this->to as $t) {
+		  $this->SingleToArray[] = $this->AddrFormat($t);
+		}
+	  } else {
+	  if(count($this->to) > 0) {
+		$result .= $this->AddrAppend('To', $this->to);
+	  } elseif (count($this->cc) == 0) {
+		$result .= $this->HeaderLine('To', 'undisclosed-recipients:;');
+	  }
+	}
+	}
+
+	$from = array();
+	$from[0][0] = trim($this->From);
+	$from[0][1] = $this->FromName;
+	$result .= $this->AddrAppend('From', $from);
+
+	// sendmail and mail() extract Cc from the header before sending
+	if(count($this->cc) > 0) {
+	  $result .= $this->AddrAppend('Cc', $this->cc);
+	}
+
+	// sendmail and mail() extract Bcc from the header before sending
+	if((($this->Mailer == 'sendmail') || ($this->Mailer == 'mail')) && (count($this->bcc) > 0)) {
+	  $result .= $this->AddrAppend('Bcc', $this->bcc);
+	}
+
+	if(count($this->ReplyTo) > 0) {
+	  $result .= $this->AddrAppend('Reply-to', $this->ReplyTo);
+	}
+
+	// mail() sets the subject itself
+	if($this->Mailer != 'mail') {
+	  $result .= $this->HeaderLine('Subject', $this->EncodeHeader($this->SecureHeader($this->Subject)));
+	}
+
+	if($this->MessageID != '') {
+	  $result .= $this->HeaderLine('Message-ID',$this->MessageID);
+	} else {
+	  $result .= sprintf("Message-ID: <%s@%s>%s", $uniq_id, $this->ServerHostname(), $this->LE);
+	}
+	$result .= $this->HeaderLine('X-Priority', $this->Priority);
+	$result .= $this->HeaderLine('X-Mailer', 'PHPMailer '.$this->Version.' (phpmailer.sourceforge.net)');
+
+	if($this->ConfirmReadingTo != '') {
+	  $result .= $this->HeaderLine('Disposition-Notification-To', '<' . trim($this->ConfirmReadingTo) . '>');
+	}
+
+	// Add custom headers
+	for($index = 0; $index < count($this->CustomHeader); $index++) {
+	  $result .= $this->HeaderLine(trim($this->CustomHeader[$index][0]), $this->EncodeHeader(trim($this->CustomHeader[$index][1])));
+	}
+	if (!$this->sign_key_file) {
+	  $result .= $this->HeaderLine('MIME-Version', '1.0');
+	  $result .= $this->GetMailMIME();
+	}
+
+	return $result;
   }
 
   /**
@@ -1154,32 +1154,32 @@ 
    * @return string
    */
   public function GetMailMIME() {
-    $result = '';
-    switch($this->message_type) {
-      case 'plain':
-        $result .= $this->HeaderLine('Content-Transfer-Encoding', $this->Encoding);
-        $result .= sprintf("Content-Type: %s; charset=\"%s\"", $this->ContentType, $this->CharSet);
-        break;
-      case 'attachments':
-      case 'alt_attachments':
-        if($this->InlineImageExists()){
-          $result .= sprintf("Content-Type: %s;%s\ttype=\"text/html\";%s\tboundary=\"%s\"%s", 'multipart/related', $this->LE, $this->LE, $this->boundary[1], $this->LE);
-        } else {
-          $result .= $this->HeaderLine('Content-Type', 'multipart/mixed;');
-          $result .= $this->TextLine("\tboundary=\"" . $this->boundary[1] . '"');
-        }
-        break;
-      case 'alt':
-        $result .= $this->HeaderLine('Content-Type', 'multipart/alternative;');
-        $result .= $this->TextLine("\tboundary=\"" . $this->boundary[1] . '"');
-        break;
-    }
-
-    if($this->Mailer != 'mail') {
-      $result .= $this->LE.$this->LE;
-    }
-
-    return $result;
+	$result = '';
+	switch($this->message_type) {
+	  case 'plain':
+		$result .= $this->HeaderLine('Content-Transfer-Encoding', $this->Encoding);
+		$result .= sprintf("Content-Type: %s; charset=\"%s\"", $this->ContentType, $this->CharSet);
+		break;
+	  case 'attachments':
+	  case 'alt_attachments':
+		if($this->InlineImageExists()){
+		  $result .= sprintf("Content-Type: %s;%s\ttype=\"text/html\";%s\tboundary=\"%s\"%s", 'multipart/related', $this->LE, $this->LE, $this->boundary[1], $this->LE);
+		} else {
+		  $result .= $this->HeaderLine('Content-Type', 'multipart/mixed;');
+		  $result .= $this->TextLine("\tboundary=\"" . $this->boundary[1] . '"');
+		}
+		break;
+	  case 'alt':
+		$result .= $this->HeaderLine('Content-Type', 'multipart/alternative;');
+		$result .= $this->TextLine("\tboundary=\"" . $this->boundary[1] . '"');
+		break;
+	}
+
+	if($this->Mailer != 'mail') {
+	  $result .= $this->LE.$this->LE;
+	}
+
+	return $result;
   }
 
   /**
@@ -1188,72 +1188,72 @@ 
    * @return string The assembled message body
    */
   public function CreateBody() {
-    $body = '';
-
-    if ($this->sign_key_file) {
-      $body .= $this->GetMailMIME();
-    }
-
-    $this->SetWordWrap();
-
-    switch($this->message_type) {
-      case 'alt':
-        $body .= $this->GetBoundary($this->boundary[1], '', 'text/plain', '');
-        $body .= $this->EncodeString($this->AltBody, $this->Encoding);
-        $body .= $this->LE.$this->LE;
-        $body .= $this->GetBoundary($this->boundary[1], '', 'text/html', '');
-        $body .= $this->EncodeString($this->Body, $this->Encoding);
-        $body .= $this->LE.$this->LE;
-        $body .= $this->EndBoundary($this->boundary[1]);
-        break;
-      case 'plain':
-        $body .= $this->EncodeString($this->Body, $this->Encoding);
-        break;
-      case 'attachments':
-        $body .= $this->GetBoundary($this->boundary[1], '', '', '');
-        $body .= $this->EncodeString($this->Body, $this->Encoding);
-        $body .= $this->LE;
-        $body .= $this->AttachAll();
-        break;
-      case 'alt_attachments':
-        $body .= sprintf("--%s%s", $this->boundary[1], $this->LE);
-        $body .= sprintf("Content-Type: %s;%s" . "\tboundary=\"%s\"%s", 'multipart/alternative', $this->LE, $this->boundary[2], $this->LE.$this->LE);
-        $body .= $this->GetBoundary($this->boundary[2], '', 'text/plain', '') . $this->LE; // Create text body
-        $body .= $this->EncodeString($this->AltBody, $this->Encoding);
-        $body .= $this->LE.$this->LE;
-        $body .= $this->GetBoundary($this->boundary[2], '', 'text/html', '') . $this->LE; // Create the HTML body
-        $body .= $this->EncodeString($this->Body, $this->Encoding);
-        $body .= $this->LE.$this->LE;
-        $body .= $this->EndBoundary($this->boundary[2]);
-        $body .= $this->AttachAll();
-        break;
-    }
-
-    if($this->IsError()) {
-      $body = '';
-    } else if ($this->sign_key_file) {
-      try {
-        $file = tempnam('', 'mail');
-        file_put_contents($file, $body, LOCK_EX); //TODO check this worked
-      $signed = tempnam("", "signed");
-        if (@openssl_pkcs7_sign($file, $signed, "file://".$this->sign_cert_file, array("file://".$this->sign_key_file, $this->sign_key_pass), NULL)) {
-          @unlink($file);
-          @unlink($signed);
-          $body = file_get_contents($signed);
-      } else {
-          @unlink($file);
-          @unlink($signed);
-          throw new phpmailerException($this->Lang("signing").openssl_error_string());
-        }
-      } catch (phpmailerException $e) {
-        $body = '';
-        if ($this->exceptions) {
-          throw $e;
-        }
-      }
-    }
-
-    return $body;
+	$body = '';
+
+	if ($this->sign_key_file) {
+	  $body .= $this->GetMailMIME();
+	}
+
+	$this->SetWordWrap();
+
+	switch($this->message_type) {
+	  case 'alt':
+		$body .= $this->GetBoundary($this->boundary[1], '', 'text/plain', '');
+		$body .= $this->EncodeString($this->AltBody, $this->Encoding);
+		$body .= $this->LE.$this->LE;
+		$body .= $this->GetBoundary($this->boundary[1], '', 'text/html', '');
+		$body .= $this->EncodeString($this->Body, $this->Encoding);
+		$body .= $this->LE.$this->LE;
+		$body .= $this->EndBoundary($this->boundary[1]);
+		break;
+	  case 'plain':
+		$body .= $this->EncodeString($this->Body, $this->Encoding);
+		break;
+	  case 'attachments':
+		$body .= $this->GetBoundary($this->boundary[1], '', '', '');
+		$body .= $this->EncodeString($this->Body, $this->Encoding);
+		$body .= $this->LE;
+		$body .= $this->AttachAll();
+		break;
+	  case 'alt_attachments':
+		$body .= sprintf("--%s%s", $this->boundary[1], $this->LE);
+		$body .= sprintf("Content-Type: %s;%s" . "\tboundary=\"%s\"%s", 'multipart/alternative', $this->LE, $this->boundary[2], $this->LE.$this->LE);
+		$body .= $this->GetBoundary($this->boundary[2], '', 'text/plain', '') . $this->LE; // Create text body
+		$body .= $this->EncodeString($this->AltBody, $this->Encoding);
+		$body .= $this->LE.$this->LE;
+		$body .= $this->GetBoundary($this->boundary[2], '', 'text/html', '') . $this->LE; // Create the HTML body
+		$body .= $this->EncodeString($this->Body, $this->Encoding);
+		$body .= $this->LE.$this->LE;
+		$body .= $this->EndBoundary($this->boundary[2]);
+		$body .= $this->AttachAll();
+		break;
+	}
+
+	if($this->IsError()) {
+	  $body = '';
+	} else if ($this->sign_key_file) {
+	  try {
+		$file = tempnam('', 'mail');
+		file_put_contents($file, $body, LOCK_EX); //TODO check this worked
+	  $signed = tempnam("", "signed");
+		if (@openssl_pkcs7_sign($file, $signed, "file://".$this->sign_cert_file, array("file://".$this->sign_key_file, $this->sign_key_pass), NULL)) {
+		  @unlink($file);
+		  @unlink($signed);
+		  $body = file_get_contents($signed);
+	  } else {
+		  @unlink($file);
+		  @unlink($signed);
+		  throw new phpmailerException($this->Lang("signing").openssl_error_string());
+		}
+	  } catch (phpmailerException $e) {
+		$body = '';
+		if ($this->exceptions) {
+		  throw $e;
+		}
+	  }
+	}
+
+	return $body;
   }
 
   /**
@@ -1261,23 +1261,23 @@ 
    * @access private
    */
   private function GetBoundary($boundary, $charSet, $contentType, $encoding) {
-    $result = '';
-    if($charSet == '') {
-      $charSet = $this->CharSet;
-    }
-    if($contentType == '') {
-      $contentType = $this->ContentType;
-    }
-    if($encoding == '') {
-      $encoding = $this->Encoding;
-    }
-    $result .= $this->TextLine('--' . $boundary);
-    $result .= sprintf("Content-Type: %s; charset = \"%s\"", $contentType, $charSet);
-    $result .= $this->LE;
-    $result .= $this->HeaderLine('Content-Transfer-Encoding', $encoding);
-    $result .= $this->LE;
-
-    return $result;
+	$result = '';
+	if($charSet == '') {
+	  $charSet = $this->CharSet;
+	}
+	if($contentType == '') {
+	  $contentType = $this->ContentType;
+	}
+	if($encoding == '') {
+	  $encoding = $this->Encoding;
+	}
+	$result .= $this->TextLine('--' . $boundary);
+	$result .= sprintf("Content-Type: %s; charset = \"%s\"", $contentType, $charSet);
+	$result .= $this->LE;
+	$result .= $this->HeaderLine('Content-Transfer-Encoding', $encoding);
+	$result .= $this->LE;
+
+	return $result;
   }
 
   /**
@@ -1285,7 +1285,7 @@ 
    * @access private
    */
   private function EndBoundary($boundary) {
-    return $this->LE . '--' . $boundary . '--' . $this->LE;
+	return $this->LE . '--' . $boundary . '--' . $this->LE;
   }
 
   /**
@@ -1294,19 +1294,19 @@ 
    * @return void
    */
   private function SetMessageType() {
-    if(count($this->attachment) < 1 && strlen($this->AltBody) < 1) {
-      $this->message_type = 'plain';
-    } else {
-      if(count($this->attachment) > 0) {
-        $this->message_type = 'attachments';
-      }
-      if(strlen($this->AltBody) > 0 && count($this->attachment) < 1) {
-        $this->message_type = 'alt';
-      }
-      if(strlen($this->AltBody) > 0 && count($this->attachment) > 0) {
-        $this->message_type = 'alt_attachments';
-      }
-    }
+	if(count($this->attachment) < 1 && strlen($this->AltBody) < 1) {
+	  $this->message_type = 'plain';
+	} else {
+	  if(count($this->attachment) > 0) {
+		$this->message_type = 'attachments';
+	  }
+	  if(strlen($this->AltBody) > 0 && count($this->attachment) < 1) {
+		$this->message_type = 'alt';
+	  }
+	  if(strlen($this->AltBody) > 0 && count($this->attachment) > 0) {
+		$this->message_type = 'alt_attachments';
+	  }
+	}
   }
 
   /**
@@ -1315,7 +1315,7 @@ 
    * @return string
    */
   public function HeaderLine($name, $value) {
-    return $name . ': ' . $value . $this->LE;
+	return $name . ': ' . $value . $this->LE;
   }
 
   /**
@@ -1324,7 +1324,7 @@ 
    * @return string
    */
   public function TextLine($value) {
-    return $value . $this->LE;
+	return $value . $this->LE;
   }
 
   /////////////////////////////////////////////////
@@ -1342,45 +1342,45 @@ 
    * @return bool
    */
   public function AddAttachment($path, $name = '', $encoding = 'base64', $type = 'application/octet-stream') {
-    try {
-    if(!@is_file($path)) {
-        throw new phpmailerException($this->Lang('file_access') . $path, self::STOP_CONTINUE);
-    }
-    $filename = basename($path);
-    if($name == '') {
-      $name = $filename;
-    }
-
-      $this->attachment[] = array(
-        0 => $path,
-        1 => $filename,
-        2 => $name,
-        3 => $encoding,
-        4 => $type,
-        5 => false,  // isStringAttachment
-        6 => 'attachment',
-        7 => 0
-      );
-
-    } catch (phpmailerException $e) {
-      $this->SetError($e->getMessage());
-      if ($this->exceptions) {
-        throw $e;
-      }
-      echo $e->getMessage()."\n";
-      if ( $e->getCode() == self::STOP_CRITICAL ) {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  /**
-  * Return the current array of attachments
-  * @return array
-  */
+	try {
+	if(!@is_file($path)) {
+		throw new phpmailerException($this->Lang('file_access') . $path, self::STOP_CONTINUE);
+	}
+	$filename = basename($path);
+	if($name == '') {
+	  $name = $filename;
+	}
+
+	  $this->attachment[] = array(
+		0 => $path,
+		1 => $filename,
+		2 => $name,
+		3 => $encoding,
+		4 => $type,
+		5 => false,  // isStringAttachment
+		6 => 'attachment',
+		7 => 0
+	  );
+
+	} catch (phpmailerException $e) {
+	  $this->SetError($e->getMessage());
+	  if ($this->exceptions) {
+		throw $e;
+	  }
+	  echo $e->getMessage()."\n";
+	  if ( $e->getCode() == self::STOP_CRITICAL ) {
+		return false;
+	  }
+	}
+	return true;
+  }
+
+  /**
+   * Return the current array of attachments
+   * @return array
+   */
   public function GetAttachments() {
-    return $this->attachment;
+	return $this->attachment;
   }
 
   /**
@@ -1390,61 +1390,61 @@ 
    * @return string
    */
   private function AttachAll() {
-    // Return text of body
-    $mime = array();
-    $cidUniq = array();
-    $incl = array();
-
-    // Add all attachments
-    foreach ($this->attachment as $attachment) {
-      // Check for string attachment
-      $bString = $attachment[5];
-      if ($bString) {
-        $string = $attachment[0];
-      } else {
-        $path = $attachment[0];
-      }
-
-      if (in_array($attachment[0], $incl)) { continue; }
-      $filename    = $attachment[1];
-      $name        = $attachment[2];
-      $encoding    = $attachment[3];
-      $type        = $attachment[4];
-      $disposition = $attachment[6];
-      $cid         = $attachment[7];
-      $incl[]      = $attachment[0];
-      if ( $disposition == 'inline' && isset($cidUniq[$cid]) ) { continue; }
-      $cidUniq[$cid] = true;
-
-      $mime[] = sprintf("--%s%s", $this->boundary[1], $this->LE);
-      $mime[] = sprintf("Content-Type: %s; name=\"%s\"%s", $type, $this->EncodeHeader($this->SecureHeader($name)), $this->LE);
-      $mime[] = sprintf("Content-Transfer-Encoding: %s%s", $encoding, $this->LE);
-
-      if($disposition == 'inline') {
-        $mime[] = sprintf("Content-ID: <%s>%s", $cid, $this->LE);
-      }
-
-      $mime[] = sprintf("Content-Disposition: %s; filename=\"%s\"%s", $disposition, $this->EncodeHeader($this->SecureHeader($name)), $this->LE.$this->LE);
-
-      // Encode as string attachment
-      if($bString) {
-        $mime[] = $this->EncodeString($string, $encoding);
-        if($this->IsError()) {
-          return '';
-        }
-        $mime[] = $this->LE.$this->LE;
-      } else {
-        $mime[] = $this->EncodeFile($path, $encoding);
-        if($this->IsError()) {
-          return '';
-        }
-        $mime[] = $this->LE.$this->LE;
-      }
-    }
-
-    $mime[] = sprintf("--%s--%s", $this->boundary[1], $this->LE);
-
-    return join('', $mime);
+	// Return text of body
+	$mime = array();
+	$cidUniq = array();
+	$incl = array();
+
+	// Add all attachments
+	foreach ($this->attachment as $attachment) {
+	  // Check for string attachment
+	  $bString = $attachment[5];
+	  if ($bString) {
+		$string = $attachment[0];
+	  } else {
+		$path = $attachment[0];
+	  }
+
+	  if (in_array($attachment[0], $incl)) { continue; }
+	  $filename    = $attachment[1];
+	  $name        = $attachment[2];
+	  $encoding    = $attachment[3];
+	  $type        = $attachment[4];
+	  $disposition = $attachment[6];
+	  $cid         = $attachment[7];
+	  $incl[]      = $attachment[0];
+	  if ( $disposition == 'inline' && isset($cidUniq[$cid]) ) { continue; }
+	  $cidUniq[$cid] = true;
+
+	  $mime[] = sprintf("--%s%s", $this->boundary[1], $this->LE);
+	  $mime[] = sprintf("Content-Type: %s; name=\"%s\"%s", $type, $this->EncodeHeader($this->SecureHeader($name)), $this->LE);
+	  $mime[] = sprintf("Content-Transfer-Encoding: %s%s", $encoding, $this->LE);
+
+	  if($disposition == 'inline') {
+		$mime[] = sprintf("Content-ID: <%s>%s", $cid, $this->LE);
+	  }
+
+	  $mime[] = sprintf("Content-Disposition: %s; filename=\"%s\"%s", $disposition, $this->EncodeHeader($this->SecureHeader($name)), $this->LE.$this->LE);
+
+	  // Encode as string attachment
+	  if($bString) {
+		$mime[] = $this->EncodeString($string, $encoding);
+		if($this->IsError()) {
+		  return '';
+		}
+		$mime[] = $this->LE.$this->LE;
+	  } else {
+		$mime[] = $this->EncodeFile($path, $encoding);
+		if($this->IsError()) {
+		  return '';
+		}
+		$mime[] = $this->LE.$this->LE;
+	  }
+	}
+
+	$mime[] = sprintf("--%s--%s", $this->boundary[1], $this->LE);
+
+	return join('', $mime);
   }
 
   /**
@@ -1457,27 +1457,27 @@ 
    * @return string
    */
   private function EncodeFile($path, $encoding = 'base64') {
-    try {
-      if (!is_readable($path)) {
-        throw new phpmailerException($this->Lang('file_open') . $path, self::STOP_CONTINUE);
-    }
-    if (function_exists('get_magic_quotes')) {
-        function get_magic_quotes() {
-            return false;
-        }
+	try {
+	  if (!is_readable($path)) {
+		throw new phpmailerException($this->Lang('file_open') . $path, self::STOP_CONTINUE);
+	}
+	if (function_exists('get_magic_quotes')) {
+		function get_magic_quotes() {
+			return false;
+		}
 }
-    if (PHP_VERSION < 5) {
-      $magic_quotes = get_magic_quotes_runtime();
-      set_magic_quotes_runtime(0);
-    }
-    $file_buffer  = file_get_contents($path);
-    $file_buffer  = $this->EncodeString($file_buffer, $encoding);
-    if (PHP_VERSION < 5) { set_magic_quotes_runtime($magic_quotes); }
-    return $file_buffer;
-    } catch (Exception $e) {
-      $this->SetError($e->getMessage());
-      return '';
-    }
+	if (PHP_VERSION < 5) {
+	  $magic_quotes = get_magic_quotes_runtime();
+	  set_magic_quotes_runtime(0);
+	}
+	$file_buffer  = file_get_contents($path);
+	$file_buffer  = $this->EncodeString($file_buffer, $encoding);
+	if (PHP_VERSION < 5) { set_magic_quotes_runtime($magic_quotes); }
+	return $file_buffer;
+	} catch (Exception $e) {
+	  $this->SetError($e->getMessage());
+	  return '';
+	}
   }
 
   /**
@@ -1489,29 +1489,29 @@ 
    * @return string
    */
   public function EncodeString ($str, $encoding = 'base64') {
-    $encoded = '';
-    switch(strtolower($encoding)) {
-      case 'base64':
-        $encoded = chunk_split(base64_encode($str), 76, $this->LE);
-        break;
-      case '7bit':
-      case '8bit':
-        $encoded = $this->FixEOL($str);
-        //Make sure it ends with a line break
-        if (substr($encoded, -(strlen($this->LE))) != $this->LE)
-          $encoded .= $this->LE;
-        break;
-      case 'binary':
-        $encoded = $str;
-        break;
-      case 'quoted-printable':
-        $encoded = $this->EncodeQP($str);
-        break;
-      default:
-        $this->SetError($this->Lang('encoding') . $encoding);
-        break;
-    }
-    return $encoded;
+	$encoded = '';
+	switch(strtolower($encoding)) {
+	  case 'base64':
+		$encoded = chunk_split(base64_encode($str), 76, $this->LE);
+		break;
+	  case '7bit':
+	  case '8bit':
+		$encoded = $this->FixEOL($str);
+		//Make sure it ends with a line break
+		if (substr($encoded, -(strlen($this->LE))) != $this->LE)
+		  $encoded .= $this->LE;
+		break;
+	  case 'binary':
+		$encoded = $str;
+		break;
+	  case 'quoted-printable':
+		$encoded = $this->EncodeQP($str);
+		break;
+	  default:
+		$this->SetError($this->Lang('encoding') . $encoding);
+		break;
+	}
+	return $encoded;
   }
 
   /**
@@ -1520,58 +1520,58 @@ 
    * @return string
    */
   public function EncodeHeader ($str, $position = 'text') {
-    $x = 0;
-
-    switch (strtolower($position)) {
-      case 'phrase':
-        if (!preg_match('/[\200-\377]/', $str)) {
-          // Can't use addslashes as we don't know what value has magic_quotes_sybase
-          $encoded = addcslashes($str, "\0..\37\177\\\"");
-          if (($str == $encoded) && !preg_match('/[^A-Za-z0-9!#$%&\'*+\/=?^_`{|}~ -]/', $str)) {
-            return ($encoded);
-          } else {
-            return ("\"$encoded\"");
-          }
-        }
-        $x = preg_match_all('/[^\040\041\043-\133\135-\176]/', $str, $matches);
-        break;
-      case 'comment':
-        $x = preg_match_all('/[()"]/', $str, $matches);
-        // Fall-through
-      case 'text':
-      default:
-        $x += preg_match_all('/[\000-\010\013\014\016-\037\177-\377]/', $str, $matches);
-        break;
-    }
-
-    if ($x == 0) {
-      return ($str);
-    }
-
-    $maxlen = 75 - 7 - strlen($this->CharSet);
-    // Try to select the encoding which should produce the shortest output
-    if (strlen($str)/3 < $x) {
-      $encoding = 'B';
-      if (function_exists('mb_strlen') && $this->HasMultiBytes($str)) {
-     // Use a custom function which correctly encodes and wraps long
-     // multibyte strings without breaking lines within a character
-        $encoded = $this->Base64EncodeWrapMB($str);
-      } else {
-        $encoded = base64_encode($str);
-        $maxlen -= $maxlen % 4;
-        $encoded = trim(chunk_split($encoded, $maxlen, "\n"));
-      }
-    } else {
-      $encoding = 'Q';
-      $encoded = $this->EncodeQ($str, $position);
-      $encoded = $this->WrapText($encoded, $maxlen, true);
-      $encoded = str_replace('='.$this->LE, "\n", trim($encoded));
-    }
-
-    $encoded = preg_replace('/^(.*)$/m', " =?".$this->CharSet."?$encoding?\\1?=", $encoded);
-    $encoded = trim(str_replace("\n", $this->LE, $encoded));
-
-    return $encoded;
+	$x = 0;
+
+	switch (strtolower($position)) {
+	  case 'phrase':
+		if (!preg_match('/[\200-\377]/', $str)) {
+		  // Can't use addslashes as we don't know what value has magic_quotes_sybase
+		  $encoded = addcslashes($str, "\0..\37\177\\\"");
+		  if (($str == $encoded) && !preg_match('/[^A-Za-z0-9!#$%&\'*+\/=?^_`{|}~ -]/', $str)) {
+			return ($encoded);
+		  } else {
+			return ("\"$encoded\"");
+		  }
+		}
+		$x = preg_match_all('/[^\040\041\043-\133\135-\176]/', $str, $matches);
+		break;
+	  case 'comment':
+		$x = preg_match_all('/[()"]/', $str, $matches);
+		// Fall-through
+	  case 'text':
+	  default:
+		$x += preg_match_all('/[\000-\010\013\014\016-\037\177-\377]/', $str, $matches);
+		break;
+	}
+
+	if ($x == 0) {
+	  return ($str);
+	}
+
+	$maxlen = 75 - 7 - strlen($this->CharSet);
+	// Try to select the encoding which should produce the shortest output
+	if (strlen($str)/3 < $x) {
+	  $encoding = 'B';
+	  if (function_exists('mb_strlen') && $this->HasMultiBytes($str)) {
+	 // Use a custom function which correctly encodes and wraps long
+	 // multibyte strings without breaking lines within a character
+		$encoded = $this->Base64EncodeWrapMB($str);
+	  } else {
+		$encoded = base64_encode($str);
+		$maxlen -= $maxlen % 4;
+		$encoded = trim(chunk_split($encoded, $maxlen, "\n"));
+	  }
+	} else {
+	  $encoding = 'Q';
+	  $encoded = $this->EncodeQ($str, $position);
+	  $encoded = $this->WrapText($encoded, $maxlen, true);
+	  $encoded = str_replace('='.$this->LE, "\n", trim($encoded));
+	}
+
+	$encoded = preg_replace('/^(.*)$/m', " =?".$this->CharSet."?$encoding?\\1?=", $encoded);
+	$encoded = trim(str_replace("\n", $this->LE, $encoded));
+
+	return $encoded;
   }
 
   /**
@@ -1581,11 +1581,11 @@ 
    * @return bool
    */
   public function HasMultiBytes($str) {
-    if (function_exists('mb_strlen')) {
-      return (strlen($str) > mb_strlen($str, $this->CharSet));
-    } else { // Assume no multibytes (we can't handle without mbstring functions anyway)
-      return false;
-    }
+	if (function_exists('mb_strlen')) {
+	  return (strlen($str) > mb_strlen($str, $this->CharSet));
+	} else { // Assume no multibytes (we can't handle without mbstring functions anyway)
+	  return false;
+	}
   }
 
   /**
@@ -1597,117 +1597,117 @@ 
    * @return string
    */
   public function Base64EncodeWrapMB($str) {
-    $start = "=?".$this->CharSet."?B?";
-    $end = "?=";
-    $encoded = "";
-
-    $mb_length = mb_strlen($str, $this->CharSet);
-    // Each line must have length <= 75, including $start and $end
-    $length = 75 - strlen($start) - strlen($end);
-    // Average multi-byte ratio
-    $ratio = $mb_length / strlen($str);
-    // Base64 has a 4:3 ratio
-    $offset = $avgLength = floor($length * $ratio * .75);
-
-    for ($i = 0; $i < $mb_length; $i += $offset) {
-      $lookBack = 0;
-
-      do {
-        $offset = $avgLength - $lookBack;
-        $chunk = mb_substr($str, $i, $offset, $this->CharSet);
-        $chunk = base64_encode($chunk);
-        $lookBack++;
-      }
-      while (strlen($chunk) > $length);
-
-      $encoded .= $chunk . $this->LE;
-    }
-
-    // Chomp the last linefeed
-    $encoded = substr($encoded, 0, -strlen($this->LE));
-    return $encoded;
-  }
-
-  /**
-  * Encode string to quoted-printable.
-  * Only uses standard PHP, slow, but will always work
-  * @access public
-  * @param string $string the text to encode
-  * @param integer $line_max Number of chars allowed on a line before wrapping
-  * @return string
-  */
+	$start = "=?".$this->CharSet."?B?";
+	$end = "?=";
+	$encoded = "";
+
+	$mb_length = mb_strlen($str, $this->CharSet);
+	// Each line must have length <= 75, including $start and $end
+	$length = 75 - strlen($start) - strlen($end);
+	// Average multi-byte ratio
+	$ratio = $mb_length / strlen($str);
+	// Base64 has a 4:3 ratio
+	$offset = $avgLength = floor($length * $ratio * .75);
+
+	for ($i = 0; $i < $mb_length; $i += $offset) {
+	  $lookBack = 0;
+
+	  do {
+		$offset = $avgLength - $lookBack;
+		$chunk = mb_substr($str, $i, $offset, $this->CharSet);
+		$chunk = base64_encode($chunk);
+		$lookBack++;
+	  }
+	  while (strlen($chunk) > $length);
+
+	  $encoded .= $chunk . $this->LE;
+	}
+
+	// Chomp the last linefeed
+	$encoded = substr($encoded, 0, -strlen($this->LE));
+	return $encoded;
+  }
+
+  /**
+   * Encode string to quoted-printable.
+   * Only uses standard PHP, slow, but will always work
+   * @access public
+   * @param string $string the text to encode
+   * @param integer $line_max Number of chars allowed on a line before wrapping
+   * @return string
+   */
   public function EncodeQPphp( $input = '', $line_max = 76, $space_conv = false) {
-    $hex = array('0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F');
-    $lines = preg_split('/(?:\r\n|\r|\n)/', $input);
-    $eol = "\r\n";
-    $escape = '=';
-    $output = '';
-    while( list(, $line) = each($lines) ) {
-      $linlen = strlen($line);
-      $newline = '';
-      for($i = 0; $i < $linlen; $i++) {
-        $c = substr( $line, $i, 1 );
-        $dec = ord( $c );
-        if ( ( $i == 0 ) && ( $dec == 46 ) ) { // convert first point in the line into =2E
-          $c = '=2E';
-        }
-        if ( $dec == 32 ) {
-          if ( $i == ( $linlen - 1 ) ) { // convert space at eol only
-            $c = '=20';
-          } else if ( $space_conv ) {
-            $c = '=20';
-          }
-        } elseif ( ($dec == 61) || ($dec < 32 ) || ($dec > 126) ) { // always encode "\t", which is *not* required
-          $h2 = floor($dec/16);
-          $h1 = floor($dec%16);
-          $c = $escape.$hex[$h2].$hex[$h1];
-        }
-        if ( (strlen($newline) + strlen($c)) >= $line_max ) { // CRLF is not counted
-          $output .= $newline.$escape.$eol; //  soft line break; " =\r\n" is okay
-          $newline = '';
-          // check if newline first character will be point or not
-          if ( $dec == 46 ) {
-            $c = '=2E';
-          }
-        }
-        $newline .= $c;
-      } // end of for
-      $output .= $newline.$eol;
-    } // end of while
-    return $output;
-  }
-
-  /**
-  * Encode string to RFC2045 (6.7) quoted-printable format
-  * Uses a PHP5 stream filter to do the encoding about 64x faster than the old version
-  * Also results in same content as you started with after decoding
-  * @see EncodeQPphp()
-  * @access public
-  * @param string $string the text to encode
-  * @param integer $line_max Number of chars allowed on a line before wrapping
-  * @param boolean $space_conv Dummy param for compatibility with existing EncodeQP function
-  * @return string
-  * @author Marcus Bointon
-  */
+	$hex = array('0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F');
+	$lines = preg_split('/(?:\r\n|\r|\n)/', $input);
+	$eol = "\r\n";
+	$escape = '=';
+	$output = '';
+	while( list(, $line) = each($lines) ) {
+	  $linlen = strlen($line);
+	  $newline = '';
+	  for($i = 0; $i < $linlen; $i++) {
+		$c = substr( $line, $i, 1 );
+		$dec = ord( $c );
+		if ( ( $i == 0 ) && ( $dec == 46 ) ) { // convert first point in the line into =2E
+		  $c = '=2E';
+		}
+		if ( $dec == 32 ) {
+		  if ( $i == ( $linlen - 1 ) ) { // convert space at eol only
+			$c = '=20';
+		  } else if ( $space_conv ) {
+			$c = '=20';
+		  }
+		} elseif ( ($dec == 61) || ($dec < 32 ) || ($dec > 126) ) { // always encode "\t", which is *not* required
+		  $h2 = floor($dec/16);
+		  $h1 = floor($dec%16);
+		  $c = $escape.$hex[$h2].$hex[$h1];
+		}
+		if ( (strlen($newline) + strlen($c)) >= $line_max ) { // CRLF is not counted
+		  $output .= $newline.$escape.$eol; //  soft line break; " =\r\n" is okay
+		  $newline = '';
+		  // check if newline first character will be point or not
+		  if ( $dec == 46 ) {
+			$c = '=2E';
+		  }
+		}
+		$newline .= $c;
+	  } // end of for
+	  $output .= $newline.$eol;
+	} // end of while
+	return $output;
+  }
+
+  /**
+   * Encode string to RFC2045 (6.7) quoted-printable format
+   * Uses a PHP5 stream filter to do the encoding about 64x faster than the old version
+   * Also results in same content as you started with after decoding
+   * @see EncodeQPphp()
+   * @access public
+   * @param string $string the text to encode
+   * @param integer $line_max Number of chars allowed on a line before wrapping
+   * @param boolean $space_conv Dummy param for compatibility with existing EncodeQP function
+   * @return string
+   * @author Marcus Bointon
+   */
   public function EncodeQP($string, $line_max = 76, $space_conv = false) {
-    if (function_exists('quoted_printable_encode')) { //Use native function if it's available (>= PHP5.3)
-      return quoted_printable_encode($string);
-    }
-    $filters = stream_get_filters();
-    if (!in_array('convert.*', $filters)) { //Got convert stream filter?
-      return $this->EncodeQPphp($string, $line_max, $space_conv); //Fall back to old implementation
-    }
-    $fp = fopen('php://temp/', 'r+');
-    $string = preg_replace('/\r\n?/', $this->LE, $string); //Normalise line breaks
-    $params = array('line-length' => $line_max, 'line-break-chars' => $this->LE);
-    $s = stream_filter_append($fp, 'convert.quoted-printable-encode', STREAM_FILTER_READ, $params);
-    fputs($fp, $string);
-    rewind($fp);
-    $out = stream_get_contents($fp);
-    stream_filter_remove($s);
-    $out = preg_replace('/^\./m', '=2E', $out); //Encode . if it is first char on a line, workaround for bug in Exchange
-    fclose($fp);
-    return $out;
+	if (function_exists('quoted_printable_encode')) { //Use native function if it's available (>= PHP5.3)
+	  return quoted_printable_encode($string);
+	}
+	$filters = stream_get_filters();
+	if (!in_array('convert.*', $filters)) { //Got convert stream filter?
+	  return $this->EncodeQPphp($string, $line_max, $space_conv); //Fall back to old implementation
+	}
+	$fp = fopen('php://temp/', 'r+');
+	$string = preg_replace('/\r\n?/', $this->LE, $string); //Normalise line breaks
+	$params = array('line-length' => $line_max, 'line-break-chars' => $this->LE);
+	$s = stream_filter_append($fp, 'convert.quoted-printable-encode', STREAM_FILTER_READ, $params);
+	fputs($fp, $string);
+	rewind($fp);
+	$out = stream_get_contents($fp);
+	stream_filter_remove($s);
+	$out = preg_replace('/^\./m', '=2E', $out); //Encode . if it is first char on a line, workaround for bug in Exchange
+	fclose($fp);
+	return $out;
   }
 
   /**
@@ -1719,28 +1719,28 @@ 
    * @return string
    */
   public function EncodeQ ($str, $position = 'text') {
-    // There should not be any EOL in the string
-    $encoded = preg_replace('/[\r\n]*/', '', $str);
+	// There should not be any EOL in the string
+	$encoded = preg_replace('/[\r\n]*/', '', $str);
 
-    switch (strtolower($position)) {
-      case 'phrase':
+	switch (strtolower($position)) {
+	  case 'phrase':
 		$encoded = preg_replace_callback('/([^A-Za-z0-9!*+\/ -])/', function($n) { return '='.sprintf('%02X', ord('\\1')); }, $encoded);
-        break;
-      case 'comment':
+		break;
+	  case 'comment':
 		$encoded = preg_replace_callback('/([\(\)\"])/', function($n) { return '='.sprintf('%02X', ord('\\1')); }, $encoded);
-      case 'text':
-      default:
-        // Replace every high ascii, control =, ? and _ characters
-        //TODO using /e (equivalent to eval()) is probably not a good idea
-        $encoded = preg_replace('/([\000-\011\013\014\016-\037\075\077\137\177-\377])/e',
-              "'='.sprintf('%02X', ord('\\1'))", $encoded);
-        break;
-    }
+	  case 'text':
+	  default:
+		// Replace every high ascii, control =, ? and _ characters
+		//TODO using /e (equivalent to eval()) is probably not a good idea
+		$encoded = preg_replace('/([\000-\011\013\014\016-\037\075\077\137\177-\377])/e',
+			  "'='.sprintf('%02X', ord('\\1'))", $encoded);
+		break;
+	}
 
-    // Replace every spaces to _ (more readable than =20)
-    $encoded = str_replace(' ', '_', $encoded);
+	// Replace every spaces to _ (more readable than =20)
+	$encoded = str_replace(' ', '_', $encoded);
 
-    return $encoded;
+	return $encoded;
   }
 
   /**
@@ -1754,17 +1754,17 @@ 
    * @return void
    */
   public function AddStringAttachment($string, $filename, $encoding = 'base64', $type = 'application/octet-stream') {
-    // Append to $attachment array
-    $this->attachment[] = array(
-      0 => $string,
-      1 => $filename,
-      2 => basename($filename),
-      3 => $encoding,
-      4 => $type,
-      5 => true,  // isStringAttachment
-      6 => 'attachment',
-      7 => 0
-    );
+	// Append to $attachment array
+	$this->attachment[] = array(
+	  0 => $string,
+	  1 => $filename,
+	  2 => basename($filename),
+	  3 => $encoding,
+	  4 => $type,
+	  5 => true,  // isStringAttachment
+	  6 => 'attachment',
+	  7 => 0
+	);
   }
 
   /**
@@ -1782,29 +1782,29 @@ 
    */
   public function AddEmbeddedImage($path, $cid, $name = '', $encoding = 'base64', $type = 'application/octet-stream') {
 
-    if(!@is_file($path)) {
-      $this->SetError($this->Lang('file_access') . $path);
-      return false;
-    }
+	if(!@is_file($path)) {
+	  $this->SetError($this->Lang('file_access') . $path);
+	  return false;
+	}
 
-    $filename = basename($path);
-    if($name == '') {
-      $name = $filename;
-    }
+	$filename = basename($path);
+	if($name == '') {
+	  $name = $filename;
+	}
 
-    // Append to $attachment array
-    $this->attachment[] = array(
-      0 => $path,
-      1 => $filename,
-      2 => $name,
-      3 => $encoding,
-      4 => $type,
-      5 => false,  // isStringAttachment
-      6 => 'inline',
-      7 => $cid
-    );
+	// Append to $attachment array
+	$this->attachment[] = array(
+	  0 => $path,
+	  1 => $filename,
+	  2 => $name,
+	  3 => $encoding,
+	  4 => $type,
+	  5 => false,  // isStringAttachment
+	  6 => 'inline',
+	  7 => $cid
+	);
 
-    return true;
+	return true;
   }
 
   /**
@@ -1813,12 +1813,12 @@ 
    * @return bool
    */
   public function InlineImageExists() {
-    foreach($this->attachment as $attachment) {
-      if ($attachment[6] == 'inline') {
-        return true;
-      }
-    }
-    return false;
+	foreach($this->attachment as $attachment) {
+	  if ($attachment[6] == 'inline') {
+		return true;
+	  }
+	}
+	return false;
   }
 
   /////////////////////////////////////////////////
@@ -1830,10 +1830,10 @@ 
    * @return void
    */
   public function ClearAddresses() {
-    foreach($this->to as $to) {
-      unset($this->all_recipients[strtolower($to[0])]);
-    }
-    $this->to = array();
+	foreach($this->to as $to) {
+	  unset($this->all_recipients[strtolower($to[0])]);
+	}
+	$this->to = array();
   }
 
   /**
@@ -1841,10 +1841,10 @@ 
    * @return void
    */
   public function ClearCCs() {
-    foreach($this->cc as $cc) {
-      unset($this->all_recipients[strtolower($cc[0])]);
-    }
-    $this->cc = array();
+	foreach($this->cc as $cc) {
+	  unset($this->all_recipients[strtolower($cc[0])]);
+	}
+	$this->cc = array();
   }
 
   /**
@@ -1852,10 +1852,10 @@ 
    * @return void
    */
   public function ClearBCCs() {
-    foreach($this->bcc as $bcc) {
-      unset($this->all_recipients[strtolower($bcc[0])]);
-    }
-    $this->bcc = array();
+	foreach($this->bcc as $bcc) {
+	  unset($this->all_recipients[strtolower($bcc[0])]);
+	}
+	$this->bcc = array();
   }
 
   /**
@@ -1863,7 +1863,7 @@ 
    * @return void
    */
   public function ClearReplyTos() {
-    $this->ReplyTo = array();
+	$this->ReplyTo = array();
   }
 
   /**
@@ -1872,10 +1872,10 @@ 
    * @return void
    */
   public function ClearAllRecipients() {
-    $this->to = array();
-    $this->cc = array();
-    $this->bcc = array();
-    $this->all_recipients = array();
+	$this->to = array();
+	$this->cc = array();
+	$this->bcc = array();
+	$this->all_recipients = array();
   }
 
   /**
@@ -1884,7 +1884,7 @@ 
    * @return void
    */
   public function ClearAttachments() {
-    $this->attachment = array();
+	$this->attachment = array();
   }
 
   /**
@@ -1892,7 +1892,7 @@ 
    * @return void
    */
   public function ClearCustomHeaders() {
-    $this->CustomHeader = array();
+	$this->CustomHeader = array();
   }
 
   /////////////////////////////////////////////////
@@ -1905,14 +1905,14 @@ 
    * @return void
    */
   protected function SetError($msg) {
-    $this->error_count++;
-    if ($this->Mailer == 'smtp' and !is_null($this->smtp)) {
-      $lasterror = $this->smtp->getError();
-      if (!empty($lasterror) and array_key_exists('smtp_msg', $lasterror)) {
-        $msg .= '<p>' . $this->Lang('smtp_error') . $lasterror['smtp_msg'] . "</p>\n";
-      }
-    }
-    $this->ErrorInfo = $msg;
+	$this->error_count++;
+	if ($this->Mailer == 'smtp' and !is_null($this->smtp)) {
+	  $lasterror = $this->smtp->getError();
+	  if (!empty($lasterror) and array_key_exists('smtp_msg', $lasterror)) {
+		$msg .= '<p>' . $this->Lang('smtp_error') . $lasterror['smtp_msg'] . "</p>\n";
+	  }
+	}
+	$this->ErrorInfo = $msg;
   }
 
   /**
@@ -1922,13 +1922,13 @@ 
    * @static
    */
   public static function RFCDate() {
-    $tz = date('Z');
-    $tzs = ($tz < 0) ? '-' : '+';
-    $tz = abs($tz);
-    $tz = (int)($tz/3600)*100 + ($tz%3600)/60;
-    $result = sprintf("%s %s%04d", date('D, j M Y H:i:s'), $tzs, $tz);
+	$tz = date('Z');
+	$tzs = ($tz < 0) ? '-' : '+';
+	$tz = abs($tz);
+	$tz = (int)($tz/3600)*100 + ($tz%3600)/60;
+	$result = sprintf("%s %s%04d", date('D, j M Y H:i:s'), $tzs, $tz);
 
-    return $result;
+	return $result;
   }
 
   /**
@@ -1937,15 +1937,15 @@ 
    * @return string
    */
   private function ServerHostname() {
-    if (!empty($this->Hostname)) {
-      $result = $this->Hostname;
-    } elseif (isset($_SERVER['SERVER_NAME'])) {
-      $result = $_SERVER['SERVER_NAME'];
-    } else {
-      $result = 'localhost.localdomain';
-    }
+	if (!empty($this->Hostname)) {
+	  $result = $this->Hostname;
+	} elseif (isset($_SERVER['SERVER_NAME'])) {
+	  $result = $_SERVER['SERVER_NAME'];
+	} else {
+	  $result = 'localhost.localdomain';
+	}
 
-    return $result;
+	return $result;
   }
 
   /**
@@ -1954,15 +1954,15 @@ 
    * @return string
    */
   private function Lang($key) {
-    if(count($this->language) < 1) {
-      $this->SetLanguage('en'); // set the default language
-    }
+	if(count($this->language) < 1) {
+	  $this->SetLanguage('en'); // set the default language
+	}
 
-    if(isset($this->language[$key])) {
-      return $this->language[$key];
-    } else {
-      return 'Language string failed to load: ' . $key;
-    }
+	if(isset($this->language[$key])) {
+	  return $this->language[$key];
+	} else {
+	  return 'Language string failed to load: ' . $key;
+	}
   }
 
   /**
@@ -1971,7 +1971,7 @@ 
    * @return bool
    */
   public function IsError() {
-    return ($this->error_count > 0);
+	return ($this->error_count > 0);
   }
 
   /**
@@ -1980,10 +1980,10 @@ 
    * @return string
    */
   private function FixEOL($str) {
-    $str = str_replace("\r\n", "\n", $str);
-    $str = str_replace("\r", "\n", $str);
-    $str = str_replace("\n", $this->LE, $str);
-    return $str;
+	$str = str_replace("\r\n", "\n", $str);
+	$str = str_replace("\r", "\n", $str);
+	$str = str_replace("\n", $this->LE, $str);
+	return $str;
   }
 
   /**
@@ -1992,7 +1992,7 @@ 
    * @return void
    */
   public function AddCustomHeader($custom_header) {
-    $this->CustomHeader[] = explode(':', $custom_header, 2);
+	$this->CustomHeader[] = explode(':', $custom_header, 2);
   }
 
   /**
@@ -2001,34 +2001,34 @@ 
    * @return $message
    */
   public function MsgHTML($message,$basedir='') {
-    preg_match_all("/(src|background)=\"(.*)\"/Ui", $message, $images);
-    if(isset($images[2])) {
-      foreach($images[2] as $i => $url) {
-        // do not change urls for absolute images (thanks to corvuscorax)
-        if (!preg_match('#^[A-z]+://#',$url)) {
-          $filename = basename($url);
-          $directory = dirname($url);
-          ($directory == '.')?$directory='':'';
-          $cid = 'cid:' . md5($filename);
-          $ext = pathinfo($filename, PATHINFO_EXTENSION);
-          $mimeType  = self::_mime_types($ext);
-          if ( strlen($basedir) > 1 && substr($basedir,-1) != '/') { $basedir .= '/'; }
-          if ( strlen($directory) > 1 && substr($directory,-1) != '/') { $directory .= '/'; }
-          if ( $this->AddEmbeddedImage($basedir.$directory.$filename, md5($filename), $filename, 'base64',$mimeType) ) {
-            $message = preg_replace("/".$images[1][$i]."=\"".preg_quote($url, '/')."\"/Ui", $images[1][$i]."=\"".$cid."\"", $message);
-          }
-        }
-      }
-    }
-    $this->IsHTML(true);
-    $this->Body = $message;
-    $textMsg = trim(strip_tags(preg_replace('/<(head|title|style|script)[^>]*>.*?<\/\\1>/s','',$message)));
-    if ( !empty($textMsg) && empty($this->AltBody) ) {
-      $this->AltBody = html_entity_decode($textMsg);
-    }
-    if ( empty($this->AltBody) ) {
-      $this->AltBody = 'To view this email message, open it in a program that understands HTML!' . "\n\n";
-    }
+	preg_match_all("/(src|background)=\"(.*)\"/Ui", $message, $images);
+	if(isset($images[2])) {
+	  foreach($images[2] as $i => $url) {
+		// do not change urls for absolute images (thanks to corvuscorax)
+		if (!preg_match('#^[A-z]+://#',$url)) {
+		  $filename = basename($url);
+		  $directory = dirname($url);
+		  ($directory == '.')?$directory='':'';
+		  $cid = 'cid:' . md5($filename);
+		  $ext = pathinfo($filename, PATHINFO_EXTENSION);
+		  $mimeType  = self::_mime_types($ext);
+		  if ( strlen($basedir) > 1 && substr($basedir,-1) != '/') { $basedir .= '/'; }
+		  if ( strlen($directory) > 1 && substr($directory,-1) != '/') { $directory .= '/'; }
+		  if ( $this->AddEmbeddedImage($basedir.$directory.$filename, md5($filename), $filename, 'base64',$mimeType) ) {
+			$message = preg_replace("/".$images[1][$i]."=\"".preg_quote($url, '/')."\"/Ui", $images[1][$i]."=\"".$cid."\"", $message);
+		  }
+		}
+	  }
+	}
+	$this->IsHTML(true);
+	$this->Body = $message;
+	$textMsg = trim(strip_tags(preg_replace('/<(head|title|style|script)[^>]*>.*?<\/\\1>/s','',$message)));
+	if ( !empty($textMsg) && empty($this->AltBody) ) {
+	  $this->AltBody = html_entity_decode($textMsg);
+	}
+	if ( empty($this->AltBody) ) {
+	  $this->AltBody = 'To view this email message, open it in a program that understands HTML!' . "\n\n";
+	}
   }
 
   /**
@@ -2039,96 +2039,96 @@ 
    * @static
    */
   public static function _mime_types($ext = '') {
-    $mimes = array(
-      'hqx'   =>  'application/mac-binhex40',
-      'cpt'   =>  'application/mac-compactpro',
-      'doc'   =>  'application/msword',
-      'bin'   =>  'application/macbinary',
-      'dms'   =>  'application/octet-stream',
-      'lha'   =>  'application/octet-stream',
-      'lzh'   =>  'application/octet-stream',
-      'exe'   =>  'application/octet-stream',
-      'class' =>  'application/octet-stream',
-      'psd'   =>  'application/octet-stream',
-      'so'    =>  'application/octet-stream',
-      'sea'   =>  'application/octet-stream',
-      'dll'   =>  'application/octet-stream',
-      'oda'   =>  'application/oda',
-      'pdf'   =>  'application/pdf',
-      'ai'    =>  'application/postscript',
-      'eps'   =>  'application/postscript',
-      'ps'    =>  'application/postscript',
-      'smi'   =>  'application/smil',
-      'smil'  =>  'application/smil',
-      'mif'   =>  'application/vnd.mif',
-      'xls'   =>  'application/vnd.ms-excel',
-      'ppt'   =>  'application/vnd.ms-powerpoint',
-      'wbxml' =>  'application/vnd.wap.wbxml',
-      'wmlc'  =>  'application/vnd.wap.wmlc',
-      'dcr'   =>  'application/x-director',
-      'dir'   =>  'application/x-director',
-      'dxr'   =>  'application/x-director',
-      'dvi'   =>  'application/x-dvi',
-      'gtar'  =>  'application/x-gtar',
-      'php'   =>  'application/x-httpd-php',
-      'php4'  =>  'application/x-httpd-php',
-      'php3'  =>  'application/x-httpd-php',
-      'phtml' =>  'application/x-httpd-php',
-      'phps'  =>  'application/x-httpd-php-source',
-      'js'    =>  'application/x-javascript',
-      'swf'   =>  'application/x-shockwave-flash',
-      'sit'   =>  'application/x-stuffit',
-      'tar'   =>  'application/x-tar',
-      'tgz'   =>  'application/x-tar',
-      'xhtml' =>  'application/xhtml+xml',
-      'xht'   =>  'application/xhtml+xml',
-      'zip'   =>  'application/zip',
-      'mid'   =>  'audio/midi',
-      'midi'  =>  'audio/midi',
-      'mpga'  =>  'audio/mpeg',
-      'mp2'   =>  'audio/mpeg',
-      'mp3'   =>  'audio/mpeg',
-      'aif'   =>  'audio/x-aiff',
-      'aiff'  =>  'audio/x-aiff',
-      'aifc'  =>  'audio/x-aiff',
-      'ram'   =>  'audio/x-pn-realaudio',
-      'rm'    =>  'audio/x-pn-realaudio',
-      'rpm'   =>  'audio/x-pn-realaudio-plugin',
-      'ra'    =>  'audio/x-realaudio',
-      'rv'    =>  'video/vnd.rn-realvideo',
-      'wav'   =>  'audio/x-wav',
-      'bmp'   =>  'image/bmp',
-      'gif'   =>  'image/gif',
-      'jpeg'  =>  'image/jpeg',
-      'jpg'   =>  'image/jpeg',
-      'jpe'   =>  'image/jpeg',
-      'png'   =>  'image/png',
-      'tiff'  =>  'image/tiff',
-      'tif'   =>  'image/tiff',
-      'css'   =>  'text/css',
-      'html'  =>  'text/html',
-      'htm'   =>  'text/html',
-      'shtml' =>  'text/html',
-      'txt'   =>  'text/plain',
-      'text'  =>  'text/plain',
-      'log'   =>  'text/plain',
-      'rtx'   =>  'text/richtext',
-      'rtf'   =>  'text/rtf',
-      'xml'   =>  'text/xml',
-      'xsl'   =>  'text/xml',
-      'mpeg'  =>  'video/mpeg',
-      'mpg'   =>  'video/mpeg',
-      'mpe'   =>  'video/mpeg',
-      'qt'    =>  'video/quicktime',
-      'mov'   =>  'video/quicktime',
-      'avi'   =>  'video/x-msvideo',
-      'movie' =>  'video/x-sgi-movie',
-      'doc'   =>  'application/msword',
-      'word'  =>  'application/msword',
-      'xl'    =>  'application/excel',
-      'eml'   =>  'message/rfc822'
-    );
-    return ( ! isset($mimes[strtolower($ext)])) ? 'application/octet-stream' : $mimes[strtolower($ext)];
+	$mimes = array(
+	  'hqx'   =>  'application/mac-binhex40',
+	  'cpt'   =>  'application/mac-compactpro',
+	  'doc'   =>  'application/msword',
+	  'bin'   =>  'application/macbinary',
+	  'dms'   =>  'application/octet-stream',
+	  'lha'   =>  'application/octet-stream',
+	  'lzh'   =>  'application/octet-stream',
+	  'exe'   =>  'application/octet-stream',
+	  'class' =>  'application/octet-stream',
+	  'psd'   =>  'application/octet-stream',
+	  'so'    =>  'application/octet-stream',
+	  'sea'   =>  'application/octet-stream',
+	  'dll'   =>  'application/octet-stream',
+	  'oda'   =>  'application/oda',
+	  'pdf'   =>  'application/pdf',
+	  'ai'    =>  'application/postscript',
+	  'eps'   =>  'application/postscript',
+	  'ps'    =>  'application/postscript',
+	  'smi'   =>  'application/smil',
+	  'smil'  =>  'application/smil',
+	  'mif'   =>  'application/vnd.mif',
+	  'xls'   =>  'application/vnd.ms-excel',
+	  'ppt'   =>  'application/vnd.ms-powerpoint',
+	  'wbxml' =>  'application/vnd.wap.wbxml',
+	  'wmlc'  =>  'application/vnd.wap.wmlc',
+	  'dcr'   =>  'application/x-director',
+	  'dir'   =>  'application/x-director',
+	  'dxr'   =>  'application/x-director',
+	  'dvi'   =>  'application/x-dvi',
+	  'gtar'  =>  'application/x-gtar',
+	  'php'   =>  'application/x-httpd-php',
+	  'php4'  =>  'application/x-httpd-php',
+	  'php3'  =>  'application/x-httpd-php',
+	  'phtml' =>  'application/x-httpd-php',
+	  'phps'  =>  'application/x-httpd-php-source',
+	  'js'    =>  'application/x-javascript',
+	  'swf'   =>  'application/x-shockwave-flash',
+	  'sit'   =>  'application/x-stuffit',
+	  'tar'   =>  'application/x-tar',
+	  'tgz'   =>  'application/x-tar',
+	  'xhtml' =>  'application/xhtml+xml',
+	  'xht'   =>  'application/xhtml+xml',
+	  'zip'   =>  'application/zip',
+	  'mid'   =>  'audio/midi',
+	  'midi'  =>  'audio/midi',
+	  'mpga'  =>  'audio/mpeg',
+	  'mp2'   =>  'audio/mpeg',
+	  'mp3'   =>  'audio/mpeg',
+	  'aif'   =>  'audio/x-aiff',
+	  'aiff'  =>  'audio/x-aiff',
+	  'aifc'  =>  'audio/x-aiff',
+	  'ram'   =>  'audio/x-pn-realaudio',
+	  'rm'    =>  'audio/x-pn-realaudio',
+	  'rpm'   =>  'audio/x-pn-realaudio-plugin',
+	  'ra'    =>  'audio/x-realaudio',
+	  'rv'    =>  'video/vnd.rn-realvideo',
+	  'wav'   =>  'audio/x-wav',
+	  'bmp'   =>  'image/bmp',
+	  'gif'   =>  'image/gif',
+	  'jpeg'  =>  'image/jpeg',
+	  'jpg'   =>  'image/jpeg',
+	  'jpe'   =>  'image/jpeg',
+	  'png'   =>  'image/png',
+	  'tiff'  =>  'image/tiff',
+	  'tif'   =>  'image/tiff',
+	  'css'   =>  'text/css',
+	  'html'  =>  'text/html',
+	  'htm'   =>  'text/html',
+	  'shtml' =>  'text/html',
+	  'txt'   =>  'text/plain',
+	  'text'  =>  'text/plain',
+	  'log'   =>  'text/plain',
+	  'rtx'   =>  'text/richtext',
+	  'rtf'   =>  'text/rtf',
+	  'xml'   =>  'text/xml',
+	  'xsl'   =>  'text/xml',
+	  'mpeg'  =>  'video/mpeg',
+	  'mpg'   =>  'video/mpeg',
+	  'mpe'   =>  'video/mpeg',
+	  'qt'    =>  'video/quicktime',
+	  'mov'   =>  'video/quicktime',
+	  'avi'   =>  'video/x-msvideo',
+	  'movie' =>  'video/x-sgi-movie',
+	  'doc'   =>  'application/msword',
+	  'word'  =>  'application/msword',
+	  'xl'    =>  'application/excel',
+	  'eml'   =>  'message/rfc822'
+	);
+	return ( ! isset($mimes[strtolower($ext)])) ? 'application/octet-stream' : $mimes[strtolower($ext)];
   }
 
   /**
@@ -2141,22 +2141,22 @@ 
    * @param string $name Parameter Name
    * @param mixed $value Parameter Value
    * NOTE: will not work with arrays, there are no arrays to set/reset
-  * @todo Should this not be using __set() magic function?
+   * @todo Should this not be using __set() magic function?
    */
   public function set ( $name, $value = '' ) {
-    try {
-    if ( isset($this->$name) ) {
-      $this->$name = $value;
-    } else {
-        throw new phpmailerException($this->Lang('variable_set') . $name, self::STOP_CRITICAL);
+	try {
+	if ( isset($this->$name) ) {
+	  $this->$name = $value;
+	} else {
+		throw new phpmailerException($this->Lang('variable_set') . $name, self::STOP_CRITICAL);
   }
-    } catch (Exception $e) {
-      $this->SetError($e->getMessage());
-      if ($e->getCode() == self::STOP_CRITICAL) {
-      return false;
-    }
+	} catch (Exception $e) {
+	  $this->SetError($e->getMessage());
+	  if ($e->getCode() == self::STOP_CRITICAL) {
+	  return false;
+	}
   }
-    return true;
+	return true;
   }
 
   /**
@@ -2166,9 +2166,9 @@ 
    * @return string
    */
   public function SecureHeader($str) {
-    $str = str_replace("\r", '', $str);
-    $str = str_replace("\n", '', $str);
-    return trim($str);
+	$str = str_replace("\r", '', $str);
+	$str = str_replace("\n", '', $str);
+	return trim($str);
   }
 
   /**
@@ -2179,9 +2179,9 @@ 
    * @param string $key_pass Password for private key
    */
   public function Sign($cert_filename, $key_filename, $key_pass) {
-    $this->sign_cert_file = $cert_filename;
-    $this->sign_key_file = $key_filename;
-    $this->sign_key_pass = $key_pass;
+	$this->sign_cert_file = $cert_filename;
+	$this->sign_key_file = $key_filename;
+	$this->sign_key_pass = $key_pass;
   }
 
   /**
@@ -2192,17 +2192,17 @@ 
    * @param string $key_pass Password for private key
    */
   public function DKIM_QP($txt) {
-    $tmp="";
-    $line="";
-    for ($i=0;$i<strlen($txt);$i++) {
-      $ord=ord($txt[$i]);
-      if ( ((0x21 <= $ord) && ($ord <= 0x3A)) || $ord == 0x3C || ((0x3E <= $ord) && ($ord <= 0x7E)) ) {
-        $line.=$txt[$i];
-      } else {
-        $line.="=".sprintf("%02X",$ord);
-      }
-    }
-    return $line;
+	$tmp="";
+	$line="";
+	for ($i=0;$i<strlen($txt);$i++) {
+	  $ord=ord($txt[$i]);
+	  if ( ((0x21 <= $ord) && ($ord <= 0x3A)) || $ord == 0x3C || ((0x3E <= $ord) && ($ord <= 0x7E)) ) {
+		$line.=$txt[$i];
+	  } else {
+		$line.="=".sprintf("%02X",$ord);
+	  }
+	}
+	return $line;
 }
 
   /**
@@ -2212,15 +2212,15 @@ 
    * @param string $s Header
    */
   public function DKIM_Sign($s) {
-    $privKeyStr = file_get_contents($this->DKIM_private);
-    if ($this->DKIM_passphrase!='') {
-      $privKey = openssl_pkey_get_private($privKeyStr,$this->DKIM_passphrase);
-    } else {
-      $privKey = $privKeyStr;
-    }
-    if (openssl_sign($s, $signature, $privKey)) {
-      return base64_encode($signature);
-    }
+	$privKeyStr = file_get_contents($this->DKIM_private);
+	if ($this->DKIM_passphrase!='') {
+	  $privKey = openssl_pkey_get_private($privKeyStr,$this->DKIM_passphrase);
+	} else {
+	  $privKey = $privKeyStr;
+	}
+	if (openssl_sign($s, $signature, $privKey)) {
+	  return base64_encode($signature);
+	}
   }
 
   /**
@@ -2230,16 +2230,16 @@ 
    * @param string $s Header
    */
   public function DKIM_HeaderC($s) {
-    $s=preg_replace("/\r\n\s+/"," ",$s);
-    $lines=explode("\r\n",$s);
-    foreach ($lines as $key=>$line) {
-      list($heading,$value)=explode(":",$line,2);
-      $heading=strtolower($heading);
-      $value=preg_replace("/\s+/"," ",$value) ; // Compress useless spaces
-      $lines[$key]=$heading.":".trim($value) ; // Don't forget to remove WSP around the value
-    }
-    $s=implode("\r\n",$lines);
-    return $s;
+	$s=preg_replace("/\r\n\s+/"," ",$s);
+	$lines=explode("\r\n",$s);
+	foreach ($lines as $key=>$line) {
+	  list($heading,$value)=explode(":",$line,2);
+	  $heading=strtolower($heading);
+	  $value=preg_replace("/\s+/"," ",$value) ; // Compress useless spaces
+	  $lines[$key]=$heading.":".trim($value) ; // Don't forget to remove WSP around the value
+	}
+	$s=implode("\r\n",$lines);
+	return $s;
   }
 
   /**
@@ -2249,15 +2249,15 @@ 
    * @param string $body Message Body
    */
   public function DKIM_BodyC($body) {
-    if ($body == '') return "\r\n";
-    // stabilize line endings
-    $body=str_replace("\r\n","\n",$body);
-    $body=str_replace("\n","\r\n",$body);
-    // END stabilize line endings
-    while (substr($body,strlen($body)-4,4) == "\r\n\r\n") {
-      $body=substr($body,0,strlen($body)-2);
-    }
-    return $body;
+	if ($body == '') return "\r\n";
+	// stabilize line endings
+	$body=str_replace("\r\n","\n",$body);
+	$body=str_replace("\n","\r\n",$body);
+	// END stabilize line endings
+	while (substr($body,strlen($body)-4,4) == "\r\n\r\n") {
+	  $body=substr($body,0,strlen($body)-2);
+	}
+	return $body;
   }
 
   /**
@@ -2269,52 +2269,52 @@ 
    * @param string $body Body
    */
   public function DKIM_Add($headers_line,$subject,$body) {
-    $DKIMsignatureType    = 'rsa-sha1'; // Signature & hash algorithms
-    $DKIMcanonicalization = 'relaxed/simple'; // Canonicalization of header/body
-    $DKIMquery            = 'dns/txt'; // Query method
-    $DKIMtime             = time() ; // Signature Timestamp = seconds since 00:00:00 - Jan 1, 1970 (UTC time zone)
-    $subject_header       = "Subject: $subject";
-    $headers              = explode("\r\n",$headers_line);
-    foreach($headers as $header) {
-      if (strpos($header,'From:') === 0) {
-        $from_header=$header;
-      } elseif (strpos($header,'To:') === 0) {
-        $to_header=$header;
-      }
-    }
-    $from     = str_replace('|','=7C',$this->DKIM_QP($from_header));
-    $to       = str_replace('|','=7C',$this->DKIM_QP($to_header));
-    $subject  = str_replace('|','=7C',$this->DKIM_QP($subject_header)) ; // Copied header fields (dkim-quoted-printable
-    $body     = $this->DKIM_BodyC($body);
-    $DKIMlen  = strlen($body) ; // Length of body
-    $DKIMb64  = base64_encode(pack("H*", sha1($body))) ; // Base64 of packed binary SHA-1 hash of body
-    $ident    = ($this->DKIM_identity == '')? '' : " i=" . $this->DKIM_identity . ";";
-    $dkimhdrs = "DKIM-Signature: v=1; a=" . $DKIMsignatureType . "; q=" . $DKIMquery . "; l=" . $DKIMlen . "; s=" . $this->DKIM_selector . ";\r\n".
-                "\tt=" . $DKIMtime . "; c=" . $DKIMcanonicalization . ";\r\n".
-                "\th=From:To:Subject;\r\n".
-                "\td=" . $this->DKIM_domain . ";" . $ident . "\r\n".
-                "\tz=$from\r\n".
-                "\t|$to\r\n".
-                "\t|$subject;\r\n".
-                "\tbh=" . $DKIMb64 . ";\r\n".
-                "\tb=";
-    $toSign   = $this->DKIM_HeaderC($from_header . "\r\n" . $to_header . "\r\n" . $subject_header . "\r\n" . $dkimhdrs);
-    $signed   = $this->DKIM_Sign($toSign);
-    return "X-PHPMAILER-DKIM: phpmailer.worxware.com\r\n".$dkimhdrs.$signed."\r\n";
+	$DKIMsignatureType    = 'rsa-sha1'; // Signature & hash algorithms
+	$DKIMcanonicalization = 'relaxed/simple'; // Canonicalization of header/body
+	$DKIMquery            = 'dns/txt'; // Query method
+	$DKIMtime             = time() ; // Signature Timestamp = seconds since 00:00:00 - Jan 1, 1970 (UTC time zone)
+	$subject_header       = "Subject: $subject";
+	$headers              = explode("\r\n",$headers_line);
+	foreach($headers as $header) {
+	  if (strpos($header,'From:') === 0) {
+		$from_header=$header;
+	  } elseif (strpos($header,'To:') === 0) {
+		$to_header=$header;
+	  }
+	}
+	$from     = str_replace('|','=7C',$this->DKIM_QP($from_header));
+	$to       = str_replace('|','=7C',$this->DKIM_QP($to_header));
+	$subject  = str_replace('|','=7C',$this->DKIM_QP($subject_header)) ; // Copied header fields (dkim-quoted-printable
+	$body     = $this->DKIM_BodyC($body);
+	$DKIMlen  = strlen($body) ; // Length of body
+	$DKIMb64  = base64_encode(pack("H*", sha1($body))) ; // Base64 of packed binary SHA-1 hash of body
+	$ident    = ($this->DKIM_identity == '')? '' : " i=" . $this->DKIM_identity . ";";
+	$dkimhdrs = "DKIM-Signature: v=1; a=" . $DKIMsignatureType . "; q=" . $DKIMquery . "; l=" . $DKIMlen . "; s=" . $this->DKIM_selector . ";\r\n".
+				"\tt=" . $DKIMtime . "; c=" . $DKIMcanonicalization . ";\r\n".
+				"\th=From:To:Subject;\r\n".
+				"\td=" . $this->DKIM_domain . ";" . $ident . "\r\n".
+				"\tz=$from\r\n".
+				"\t|$to\r\n".
+				"\t|$subject;\r\n".
+				"\tbh=" . $DKIMb64 . ";\r\n".
+				"\tb=";
+	$toSign   = $this->DKIM_HeaderC($from_header . "\r\n" . $to_header . "\r\n" . $subject_header . "\r\n" . $dkimhdrs);
+	$signed   = $this->DKIM_Sign($toSign);
+	return "X-PHPMAILER-DKIM: phpmailer.worxware.com\r\n".$dkimhdrs.$signed."\r\n";
   }
 
   protected function doCallback($isSent,$to,$cc,$bcc,$subject,$body) {
-    if (!empty($this->action_function) && function_exists($this->action_function)) {
-      $params = array($isSent,$to,$cc,$bcc,$subject,$body);
-      call_user_func_array($this->action_function,$params);
-    }
+	if (!empty($this->action_function) && function_exists($this->action_function)) {
+	  $params = array($isSent,$to,$cc,$bcc,$subject,$body);
+	  call_user_func_array($this->action_function,$params);
+	}
   }
 }
 
 class phpmailerException extends Exception {
   public function errorMessage() {
-    $errorMsg = '<strong>' . $this->getMessage() . "</strong><br />\n";
-    return $errorMsg;
+	$errorMsg = '<strong>' . $this->getMessage() . "</strong><br />\n";
+	return $errorMsg;
   }
 }
 ?>
\ No newline at end of file

Spacing +250 added lines, -251 removed lines

@@ -38,7 +38,7 @@ 
  * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
  */
 
-if (version_compare(PHP_VERSION, '5.0.0', '<') ) exit("Sorry, this version of PHPMailer will only run on PHP version 5 or greater!\n");
+if (version_compare(PHP_VERSION, '5.0.0', '<')) exit("Sorry, this version of PHPMailer will only run on PHP version 5 or greater!\n");
 
 class PHPMailer {
 
@@ -50,64 +50,64 @@ 
    * Email priority (1 = High, 3 = Normal, 5 = low).
    * @var int
    */
-  public $Priority          = 3;
+  public $Priority = 3;
 
   /**
    * Sets the CharSet of the message.
    * @var string
    */
-  public $CharSet           = 'utf-8';
+  public $CharSet = 'utf-8';
 
   /**
    * Sets the Content-type of the message.
    * @var string
    */
-  public $ContentType       = 'text/plain';
+  public $ContentType = 'text/plain';
 
   /**
    * Sets the Encoding of the message. Options for this are
    *  "8bit", "7bit", "binary", "base64", and "quoted-printable".
    * @var string
    */
-  public $Encoding          = '8bit';
+  public $Encoding = '8bit';
 
   /**
    * Holds the most recent mailer error message.
    * @var string
    */
-  public $ErrorInfo         = '';
+  public $ErrorInfo = '';
 
   /**
    * Sets the From email address for the message.
    * @var string
    */
-  public $From              = 'root@localhost';
+  public $From = 'root@localhost';
 
   /**
    * Sets the From name of the message.
    * @var string
    */
-  public $FromName          = 'Root User';
+  public $FromName = 'Root User';
 
   /**
    * Sets the Sender email (Return-Path) of the message.  If not empty,
    * will be sent via -f to sendmail or as 'MAIL FROM' in smtp mode.
    * @var string
    */
-  public $Sender            = '';
+  public $Sender = '';
 
   /**
    * Sets the Subject of the message.
    * @var string
    */
-  public $Subject           = '';
+  public $Subject = '';
 
   /**
    * Sets the Body of the message.  This can be either an HTML or text body.
    * If HTML then run IsHTML(true).
    * @var string
    */
-  public $Body              = '';
+  public $Body = '';
 
   /**
    * Sets the text-only body of the message.  This automatically sets the
@@ -116,39 +116,39 @@ 
    * that can read HTML will view the normal Body.
    * @var string
    */
-  public $AltBody           = '';
+  public $AltBody = '';
 
   /**
    * Sets word wrapping on the body of the message to a given number of
    * characters.
    * @var int
    */
-  public $WordWrap          = 0;
+  public $WordWrap = 0;
 
   /**
    * Method to send mail: ("mail", "sendmail", or "smtp").
    * @var string
    */
-  public $Mailer            = 'mail';
+  public $Mailer = 'mail';
 
   /**
    * Sets the path of the sendmail program.
    * @var string
    */
-  public $Sendmail          = '/usr/sbin/sendmail';
+  public $Sendmail = '/usr/sbin/sendmail';
 
   /**
    * Path to PHPMailer plugins.  Useful if the SMTP class
    * is in a different directory than the PHP include path.
    * @var string
    */
-  public $PluginDir         = '';
+  public $PluginDir = '';
 
   /**
    * Sets the email address that a reading confirmation will be sent.
    * @var string
    */
-  public $ConfirmReadingTo  = '';
+  public $ConfirmReadingTo = '';
 
   /**
    * Sets the hostname to use in Message-Id and Received headers
@@ -156,14 +156,14 @@ 
    * by SERVER_NAME is used or 'localhost.localdomain'.
    * @var string
    */
-  public $Hostname          = '';
+  public $Hostname = '';
 
   /**
    * Sets the message ID to be used in the Message-Id header.
    * If empty, a unique id will be generated.
    * @var string
    */
-  public $MessageID      = '';
+  public $MessageID = '';
 
   /////////////////////////////////////////////////
   // PROPERTIES FOR SMTP
@@ -177,57 +177,57 @@ 
    * Hosts will be tried in order.
    * @var string
    */
-  public $Host        = 'localhost';
+  public $Host = 'localhost';
 
   /**
    * Sets the default SMTP server port.
    * @var int
    */
-  public $Port        = 25;
+  public $Port = 25;
 
   /**
    * Sets the SMTP HELO of the message (Default is $Hostname).
    * @var string
    */
-  public $Helo        = '';
+  public $Helo = '';
 
   /**
    * Sets connection prefix.
    * Options are "", "ssl" or "tls"
    * @var string
    */
-  public $SMTPSecure    = '';
+  public $SMTPSecure = '';
 
   /**
    * Sets SMTP authentication. Utilizes the Username and Password variables.
    * @var bool
    */
-  public $SMTPAuth     = false;
+  public $SMTPAuth = false;
 
   /**
    * Sets SMTP username.
    * @var string
    */
-  public $Username     = '';
+  public $Username = '';
 
   /**
    * Sets SMTP password.
    * @var string
    */
-  public $Password     = '';
+  public $Password = '';
 
   /**
    * Sets the SMTP server timeout in seconds.
    * This function will not work with the win32 version.
    * @var int
    */
-  public $Timeout      = 10;
+  public $Timeout = 10;
 
   /**
    * Sets SMTP class debugging on or off.
    * @var bool
    */
-  public $SMTPDebug    = false;
+  public $SMTPDebug = false;
 
   /**
    * Prevents the SMTP connection from being closed after each mail
@@ -254,34 +254,34 @@ 
    * Provides the ability to change the line ending
    * @var string
    */
-  public $LE              = "\n";
+  public $LE = "\n";
 
   /**
    * Used with DKIM DNS Resource Record
    * @var string
    */
-  public $DKIM_selector   = 'phpmailer';
+  public $DKIM_selector = 'phpmailer';
 
   /**
    * Used with DKIM DNS Resource Record
    * optional, in format of email address 'you@yourdomain.com'
    * @var string
    */
-  public $DKIM_identity   = '';
+  public $DKIM_identity = '';
 
   /**
    * Used with DKIM DNS Resource Record
    * optional, in format of email address 'you@yourdomain.com'
    * @var string
    */
-  public $DKIM_domain     = '';
+  public $DKIM_domain = '';
 
   /**
    * Used with DKIM DNS Resource Record
    * optional, in format of email address 'you@yourdomain.com'
    * @var string
    */
-  public $DKIM_private    = '';
+  public $DKIM_private = '';
 
   /**
    * Callback Action function name
@@ -300,7 +300,7 @@ 
    * Sets the PHPMailer Version number
    * @var string
    */
-  public $Version         = '5.1';
+  public $Version = '5.1';
 
   /////////////////////////////////////////////////
   // PROPERTIES, PRIVATE AND PROTECTED
@@ -316,12 +316,12 @@ 
   private $CustomHeader    = array();
   private $message_type    = '';
   private $boundary        = array();
-  protected $language       = array();
+  protected $language = array();
   private $error_count     = 0;
   private $sign_cert_file  = "";
   private $sign_key_file   = "";
   private $sign_key_pass   = "";
-  private   $exceptions     = false;
+  private   $exceptions = false;
 
   /////////////////////////////////////////////////
   // CONSTANTS
@@ -451,13 +451,13 @@ 
    */
   private function AddAnAddress($kind, $address, $name = '') {
     if (!preg_match('/^(to|cc|bcc|ReplyTo)$/', $kind)) {
-      echo 'Invalid recipient array: ' . kind;
+      echo 'Invalid recipient array: '.kind;
       return false;
     }
     $address = trim($address);
     $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
     if (!self::ValidateAddress($address)) {
-      $this->SetError($this->Lang('invalid_address').': '. $address);
+      $this->SetError($this->Lang('invalid_address').': '.$address);
       if ($this->exceptions) {
         throw new phpmailerException($this->Lang('invalid_address').': '.$address);
       }
@@ -485,11 +485,11 @@ 
  * @param string $name
  * @return boolean
  */
-  public function SetFrom($address, $name = '',$auto=1) {
+  public function SetFrom($address, $name = '', $auto = 1) {
     $address = trim($address);
     $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
     if (!self::ValidateAddress($address)) {
-      $this->SetError($this->Lang('invalid_address').': '. $address);
+      $this->SetError($this->Lang('invalid_address').': '.$address);
       if ($this->exceptions) {
         throw new phpmailerException($this->Lang('invalid_address').': '.$address);
       }
@@ -522,7 +522,7 @@ 
    */
   public static function ValidateAddress($address) {
     if (function_exists('filter_var')) { //Introduced in PHP 5.2
-      if(filter_var($address, FILTER_VALIDATE_EMAIL) === FALSE) {
+      if (filter_var($address, FILTER_VALIDATE_EMAIL) === FALSE) {
         return false;
       } else {
         return true;
@@ -544,12 +544,12 @@ 
    */
   public function Send() {
     try {
-    if((count($this->to) + count($this->cc) + count($this->bcc)) < 1) {
+    if ((count($this->to) + count($this->cc) + count($this->bcc)) < 1) {
         throw new phpmailerException($this->Lang('provide_address'), self::STOP_CRITICAL);
     }
 
       // Set whether the message is multipart/alternative
-    if(!empty($this->AltBody)) {
+    if (!empty($this->AltBody)) {
       $this->ContentType = 'multipart/alternative';
     }
 
@@ -564,12 +564,12 @@ 
 
       // digitally sign with DKIM if enabled
       if ($this->DKIM_domain && $this->DKIM_private) {
-        $header_dkim = $this->DKIM_Add($header,$this->Subject,$body);
-        $header = str_replace("\r\n","\n",$header_dkim) . $header;
+        $header_dkim = $this->DKIM_Add($header, $this->Subject, $body);
+        $header = str_replace("\r\n", "\n", $header_dkim).$header;
     }
 
       // Choose the mailer and send through it
-    switch($this->Mailer) {
+    switch ($this->Mailer) {
       case 'sendmail':
           return $this->SendmailSend($header, $body);
       case 'smtp':
@@ -603,32 +603,32 @@ 
     }
     if ($this->SingleTo === true) {
       foreach ($this->SingleToArray as $key => $val) {
-    if(!@$mail = popen($sendmail, 'w')) {
-          throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+    if (!@$mail = popen($sendmail, 'w')) {
+          throw new phpmailerException($this->Lang('execute').$this->Sendmail, self::STOP_CRITICAL);
     }
-        fputs($mail, "To: " . $val . "\n");
+        fputs($mail, "To: ".$val."\n");
     fputs($mail, $header);
     fputs($mail, $body);
     $result = pclose($mail);
         // implement call back function if it exists
         $isSent = ($result == 0) ? 1 : 0;
-        $this->doCallback($isSent,$val,$this->cc,$this->bcc,$this->Subject,$body);
-        if($result != 0) {
-          throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+        $this->doCallback($isSent, $val, $this->cc, $this->bcc, $this->Subject, $body);
+        if ($result != 0) {
+          throw new phpmailerException($this->Lang('execute').$this->Sendmail, self::STOP_CRITICAL);
         }
       }
     } else {
-      if(!@$mail = popen($sendmail, 'w')) {
-        throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+      if (!@$mail = popen($sendmail, 'w')) {
+        throw new phpmailerException($this->Lang('execute').$this->Sendmail, self::STOP_CRITICAL);
     }
       fputs($mail, $header);
       fputs($mail, $body);
       $result = pclose($mail);
       // implement call back function if it exists
       $isSent = ($result == 0) ? 1 : 0;
-      $this->doCallback($isSent,$this->to,$this->cc,$this->bcc,$this->Subject,$body);
-    if($result != 0) {
-        throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+      $this->doCallback($isSent, $this->to, $this->cc, $this->bcc, $this->Subject, $body);
+    if ($result != 0) {
+        throw new phpmailerException($this->Lang('execute').$this->Sendmail, self::STOP_CRITICAL);
       }
     }
     return true;
@@ -643,13 +643,13 @@ 
    */
   protected function MailSend($header, $body) {
     $toArr = array();
-    foreach($this->to as $t) {
+    foreach ($this->to as $t) {
       $toArr[] = $this->AddrFormat($t);
     }
     $to = implode(', ', $toArr);
 
     $params = sprintf("-oi -f %s", $this->Sender);
-    if ($this->Sender != '' && strlen(ini_get('safe_mode'))< 1) {
+    if ($this->Sender != '' && strlen(ini_get('safe_mode')) < 1) {
       $old_from = ini_get('sendmail_from');
       ini_set('sendmail_from', $this->Sender);
       if ($this->SingleTo === true && count($toArr) > 1) {
@@ -657,13 +657,13 @@ 
           $rt = @mail($val, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
           // implement call back function if it exists
           $isSent = ($rt == 1) ? 1 : 0;
-          $this->doCallback($isSent,$val,$this->cc,$this->bcc,$this->Subject,$body);
+          $this->doCallback($isSent, $val, $this->cc, $this->bcc, $this->Subject, $body);
         }
       } else {
         $rt = @mail($to, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
         // implement call back function if it exists
         $isSent = ($rt == 1) ? 1 : 0;
-        $this->doCallback($isSent,$to,$this->cc,$this->bcc,$this->Subject,$body);
+        $this->doCallback($isSent, $to, $this->cc, $this->bcc, $this->Subject, $body);
       }
     } else {
       if ($this->SingleTo === true && count($toArr) > 1) {
@@ -671,19 +671,19 @@ 
           $rt = @mail($val, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
           // implement call back function if it exists
           $isSent = ($rt == 1) ? 1 : 0;
-          $this->doCallback($isSent,$val,$this->cc,$this->bcc,$this->Subject,$body);
+          $this->doCallback($isSent, $val, $this->cc, $this->bcc, $this->Subject, $body);
         }
       } else {
         $rt = @mail($to, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header);
         // implement call back function if it exists
         $isSent = ($rt == 1) ? 1 : 0;
-        $this->doCallback($isSent,$to,$this->cc,$this->bcc,$this->Subject,$body);
+        $this->doCallback($isSent, $to, $this->cc, $this->bcc, $this->Subject, $body);
       }
     }
     if (isset($old_from)) {
       ini_set('sendmail_from', $old_from);
     }
-    if(!$rt) {
+    if (!$rt) {
       throw new phpmailerException($this->Lang('instantiate'), self::STOP_CRITICAL);
     }
     return true;
@@ -699,64 +699,64 @@ 
    * @return bool
    */
   protected function SmtpSend($header, $body) {
-    require_once $this->PluginDir . 'smtp.php';
+    require_once $this->PluginDir.'smtp.php';
     $bad_rcpt = array();
 
-    if(!$this->SmtpConnect()) {
+    if (!$this->SmtpConnect()) {
       throw new phpmailerException($this->Lang('smtp_connect_failed'), self::STOP_CRITICAL);
     }
     $smtp_from = ($this->Sender == '') ? $this->From : $this->Sender;
-    if(!$this->smtp->Mail($smtp_from)) {
-      throw new phpmailerException($this->Lang('from_failed') . $smtp_from, self::STOP_CRITICAL);
+    if (!$this->smtp->Mail($smtp_from)) {
+      throw new phpmailerException($this->Lang('from_failed').$smtp_from, self::STOP_CRITICAL);
     }
 
     // Attempt to send attach all recipients
-    foreach($this->to as $to) {
+    foreach ($this->to as $to) {
       if (!$this->smtp->Recipient($to[0])) {
         $bad_rcpt[] = $to[0];
         // implement call back function if it exists
         $isSent = 0;
-        $this->doCallback($isSent,$to[0],'','',$this->Subject,$body);
+        $this->doCallback($isSent, $to[0], '', '', $this->Subject, $body);
       } else {
         // implement call back function if it exists
         $isSent = 1;
-        $this->doCallback($isSent,$to[0],'','',$this->Subject,$body);
+        $this->doCallback($isSent, $to[0], '', '', $this->Subject, $body);
       }
     }
-    foreach($this->cc as $cc) {
+    foreach ($this->cc as $cc) {
       if (!$this->smtp->Recipient($cc[0])) {
         $bad_rcpt[] = $cc[0];
         // implement call back function if it exists
         $isSent = 0;
-        $this->doCallback($isSent,'',$cc[0],'',$this->Subject,$body);
+        $this->doCallback($isSent, '', $cc[0], '', $this->Subject, $body);
       } else {
         // implement call back function if it exists
         $isSent = 1;
-        $this->doCallback($isSent,'',$cc[0],'',$this->Subject,$body);
+        $this->doCallback($isSent, '', $cc[0], '', $this->Subject, $body);
       }
     }
-    foreach($this->bcc as $bcc) {
+    foreach ($this->bcc as $bcc) {
       if (!$this->smtp->Recipient($bcc[0])) {
         $bad_rcpt[] = $bcc[0];
         // implement call back function if it exists
         $isSent = 0;
-        $this->doCallback($isSent,'','',$bcc[0],$this->Subject,$body);
+        $this->doCallback($isSent, '', '', $bcc[0], $this->Subject, $body);
       } else {
         // implement call back function if it exists
         $isSent = 1;
-        $this->doCallback($isSent,'','',$bcc[0],$this->Subject,$body);
+        $this->doCallback($isSent, '', '', $bcc[0], $this->Subject, $body);
       }
     }
 
 
-    if (count($bad_rcpt) > 0 ) { //Create error message for any bad addresses
+    if (count($bad_rcpt) > 0) { //Create error message for any bad addresses
       $badaddresses = implode(', ', $bad_rcpt);
-      throw new phpmailerException($this->Lang('recipients_failed') . $badaddresses);
+      throw new phpmailerException($this->Lang('recipients_failed').$badaddresses);
     }
-    if(!$this->smtp->Data($header . $body)) {
+    if (!$this->smtp->Data($header.$body)) {
       throw new phpmailerException($this->Lang('data_not_accepted'), self::STOP_CRITICAL);
     }
-    if($this->SMTPKeepAlive == true) {
+    if ($this->SMTPKeepAlive == true) {
       $this->smtp->Reset();
     }
     return true;
@@ -770,7 +770,7 @@ 
    * @return bool
    */
   public function SmtpConnect() {
-    if(is_null($this->smtp)) {
+    if (is_null($this->smtp)) {
       $this->smtp = new SMTP();
     }
 
@@ -781,7 +781,7 @@ 
 
     // Retry while there is no connection
     try {
-      while($index < count($hosts) && !$connection) {
+      while ($index < count($hosts) && !$connection) {
       $hostinfo = array();
         if (preg_match('/^(.+):([0-9]+)$/', $hosts[$index], $hostinfo)) {
         $host = $hostinfo[1];
@@ -794,13 +794,13 @@ 
       $tls = ($this->SMTPSecure == 'tls');
       $ssl = ($this->SMTPSecure == 'ssl');
 
-      if($this->smtp->Connect(($ssl ? 'ssl://':'').$host, $port, $this->Timeout)) {
+      if ($this->smtp->Connect(($ssl ? 'ssl://' : '').$host, $port, $this->Timeout)) {
 
         $hello = ($this->Helo != '' ? $this->Helo : $this->ServerHostname());
         $this->smtp->Hello($hello);
 
-        if($tls) {
-          if(!$this->smtp->StartTLS()) {
+        if ($tls) {
+          if (!$this->smtp->StartTLS()) {
               throw new phpmailerException($this->Lang('tls'));
           }
 
@@ -809,14 +809,14 @@ 
         }
 
         $connection = true;
-        if($this->SMTPAuth) {
-          if(!$this->smtp->Authenticate($this->Username, $this->Password)) {
+        if ($this->SMTPAuth) {
+          if (!$this->smtp->Authenticate($this->Username, $this->Password)) {
               throw new phpmailerException($this->Lang('authenticate'));
           }
         }
       }
       $index++;
-    if(!$connection) {
+    if (!$connection) {
           throw new phpmailerException($this->Lang('connect_host'));
     }
       }
@@ -832,8 +832,8 @@ 
    * @return void
    */
   public function SmtpClose() {
-    if(!is_null($this->smtp)) {
-      if($this->smtp->Connected()) {
+    if (!is_null($this->smtp)) {
+      if ($this->smtp->Connected()) {
         $this->smtp->Quit();
         $this->smtp->Close();
       }
@@ -895,7 +895,7 @@ 
    * @return string
    */
   public function AddrAppend($type, $addr) {
-    $addr_str = $type . ': ';
+    $addr_str = $type.': ';
     $addresses = array();
     foreach ($addr as $a) {
       $addresses[] = $this->AddrFormat($a);
@@ -912,10 +912,10 @@ 
    * @return string
    */
   public function AddrFormat($addr) {
-    if(empty($addr[1])) {
+    if (empty($addr[1])) {
       return $this->SecureHeader($addr[0]);
     } else {
-      return $this->EncodeHeader($this->SecureHeader($addr[1]), 'phrase') . " <" . $this->SecureHeader($addr[0]) . ">";
+      return $this->EncodeHeader($this->SecureHeader($addr[1]), 'phrase')." <".$this->SecureHeader($addr[0]).">";
     }
   }
 
@@ -942,10 +942,10 @@ 
 
     $line = explode($this->LE, $message);
     $message = '';
-    for ($i=0 ;$i < count($line); $i++) {
+    for ($i = 0; $i < count($line); $i++) {
       $line_part = explode(' ', $line[$i]);
       $buf = '';
-      for ($e = 0; $e<count($line_part); $e++) {
+      for ($e = 0; $e < count($line_part); $e++) {
         $word = $line_part[$e];
         if ($qp_mode and (strlen($word) > $length)) {
           $space_left = $length - strlen($buf) - 1;
@@ -961,10 +961,10 @@ 
               }
               $part = substr($word, 0, $len);
               $word = substr($word, $len);
-              $buf .= ' ' . $part;
-              $message .= $buf . sprintf("=%s", $this->LE);
+              $buf .= ' '.$part;
+              $message .= $buf.sprintf("=%s", $this->LE);
             } else {
-              $message .= $buf . $soft_break;
+              $message .= $buf.$soft_break;
             }
             $buf = '';
           }
@@ -981,22 +981,22 @@ 
             $word = substr($word, $len);
 
             if (strlen($word) > 0) {
-              $message .= $part . sprintf("=%s", $this->LE);
+              $message .= $part.sprintf("=%s", $this->LE);
             } else {
               $buf = $part;
             }
           }
         } else {
           $buf_o = $buf;
-          $buf .= ($e == 0) ? $word : (' ' . $word);
+          $buf .= ($e == 0) ? $word : (' '.$word);
 
           if (strlen($buf) > $length and $buf_o != '') {
-            $message .= $buf_o . $soft_break;
+            $message .= $buf_o.$soft_break;
             $buf = $word;
           }
         }
       }
-      $message .= $buf . $this->LE;
+      $message .= $buf.$this->LE;
     }
 
     return $message;
@@ -1025,8 +1025,7 @@ 
         if ($dec < 128) { // Single byte character.
           // If the encoded char was found at pos 0, it will fit
           // otherwise reduce maxLength to start of the encoded char
-          $maxLength = ($encodedCharPos == 0) ? $maxLength :
-          $maxLength - ($lookBack - $encodedCharPos);
+          $maxLength = ($encodedCharPos == 0) ? $maxLength : $maxLength - ($lookBack - $encodedCharPos);
           $foundSplitPos = true;
         } elseif ($dec >= 192) { // First byte of a multi byte character
           // Reduce maxLength to split at start of character
@@ -1050,11 +1049,11 @@ 
    * @return void
    */
   public function SetWordWrap() {
-    if($this->WordWrap < 1) {
+    if ($this->WordWrap < 1) {
       return;
     }
 
-    switch($this->message_type) {
+    switch ($this->message_type) {
       case 'alt':
       case 'alt_attachments':
         $this->AltBody = $this->WrapText($this->AltBody, $this->WordWrap);
@@ -1075,24 +1074,24 @@ 
 
     // Set the boundaries
     $uniq_id = md5(uniqid(time()));
-    $this->boundary[1] = 'b1_' . $uniq_id;
-    $this->boundary[2] = 'b2_' . $uniq_id;
+    $this->boundary[1] = 'b1_'.$uniq_id;
+    $this->boundary[2] = 'b2_'.$uniq_id;
 
     $result .= $this->HeaderLine('Date', self::RFCDate());
-    if($this->Sender == '') {
+    if ($this->Sender == '') {
       $result .= $this->HeaderLine('Return-Path', trim($this->From));
     } else {
       $result .= $this->HeaderLine('Return-Path', trim($this->Sender));
     }
 
     // To be created automatically by mail()
-    if($this->Mailer != 'mail') {
+    if ($this->Mailer != 'mail') {
       if ($this->SingleTo === true) {
-        foreach($this->to as $t) {
+        foreach ($this->to as $t) {
           $this->SingleToArray[] = $this->AddrFormat($t);
         }
       } else {
-      if(count($this->to) > 0) {
+      if (count($this->to) > 0) {
         $result .= $this->AddrAppend('To', $this->to);
       } elseif (count($this->cc) == 0) {
         $result .= $this->HeaderLine('To', 'undisclosed-recipients:;');
@@ -1106,38 +1105,38 @@ 
     $result .= $this->AddrAppend('From', $from);
 
     // sendmail and mail() extract Cc from the header before sending
-    if(count($this->cc) > 0) {
+    if (count($this->cc) > 0) {
       $result .= $this->AddrAppend('Cc', $this->cc);
     }
 
     // sendmail and mail() extract Bcc from the header before sending
-    if((($this->Mailer == 'sendmail') || ($this->Mailer == 'mail')) && (count($this->bcc) > 0)) {
+    if ((($this->Mailer == 'sendmail') || ($this->Mailer == 'mail')) && (count($this->bcc) > 0)) {
       $result .= $this->AddrAppend('Bcc', $this->bcc);
     }
 
-    if(count($this->ReplyTo) > 0) {
+    if (count($this->ReplyTo) > 0) {
       $result .= $this->AddrAppend('Reply-to', $this->ReplyTo);
     }
 
     // mail() sets the subject itself
-    if($this->Mailer != 'mail') {
+    if ($this->Mailer != 'mail') {
       $result .= $this->HeaderLine('Subject', $this->EncodeHeader($this->SecureHeader($this->Subject)));
     }
 
-    if($this->MessageID != '') {
-      $result .= $this->HeaderLine('Message-ID',$this->MessageID);
+    if ($this->MessageID != '') {
+      $result .= $this->HeaderLine('Message-ID', $this->MessageID);
     } else {
       $result .= sprintf("Message-ID: <%s@%s>%s", $uniq_id, $this->ServerHostname(), $this->LE);
     }
     $result .= $this->HeaderLine('X-Priority', $this->Priority);
     $result .= $this->HeaderLine('X-Mailer', 'PHPMailer '.$this->Version.' (phpmailer.sourceforge.net)');
 
-    if($this->ConfirmReadingTo != '') {
-      $result .= $this->HeaderLine('Disposition-Notification-To', '<' . trim($this->ConfirmReadingTo) . '>');
+    if ($this->ConfirmReadingTo != '') {
+      $result .= $this->HeaderLine('Disposition-Notification-To', '<'.trim($this->ConfirmReadingTo).'>');
     }
 
     // Add custom headers
-    for($index = 0; $index < count($this->CustomHeader); $index++) {
+    for ($index = 0; $index < count($this->CustomHeader); $index++) {
       $result .= $this->HeaderLine(trim($this->CustomHeader[$index][0]), $this->EncodeHeader(trim($this->CustomHeader[$index][1])));
     }
     if (!$this->sign_key_file) {
@@ -1155,27 +1154,27 @@ 
    */
   public function GetMailMIME() {
     $result = '';
-    switch($this->message_type) {
+    switch ($this->message_type) {
       case 'plain':
         $result .= $this->HeaderLine('Content-Transfer-Encoding', $this->Encoding);
         $result .= sprintf("Content-Type: %s; charset=\"%s\"", $this->ContentType, $this->CharSet);
         break;
       case 'attachments':
       case 'alt_attachments':
-        if($this->InlineImageExists()){
+        if ($this->InlineImageExists()) {
           $result .= sprintf("Content-Type: %s;%s\ttype=\"text/html\";%s\tboundary=\"%s\"%s", 'multipart/related', $this->LE, $this->LE, $this->boundary[1], $this->LE);
         } else {
           $result .= $this->HeaderLine('Content-Type', 'multipart/mixed;');
-          $result .= $this->TextLine("\tboundary=\"" . $this->boundary[1] . '"');
+          $result .= $this->TextLine("\tboundary=\"".$this->boundary[1].'"');
         }
         break;
       case 'alt':
         $result .= $this->HeaderLine('Content-Type', 'multipart/alternative;');
-        $result .= $this->TextLine("\tboundary=\"" . $this->boundary[1] . '"');
+        $result .= $this->TextLine("\tboundary=\"".$this->boundary[1].'"');
         break;
     }
 
-    if($this->Mailer != 'mail') {
+    if ($this->Mailer != 'mail') {
       $result .= $this->LE.$this->LE;
     }
 
@@ -1196,7 +1195,7 @@ 
 
     $this->SetWordWrap();
 
-    switch($this->message_type) {
+    switch ($this->message_type) {
       case 'alt':
         $body .= $this->GetBoundary($this->boundary[1], '', 'text/plain', '');
         $body .= $this->EncodeString($this->AltBody, $this->Encoding);
@@ -1217,11 +1216,11 @@ 
         break;
       case 'alt_attachments':
         $body .= sprintf("--%s%s", $this->boundary[1], $this->LE);
-        $body .= sprintf("Content-Type: %s;%s" . "\tboundary=\"%s\"%s", 'multipart/alternative', $this->LE, $this->boundary[2], $this->LE.$this->LE);
-        $body .= $this->GetBoundary($this->boundary[2], '', 'text/plain', '') . $this->LE; // Create text body
+        $body .= sprintf("Content-Type: %s;%s"."\tboundary=\"%s\"%s", 'multipart/alternative', $this->LE, $this->boundary[2], $this->LE.$this->LE);
+        $body .= $this->GetBoundary($this->boundary[2], '', 'text/plain', '').$this->LE; // Create text body
         $body .= $this->EncodeString($this->AltBody, $this->Encoding);
         $body .= $this->LE.$this->LE;
-        $body .= $this->GetBoundary($this->boundary[2], '', 'text/html', '') . $this->LE; // Create the HTML body
+        $body .= $this->GetBoundary($this->boundary[2], '', 'text/html', '').$this->LE; // Create the HTML body
         $body .= $this->EncodeString($this->Body, $this->Encoding);
         $body .= $this->LE.$this->LE;
         $body .= $this->EndBoundary($this->boundary[2]);
@@ -1229,7 +1228,7 @@ 
         break;
     }
 
-    if($this->IsError()) {
+    if ($this->IsError()) {
       $body = '';
     } else if ($this->sign_key_file) {
       try {
@@ -1262,16 +1261,16 @@ 
    */
   private function GetBoundary($boundary, $charSet, $contentType, $encoding) {
     $result = '';
-    if($charSet == '') {
+    if ($charSet == '') {
       $charSet = $this->CharSet;
     }
-    if($contentType == '') {
+    if ($contentType == '') {
       $contentType = $this->ContentType;
     }
-    if($encoding == '') {
+    if ($encoding == '') {
       $encoding = $this->Encoding;
     }
-    $result .= $this->TextLine('--' . $boundary);
+    $result .= $this->TextLine('--'.$boundary);
     $result .= sprintf("Content-Type: %s; charset = \"%s\"", $contentType, $charSet);
     $result .= $this->LE;
     $result .= $this->HeaderLine('Content-Transfer-Encoding', $encoding);
@@ -1285,7 +1284,7 @@ 
    * @access private
    */
   private function EndBoundary($boundary) {
-    return $this->LE . '--' . $boundary . '--' . $this->LE;
+    return $this->LE.'--'.$boundary.'--'.$this->LE;
   }
 
   /**
@@ -1294,16 +1293,16 @@ 
    * @return void
    */
   private function SetMessageType() {
-    if(count($this->attachment) < 1 && strlen($this->AltBody) < 1) {
+    if (count($this->attachment) < 1 && strlen($this->AltBody) < 1) {
       $this->message_type = 'plain';
     } else {
-      if(count($this->attachment) > 0) {
+      if (count($this->attachment) > 0) {
         $this->message_type = 'attachments';
       }
-      if(strlen($this->AltBody) > 0 && count($this->attachment) < 1) {
+      if (strlen($this->AltBody) > 0 && count($this->attachment) < 1) {
         $this->message_type = 'alt';
       }
-      if(strlen($this->AltBody) > 0 && count($this->attachment) > 0) {
+      if (strlen($this->AltBody) > 0 && count($this->attachment) > 0) {
         $this->message_type = 'alt_attachments';
       }
     }
@@ -1315,7 +1314,7 @@ 
    * @return string
    */
   public function HeaderLine($name, $value) {
-    return $name . ': ' . $value . $this->LE;
+    return $name.': '.$value.$this->LE;
   }
 
   /**
@@ -1324,7 +1323,7 @@ 
    * @return string
    */
   public function TextLine($value) {
-    return $value . $this->LE;
+    return $value.$this->LE;
   }
 
   /////////////////////////////////////////////////
@@ -1343,11 +1342,11 @@ 
    */
   public function AddAttachment($path, $name = '', $encoding = 'base64', $type = 'application/octet-stream') {
     try {
-    if(!@is_file($path)) {
-        throw new phpmailerException($this->Lang('file_access') . $path, self::STOP_CONTINUE);
+    if (!@is_file($path)) {
+        throw new phpmailerException($this->Lang('file_access').$path, self::STOP_CONTINUE);
     }
     $filename = basename($path);
-    if($name == '') {
+    if ($name == '') {
       $name = $filename;
     }
 
@@ -1357,7 +1356,7 @@ 
         2 => $name,
         3 => $encoding,
         4 => $type,
-        5 => false,  // isStringAttachment
+        5 => false, // isStringAttachment
         6 => 'attachment',
         7 => 0
       );
@@ -1368,7 +1367,7 @@ 
         throw $e;
       }
       echo $e->getMessage()."\n";
-      if ( $e->getCode() == self::STOP_CRITICAL ) {
+      if ($e->getCode() == self::STOP_CRITICAL) {
         return false;
       }
     }
@@ -1413,29 +1412,29 @@ 
       $disposition = $attachment[6];
       $cid         = $attachment[7];
       $incl[]      = $attachment[0];
-      if ( $disposition == 'inline' && isset($cidUniq[$cid]) ) { continue; }
+      if ($disposition == 'inline' && isset($cidUniq[$cid])) { continue; }
       $cidUniq[$cid] = true;
 
       $mime[] = sprintf("--%s%s", $this->boundary[1], $this->LE);
       $mime[] = sprintf("Content-Type: %s; name=\"%s\"%s", $type, $this->EncodeHeader($this->SecureHeader($name)), $this->LE);
       $mime[] = sprintf("Content-Transfer-Encoding: %s%s", $encoding, $this->LE);
 
-      if($disposition == 'inline') {
+      if ($disposition == 'inline') {
         $mime[] = sprintf("Content-ID: <%s>%s", $cid, $this->LE);
       }
 
       $mime[] = sprintf("Content-Disposition: %s; filename=\"%s\"%s", $disposition, $this->EncodeHeader($this->SecureHeader($name)), $this->LE.$this->LE);
 
       // Encode as string attachment
-      if($bString) {
+      if ($bString) {
         $mime[] = $this->EncodeString($string, $encoding);
-        if($this->IsError()) {
+        if ($this->IsError()) {
           return '';
         }
         $mime[] = $this->LE.$this->LE;
       } else {
         $mime[] = $this->EncodeFile($path, $encoding);
-        if($this->IsError()) {
+        if ($this->IsError()) {
           return '';
         }
         $mime[] = $this->LE.$this->LE;
@@ -1459,7 +1458,7 @@ 
   private function EncodeFile($path, $encoding = 'base64') {
     try {
       if (!is_readable($path)) {
-        throw new phpmailerException($this->Lang('file_open') . $path, self::STOP_CONTINUE);
+        throw new phpmailerException($this->Lang('file_open').$path, self::STOP_CONTINUE);
     }
     if (function_exists('get_magic_quotes')) {
         function get_magic_quotes() {
@@ -1488,9 +1487,9 @@ 
    * @access public
    * @return string
    */
-  public function EncodeString ($str, $encoding = 'base64') {
+  public function EncodeString($str, $encoding = 'base64') {
     $encoded = '';
-    switch(strtolower($encoding)) {
+    switch (strtolower($encoding)) {
       case 'base64':
         $encoded = chunk_split(base64_encode($str), 76, $this->LE);
         break;
@@ -1508,7 +1507,7 @@ 
         $encoded = $this->EncodeQP($str);
         break;
       default:
-        $this->SetError($this->Lang('encoding') . $encoding);
+        $this->SetError($this->Lang('encoding').$encoding);
         break;
     }
     return $encoded;
@@ -1519,7 +1518,7 @@ 
    * @access public
    * @return string
    */
-  public function EncodeHeader ($str, $position = 'text') {
+  public function EncodeHeader($str, $position = 'text') {
     $x = 0;
 
     switch (strtolower($position)) {
@@ -1550,7 +1549,7 @@ 
 
     $maxlen = 75 - 7 - strlen($this->CharSet);
     // Try to select the encoding which should produce the shortest output
-    if (strlen($str)/3 < $x) {
+    if (strlen($str) / 3 < $x) {
       $encoding = 'B';
       if (function_exists('mb_strlen') && $this->HasMultiBytes($str)) {
      // Use a custom function which correctly encodes and wraps long
@@ -1620,7 +1619,7 @@ 
       }
       while (strlen($chunk) > $length);
 
-      $encoded .= $chunk . $this->LE;
+      $encoded .= $chunk.$this->LE;
     }
 
     // Chomp the last linefeed
@@ -1636,37 +1635,37 @@ 
   * @param integer $line_max Number of chars allowed on a line before wrapping
   * @return string
   */
-  public function EncodeQPphp( $input = '', $line_max = 76, $space_conv = false) {
-    $hex = array('0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F');
+  public function EncodeQPphp($input = '', $line_max = 76, $space_conv = false) {
+    $hex = array('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F');
     $lines = preg_split('/(?:\r\n|\r|\n)/', $input);
     $eol = "\r\n";
     $escape = '=';
     $output = '';
-    while( list(, $line) = each($lines) ) {
+    while (list(, $line) = each($lines)) {
       $linlen = strlen($line);
       $newline = '';
-      for($i = 0; $i < $linlen; $i++) {
-        $c = substr( $line, $i, 1 );
-        $dec = ord( $c );
-        if ( ( $i == 0 ) && ( $dec == 46 ) ) { // convert first point in the line into =2E
+      for ($i = 0; $i < $linlen; $i++) {
+        $c = substr($line, $i, 1);
+        $dec = ord($c);
+        if (($i == 0) && ($dec == 46)) { // convert first point in the line into =2E
           $c = '=2E';
         }
-        if ( $dec == 32 ) {
-          if ( $i == ( $linlen - 1 ) ) { // convert space at eol only
+        if ($dec == 32) {
+          if ($i == ($linlen - 1)) { // convert space at eol only
             $c = '=20';
-          } else if ( $space_conv ) {
+          } else if ($space_conv) {
             $c = '=20';
           }
-        } elseif ( ($dec == 61) || ($dec < 32 ) || ($dec > 126) ) { // always encode "\t", which is *not* required
-          $h2 = floor($dec/16);
-          $h1 = floor($dec%16);
+        } elseif (($dec == 61) || ($dec < 32) || ($dec > 126)) { // always encode "\t", which is *not* required
+          $h2 = floor($dec / 16);
+          $h1 = floor($dec % 16);
           $c = $escape.$hex[$h2].$hex[$h1];
         }
-        if ( (strlen($newline) + strlen($c)) >= $line_max ) { // CRLF is not counted
+        if ((strlen($newline) + strlen($c)) >= $line_max) { // CRLF is not counted
           $output .= $newline.$escape.$eol; //  soft line break; " =\r\n" is okay
           $newline = '';
           // check if newline first character will be point or not
-          if ( $dec == 46 ) {
+          if ($dec == 46) {
             $c = '=2E';
           }
         }
@@ -1718,7 +1717,7 @@ 
    * @access public
    * @return string
    */
-  public function EncodeQ ($str, $position = 'text') {
+  public function EncodeQ($str, $position = 'text') {
     // There should not be any EOL in the string
     $encoded = preg_replace('/[\r\n]*/', '', $str);
 
@@ -1761,7 +1760,7 @@ 
       2 => basename($filename),
       3 => $encoding,
       4 => $type,
-      5 => true,  // isStringAttachment
+      5 => true, // isStringAttachment
       6 => 'attachment',
       7 => 0
     );
@@ -1782,13 +1781,13 @@ 
    */
   public function AddEmbeddedImage($path, $cid, $name = '', $encoding = 'base64', $type = 'application/octet-stream') {
 
-    if(!@is_file($path)) {
-      $this->SetError($this->Lang('file_access') . $path);
+    if (!@is_file($path)) {
+      $this->SetError($this->Lang('file_access').$path);
       return false;
     }
 
     $filename = basename($path);
-    if($name == '') {
+    if ($name == '') {
       $name = $filename;
     }
 
@@ -1799,7 +1798,7 @@ 
       2 => $name,
       3 => $encoding,
       4 => $type,
-      5 => false,  // isStringAttachment
+      5 => false, // isStringAttachment
       6 => 'inline',
       7 => $cid
     );
@@ -1813,7 +1812,7 @@ 
    * @return bool
    */
   public function InlineImageExists() {
-    foreach($this->attachment as $attachment) {
+    foreach ($this->attachment as $attachment) {
       if ($attachment[6] == 'inline') {
         return true;
       }
@@ -1830,7 +1829,7 @@ 
    * @return void
    */
   public function ClearAddresses() {
-    foreach($this->to as $to) {
+    foreach ($this->to as $to) {
       unset($this->all_recipients[strtolower($to[0])]);
     }
     $this->to = array();
@@ -1841,7 +1840,7 @@ 
    * @return void
    */
   public function ClearCCs() {
-    foreach($this->cc as $cc) {
+    foreach ($this->cc as $cc) {
       unset($this->all_recipients[strtolower($cc[0])]);
     }
     $this->cc = array();
@@ -1852,7 +1851,7 @@ 
    * @return void
    */
   public function ClearBCCs() {
-    foreach($this->bcc as $bcc) {
+    foreach ($this->bcc as $bcc) {
       unset($this->all_recipients[strtolower($bcc[0])]);
     }
     $this->bcc = array();
@@ -1909,7 +1908,7 @@ 
     if ($this->Mailer == 'smtp' and !is_null($this->smtp)) {
       $lasterror = $this->smtp->getError();
       if (!empty($lasterror) and array_key_exists('smtp_msg', $lasterror)) {
-        $msg .= '<p>' . $this->Lang('smtp_error') . $lasterror['smtp_msg'] . "</p>\n";
+        $msg .= '<p>'.$this->Lang('smtp_error').$lasterror['smtp_msg']."</p>\n";
       }
     }
     $this->ErrorInfo = $msg;
@@ -1925,7 +1924,7 @@ 
     $tz = date('Z');
     $tzs = ($tz < 0) ? '-' : '+';
     $tz = abs($tz);
-    $tz = (int)($tz/3600)*100 + ($tz%3600)/60;
+    $tz = (int) ($tz / 3600) * 100 + ($tz % 3600) / 60;
     $result = sprintf("%s %s%04d", date('D, j M Y H:i:s'), $tzs, $tz);
 
     return $result;
@@ -1954,14 +1953,14 @@ 
    * @return string
    */
   private function Lang($key) {
-    if(count($this->language) < 1) {
+    if (count($this->language) < 1) {
       $this->SetLanguage('en'); // set the default language
     }
 
-    if(isset($this->language[$key])) {
+    if (isset($this->language[$key])) {
       return $this->language[$key];
     } else {
-      return 'Language string failed to load: ' . $key;
+      return 'Language string failed to load: '.$key;
     }
   }
 
@@ -2000,21 +1999,21 @@ 
    * @access public
    * @return $message
    */
-  public function MsgHTML($message,$basedir='') {
+  public function MsgHTML($message, $basedir = '') {
     preg_match_all("/(src|background)=\"(.*)\"/Ui", $message, $images);
-    if(isset($images[2])) {
-      foreach($images[2] as $i => $url) {
+    if (isset($images[2])) {
+      foreach ($images[2] as $i => $url) {
         // do not change urls for absolute images (thanks to corvuscorax)
-        if (!preg_match('#^[A-z]+://#',$url)) {
+        if (!preg_match('#^[A-z]+://#', $url)) {
           $filename = basename($url);
           $directory = dirname($url);
-          ($directory == '.')?$directory='':'';
-          $cid = 'cid:' . md5($filename);
+          ($directory == '.') ? $directory = '' : '';
+          $cid = 'cid:'.md5($filename);
           $ext = pathinfo($filename, PATHINFO_EXTENSION);
-          $mimeType  = self::_mime_types($ext);
-          if ( strlen($basedir) > 1 && substr($basedir,-1) != '/') { $basedir .= '/'; }
-          if ( strlen($directory) > 1 && substr($directory,-1) != '/') { $directory .= '/'; }
-          if ( $this->AddEmbeddedImage($basedir.$directory.$filename, md5($filename), $filename, 'base64',$mimeType) ) {
+          $mimeType = self::_mime_types($ext);
+          if (strlen($basedir) > 1 && substr($basedir, -1) != '/') { $basedir .= '/'; }
+          if (strlen($directory) > 1 && substr($directory, -1) != '/') { $directory .= '/'; }
+          if ($this->AddEmbeddedImage($basedir.$directory.$filename, md5($filename), $filename, 'base64', $mimeType)) {
             $message = preg_replace("/".$images[1][$i]."=\"".preg_quote($url, '/')."\"/Ui", $images[1][$i]."=\"".$cid."\"", $message);
           }
         }
@@ -2022,12 +2021,12 @@ 
     }
     $this->IsHTML(true);
     $this->Body = $message;
-    $textMsg = trim(strip_tags(preg_replace('/<(head|title|style|script)[^>]*>.*?<\/\\1>/s','',$message)));
-    if ( !empty($textMsg) && empty($this->AltBody) ) {
+    $textMsg = trim(strip_tags(preg_replace('/<(head|title|style|script)[^>]*>.*?<\/\\1>/s', '', $message)));
+    if (!empty($textMsg) && empty($this->AltBody)) {
       $this->AltBody = html_entity_decode($textMsg);
     }
-    if ( empty($this->AltBody) ) {
-      $this->AltBody = 'To view this email message, open it in a program that understands HTML!' . "\n\n";
+    if (empty($this->AltBody)) {
+      $this->AltBody = 'To view this email message, open it in a program that understands HTML!'."\n\n";
     }
   }
 
@@ -2128,7 +2127,7 @@ 
       'xl'    =>  'application/excel',
       'eml'   =>  'message/rfc822'
     );
-    return ( ! isset($mimes[strtolower($ext)])) ? 'application/octet-stream' : $mimes[strtolower($ext)];
+    return (!isset($mimes[strtolower($ext)])) ? 'application/octet-stream' : $mimes[strtolower($ext)];
   }
 
   /**
@@ -2143,12 +2142,12 @@ 
    * NOTE: will not work with arrays, there are no arrays to set/reset
   * @todo Should this not be using __set() magic function?
    */
-  public function set ( $name, $value = '' ) {
+  public function set($name, $value = '') {
     try {
-    if ( isset($this->$name) ) {
+    if (isset($this->$name)) {
       $this->$name = $value;
     } else {
-        throw new phpmailerException($this->Lang('variable_set') . $name, self::STOP_CRITICAL);
+        throw new phpmailerException($this->Lang('variable_set').$name, self::STOP_CRITICAL);
   }
     } catch (Exception $e) {
       $this->SetError($e->getMessage());
@@ -2192,14 +2191,14 @@ 
    * @param string $key_pass Password for private key
    */
   public function DKIM_QP($txt) {
-    $tmp="";
-    $line="";
-    for ($i=0;$i<strlen($txt);$i++) {
-      $ord=ord($txt[$i]);
-      if ( ((0x21 <= $ord) && ($ord <= 0x3A)) || $ord == 0x3C || ((0x3E <= $ord) && ($ord <= 0x7E)) ) {
-        $line.=$txt[$i];
+    $tmp = "";
+    $line = "";
+    for ($i = 0; $i < strlen($txt); $i++) {
+      $ord = ord($txt[$i]);
+      if (((0x21 <= $ord) && ($ord <= 0x3A)) || $ord == 0x3C || ((0x3E <= $ord) && ($ord <= 0x7E))) {
+        $line .= $txt[$i];
       } else {
-        $line.="=".sprintf("%02X",$ord);
+        $line .= "=".sprintf("%02X", $ord);
       }
     }
     return $line;
@@ -2213,8 +2212,8 @@ 
    */
   public function DKIM_Sign($s) {
     $privKeyStr = file_get_contents($this->DKIM_private);
-    if ($this->DKIM_passphrase!='') {
-      $privKey = openssl_pkey_get_private($privKeyStr,$this->DKIM_passphrase);
+    if ($this->DKIM_passphrase != '') {
+      $privKey = openssl_pkey_get_private($privKeyStr, $this->DKIM_passphrase);
     } else {
       $privKey = $privKeyStr;
     }
@@ -2230,15 +2229,15 @@ 
    * @param string $s Header
    */
   public function DKIM_HeaderC($s) {
-    $s=preg_replace("/\r\n\s+/"," ",$s);
-    $lines=explode("\r\n",$s);
+    $s = preg_replace("/\r\n\s+/", " ", $s);
+    $lines = explode("\r\n", $s);
     foreach ($lines as $key=>$line) {
-      list($heading,$value)=explode(":",$line,2);
-      $heading=strtolower($heading);
-      $value=preg_replace("/\s+/"," ",$value) ; // Compress useless spaces
-      $lines[$key]=$heading.":".trim($value) ; // Don't forget to remove WSP around the value
+      list($heading, $value) = explode(":", $line, 2);
+      $heading = strtolower($heading);
+      $value = preg_replace("/\s+/", " ", $value); // Compress useless spaces
+      $lines[$key] = $heading.":".trim($value); // Don't forget to remove WSP around the value
     }
-    $s=implode("\r\n",$lines);
+    $s = implode("\r\n", $lines);
     return $s;
   }
 
@@ -2251,11 +2250,11 @@ 
   public function DKIM_BodyC($body) {
     if ($body == '') return "\r\n";
     // stabilize line endings
-    $body=str_replace("\r\n","\n",$body);
-    $body=str_replace("\n","\r\n",$body);
+    $body = str_replace("\r\n", "\n", $body);
+    $body = str_replace("\n", "\r\n", $body);
     // END stabilize line endings
-    while (substr($body,strlen($body)-4,4) == "\r\n\r\n") {
-      $body=substr($body,0,strlen($body)-2);
+    while (substr($body, strlen($body) - 4, 4) == "\r\n\r\n") {
+      $body = substr($body, 0, strlen($body) - 2);
     }
     return $body;
   }
@@ -2268,52 +2267,52 @@ 
    * @param string $subject Subject
    * @param string $body Body
    */
-  public function DKIM_Add($headers_line,$subject,$body) {
+  public function DKIM_Add($headers_line, $subject, $body) {
     $DKIMsignatureType    = 'rsa-sha1'; // Signature & hash algorithms
     $DKIMcanonicalization = 'relaxed/simple'; // Canonicalization of header/body
     $DKIMquery            = 'dns/txt'; // Query method
-    $DKIMtime             = time() ; // Signature Timestamp = seconds since 00:00:00 - Jan 1, 1970 (UTC time zone)
+    $DKIMtime             = time(); // Signature Timestamp = seconds since 00:00:00 - Jan 1, 1970 (UTC time zone)
     $subject_header       = "Subject: $subject";
-    $headers              = explode("\r\n",$headers_line);
-    foreach($headers as $header) {
-      if (strpos($header,'From:') === 0) {
-        $from_header=$header;
-      } elseif (strpos($header,'To:') === 0) {
-        $to_header=$header;
+    $headers              = explode("\r\n", $headers_line);
+    foreach ($headers as $header) {
+      if (strpos($header, 'From:') === 0) {
+        $from_header = $header;
+      } elseif (strpos($header, 'To:') === 0) {
+        $to_header = $header;
       }
     }
-    $from     = str_replace('|','=7C',$this->DKIM_QP($from_header));
-    $to       = str_replace('|','=7C',$this->DKIM_QP($to_header));
-    $subject  = str_replace('|','=7C',$this->DKIM_QP($subject_header)) ; // Copied header fields (dkim-quoted-printable
+    $from     = str_replace('|', '=7C', $this->DKIM_QP($from_header));
+    $to       = str_replace('|', '=7C', $this->DKIM_QP($to_header));
+    $subject  = str_replace('|', '=7C', $this->DKIM_QP($subject_header)); // Copied header fields (dkim-quoted-printable
     $body     = $this->DKIM_BodyC($body);
-    $DKIMlen  = strlen($body) ; // Length of body
-    $DKIMb64  = base64_encode(pack("H*", sha1($body))) ; // Base64 of packed binary SHA-1 hash of body
-    $ident    = ($this->DKIM_identity == '')? '' : " i=" . $this->DKIM_identity . ";";
-    $dkimhdrs = "DKIM-Signature: v=1; a=" . $DKIMsignatureType . "; q=" . $DKIMquery . "; l=" . $DKIMlen . "; s=" . $this->DKIM_selector . ";\r\n".
-                "\tt=" . $DKIMtime . "; c=" . $DKIMcanonicalization . ";\r\n".
+    $DKIMlen  = strlen($body); // Length of body
+    $DKIMb64  = base64_encode(pack("H*", sha1($body))); // Base64 of packed binary SHA-1 hash of body
+    $ident    = ($this->DKIM_identity == '') ? '' : " i=".$this->DKIM_identity.";";
+    $dkimhdrs = "DKIM-Signature: v=1; a=".$DKIMsignatureType."; q=".$DKIMquery."; l=".$DKIMlen."; s=".$this->DKIM_selector.";\r\n".
+                "\tt=".$DKIMtime."; c=".$DKIMcanonicalization.";\r\n".
                 "\th=From:To:Subject;\r\n".
-                "\td=" . $this->DKIM_domain . ";" . $ident . "\r\n".
+                "\td=".$this->DKIM_domain.";".$ident."\r\n".
                 "\tz=$from\r\n".
                 "\t|$to\r\n".
                 "\t|$subject;\r\n".
-                "\tbh=" . $DKIMb64 . ";\r\n".
+                "\tbh=".$DKIMb64.";\r\n".
                 "\tb=";
-    $toSign   = $this->DKIM_HeaderC($from_header . "\r\n" . $to_header . "\r\n" . $subject_header . "\r\n" . $dkimhdrs);
+    $toSign   = $this->DKIM_HeaderC($from_header."\r\n".$to_header."\r\n".$subject_header."\r\n".$dkimhdrs);
     $signed   = $this->DKIM_Sign($toSign);
     return "X-PHPMAILER-DKIM: phpmailer.worxware.com\r\n".$dkimhdrs.$signed."\r\n";
   }
 
-  protected function doCallback($isSent,$to,$cc,$bcc,$subject,$body) {
+  protected function doCallback($isSent, $to, $cc, $bcc, $subject, $body) {
     if (!empty($this->action_function) && function_exists($this->action_function)) {
-      $params = array($isSent,$to,$cc,$bcc,$subject,$body);
-      call_user_func_array($this->action_function,$params);
+      $params = array($isSent, $to, $cc, $bcc, $subject, $body);
+      call_user_func_array($this->action_function, $params);
     }
   }
 }
 
 class phpmailerException extends Exception {
   public function errorMessage() {
-    $errorMsg = '<strong>' . $this->getMessage() . "</strong><br />\n";
+    $errorMsg = '<strong>'.$this->getMessage()."</strong><br />\n";
     return $errorMsg;
   }
 }

libs/phpmailer/smtp.php

Doc Comments +7 added lines

@@ -107,6 +107,7 @@ 
    * SMTP CODE SUCCESS: 220
    * SMTP CODE FAILURE: 421
    * @access public
+   * @param string $host
    * @return bool
    */
   public function Connect($host,$port=0,$tval=30) {
@@ -205,6 +206,8 @@ 
    * Performs SMTP authentication.  Must be run after running the
    * Hello() method.  Returns true if successfully authenticated.
    * @access public
+   * @param string $username
+   * @param string $password
    * @return bool
    */
   public function Authenticate($username, $password) {
@@ -321,6 +324,7 @@ 
    * SMTP CODE FAILURE: 451,554
    * SMTP CODE ERROR  : 500,501,503,421
    * @access public
+   * @param string $msg_data
    * @return bool
    */
   public function Data($msg_data) {
@@ -489,6 +493,8 @@ 
   /**
    * Sends a HELO/EHLO command.
    * @access private
+   * @param string $hello
+   * @param string $host
    * @return bool
    */
   private function SendHello($hello, $host) {
@@ -529,6 +535,7 @@ 
    * SMTP CODE SUCCESS: 552,451,452
    * SMTP CODE SUCCESS: 500,501,421
    * @access public
+   * @param string $from
    * @return bool
    */
   public function Mail($from) {

Indentation +470 added lines, -470 removed lines

@@ -85,11 +85,11 @@ 
    * @return void
    */
   public function __construct() {
-    $this->smtp_conn = 0;
-    $this->error = null;
-    $this->helo_rply = null;
+	$this->smtp_conn = 0;
+	$this->error = null;
+	$this->helo_rply = null;
 
-    $this->do_debug = 0;
+	$this->do_debug = 0;
   }
 
   /////////////////////////////////////////////////
@@ -110,50 +110,50 @@ 
    * @return bool
    */
   public function Connect($host,$port=0,$tval=30) {
-    // set the error val to null so there is no confusion
-    $this->error = null;
-
-    // make sure we are __not__ connected
-    if($this->connected()) {
-      // already connected, generate error
-      $this->error = array("error" => "Already connected to a server");
-      return false;
-    }
-
-    if(empty($port)) {
-      $port = $this->SMTP_PORT;
-    }
-
-    // connect to the smtp server
-    $this->smtp_conn = @fsockopen($host,    // the host of the server
-                                 $port,    // the port to use
-                                 $errno,   // error number if any
-                                 $errstr,  // error message if any
-                                 $tval);   // give up after ? secs
-    // verify we connected properly
-    if(empty($this->smtp_conn)) {
-      $this->error = array("error" => "Failed to connect to server",
-                           "errno" => $errno,
-                           "errstr" => $errstr);
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] . ": $errstr ($errno)" . $this->CRLF . '<br />';
-      }
-      return false;
-    }
-
-    // SMTP server can take longer to respond, give longer timeout for first read
-    // Windows does not have support for this timeout function
-    if(substr(PHP_OS, 0, 3) != "WIN")
-     socket_set_timeout($this->smtp_conn, $tval, 0);
-
-    // get any announcement
-    $announce = $this->get_lines();
-
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $announce . $this->CRLF . '<br />';
-    }
-
-    return true;
+	// set the error val to null so there is no confusion
+	$this->error = null;
+
+	// make sure we are __not__ connected
+	if($this->connected()) {
+	  // already connected, generate error
+	  $this->error = array("error" => "Already connected to a server");
+	  return false;
+	}
+
+	if(empty($port)) {
+	  $port = $this->SMTP_PORT;
+	}
+
+	// connect to the smtp server
+	$this->smtp_conn = @fsockopen($host,    // the host of the server
+								 $port,    // the port to use
+								 $errno,   // error number if any
+								 $errstr,  // error message if any
+								 $tval);   // give up after ? secs
+	// verify we connected properly
+	if(empty($this->smtp_conn)) {
+	  $this->error = array("error" => "Failed to connect to server",
+						   "errno" => $errno,
+						   "errstr" => $errstr);
+	  if($this->do_debug >= 1) {
+		echo "SMTP -> ERROR: " . $this->error["error"] . ": $errstr ($errno)" . $this->CRLF . '<br />';
+	  }
+	  return false;
+	}
+
+	// SMTP server can take longer to respond, give longer timeout for first read
+	// Windows does not have support for this timeout function
+	if(substr(PHP_OS, 0, 3) != "WIN")
+	 socket_set_timeout($this->smtp_conn, $tval, 0);
+
+	// get any announcement
+	$announce = $this->get_lines();
+
+	if($this->do_debug >= 2) {
+	  echo "SMTP -> FROM SERVER:" . $announce . $this->CRLF . '<br />';
+	}
+
+	return true;
   }
 
   /**
@@ -166,39 +166,39 @@ 
    * @return bool success
    */
   public function StartTLS() {
-    $this->error = null; # to avoid confusion
-
-    if(!$this->connected()) {
-      $this->error = array("error" => "Called StartTLS() without being connected");
-      return false;
-    }
-
-    fputs($this->smtp_conn,"STARTTLS" . $this->CRLF);
-
-    $rply = $this->get_lines();
-    $code = substr($rply,0,3);
-
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
-    }
-
-    if($code != 220) {
-      $this->error =
-         array("error"     => "STARTTLS not accepted from server",
-               "smtp_code" => $code,
-               "smtp_msg"  => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
-      }
-      return false;
-    }
-
-    //Begin encrypted connection
-    if(!stream_socket_enable_crypto($this->smtp_conn, true, STREAM_CRYPTO_METHOD_TLS_CLIENT)) {
-      return false;
-    }
-
-    return true;
+	$this->error = null; # to avoid confusion
+
+	if(!$this->connected()) {
+	  $this->error = array("error" => "Called StartTLS() without being connected");
+	  return false;
+	}
+
+	fputs($this->smtp_conn,"STARTTLS" . $this->CRLF);
+
+	$rply = $this->get_lines();
+	$code = substr($rply,0,3);
+
+	if($this->do_debug >= 2) {
+	  echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
+	}
+
+	if($code != 220) {
+	  $this->error =
+		 array("error"     => "STARTTLS not accepted from server",
+			   "smtp_code" => $code,
+			   "smtp_msg"  => substr($rply,4));
+	  if($this->do_debug >= 1) {
+		echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
+	  }
+	  return false;
+	}
+
+	//Begin encrypted connection
+	if(!stream_socket_enable_crypto($this->smtp_conn, true, STREAM_CRYPTO_METHOD_TLS_CLIENT)) {
+	  return false;
+	}
+
+	return true;
   }
 
   /**
@@ -208,58 +208,58 @@ 
    * @return bool
    */
   public function Authenticate($username, $password) {
-    // Start authentication
-    fputs($this->smtp_conn,"AUTH LOGIN" . $this->CRLF);
-
-    $rply = $this->get_lines();
-    $code = substr($rply,0,3);
-
-    if($code != 334) {
-      $this->error =
-        array("error" => "AUTH not accepted from server",
-              "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
-      }
-      return false;
-    }
-
-    // Send encoded username
-    fputs($this->smtp_conn, base64_encode($username) . $this->CRLF);
-
-    $rply = $this->get_lines();
-    $code = substr($rply,0,3);
-
-    if($code != 334) {
-      $this->error =
-        array("error" => "Username not accepted from server",
-              "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
-      }
-      return false;
-    }
-
-    // Send encoded password
-    fputs($this->smtp_conn, base64_encode($password) . $this->CRLF);
-
-    $rply = $this->get_lines();
-    $code = substr($rply,0,3);
-
-    if($code != 235) {
-      $this->error =
-        array("error" => "Password not accepted from server",
-              "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
-      }
-      return false;
-    }
-
-    return true;
+	// Start authentication
+	fputs($this->smtp_conn,"AUTH LOGIN" . $this->CRLF);
+
+	$rply = $this->get_lines();
+	$code = substr($rply,0,3);
+
+	if($code != 334) {
+	  $this->error =
+		array("error" => "AUTH not accepted from server",
+			  "smtp_code" => $code,
+			  "smtp_msg" => substr($rply,4));
+	  if($this->do_debug >= 1) {
+		echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
+	  }
+	  return false;
+	}
+
+	// Send encoded username
+	fputs($this->smtp_conn, base64_encode($username) . $this->CRLF);
+
+	$rply = $this->get_lines();
+	$code = substr($rply,0,3);
+
+	if($code != 334) {
+	  $this->error =
+		array("error" => "Username not accepted from server",
+			  "smtp_code" => $code,
+			  "smtp_msg" => substr($rply,4));
+	  if($this->do_debug >= 1) {
+		echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
+	  }
+	  return false;
+	}
+
+	// Send encoded password
+	fputs($this->smtp_conn, base64_encode($password) . $this->CRLF);
+
+	$rply = $this->get_lines();
+	$code = substr($rply,0,3);
+
+	if($code != 235) {
+	  $this->error =
+		array("error" => "Password not accepted from server",
+			  "smtp_code" => $code,
+			  "smtp_msg" => substr($rply,4));
+	  if($this->do_debug >= 1) {
+		echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
+	  }
+	  return false;
+	}
+
+	return true;
   }
 
   /**
@@ -268,19 +268,19 @@ 
    * @return bool
    */
   public function Connected() {
-    if(!empty($this->smtp_conn)) {
-      $sock_status = socket_get_status($this->smtp_conn);
-      if($sock_status["eof"]) {
-        // the socket is valid but we are not connected
-        if($this->do_debug >= 1) {
-            echo "SMTP -> NOTICE:" . $this->CRLF . "EOF caught while checking if connected";
-        }
-        $this->Close();
-        return false;
-      }
-      return true; // everything looks good
-    }
-    return false;
+	if(!empty($this->smtp_conn)) {
+	  $sock_status = socket_get_status($this->smtp_conn);
+	  if($sock_status["eof"]) {
+		// the socket is valid but we are not connected
+		if($this->do_debug >= 1) {
+			echo "SMTP -> NOTICE:" . $this->CRLF . "EOF caught while checking if connected";
+		}
+		$this->Close();
+		return false;
+	  }
+	  return true; // everything looks good
+	}
+	return false;
   }
 
   /**
@@ -291,13 +291,13 @@ 
    * @return void
    */
   public function Close() {
-    $this->error = null; // so there is no confusion
-    $this->helo_rply = null;
-    if(!empty($this->smtp_conn)) {
-      // close the connection and cleanup
-      fclose($this->smtp_conn);
-      $this->smtp_conn = 0;
-    }
+	$this->error = null; // so there is no confusion
+	$this->helo_rply = null;
+	if(!empty($this->smtp_conn)) {
+	  // close the connection and cleanup
+	  fclose($this->smtp_conn);
+	  $this->smtp_conn = 0;
+	}
   }
 
   /////////////////////////////////////////////////
@@ -324,35 +324,35 @@ 
    * @return bool
    */
   public function Data($msg_data) {
-    $this->error = null; // so no confusion is caused
-
-    if(!$this->connected()) {
-      $this->error = array(
-              "error" => "Called Data() without being connected");
-      return false;
-    }
-
-    fputs($this->smtp_conn,"DATA" . $this->CRLF);
-
-    $rply = $this->get_lines();
-    $code = substr($rply,0,3);
-
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
-    }
-
-    if($code != 354) {
-      $this->error =
-        array("error" => "DATA command not accepted from server",
-              "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
-      }
-      return false;
-    }
-
-    /* the server is ready to accept data!
+	$this->error = null; // so no confusion is caused
+
+	if(!$this->connected()) {
+	  $this->error = array(
+			  "error" => "Called Data() without being connected");
+	  return false;
+	}
+
+	fputs($this->smtp_conn,"DATA" . $this->CRLF);
+
+	$rply = $this->get_lines();
+	$code = substr($rply,0,3);
+
+	if($this->do_debug >= 2) {
+	  echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
+	}
+
+	if($code != 354) {
+	  $this->error =
+		array("error" => "DATA command not accepted from server",
+			  "smtp_code" => $code,
+			  "smtp_msg" => substr($rply,4));
+	  if($this->do_debug >= 1) {
+		echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
+	  }
+	  return false;
+	}
+
+	/* the server is ready to accept data!
      * according to rfc 821 we should not send more than 1000
      * including the CRLF
      * characters on a single line so we will break the data up
@@ -363,12 +363,12 @@ 
      * line. NOTE: this does not count towards limit.
      */
 
-    // normalize the line breaks so we know the explode works
-    $msg_data = str_replace("\r\n","\n",$msg_data);
-    $msg_data = str_replace("\r","\n",$msg_data);
-    $lines = explode("\n",$msg_data);
+	// normalize the line breaks so we know the explode works
+	$msg_data = str_replace("\r\n","\n",$msg_data);
+	$msg_data = str_replace("\r","\n",$msg_data);
+	$lines = explode("\n",$msg_data);
 
-    /* we need to find a good way to determine is headers are
+	/* we need to find a good way to determine is headers are
      * in the msg_data or if it is a straight msg body
      * currently I am assuming rfc 822 definitions of msg headers
      * and if the first field of the first line (':' sperated)
@@ -377,76 +377,76 @@ 
      * headers.
      */
 
-    $field = substr($lines[0],0,strpos($lines[0],":"));
-    $in_headers = false;
-    if(!empty($field) && !strstr($field," ")) {
-      $in_headers = true;
-    }
-
-    $max_line_length = 998; // used below; set here for ease in change
-
-    while(list(,$line) = @each($lines)) {
-      $lines_out = null;
-      if($line == "" && $in_headers) {
-        $in_headers = false;
-      }
-      // ok we need to break this line up into several smaller lines
-      while(strlen($line) > $max_line_length) {
-        $pos = strrpos(substr($line,0,$max_line_length)," ");
-
-        // Patch to fix DOS attack
-        if(!$pos) {
-          $pos = $max_line_length - 1;
-          $lines_out[] = substr($line,0,$pos);
-          $line = substr($line,$pos);
-        } else {
-          $lines_out[] = substr($line,0,$pos);
-          $line = substr($line,$pos + 1);
-        }
-
-        /* if we are processing headers we need to
+	$field = substr($lines[0],0,strpos($lines[0],":"));
+	$in_headers = false;
+	if(!empty($field) && !strstr($field," ")) {
+	  $in_headers = true;
+	}
+
+	$max_line_length = 998; // used below; set here for ease in change
+
+	while(list(,$line) = @each($lines)) {
+	  $lines_out = null;
+	  if($line == "" && $in_headers) {
+		$in_headers = false;
+	  }
+	  // ok we need to break this line up into several smaller lines
+	  while(strlen($line) > $max_line_length) {
+		$pos = strrpos(substr($line,0,$max_line_length)," ");
+
+		// Patch to fix DOS attack
+		if(!$pos) {
+		  $pos = $max_line_length - 1;
+		  $lines_out[] = substr($line,0,$pos);
+		  $line = substr($line,$pos);
+		} else {
+		  $lines_out[] = substr($line,0,$pos);
+		  $line = substr($line,$pos + 1);
+		}
+
+		/* if we are processing headers we need to
          * add a LWSP-char to the front of the new line
          * rfc 822 on long msg headers
          */
-        if($in_headers) {
-          $line = "\t" . $line;
-        }
-      }
-      $lines_out[] = $line;
-
-      // send the lines to the server
-      while(list(,$line_out) = @each($lines_out)) {
-        if(strlen($line_out) > 0)
-        {
-          if(substr($line_out, 0, 1) == ".") {
-            $line_out = "." . $line_out;
-          }
-        }
-        fputs($this->smtp_conn,$line_out . $this->CRLF);
-      }
-    }
-
-    // message data has been sent
-    fputs($this->smtp_conn, $this->CRLF . "." . $this->CRLF);
-
-    $rply = $this->get_lines();
-    $code = substr($rply,0,3);
-
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
-    }
-
-    if($code != 250) {
-      $this->error =
-        array("error" => "DATA not accepted from server",
-              "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
-      }
-      return false;
-    }
-    return true;
+		if($in_headers) {
+		  $line = "\t" . $line;
+		}
+	  }
+	  $lines_out[] = $line;
+
+	  // send the lines to the server
+	  while(list(,$line_out) = @each($lines_out)) {
+		if(strlen($line_out) > 0)
+		{
+		  if(substr($line_out, 0, 1) == ".") {
+			$line_out = "." . $line_out;
+		  }
+		}
+		fputs($this->smtp_conn,$line_out . $this->CRLF);
+	  }
+	}
+
+	// message data has been sent
+	fputs($this->smtp_conn, $this->CRLF . "." . $this->CRLF);
+
+	$rply = $this->get_lines();
+	$code = substr($rply,0,3);
+
+	if($this->do_debug >= 2) {
+	  echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
+	}
+
+	if($code != 250) {
+	  $this->error =
+		array("error" => "DATA not accepted from server",
+			  "smtp_code" => $code,
+			  "smtp_msg" => substr($rply,4));
+	  if($this->do_debug >= 1) {
+		echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
+	  }
+	  return false;
+	}
+	return true;
   }
 
   /**
@@ -462,28 +462,28 @@ 
    * @return bool
    */
   public function Hello($host = '') {
-    $this->error = null; // so no confusion is caused
-
-    if(!$this->connected()) {
-      $this->error = array(
-            "error" => "Called Hello() without being connected");
-      return false;
-    }
-
-    // if hostname for HELO was not specified send default
-    if(empty($host)) {
-      // determine appropriate default to send to server
-      $host = "localhost";
-    }
-
-    // Send extended hello first (RFC 2821)
-    if(!$this->SendHello("EHLO", $host)) {
-      if(!$this->SendHello("HELO", $host)) {
-          return false;
-    }
-    }
-
-    return true;
+	$this->error = null; // so no confusion is caused
+
+	if(!$this->connected()) {
+	  $this->error = array(
+			"error" => "Called Hello() without being connected");
+	  return false;
+	}
+
+	// if hostname for HELO was not specified send default
+	if(empty($host)) {
+	  // determine appropriate default to send to server
+	  $host = "localhost";
+	}
+
+	// Send extended hello first (RFC 2821)
+	if(!$this->SendHello("EHLO", $host)) {
+	  if(!$this->SendHello("HELO", $host)) {
+		  return false;
+	}
+	}
+
+	return true;
   }
 
   /**
@@ -492,29 +492,29 @@ 
    * @return bool
    */
   private function SendHello($hello, $host) {
-    fputs($this->smtp_conn, $hello . " " . $host . $this->CRLF);
+	fputs($this->smtp_conn, $hello . " " . $host . $this->CRLF);
 
-    $rply = $this->get_lines();
-    $code = substr($rply,0,3);
+	$rply = $this->get_lines();
+	$code = substr($rply,0,3);
 
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER: " . $rply . $this->CRLF . '<br />';
-    }
+	if($this->do_debug >= 2) {
+	  echo "SMTP -> FROM SERVER: " . $rply . $this->CRLF . '<br />';
+	}
 
-    if($code != 250) {
-      $this->error =
-        array("error" => $hello . " not accepted from server",
-              "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
-      }
-      return false;
-    }
+	if($code != 250) {
+	  $this->error =
+		array("error" => $hello . " not accepted from server",
+			  "smtp_code" => $code,
+			  "smtp_msg" => substr($rply,4));
+	  if($this->do_debug >= 1) {
+		echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
+	  }
+	  return false;
+	}
 
-    $this->helo_rply = $rply;
+	$this->helo_rply = $rply;
 
-    return true;
+	return true;
   }
 
   /**
@@ -532,35 +532,35 @@ 
    * @return bool
    */
   public function Mail($from) {
-    $this->error = null; // so no confusion is caused
-
-    if(!$this->connected()) {
-      $this->error = array(
-              "error" => "Called Mail() without being connected");
-      return false;
-    }
-
-    $useVerp = ($this->do_verp ? "XVERP" : "");
-    fputs($this->smtp_conn,"MAIL FROM:<" . $from . ">" . $useVerp . $this->CRLF);
-
-    $rply = $this->get_lines();
-    $code = substr($rply,0,3);
-
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
-    }
-
-    if($code != 250) {
-      $this->error =
-        array("error" => "MAIL not accepted from server",
-              "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
-      }
-      return false;
-    }
-    return true;
+	$this->error = null; // so no confusion is caused
+
+	if(!$this->connected()) {
+	  $this->error = array(
+			  "error" => "Called Mail() without being connected");
+	  return false;
+	}
+
+	$useVerp = ($this->do_verp ? "XVERP" : "");
+	fputs($this->smtp_conn,"MAIL FROM:<" . $from . ">" . $useVerp . $this->CRLF);
+
+	$rply = $this->get_lines();
+	$code = substr($rply,0,3);
+
+	if($this->do_debug >= 2) {
+	  echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
+	}
+
+	if($code != 250) {
+	  $this->error =
+		array("error" => "MAIL not accepted from server",
+			  "smtp_code" => $code,
+			  "smtp_msg" => substr($rply,4));
+	  if($this->do_debug >= 1) {
+		echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
+	  }
+	  return false;
+	}
+	return true;
   }
 
   /**
@@ -575,44 +575,44 @@ 
    * @return bool
    */
   public function Quit($close_on_error=true) {
-    $this->error = null; // so there is no confusion
-
-    if(!$this->connected()) {
-      $this->error = array(
-              "error" => "Called Quit() without being connected");
-      return false;
-    }
-
-    // send the quit command to the server
-    fputs($this->smtp_conn,"quit" . $this->CRLF);
-
-    // get any good-bye messages
-    $byemsg = $this->get_lines();
-
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $byemsg . $this->CRLF . '<br />';
-    }
-
-    $rval = true;
-    $e = null;
-
-    $code = substr($byemsg,0,3);
-    if($code != 221) {
-      // use e as a tmp var cause Close will overwrite $this->error
-      $e = array("error" => "SMTP server rejected quit command",
-                 "smtp_code" => $code,
-                 "smtp_rply" => substr($byemsg,4));
-      $rval = false;
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $e["error"] . ": " . $byemsg . $this->CRLF . '<br />';
-      }
-    }
-
-    if(empty($e) || $close_on_error) {
-      $this->Close();
-    }
-
-    return $rval;
+	$this->error = null; // so there is no confusion
+
+	if(!$this->connected()) {
+	  $this->error = array(
+			  "error" => "Called Quit() without being connected");
+	  return false;
+	}
+
+	// send the quit command to the server
+	fputs($this->smtp_conn,"quit" . $this->CRLF);
+
+	// get any good-bye messages
+	$byemsg = $this->get_lines();
+
+	if($this->do_debug >= 2) {
+	  echo "SMTP -> FROM SERVER:" . $byemsg . $this->CRLF . '<br />';
+	}
+
+	$rval = true;
+	$e = null;
+
+	$code = substr($byemsg,0,3);
+	if($code != 221) {
+	  // use e as a tmp var cause Close will overwrite $this->error
+	  $e = array("error" => "SMTP server rejected quit command",
+				 "smtp_code" => $code,
+				 "smtp_rply" => substr($byemsg,4));
+	  $rval = false;
+	  if($this->do_debug >= 1) {
+		echo "SMTP -> ERROR: " . $e["error"] . ": " . $byemsg . $this->CRLF . '<br />';
+	  }
+	}
+
+	if(empty($e) || $close_on_error) {
+	  $this->Close();
+	}
+
+	return $rval;
   }
 
   /**
@@ -628,34 +628,34 @@ 
    * @return bool
    */
   public function Recipient($to) {
-    $this->error = null; // so no confusion is caused
-
-    if(!$this->connected()) {
-      $this->error = array(
-              "error" => "Called Recipient() without being connected");
-      return false;
-    }
-
-    fputs($this->smtp_conn,"RCPT TO:<" . $to . ">" . $this->CRLF);
-
-    $rply = $this->get_lines();
-    $code = substr($rply,0,3);
-
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
-    }
-
-    if($code != 250 && $code != 251) {
-      $this->error =
-        array("error" => "RCPT not accepted from server",
-              "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
-      }
-      return false;
-    }
-    return true;
+	$this->error = null; // so no confusion is caused
+
+	if(!$this->connected()) {
+	  $this->error = array(
+			  "error" => "Called Recipient() without being connected");
+	  return false;
+	}
+
+	fputs($this->smtp_conn,"RCPT TO:<" . $to . ">" . $this->CRLF);
+
+	$rply = $this->get_lines();
+	$code = substr($rply,0,3);
+
+	if($this->do_debug >= 2) {
+	  echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
+	}
+
+	if($code != 250 && $code != 251) {
+	  $this->error =
+		array("error" => "RCPT not accepted from server",
+			  "smtp_code" => $code,
+			  "smtp_msg" => substr($rply,4));
+	  if($this->do_debug >= 1) {
+		echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
+	  }
+	  return false;
+	}
+	return true;
   }
 
   /**
@@ -671,35 +671,35 @@ 
    * @return bool
    */
   public function Reset() {
-    $this->error = null; // so no confusion is caused
-
-    if(!$this->connected()) {
-      $this->error = array(
-              "error" => "Called Reset() without being connected");
-      return false;
-    }
-
-    fputs($this->smtp_conn,"RSET" . $this->CRLF);
-
-    $rply = $this->get_lines();
-    $code = substr($rply,0,3);
-
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
-    }
-
-    if($code != 250) {
-      $this->error =
-        array("error" => "RSET failed",
-              "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
-      }
-      return false;
-    }
-
-    return true;
+	$this->error = null; // so no confusion is caused
+
+	if(!$this->connected()) {
+	  $this->error = array(
+			  "error" => "Called Reset() without being connected");
+	  return false;
+	}
+
+	fputs($this->smtp_conn,"RSET" . $this->CRLF);
+
+	$rply = $this->get_lines();
+	$code = substr($rply,0,3);
+
+	if($this->do_debug >= 2) {
+	  echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
+	}
+
+	if($code != 250) {
+	  $this->error =
+		array("error" => "RSET failed",
+			  "smtp_code" => $code,
+			  "smtp_msg" => substr($rply,4));
+	  if($this->do_debug >= 1) {
+		echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
+	  }
+	  return false;
+	}
+
+	return true;
   }
 
   /**
@@ -719,34 +719,34 @@ 
    * @return bool
    */
   public function SendAndMail($from) {
-    $this->error = null; // so no confusion is caused
-
-    if(!$this->connected()) {
-      $this->error = array(
-          "error" => "Called SendAndMail() without being connected");
-      return false;
-    }
-
-    fputs($this->smtp_conn,"SAML FROM:" . $from . $this->CRLF);
-
-    $rply = $this->get_lines();
-    $code = substr($rply,0,3);
-
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
-    }
-
-    if($code != 250) {
-      $this->error =
-        array("error" => "SAML not accepted from server",
-              "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
-      }
-      return false;
-    }
-    return true;
+	$this->error = null; // so no confusion is caused
+
+	if(!$this->connected()) {
+	  $this->error = array(
+		  "error" => "Called SendAndMail() without being connected");
+	  return false;
+	}
+
+	fputs($this->smtp_conn,"SAML FROM:" . $from . $this->CRLF);
+
+	$rply = $this->get_lines();
+	$code = substr($rply,0,3);
+
+	if($this->do_debug >= 2) {
+	  echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
+	}
+
+	if($code != 250) {
+	  $this->error =
+		array("error" => "SAML not accepted from server",
+			  "smtp_code" => $code,
+			  "smtp_msg" => substr($rply,4));
+	  if($this->do_debug >= 1) {
+		echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
+	  }
+	  return false;
+	}
+	return true;
   }
 
   /**
@@ -763,22 +763,22 @@ 
    * @return bool
    */
   public function Turn() {
-    $this->error = array("error" => "This method, TURN, of the SMTP ".
-                                    "is not implemented");
-    if($this->do_debug >= 1) {
-      echo "SMTP -> NOTICE: " . $this->error["error"] . $this->CRLF . '<br />';
-    }
-    return false;
+	$this->error = array("error" => "This method, TURN, of the SMTP ".
+									"is not implemented");
+	if($this->do_debug >= 1) {
+	  echo "SMTP -> NOTICE: " . $this->error["error"] . $this->CRLF . '<br />';
+	}
+	return false;
   }
 
   /**
-  * Get the current error
+   * Get the current error
    * @access public
-  * @return array
+   * @return array
    */
   public function getError() {
-    return $this->error;
-    }
+	return $this->error;
+	}
 
   /////////////////////////////////////////////////
   // INTERNAL FUNCTIONS
@@ -794,20 +794,20 @@ 
    * @return string
    */
   private function get_lines() {
-    $data = "";
-    while($str = @fgets($this->smtp_conn,515)) {
-      if($this->do_debug >= 4) {
-        echo "SMTP -> get_lines(): \$data was \"$data\"" . $this->CRLF . '<br />';
-        echo "SMTP -> get_lines(): \$str is \"$str\"" . $this->CRLF . '<br />';
-      }
-      $data .= $str;
-      if($this->do_debug >= 4) {
-        echo "SMTP -> get_lines(): \$data is \"$data\"" . $this->CRLF . '<br />';
-      }
-      // if 4th character is a space, we are done reading, break the loop
-      if(substr($str,3,1) == " ") { break; }
-    }
-    return $data;
+	$data = "";
+	while($str = @fgets($this->smtp_conn,515)) {
+	  if($this->do_debug >= 4) {
+		echo "SMTP -> get_lines(): \$data was \"$data\"" . $this->CRLF . '<br />';
+		echo "SMTP -> get_lines(): \$str is \"$str\"" . $this->CRLF . '<br />';
+	  }
+	  $data .= $str;
+	  if($this->do_debug >= 4) {
+		echo "SMTP -> get_lines(): \$data is \"$data\"" . $this->CRLF . '<br />';
+	  }
+	  // if 4th character is a space, we are done reading, break the loop
+	  if(substr($str,3,1) == " ") { break; }
+	}
+	return $data;
   }
 
 }

Braces +3 added lines, -2 removed lines

@@ -143,8 +143,9 @@
 
     // SMTP server can take longer to respond, give longer timeout for first read
     // Windows does not have support for this timeout function
-    if(substr(PHP_OS, 0, 3) != "WIN")
-     socket_set_timeout($this->smtp_conn, $tval, 0);
+    if(substr(PHP_OS, 0, 3) != "WIN") {
+         socket_set_timeout($this->smtp_conn, $tval, 0);
+    }
 
     // get any announcement
     $announce = $this->get_lines();

Spacing +158 added lines, -158 removed lines

@@ -63,7 +63,7 @@ 
    *  Sets whether debugging is turned on
    *  @var bool
    */
-  public $do_debug;       // the level of debug to perform
+  public $do_debug; // the level of debug to perform
 
   /**
    *  Sets VERP use on/off (default is off)
@@ -75,9 +75,9 @@ 
   // PROPERTIES, PRIVATE AND PROTECTED
   /////////////////////////////////////////////////
 
-  private $smtp_conn;      // the socket to the server
-  private $error;          // error if any on the last call
-  private $helo_rply;      // the reply the server sent to us for HELO
+  private $smtp_conn; // the socket to the server
+  private $error; // error if any on the last call
+  private $helo_rply; // the reply the server sent to us for HELO
 
   /**
    * Initialize the class so that the data is in a known state.
@@ -109,48 +109,48 @@ 
    * @access public
    * @return bool
    */
-  public function Connect($host,$port=0,$tval=30) {
+  public function Connect($host, $port = 0, $tval = 30) {
     // set the error val to null so there is no confusion
     $this->error = null;
 
     // make sure we are __not__ connected
-    if($this->connected()) {
+    if ($this->connected()) {
       // already connected, generate error
       $this->error = array("error" => "Already connected to a server");
       return false;
     }
 
-    if(empty($port)) {
+    if (empty($port)) {
       $port = $this->SMTP_PORT;
     }
 
     // connect to the smtp server
-    $this->smtp_conn = @fsockopen($host,    // the host of the server
-                                 $port,    // the port to use
-                                 $errno,   // error number if any
-                                 $errstr,  // error message if any
-                                 $tval);   // give up after ? secs
+    $this->smtp_conn = @fsockopen($host, // the host of the server
+                                 $port, // the port to use
+                                 $errno, // error number if any
+                                 $errstr, // error message if any
+                                 $tval); // give up after ? secs
     // verify we connected properly
-    if(empty($this->smtp_conn)) {
+    if (empty($this->smtp_conn)) {
       $this->error = array("error" => "Failed to connect to server",
                            "errno" => $errno,
                            "errstr" => $errstr);
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] . ": $errstr ($errno)" . $this->CRLF . '<br />';
+      if ($this->do_debug >= 1) {
+        echo "SMTP -> ERROR: ".$this->error["error"].": $errstr ($errno)".$this->CRLF.'<br />';
       }
       return false;
     }
 
     // SMTP server can take longer to respond, give longer timeout for first read
     // Windows does not have support for this timeout function
-    if(substr(PHP_OS, 0, 3) != "WIN")
+    if (substr(PHP_OS, 0, 3) != "WIN")
      socket_set_timeout($this->smtp_conn, $tval, 0);
 
     // get any announcement
     $announce = $this->get_lines();
 
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $announce . $this->CRLF . '<br />';
+    if ($this->do_debug >= 2) {
+      echo "SMTP -> FROM SERVER:".$announce.$this->CRLF.'<br />';
     }
 
     return true;
@@ -168,33 +168,33 @@ 
   public function StartTLS() {
     $this->error = null; # to avoid confusion
 
-    if(!$this->connected()) {
+    if (!$this->connected()) {
       $this->error = array("error" => "Called StartTLS() without being connected");
       return false;
     }
 
-    fputs($this->smtp_conn,"STARTTLS" . $this->CRLF);
+    fputs($this->smtp_conn, "STARTTLS".$this->CRLF);
 
     $rply = $this->get_lines();
-    $code = substr($rply,0,3);
+    $code = substr($rply, 0, 3);
 
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
+    if ($this->do_debug >= 2) {
+      echo "SMTP -> FROM SERVER:".$rply.$this->CRLF.'<br />';
     }
 
-    if($code != 220) {
+    if ($code != 220) {
       $this->error =
          array("error"     => "STARTTLS not accepted from server",
                "smtp_code" => $code,
-               "smtp_msg"  => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
+               "smtp_msg"  => substr($rply, 4));
+      if ($this->do_debug >= 1) {
+        echo "SMTP -> ERROR: ".$this->error["error"].": ".$rply.$this->CRLF.'<br />';
       }
       return false;
     }
 
     //Begin encrypted connection
-    if(!stream_socket_enable_crypto($this->smtp_conn, true, STREAM_CRYPTO_METHOD_TLS_CLIENT)) {
+    if (!stream_socket_enable_crypto($this->smtp_conn, true, STREAM_CRYPTO_METHOD_TLS_CLIENT)) {
       return false;
     }
 
@@ -209,52 +209,52 @@ 
    */
   public function Authenticate($username, $password) {
     // Start authentication
-    fputs($this->smtp_conn,"AUTH LOGIN" . $this->CRLF);
+    fputs($this->smtp_conn, "AUTH LOGIN".$this->CRLF);
 
     $rply = $this->get_lines();
-    $code = substr($rply,0,3);
+    $code = substr($rply, 0, 3);
 
-    if($code != 334) {
+    if ($code != 334) {
       $this->error =
         array("error" => "AUTH not accepted from server",
               "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
+              "smtp_msg" => substr($rply, 4));
+      if ($this->do_debug >= 1) {
+        echo "SMTP -> ERROR: ".$this->error["error"].": ".$rply.$this->CRLF.'<br />';
       }
       return false;
     }
 
     // Send encoded username
-    fputs($this->smtp_conn, base64_encode($username) . $this->CRLF);
+    fputs($this->smtp_conn, base64_encode($username).$this->CRLF);
 
     $rply = $this->get_lines();
-    $code = substr($rply,0,3);
+    $code = substr($rply, 0, 3);
 
-    if($code != 334) {
+    if ($code != 334) {
       $this->error =
         array("error" => "Username not accepted from server",
               "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
+              "smtp_msg" => substr($rply, 4));
+      if ($this->do_debug >= 1) {
+        echo "SMTP -> ERROR: ".$this->error["error"].": ".$rply.$this->CRLF.'<br />';
       }
       return false;
     }
 
     // Send encoded password
-    fputs($this->smtp_conn, base64_encode($password) . $this->CRLF);
+    fputs($this->smtp_conn, base64_encode($password).$this->CRLF);
 
     $rply = $this->get_lines();
-    $code = substr($rply,0,3);
+    $code = substr($rply, 0, 3);
 
-    if($code != 235) {
+    if ($code != 235) {
       $this->error =
         array("error" => "Password not accepted from server",
               "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
+              "smtp_msg" => substr($rply, 4));
+      if ($this->do_debug >= 1) {
+        echo "SMTP -> ERROR: ".$this->error["error"].": ".$rply.$this->CRLF.'<br />';
       }
       return false;
     }
@@ -268,12 +268,12 @@ 
    * @return bool
    */
   public function Connected() {
-    if(!empty($this->smtp_conn)) {
+    if (!empty($this->smtp_conn)) {
       $sock_status = socket_get_status($this->smtp_conn);
-      if($sock_status["eof"]) {
+      if ($sock_status["eof"]) {
         // the socket is valid but we are not connected
-        if($this->do_debug >= 1) {
-            echo "SMTP -> NOTICE:" . $this->CRLF . "EOF caught while checking if connected";
+        if ($this->do_debug >= 1) {
+            echo "SMTP -> NOTICE:".$this->CRLF."EOF caught while checking if connected";
         }
         $this->Close();
         return false;
@@ -293,7 +293,7 @@ 
   public function Close() {
     $this->error = null; // so there is no confusion
     $this->helo_rply = null;
-    if(!empty($this->smtp_conn)) {
+    if (!empty($this->smtp_conn)) {
       // close the connection and cleanup
       fclose($this->smtp_conn);
       $this->smtp_conn = 0;
@@ -326,28 +326,28 @@ 
   public function Data($msg_data) {
     $this->error = null; // so no confusion is caused
 
-    if(!$this->connected()) {
+    if (!$this->connected()) {
       $this->error = array(
               "error" => "Called Data() without being connected");
       return false;
     }
 
-    fputs($this->smtp_conn,"DATA" . $this->CRLF);
+    fputs($this->smtp_conn, "DATA".$this->CRLF);
 
     $rply = $this->get_lines();
-    $code = substr($rply,0,3);
+    $code = substr($rply, 0, 3);
 
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
+    if ($this->do_debug >= 2) {
+      echo "SMTP -> FROM SERVER:".$rply.$this->CRLF.'<br />';
     }
 
-    if($code != 354) {
+    if ($code != 354) {
       $this->error =
         array("error" => "DATA command not accepted from server",
               "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
+              "smtp_msg" => substr($rply, 4));
+      if ($this->do_debug >= 1) {
+        echo "SMTP -> ERROR: ".$this->error["error"].": ".$rply.$this->CRLF.'<br />';
       }
       return false;
     }
@@ -364,9 +364,9 @@ 
      */
 
     // normalize the line breaks so we know the explode works
-    $msg_data = str_replace("\r\n","\n",$msg_data);
-    $msg_data = str_replace("\r","\n",$msg_data);
-    $lines = explode("\n",$msg_data);
+    $msg_data = str_replace("\r\n", "\n", $msg_data);
+    $msg_data = str_replace("\r", "\n", $msg_data);
+    $lines = explode("\n", $msg_data);
 
     /* we need to find a good way to determine is headers are
      * in the msg_data or if it is a straight msg body
@@ -377,72 +377,72 @@ 
      * headers.
      */
 
-    $field = substr($lines[0],0,strpos($lines[0],":"));
+    $field = substr($lines[0], 0, strpos($lines[0], ":"));
     $in_headers = false;
-    if(!empty($field) && !strstr($field," ")) {
+    if (!empty($field) && !strstr($field, " ")) {
       $in_headers = true;
     }
 
     $max_line_length = 998; // used below; set here for ease in change
 
-    while(list(,$line) = @each($lines)) {
+    while (list(,$line) = @each($lines)) {
       $lines_out = null;
-      if($line == "" && $in_headers) {
+      if ($line == "" && $in_headers) {
         $in_headers = false;
       }
       // ok we need to break this line up into several smaller lines
-      while(strlen($line) > $max_line_length) {
-        $pos = strrpos(substr($line,0,$max_line_length)," ");
+      while (strlen($line) > $max_line_length) {
+        $pos = strrpos(substr($line, 0, $max_line_length), " ");
 
         // Patch to fix DOS attack
-        if(!$pos) {
+        if (!$pos) {
           $pos = $max_line_length - 1;
-          $lines_out[] = substr($line,0,$pos);
-          $line = substr($line,$pos);
+          $lines_out[] = substr($line, 0, $pos);
+          $line = substr($line, $pos);
         } else {
-          $lines_out[] = substr($line,0,$pos);
-          $line = substr($line,$pos + 1);
+          $lines_out[] = substr($line, 0, $pos);
+          $line = substr($line, $pos + 1);
         }
 
         /* if we are processing headers we need to
          * add a LWSP-char to the front of the new line
          * rfc 822 on long msg headers
          */
-        if($in_headers) {
-          $line = "\t" . $line;
+        if ($in_headers) {
+          $line = "\t".$line;
         }
       }
       $lines_out[] = $line;
 
       // send the lines to the server
-      while(list(,$line_out) = @each($lines_out)) {
-        if(strlen($line_out) > 0)
+      while (list(,$line_out) = @each($lines_out)) {
+        if (strlen($line_out) > 0)
         {
-          if(substr($line_out, 0, 1) == ".") {
-            $line_out = "." . $line_out;
+          if (substr($line_out, 0, 1) == ".") {
+            $line_out = ".".$line_out;
           }
         }
-        fputs($this->smtp_conn,$line_out . $this->CRLF);
+        fputs($this->smtp_conn, $line_out.$this->CRLF);
       }
     }
 
     // message data has been sent
-    fputs($this->smtp_conn, $this->CRLF . "." . $this->CRLF);
+    fputs($this->smtp_conn, $this->CRLF.".".$this->CRLF);
 
     $rply = $this->get_lines();
-    $code = substr($rply,0,3);
+    $code = substr($rply, 0, 3);
 
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
+    if ($this->do_debug >= 2) {
+      echo "SMTP -> FROM SERVER:".$rply.$this->CRLF.'<br />';
     }
 
-    if($code != 250) {
+    if ($code != 250) {
       $this->error =
         array("error" => "DATA not accepted from server",
               "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
+              "smtp_msg" => substr($rply, 4));
+      if ($this->do_debug >= 1) {
+        echo "SMTP -> ERROR: ".$this->error["error"].": ".$rply.$this->CRLF.'<br />';
       }
       return false;
     }
@@ -464,21 +464,21 @@ 
   public function Hello($host = '') {
     $this->error = null; // so no confusion is caused
 
-    if(!$this->connected()) {
+    if (!$this->connected()) {
       $this->error = array(
             "error" => "Called Hello() without being connected");
       return false;
     }
 
     // if hostname for HELO was not specified send default
-    if(empty($host)) {
+    if (empty($host)) {
       // determine appropriate default to send to server
       $host = "localhost";
     }
 
     // Send extended hello first (RFC 2821)
-    if(!$this->SendHello("EHLO", $host)) {
-      if(!$this->SendHello("HELO", $host)) {
+    if (!$this->SendHello("EHLO", $host)) {
+      if (!$this->SendHello("HELO", $host)) {
           return false;
     }
     }
@@ -492,22 +492,22 @@ 
    * @return bool
    */
   private function SendHello($hello, $host) {
-    fputs($this->smtp_conn, $hello . " " . $host . $this->CRLF);
+    fputs($this->smtp_conn, $hello." ".$host.$this->CRLF);
 
     $rply = $this->get_lines();
-    $code = substr($rply,0,3);
+    $code = substr($rply, 0, 3);
 
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER: " . $rply . $this->CRLF . '<br />';
+    if ($this->do_debug >= 2) {
+      echo "SMTP -> FROM SERVER: ".$rply.$this->CRLF.'<br />';
     }
 
-    if($code != 250) {
+    if ($code != 250) {
       $this->error =
-        array("error" => $hello . " not accepted from server",
+        array("error" => $hello." not accepted from server",
               "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
+              "smtp_msg" => substr($rply, 4));
+      if ($this->do_debug >= 1) {
+        echo "SMTP -> ERROR: ".$this->error["error"].": ".$rply.$this->CRLF.'<br />';
       }
       return false;
     }
@@ -534,29 +534,29 @@ 
   public function Mail($from) {
     $this->error = null; // so no confusion is caused
 
-    if(!$this->connected()) {
+    if (!$this->connected()) {
       $this->error = array(
               "error" => "Called Mail() without being connected");
       return false;
     }
 
     $useVerp = ($this->do_verp ? "XVERP" : "");
-    fputs($this->smtp_conn,"MAIL FROM:<" . $from . ">" . $useVerp . $this->CRLF);
+    fputs($this->smtp_conn, "MAIL FROM:<".$from.">".$useVerp.$this->CRLF);
 
     $rply = $this->get_lines();
-    $code = substr($rply,0,3);
+    $code = substr($rply, 0, 3);
 
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
+    if ($this->do_debug >= 2) {
+      echo "SMTP -> FROM SERVER:".$rply.$this->CRLF.'<br />';
     }
 
-    if($code != 250) {
+    if ($code != 250) {
       $this->error =
         array("error" => "MAIL not accepted from server",
               "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
+              "smtp_msg" => substr($rply, 4));
+      if ($this->do_debug >= 1) {
+        echo "SMTP -> ERROR: ".$this->error["error"].": ".$rply.$this->CRLF.'<br />';
       }
       return false;
     }
@@ -574,41 +574,41 @@ 
    * @access public
    * @return bool
    */
-  public function Quit($close_on_error=true) {
+  public function Quit($close_on_error = true) {
     $this->error = null; // so there is no confusion
 
-    if(!$this->connected()) {
+    if (!$this->connected()) {
       $this->error = array(
               "error" => "Called Quit() without being connected");
       return false;
     }
 
     // send the quit command to the server
-    fputs($this->smtp_conn,"quit" . $this->CRLF);
+    fputs($this->smtp_conn, "quit".$this->CRLF);
 
     // get any good-bye messages
     $byemsg = $this->get_lines();
 
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $byemsg . $this->CRLF . '<br />';
+    if ($this->do_debug >= 2) {
+      echo "SMTP -> FROM SERVER:".$byemsg.$this->CRLF.'<br />';
     }
 
     $rval = true;
     $e = null;
 
-    $code = substr($byemsg,0,3);
-    if($code != 221) {
+    $code = substr($byemsg, 0, 3);
+    if ($code != 221) {
       // use e as a tmp var cause Close will overwrite $this->error
       $e = array("error" => "SMTP server rejected quit command",
                  "smtp_code" => $code,
-                 "smtp_rply" => substr($byemsg,4));
+                 "smtp_rply" => substr($byemsg, 4));
       $rval = false;
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $e["error"] . ": " . $byemsg . $this->CRLF . '<br />';
+      if ($this->do_debug >= 1) {
+        echo "SMTP -> ERROR: ".$e["error"].": ".$byemsg.$this->CRLF.'<br />';
       }
     }
 
-    if(empty($e) || $close_on_error) {
+    if (empty($e) || $close_on_error) {
       $this->Close();
     }
 
@@ -630,28 +630,28 @@ 
   public function Recipient($to) {
     $this->error = null; // so no confusion is caused
 
-    if(!$this->connected()) {
+    if (!$this->connected()) {
       $this->error = array(
               "error" => "Called Recipient() without being connected");
       return false;
     }
 
-    fputs($this->smtp_conn,"RCPT TO:<" . $to . ">" . $this->CRLF);
+    fputs($this->smtp_conn, "RCPT TO:<".$to.">".$this->CRLF);
 
     $rply = $this->get_lines();
-    $code = substr($rply,0,3);
+    $code = substr($rply, 0, 3);
 
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
+    if ($this->do_debug >= 2) {
+      echo "SMTP -> FROM SERVER:".$rply.$this->CRLF.'<br />';
     }
 
-    if($code != 250 && $code != 251) {
+    if ($code != 250 && $code != 251) {
       $this->error =
         array("error" => "RCPT not accepted from server",
               "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
+              "smtp_msg" => substr($rply, 4));
+      if ($this->do_debug >= 1) {
+        echo "SMTP -> ERROR: ".$this->error["error"].": ".$rply.$this->CRLF.'<br />';
       }
       return false;
     }
@@ -673,28 +673,28 @@ 
   public function Reset() {
     $this->error = null; // so no confusion is caused
 
-    if(!$this->connected()) {
+    if (!$this->connected()) {
       $this->error = array(
               "error" => "Called Reset() without being connected");
       return false;
     }
 
-    fputs($this->smtp_conn,"RSET" . $this->CRLF);
+    fputs($this->smtp_conn, "RSET".$this->CRLF);
 
     $rply = $this->get_lines();
-    $code = substr($rply,0,3);
+    $code = substr($rply, 0, 3);
 
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
+    if ($this->do_debug >= 2) {
+      echo "SMTP -> FROM SERVER:".$rply.$this->CRLF.'<br />';
     }
 
-    if($code != 250) {
+    if ($code != 250) {
       $this->error =
         array("error" => "RSET failed",
               "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
+              "smtp_msg" => substr($rply, 4));
+      if ($this->do_debug >= 1) {
+        echo "SMTP -> ERROR: ".$this->error["error"].": ".$rply.$this->CRLF.'<br />';
       }
       return false;
     }
@@ -721,28 +721,28 @@ 
   public function SendAndMail($from) {
     $this->error = null; // so no confusion is caused
 
-    if(!$this->connected()) {
+    if (!$this->connected()) {
       $this->error = array(
           "error" => "Called SendAndMail() without being connected");
       return false;
     }
 
-    fputs($this->smtp_conn,"SAML FROM:" . $from . $this->CRLF);
+    fputs($this->smtp_conn, "SAML FROM:".$from.$this->CRLF);
 
     $rply = $this->get_lines();
-    $code = substr($rply,0,3);
+    $code = substr($rply, 0, 3);
 
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
+    if ($this->do_debug >= 2) {
+      echo "SMTP -> FROM SERVER:".$rply.$this->CRLF.'<br />';
     }
 
-    if($code != 250) {
+    if ($code != 250) {
       $this->error =
         array("error" => "SAML not accepted from server",
               "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
+              "smtp_msg" => substr($rply, 4));
+      if ($this->do_debug >= 1) {
+        echo "SMTP -> ERROR: ".$this->error["error"].": ".$rply.$this->CRLF.'<br />';
       }
       return false;
     }
@@ -765,8 +765,8 @@ 
   public function Turn() {
     $this->error = array("error" => "This method, TURN, of the SMTP ".
                                     "is not implemented");
-    if($this->do_debug >= 1) {
-      echo "SMTP -> NOTICE: " . $this->error["error"] . $this->CRLF . '<br />';
+    if ($this->do_debug >= 1) {
+      echo "SMTP -> NOTICE: ".$this->error["error"].$this->CRLF.'<br />';
     }
     return false;
   }
@@ -795,17 +795,17 @@ 
    */
   private function get_lines() {
     $data = "";
-    while($str = @fgets($this->smtp_conn,515)) {
-      if($this->do_debug >= 4) {
-        echo "SMTP -> get_lines(): \$data was \"$data\"" . $this->CRLF . '<br />';
-        echo "SMTP -> get_lines(): \$str is \"$str\"" . $this->CRLF . '<br />';
+    while ($str = @fgets($this->smtp_conn, 515)) {
+      if ($this->do_debug >= 4) {
+        echo "SMTP -> get_lines(): \$data was \"$data\"".$this->CRLF.'<br />';
+        echo "SMTP -> get_lines(): \$str is \"$str\"".$this->CRLF.'<br />';
       }
       $data .= $str;
-      if($this->do_debug >= 4) {
-        echo "SMTP -> get_lines(): \$data is \"$data\"" . $this->CRLF . '<br />';
+      if ($this->do_debug >= 4) {
+        echo "SMTP -> get_lines(): \$data is \"$data\"".$this->CRLF.'<br />';
       }
       // if 4th character is a space, we are done reading, break the loop
-      if(substr($str,3,1) == " ") { break; }
+      if (substr($str, 3, 1) == " ") { break; }
     }
     return $data;
   }

libs/tar.class.php

Doc Comments +24 added lines

@@ -84,6 +84,10 @@ 
     // Computes the unsigned Checksum of a file's header
     // to try to ensure valid file
     // PRIVATE ACCESS FUNCTION
+
+    /**
+     * @param string $bytestring
+     */
     function __computeUnsignedChecksum($bytestring) {
         for($i=0; $i<512; $i++)
             $unsigned_chksum += ord($bytestring[$i]);
@@ -97,6 +101,10 @@ 
 
     // Converts a NULL padded string to a non-NULL padded string
     // PRIVATE ACCESS FUNCTION
+
+    /**
+     * @param string $string
+     */
     function __parseNullPaddedString($string) {
         $position = strpos($string,chr(0));
 		if(!$position)
@@ -357,6 +365,10 @@ 
 
 
     // Open a TAR file
+
+    /**
+     * @param string $filename
+     */
     function openTAR($filename) {
         // Clear any values from previous tar archives
         unset($this->filename);
@@ -393,6 +405,10 @@ 
 
 
     // Retrieves information about a file in the current tar archive
+
+    /**
+     * @param string $filename
+     */
     function getFile($filename) {
         if($this->numFiles > 0) {
             foreach($this->files as $key => $information) {
@@ -467,6 +483,10 @@ 
 
 
     // Add a file to the tar archive
+
+    /**
+     * @param string $filename
+     */
     function addFile($filename,$from=null,$to=null) {
         // Make sure the file we are adding exists!
         if(!file_exists($filename))
@@ -555,6 +575,10 @@ 
 
 
     // Saves tar archive to a different file than the current file
+
+    /**
+     * @param boolean $useGzip
+     */
     function toTar($filename,$useGzip) {
         if(!$filename)
             return false;

Indentation +431 added lines, -431 removed lines

@@ -63,99 +63,99 @@ 
 */
 
 class tar {
-    // Unprocessed Archive Information
-    var $filename;
-    var $isGzipped;
-    var $tar_file;
-
-    // Processed Archive Information
-    var $files;
-    var $directories;
-    var $numFiles;
-    var $numDirectories;
-
-
-    // Class Constructor -- Does nothing...
-    function tar() {
-        return true;
-    }
-
-
-    // Computes the unsigned Checksum of a file's header
-    // to try to ensure valid file
-    // PRIVATE ACCESS FUNCTION
-    function __computeUnsignedChecksum($bytestring) {
-        for($i=0; $i<512; $i++)
-            $unsigned_chksum += ord($bytestring[$i]);
-        for($i=0; $i<8; $i++)
-            $unsigned_chksum -= ord($bytestring[148 + $i]);
-        $unsigned_chksum += ord(" ") * 8;
-
-        return $unsigned_chksum;
-    }
-
-
-    // Converts a NULL padded string to a non-NULL padded string
-    // PRIVATE ACCESS FUNCTION
-    function __parseNullPaddedString($string) {
-        $position = strpos($string,chr(0));
+	// Unprocessed Archive Information
+	var $filename;
+	var $isGzipped;
+	var $tar_file;
+
+	// Processed Archive Information
+	var $files;
+	var $directories;
+	var $numFiles;
+	var $numDirectories;
+
+
+	// Class Constructor -- Does nothing...
+	function tar() {
+		return true;
+	}
+
+
+	// Computes the unsigned Checksum of a file's header
+	// to try to ensure valid file
+	// PRIVATE ACCESS FUNCTION
+	function __computeUnsignedChecksum($bytestring) {
+		for($i=0; $i<512; $i++)
+			$unsigned_chksum += ord($bytestring[$i]);
+		for($i=0; $i<8; $i++)
+			$unsigned_chksum -= ord($bytestring[148 + $i]);
+		$unsigned_chksum += ord(" ") * 8;
+
+		return $unsigned_chksum;
+	}
+
+
+	// Converts a NULL padded string to a non-NULL padded string
+	// PRIVATE ACCESS FUNCTION
+	function __parseNullPaddedString($string) {
+		$position = strpos($string,chr(0));
 		if(!$position)
 		{
 			$position = strlen($string);
 		}
-        return substr($string,0,$position);
-    }
+		return substr($string,0,$position);
+	}
 
 
-    // This function parses the current TAR file
-    // PRIVATE ACCESS FUNCTION
-    function __parseTar() {
-        // Read Files from archive
-        $tar_length = strlen($this->tar_file);
-        $main_offset = 0;
+	// This function parses the current TAR file
+	// PRIVATE ACCESS FUNCTION
+	function __parseTar() {
+		// Read Files from archive
+		$tar_length = strlen($this->tar_file);
+		$main_offset = 0;
 		$flag_longlink = false;
-        while($main_offset < $tar_length) {
-            // If we read a block of 512 nulls, we are at the end of the archive
-            if(substr($this->tar_file,$main_offset,512) == str_repeat(chr(0),512))
-                break;
+		while($main_offset < $tar_length) {
+			// If we read a block of 512 nulls, we are at the end of the archive
+			if(substr($this->tar_file,$main_offset,512) == str_repeat(chr(0),512))
+				break;
 
-            // Parse file name
-            $file_name      = $this->__parseNullPaddedString(substr($this->tar_file,$main_offset,100));
+			// Parse file name
+			$file_name      = $this->__parseNullPaddedString(substr($this->tar_file,$main_offset,100));
 
-            // Parse the file mode
-            $file_mode      = substr($this->tar_file,$main_offset + 100,8);
+			// Parse the file mode
+			$file_mode      = substr($this->tar_file,$main_offset + 100,8);
 
-            // Parse the file user ID
-            $file_uid       = octdec(substr($this->tar_file,$main_offset + 108,8));
+			// Parse the file user ID
+			$file_uid       = octdec(substr($this->tar_file,$main_offset + 108,8));
 
-            // Parse the file group ID
-            $file_gid       = octdec(substr($this->tar_file,$main_offset + 116,8));
+			// Parse the file group ID
+			$file_gid       = octdec(substr($this->tar_file,$main_offset + 116,8));
 
-            // Parse the file size
-            $file_size      = octdec(substr($this->tar_file,$main_offset + 124,12));
+			// Parse the file size
+			$file_size      = octdec(substr($this->tar_file,$main_offset + 124,12));
 
-            // Parse the file update time - unix timestamp format
-            $file_time      = octdec(substr($this->tar_file,$main_offset + 136,12));
+			// Parse the file update time - unix timestamp format
+			$file_time      = octdec(substr($this->tar_file,$main_offset + 136,12));
 
-            // Parse Checksum
-            $file_chksum        = octdec(substr($this->tar_file,$main_offset + 148,6));
+			// Parse Checksum
+			$file_chksum        = octdec(substr($this->tar_file,$main_offset + 148,6));
 
-            // Parse user name
-            $file_uname     = $this->__parseNullPaddedString(substr($this->tar_file,$main_offset + 265,32));
+			// Parse user name
+			$file_uname     = $this->__parseNullPaddedString(substr($this->tar_file,$main_offset + 265,32));
 
-            // Parse Group name
-            $file_gname     = $this->__parseNullPaddedString(substr($this->tar_file,$main_offset + 297,32));
+			// Parse Group name
+			$file_gname     = $this->__parseNullPaddedString(substr($this->tar_file,$main_offset + 297,32));
 
-            $file_type = substr($this->tar_file,$main_offset + 156,1);
+			$file_type = substr($this->tar_file,$main_offset + 156,1);
 
-            // Make sure our file is valid
-            if($this->__computeUnsignedChecksum(substr($this->tar_file,$main_offset,512)) != $file_chksum)
-                return false;
+			// Make sure our file is valid
+			if($this->__computeUnsignedChecksum(substr($this->tar_file,$main_offset,512)) != $file_chksum)
+				return false;
 
-            // Parse File Contents
-            $file_contents      = substr($this->tar_file,$main_offset + 512,$file_size);
+			// Parse File Contents
+			$file_contents      = substr($this->tar_file,$main_offset + 512,$file_size);
 
-            /*  ### Unused Header Information ###
+			/*  ### Unused Header Information ###
                 $activeFile["typeflag"]     = substr($this->tar_file,$main_offset + 156,1);
                 $activeFile["linkname"]     = substr($this->tar_file,$main_offset + 157,100);
                 $activeFile["magic"]        = substr($this->tar_file,$main_offset + 257,6);
@@ -228,363 +228,363 @@ 
 				$flag_longlink = false;
 			}
 
-            // Move our offset the number of blocks we have processed
-            $main_offset += 512 + (ceil($file_size / 512) * 512);
-        }
-
-        return true;
-    }
-
-
-    // Read a non gzipped tar file in for processing
-    // PRIVATE ACCESS FUNCTION
-    function __readTar($filename='') {
-        // Set the filename to load
-        if(!$filename)
-            $filename = $this->filename;
-
-        // Read in the TAR file
-        $fp = fopen($filename,"rb");
-        $this->tar_file = fread($fp,filesize($filename));
-        fclose($fp);
-
-        if($this->tar_file[0] == chr(31) && $this->tar_file[1] == chr(139) && $this->tar_file[2] == chr(8)) {
-            if(!function_exists("gzinflate"))
-                return false;
-
-            $this->isGzipped = TRUE;
-
-            $this->tar_file = gzinflate(substr($this->tar_file,10,-4));
-        }
-
-        // Parse the TAR file
-        $this->__parseTar();
-
-        return true;
-    }
-
-
-    // Generates a TAR file from the processed data
-    // PRIVATE ACCESS FUNCTION
-    function __generateTAR() {
-        // Clear any data currently in $this->tar_file
-        unset($this->tar_file);
-
-        // Generate Records for each directory, if we have directories
-        if($this->numDirectories > 0) {
-            foreach($this->directories as $key => $information) {
-                unset($header);
-
-                // Generate tar header for this directory
-                // Filename, Permissions, UID, GID, size, Time, checksum, typeflag, linkname, magic, version, user name, group name, devmajor, devminor, prefix, end
-                $header .= str_pad($information["name"],100,chr(0));
-                $header .= str_pad(decoct($information["mode"]),7,"0",STR_PAD_LEFT) . chr(0);
-                $header .= str_pad(decoct($information["user_id"]),7,"0",STR_PAD_LEFT) . chr(0);
-                $header .= str_pad(decoct($information["group_id"]),7,"0",STR_PAD_LEFT) . chr(0);
-                $header .= str_pad(decoct(0),11,"0",STR_PAD_LEFT) . chr(0);
-                $header .= str_pad(decoct($information["time"]),11,"0",STR_PAD_LEFT) . chr(0);
-                $header .= str_repeat(" ",8);
-                $header .= "5";
-                $header .= str_repeat(chr(0),100);
-                $header .= str_pad("ustar",6,chr(32));
-                $header .= chr(32) . chr(0);
-                $header .= str_pad("",32,chr(0));
-                $header .= str_pad("",32,chr(0));
-                $header .= str_repeat(chr(0),8);
-                $header .= str_repeat(chr(0),8);
-                $header .= str_repeat(chr(0),155);
-                $header .= str_repeat(chr(0),12);
-
-                // Compute header checksum
-                $checksum = str_pad(decoct($this->__computeUnsignedChecksum($header)),6,"0",STR_PAD_LEFT);
-                for($i=0; $i<6; $i++) {
-                    $header[(148 + $i)] = substr($checksum,$i,1);
-                }
-                $header[154] = chr(0);
-                $header[155] = chr(32);
-
-                // Add new tar formatted data to tar file contents
-                $this->tar_file .= $header;
-            }
-        }
-
-        // Generate Records for each file, if we have files (We should...)
-        if($this->numFiles > 0) {
-            foreach($this->files as $key => $information) {
-                unset($header);
-
-                // Generate the TAR header for this file
-                // Filename, Permissions, UID, GID, size, Time, checksum, typeflag, linkname, magic, version, user name, group name, devmajor, devminor, prefix, end
-                $header .= str_pad($information["name"],100,chr(0));
-                $header .= str_pad(decoct($information["mode"]),7,"0",STR_PAD_LEFT) . chr(0);
-                $header .= str_pad(decoct($information["user_id"]),7,"0",STR_PAD_LEFT) . chr(0);
-                $header .= str_pad(decoct($information["group_id"]),7,"0",STR_PAD_LEFT) . chr(0);
-                $header .= str_pad(decoct($information["size"]),11,"0",STR_PAD_LEFT) . chr(0);
-                $header .= str_pad(decoct($information["time"]),11,"0",STR_PAD_LEFT) . chr(0);
-                $header .= str_repeat(" ",8);
-                $header .= "0";
-                $header .= str_repeat(chr(0),100);
-                $header .= str_pad("ustar",6,chr(32));
-                $header .= chr(32) . chr(0);
-                $header .= str_pad($information["user_name"],32,chr(0));    // How do I get a file's user name from PHP?
-                $header .= str_pad($information["group_name"],32,chr(0));   // How do I get a file's group name from PHP?
-                $header .= str_repeat(chr(0),8);
-                $header .= str_repeat(chr(0),8);
-                $header .= str_repeat(chr(0),155);
-                $header .= str_repeat(chr(0),12);
-
-                // Compute header checksum
-                $checksum = str_pad(decoct($this->__computeUnsignedChecksum($header)),6,"0",STR_PAD_LEFT);
-                for($i=0; $i<6; $i++) {
-                    $header[(148 + $i)] = substr($checksum,$i,1);
-                }
-                $header[154] = chr(0);
-                $header[155] = chr(32);
-
-                // Pad file contents to byte count divisible by 512
-                $file_contents = str_pad($information["file"],(ceil($information["size"] / 512) * 512),chr(0));
-
-                // Add new tar formatted data to tar file contents
-                $this->tar_file .= $header . $file_contents;
-            }
-        }
-
-        // Add 512 bytes of NULLs to designate EOF
-        $this->tar_file .= str_repeat(chr(0),512);
-
-        return true;
-    }
-
-
-    // Open a TAR file
-    function openTAR($filename) {
-        // Clear any values from previous tar archives
-        unset($this->filename);
-        unset($this->isGzipped);
-        unset($this->tar_file);
-        unset($this->files);
-        unset($this->directories);
-        unset($this->numFiles);
-        unset($this->numDirectories);
-
-        // If the tar file doesn't exist...
-        if(!file_exists($filename))
-            return false;
-
-        $this->filename = $filename;
-
-        // Parse this file
-        $this->__readTar();
-
-        return true;
-    }
-
-
-    // Appends a tar file to the end of the currently opened tar file
-    function appendTar($filename) {
-        // If the tar file doesn't exist...
-        if(!file_exists($filename))
-            return false;
-
-        $this->__readTar($filename);
-
-        return true;
-    }
-
-
-    // Retrieves information about a file in the current tar archive
-    function getFile($filename) {
-        if($this->numFiles > 0) {
-            foreach($this->files as $key => $information) {
-                if($information["name"] == $filename)
-                    return $information;
-            }
-        }
-
-        return false;
-    }
-
-
-    // Retrieves information about a directory in the current tar archive
-    function getDirectory($dirname) {
-        if($this->numDirectories > 0) {
-            foreach($this->directories as $key => $information) {
-                if($information["name"] == $dirname)
-                    return $information;
-            }
-        }
-
-        return false;
-    }
-
-
-    // Check if this tar archive contains a specific file
-    function containsFile($filename) {
-        if($this->numFiles > 0) {
-            foreach($this->files as $key => $information) {
-                if($information["name"] == $filename)
-                    return true;
-            }
-        }
-
-        return false;
-    }
-
-
-    // Check if this tar archive contains a specific directory
-    function containsDirectory($dirname) {
-        if($this->numDirectories > 0) {
-            foreach($this->directories as $key => $information) {
-                if($information["name"] == $dirname)
-                    return true;
-            }
-        }
-
-        return false;
-    }
-
-
-    // Add a directory to this tar archive
-    function addDirectory($dirname) {
-        if(!file_exists($dirname))
-            return false;
-
-        // Get directory information
-        $file_information = stat($dirname);
-
-        // Add directory to processed data
-        $this->numDirectories++;
-        $activeDir      = &$this->directories[];
-        $activeDir["name"]  = $dirname;
-        $activeDir["mode"]  = $file_information["mode"];
-        $activeDir["time"]  = $file_information["time"];
-        $activeDir["user_id"]   = $file_information["uid"];
-        $activeDir["group_id"]  = $file_information["gid"];
-        $activeDir["checksum"]  = $checksum;
-
-        return true;
-    }
-
-
-    // Add a file to the tar archive
-    function addFile($filename,$from=null,$to=null) {
-        // Make sure the file we are adding exists!
-        if(!file_exists($filename))
-            return false;
-
-        if(filesize($filename)==0)
-            return false;
-
-        // Make sure there are no other files in the archive that have this same filename
-        if($this->containsFile($filename))
-            return false;
-
-        // Get file information
-        $file_information = stat($filename);
-
-        // Read in the file's contents
-        $fp = fopen($filename,"rb");
-        $file_contents = fread($fp,filesize($filename));
-        fclose($fp);
-
-        if($from && $to){
-            $file_contents = str_replace($from,$to,$file_contents);
-            $file_information["size"] = strlen($file_contents);
-        }
-
-        // Add file to processed data
-        $this->numFiles++;
-        $activeFile         = &$this->files[];
-        $activeFile["name"]     = $filename;
-        $activeFile["mode"]     = $file_information["mode"];
-        $activeFile["user_id"]      = $file_information["uid"];
-        $activeFile["group_id"]     = $file_information["gid"];
-        $activeFile["size"]     = $file_information["size"];
-        $activeFile["time"]     = $file_information["mtime"];
-        $activeFile["checksum"]     = $checksum;
-        $activeFile["user_name"]    = "";
-        $activeFile["group_name"]   = "";
-        $activeFile["file"]     = $file_contents;
-
-        return true;
-    }
-
-
-    // Remove a file from the tar archive
-    function removeFile($filename) {
-        if($this->numFiles > 0) {
-            foreach($this->files as $key => $information) {
-                if($information["name"] == $filename) {
-                    $this->numFiles--;
-                    unset($this->files[$key]);
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
-
-    // Remove a directory from the tar archive
-    function removeDirectory($dirname) {
-        if($this->numDirectories > 0) {
-            foreach($this->directories as $key => $information) {
-                if($information["name"] == $dirname) {
-                    $this->numDirectories--;
-                    unset($this->directories[$key]);
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
-
-    // Write the currently loaded tar archive to disk
-    function saveTar() {
-        if(!$this->filename)
-            return false;
-
-        // Write tar to current file using specified gzip compression
-        $this->toTar($this->filename,$this->isGzipped);
-
-        return true;
-    }
-
-
-    // Saves tar archive to a different file than the current file
-    function toTar($filename,$useGzip) {
-        if(!$filename)
-            return false;
-
-        // Encode processed files into TAR file format
-        $this->__generateTar();
-
-        // GZ Compress the data if we need to
-        if($useGzip) {
-            // Make sure we have gzip support
-            if(!function_exists("gzencode"))
-                return false;
-
-            $file = gzencode($this->tar_file);
-        } else {
-            $file = $this->tar_file;
-        }
-
-        // Write the TAR file
-        $fp = fopen($filename,"wb");
-        fwrite($fp,$file);
-        fclose($fp);
-
-        return true;
-    }
-
-
-    function toTarStream() {
-        $this->__generateTar();
-        return $this->tar_file;
-    }
+			// Move our offset the number of blocks we have processed
+			$main_offset += 512 + (ceil($file_size / 512) * 512);
+		}
+
+		return true;
+	}
+
+
+	// Read a non gzipped tar file in for processing
+	// PRIVATE ACCESS FUNCTION
+	function __readTar($filename='') {
+		// Set the filename to load
+		if(!$filename)
+			$filename = $this->filename;
+
+		// Read in the TAR file
+		$fp = fopen($filename,"rb");
+		$this->tar_file = fread($fp,filesize($filename));
+		fclose($fp);
+
+		if($this->tar_file[0] == chr(31) && $this->tar_file[1] == chr(139) && $this->tar_file[2] == chr(8)) {
+			if(!function_exists("gzinflate"))
+				return false;
+
+			$this->isGzipped = TRUE;
+
+			$this->tar_file = gzinflate(substr($this->tar_file,10,-4));
+		}
+
+		// Parse the TAR file
+		$this->__parseTar();
+
+		return true;
+	}
+
+
+	// Generates a TAR file from the processed data
+	// PRIVATE ACCESS FUNCTION
+	function __generateTAR() {
+		// Clear any data currently in $this->tar_file
+		unset($this->tar_file);
+
+		// Generate Records for each directory, if we have directories
+		if($this->numDirectories > 0) {
+			foreach($this->directories as $key => $information) {
+				unset($header);
+
+				// Generate tar header for this directory
+				// Filename, Permissions, UID, GID, size, Time, checksum, typeflag, linkname, magic, version, user name, group name, devmajor, devminor, prefix, end
+				$header .= str_pad($information["name"],100,chr(0));
+				$header .= str_pad(decoct($information["mode"]),7,"0",STR_PAD_LEFT) . chr(0);
+				$header .= str_pad(decoct($information["user_id"]),7,"0",STR_PAD_LEFT) . chr(0);
+				$header .= str_pad(decoct($information["group_id"]),7,"0",STR_PAD_LEFT) . chr(0);
+				$header .= str_pad(decoct(0),11,"0",STR_PAD_LEFT) . chr(0);
+				$header .= str_pad(decoct($information["time"]),11,"0",STR_PAD_LEFT) . chr(0);
+				$header .= str_repeat(" ",8);
+				$header .= "5";
+				$header .= str_repeat(chr(0),100);
+				$header .= str_pad("ustar",6,chr(32));
+				$header .= chr(32) . chr(0);
+				$header .= str_pad("",32,chr(0));
+				$header .= str_pad("",32,chr(0));
+				$header .= str_repeat(chr(0),8);
+				$header .= str_repeat(chr(0),8);
+				$header .= str_repeat(chr(0),155);
+				$header .= str_repeat(chr(0),12);
+
+				// Compute header checksum
+				$checksum = str_pad(decoct($this->__computeUnsignedChecksum($header)),6,"0",STR_PAD_LEFT);
+				for($i=0; $i<6; $i++) {
+					$header[(148 + $i)] = substr($checksum,$i,1);
+				}
+				$header[154] = chr(0);
+				$header[155] = chr(32);
+
+				// Add new tar formatted data to tar file contents
+				$this->tar_file .= $header;
+			}
+		}
+
+		// Generate Records for each file, if we have files (We should...)
+		if($this->numFiles > 0) {
+			foreach($this->files as $key => $information) {
+				unset($header);
+
+				// Generate the TAR header for this file
+				// Filename, Permissions, UID, GID, size, Time, checksum, typeflag, linkname, magic, version, user name, group name, devmajor, devminor, prefix, end
+				$header .= str_pad($information["name"],100,chr(0));
+				$header .= str_pad(decoct($information["mode"]),7,"0",STR_PAD_LEFT) . chr(0);
+				$header .= str_pad(decoct($information["user_id"]),7,"0",STR_PAD_LEFT) . chr(0);
+				$header .= str_pad(decoct($information["group_id"]),7,"0",STR_PAD_LEFT) . chr(0);
+				$header .= str_pad(decoct($information["size"]),11,"0",STR_PAD_LEFT) . chr(0);
+				$header .= str_pad(decoct($information["time"]),11,"0",STR_PAD_LEFT) . chr(0);
+				$header .= str_repeat(" ",8);
+				$header .= "0";
+				$header .= str_repeat(chr(0),100);
+				$header .= str_pad("ustar",6,chr(32));
+				$header .= chr(32) . chr(0);
+				$header .= str_pad($information["user_name"],32,chr(0));    // How do I get a file's user name from PHP?
+				$header .= str_pad($information["group_name"],32,chr(0));   // How do I get a file's group name from PHP?
+				$header .= str_repeat(chr(0),8);
+				$header .= str_repeat(chr(0),8);
+				$header .= str_repeat(chr(0),155);
+				$header .= str_repeat(chr(0),12);
+
+				// Compute header checksum
+				$checksum = str_pad(decoct($this->__computeUnsignedChecksum($header)),6,"0",STR_PAD_LEFT);
+				for($i=0; $i<6; $i++) {
+					$header[(148 + $i)] = substr($checksum,$i,1);
+				}
+				$header[154] = chr(0);
+				$header[155] = chr(32);
+
+				// Pad file contents to byte count divisible by 512
+				$file_contents = str_pad($information["file"],(ceil($information["size"] / 512) * 512),chr(0));
+
+				// Add new tar formatted data to tar file contents
+				$this->tar_file .= $header . $file_contents;
+			}
+		}
+
+		// Add 512 bytes of NULLs to designate EOF
+		$this->tar_file .= str_repeat(chr(0),512);
+
+		return true;
+	}
+
+
+	// Open a TAR file
+	function openTAR($filename) {
+		// Clear any values from previous tar archives
+		unset($this->filename);
+		unset($this->isGzipped);
+		unset($this->tar_file);
+		unset($this->files);
+		unset($this->directories);
+		unset($this->numFiles);
+		unset($this->numDirectories);
+
+		// If the tar file doesn't exist...
+		if(!file_exists($filename))
+			return false;
+
+		$this->filename = $filename;
+
+		// Parse this file
+		$this->__readTar();
+
+		return true;
+	}
+
+
+	// Appends a tar file to the end of the currently opened tar file
+	function appendTar($filename) {
+		// If the tar file doesn't exist...
+		if(!file_exists($filename))
+			return false;
+
+		$this->__readTar($filename);
+
+		return true;
+	}
+
+
+	// Retrieves information about a file in the current tar archive
+	function getFile($filename) {
+		if($this->numFiles > 0) {
+			foreach($this->files as $key => $information) {
+				if($information["name"] == $filename)
+					return $information;
+			}
+		}
+
+		return false;
+	}
+
+
+	// Retrieves information about a directory in the current tar archive
+	function getDirectory($dirname) {
+		if($this->numDirectories > 0) {
+			foreach($this->directories as $key => $information) {
+				if($information["name"] == $dirname)
+					return $information;
+			}
+		}
+
+		return false;
+	}
+
+
+	// Check if this tar archive contains a specific file
+	function containsFile($filename) {
+		if($this->numFiles > 0) {
+			foreach($this->files as $key => $information) {
+				if($information["name"] == $filename)
+					return true;
+			}
+		}
+
+		return false;
+	}
+
+
+	// Check if this tar archive contains a specific directory
+	function containsDirectory($dirname) {
+		if($this->numDirectories > 0) {
+			foreach($this->directories as $key => $information) {
+				if($information["name"] == $dirname)
+					return true;
+			}
+		}
+
+		return false;
+	}
+
+
+	// Add a directory to this tar archive
+	function addDirectory($dirname) {
+		if(!file_exists($dirname))
+			return false;
+
+		// Get directory information
+		$file_information = stat($dirname);
+
+		// Add directory to processed data
+		$this->numDirectories++;
+		$activeDir      = &$this->directories[];
+		$activeDir["name"]  = $dirname;
+		$activeDir["mode"]  = $file_information["mode"];
+		$activeDir["time"]  = $file_information["time"];
+		$activeDir["user_id"]   = $file_information["uid"];
+		$activeDir["group_id"]  = $file_information["gid"];
+		$activeDir["checksum"]  = $checksum;
+
+		return true;
+	}
+
+
+	// Add a file to the tar archive
+	function addFile($filename,$from=null,$to=null) {
+		// Make sure the file we are adding exists!
+		if(!file_exists($filename))
+			return false;
+
+		if(filesize($filename)==0)
+			return false;
+
+		// Make sure there are no other files in the archive that have this same filename
+		if($this->containsFile($filename))
+			return false;
+
+		// Get file information
+		$file_information = stat($filename);
+
+		// Read in the file's contents
+		$fp = fopen($filename,"rb");
+		$file_contents = fread($fp,filesize($filename));
+		fclose($fp);
+
+		if($from && $to){
+			$file_contents = str_replace($from,$to,$file_contents);
+			$file_information["size"] = strlen($file_contents);
+		}
+
+		// Add file to processed data
+		$this->numFiles++;
+		$activeFile         = &$this->files[];
+		$activeFile["name"]     = $filename;
+		$activeFile["mode"]     = $file_information["mode"];
+		$activeFile["user_id"]      = $file_information["uid"];
+		$activeFile["group_id"]     = $file_information["gid"];
+		$activeFile["size"]     = $file_information["size"];
+		$activeFile["time"]     = $file_information["mtime"];
+		$activeFile["checksum"]     = $checksum;
+		$activeFile["user_name"]    = "";
+		$activeFile["group_name"]   = "";
+		$activeFile["file"]     = $file_contents;
+
+		return true;
+	}
+
+
+	// Remove a file from the tar archive
+	function removeFile($filename) {
+		if($this->numFiles > 0) {
+			foreach($this->files as $key => $information) {
+				if($information["name"] == $filename) {
+					$this->numFiles--;
+					unset($this->files[$key]);
+					return true;
+				}
+			}
+		}
+
+		return false;
+	}
+
+
+	// Remove a directory from the tar archive
+	function removeDirectory($dirname) {
+		if($this->numDirectories > 0) {
+			foreach($this->directories as $key => $information) {
+				if($information["name"] == $dirname) {
+					$this->numDirectories--;
+					unset($this->directories[$key]);
+					return true;
+				}
+			}
+		}
+
+		return false;
+	}
+
+
+	// Write the currently loaded tar archive to disk
+	function saveTar() {
+		if(!$this->filename)
+			return false;
+
+		// Write tar to current file using specified gzip compression
+		$this->toTar($this->filename,$this->isGzipped);
+
+		return true;
+	}
+
+
+	// Saves tar archive to a different file than the current file
+	function toTar($filename,$useGzip) {
+		if(!$filename)
+			return false;
+
+		// Encode processed files into TAR file format
+		$this->__generateTar();
+
+		// GZ Compress the data if we need to
+		if($useGzip) {
+			// Make sure we have gzip support
+			if(!function_exists("gzencode"))
+				return false;
+
+			$file = gzencode($this->tar_file);
+		} else {
+			$file = $this->tar_file;
+		}
+
+		// Write the TAR file
+		$fp = fopen($filename,"wb");
+		fwrite($fp,$file);
+		fclose($fp);
+
+		return true;
+	}
+
+
+	function toTarStream() {
+		$this->__generateTar();
+		return $this->tar_file;
+	}
 }
 ?>

Braces +60 added lines, -44 removed lines

@@ -85,10 +85,12 @@ 
     // to try to ensure valid file
     // PRIVATE ACCESS FUNCTION
     function __computeUnsignedChecksum($bytestring) {
-        for($i=0; $i<512; $i++)
-            $unsigned_chksum += ord($bytestring[$i]);
-        for($i=0; $i<8; $i++)
-            $unsigned_chksum -= ord($bytestring[148 + $i]);
+        for($i=0; $i<512; $i++) {
+                    $unsigned_chksum += ord($bytestring[$i]);
+        }
+        for($i=0; $i<8; $i++) {
+                    $unsigned_chksum -= ord($bytestring[148 + $i]);
+        }
         $unsigned_chksum += ord(" ") * 8;
 
         return $unsigned_chksum;
@@ -116,8 +118,9 @@ 
 		$flag_longlink = false;
         while($main_offset < $tar_length) {
             // If we read a block of 512 nulls, we are at the end of the archive
-            if(substr($this->tar_file,$main_offset,512) == str_repeat(chr(0),512))
-                break;
+            if(substr($this->tar_file,$main_offset,512) == str_repeat(chr(0),512)) {
+                            break;
+            }
 
             // Parse file name
             $file_name      = $this->__parseNullPaddedString(substr($this->tar_file,$main_offset,100));
@@ -149,8 +152,9 @@ 
             $file_type = substr($this->tar_file,$main_offset + 156,1);
 
             // Make sure our file is valid
-            if($this->__computeUnsignedChecksum(substr($this->tar_file,$main_offset,512)) != $file_chksum)
-                return false;
+            if($this->__computeUnsignedChecksum(substr($this->tar_file,$main_offset,512)) != $file_chksum) {
+                            return false;
+            }
 
             // Parse File Contents
             $file_contents      = substr($this->tar_file,$main_offset + 512,$file_size);
@@ -170,8 +174,7 @@ 
 			{
 				$flag_longlink = true;
 				$longlink_name = $this->__parseNullPaddedString($file_contents);
-			}
-			elseif($file_type == '0') {
+			} elseif($file_type == '0') {
 				// Increment number of files
 				$this->numFiles++;
 
@@ -182,8 +185,7 @@ 
 				if($flag_longlink)
 				{
 					$activeFile["name"]     = $longlink_name;
-				}
-				else
+				} else
 				{
 					$activeFile["name"]     = $file_name;
 				}
@@ -211,8 +213,7 @@ 
 				if($flag_longlink)
 				{
 					$activeDir["name"]     = $longlink_name;
-				}
-				else
+				} else
 				{
 					$activeDir["name"]     = $file_name;
 				}
@@ -240,8 +241,9 @@ 
     // PRIVATE ACCESS FUNCTION
     function __readTar($filename='') {
         // Set the filename to load
-        if(!$filename)
-            $filename = $this->filename;
+        if(!$filename) {
+                    $filename = $this->filename;
+        }
 
         // Read in the TAR file
         $fp = fopen($filename,"rb");
@@ -249,8 +251,9 @@ 
         fclose($fp);
 
         if($this->tar_file[0] == chr(31) && $this->tar_file[1] == chr(139) && $this->tar_file[2] == chr(8)) {
-            if(!function_exists("gzinflate"))
-                return false;
+            if(!function_exists("gzinflate")) {
+                            return false;
+            }
 
             $this->isGzipped = TRUE;
 
@@ -368,8 +371,9 @@ 
         unset($this->numDirectories);
 
         // If the tar file doesn't exist...
-        if(!file_exists($filename))
-            return false;
+        if(!file_exists($filename)) {
+                    return false;
+        }
 
         $this->filename = $filename;
 
@@ -383,8 +387,9 @@ 
     // Appends a tar file to the end of the currently opened tar file
     function appendTar($filename) {
         // If the tar file doesn't exist...
-        if(!file_exists($filename))
-            return false;
+        if(!file_exists($filename)) {
+                    return false;
+        }
 
         $this->__readTar($filename);
 
@@ -396,8 +401,9 @@ 
     function getFile($filename) {
         if($this->numFiles > 0) {
             foreach($this->files as $key => $information) {
-                if($information["name"] == $filename)
-                    return $information;
+                if($information["name"] == $filename) {
+                                    return $information;
+                }
             }
         }
 
@@ -409,8 +415,9 @@ 
     function getDirectory($dirname) {
         if($this->numDirectories > 0) {
             foreach($this->directories as $key => $information) {
-                if($information["name"] == $dirname)
-                    return $information;
+                if($information["name"] == $dirname) {
+                                    return $information;
+                }
             }
         }
 
@@ -422,8 +429,9 @@ 
     function containsFile($filename) {
         if($this->numFiles > 0) {
             foreach($this->files as $key => $information) {
-                if($information["name"] == $filename)
-                    return true;
+                if($information["name"] == $filename) {
+                                    return true;
+                }
             }
         }
 
@@ -435,8 +443,9 @@ 
     function containsDirectory($dirname) {
         if($this->numDirectories > 0) {
             foreach($this->directories as $key => $information) {
-                if($information["name"] == $dirname)
-                    return true;
+                if($information["name"] == $dirname) {
+                                    return true;
+                }
             }
         }
 
@@ -446,8 +455,9 @@ 
 
     // Add a directory to this tar archive
     function addDirectory($dirname) {
-        if(!file_exists($dirname))
-            return false;
+        if(!file_exists($dirname)) {
+                    return false;
+        }
 
         // Get directory information
         $file_information = stat($dirname);
@@ -469,15 +479,18 @@ 
     // Add a file to the tar archive
     function addFile($filename,$from=null,$to=null) {
         // Make sure the file we are adding exists!
-        if(!file_exists($filename))
-            return false;
+        if(!file_exists($filename)) {
+                    return false;
+        }
 
-        if(filesize($filename)==0)
-            return false;
+        if(filesize($filename)==0) {
+                    return false;
+        }
 
         // Make sure there are no other files in the archive that have this same filename
-        if($this->containsFile($filename))
-            return false;
+        if($this->containsFile($filename)) {
+                    return false;
+        }
 
         // Get file information
         $file_information = stat($filename);
@@ -544,8 +557,9 @@ 
 
     // Write the currently loaded tar archive to disk
     function saveTar() {
-        if(!$this->filename)
-            return false;
+        if(!$this->filename) {
+                    return false;
+        }
 
         // Write tar to current file using specified gzip compression
         $this->toTar($this->filename,$this->isGzipped);
@@ -556,8 +570,9 @@ 
 
     // Saves tar archive to a different file than the current file
     function toTar($filename,$useGzip) {
-        if(!$filename)
-            return false;
+        if(!$filename) {
+                    return false;
+        }
 
         // Encode processed files into TAR file format
         $this->__generateTar();
@@ -565,8 +580,9 @@ 
         // GZ Compress the data if we need to
         if($useGzip) {
             // Make sure we have gzip support
-            if(!function_exists("gzencode"))
-                return false;
+            if(!function_exists("gzencode")) {
+                            return false;
+            }
 
             $file = gzencode($this->tar_file);
         } else {

Spacing +120 added lines, -120 removed lines

@@ -85,9 +85,9 @@ 
     // to try to ensure valid file
     // PRIVATE ACCESS FUNCTION
     function __computeUnsignedChecksum($bytestring) {
-        for($i=0; $i<512; $i++)
+        for ($i = 0; $i < 512; $i++)
             $unsigned_chksum += ord($bytestring[$i]);
-        for($i=0; $i<8; $i++)
+        for ($i = 0; $i < 8; $i++)
             $unsigned_chksum -= ord($bytestring[148 + $i]);
         $unsigned_chksum += ord(" ") * 8;
 
@@ -98,12 +98,12 @@ 
     // Converts a NULL padded string to a non-NULL padded string
     // PRIVATE ACCESS FUNCTION
     function __parseNullPaddedString($string) {
-        $position = strpos($string,chr(0));
-		if(!$position)
+        $position = strpos($string, chr(0));
+		if (!$position)
 		{
 			$position = strlen($string);
 		}
-        return substr($string,0,$position);
+        return substr($string, 0, $position);
     }
 
 
@@ -114,46 +114,46 @@ 
         $tar_length = strlen($this->tar_file);
         $main_offset = 0;
 		$flag_longlink = false;
-        while($main_offset < $tar_length) {
+        while ($main_offset < $tar_length) {
             // If we read a block of 512 nulls, we are at the end of the archive
-            if(substr($this->tar_file,$main_offset,512) == str_repeat(chr(0),512))
+            if (substr($this->tar_file, $main_offset, 512) == str_repeat(chr(0), 512))
                 break;
 
             // Parse file name
-            $file_name      = $this->__parseNullPaddedString(substr($this->tar_file,$main_offset,100));
+            $file_name      = $this->__parseNullPaddedString(substr($this->tar_file, $main_offset, 100));
 
             // Parse the file mode
-            $file_mode      = substr($this->tar_file,$main_offset + 100,8);
+            $file_mode      = substr($this->tar_file, $main_offset + 100, 8);
 
             // Parse the file user ID
-            $file_uid       = octdec(substr($this->tar_file,$main_offset + 108,8));
+            $file_uid       = octdec(substr($this->tar_file, $main_offset + 108, 8));
 
             // Parse the file group ID
-            $file_gid       = octdec(substr($this->tar_file,$main_offset + 116,8));
+            $file_gid       = octdec(substr($this->tar_file, $main_offset + 116, 8));
 
             // Parse the file size
-            $file_size      = octdec(substr($this->tar_file,$main_offset + 124,12));
+            $file_size      = octdec(substr($this->tar_file, $main_offset + 124, 12));
 
             // Parse the file update time - unix timestamp format
-            $file_time      = octdec(substr($this->tar_file,$main_offset + 136,12));
+            $file_time      = octdec(substr($this->tar_file, $main_offset + 136, 12));
 
             // Parse Checksum
-            $file_chksum        = octdec(substr($this->tar_file,$main_offset + 148,6));
+            $file_chksum = octdec(substr($this->tar_file, $main_offset + 148, 6));
 
             // Parse user name
-            $file_uname     = $this->__parseNullPaddedString(substr($this->tar_file,$main_offset + 265,32));
+            $file_uname     = $this->__parseNullPaddedString(substr($this->tar_file, $main_offset + 265, 32));
 
             // Parse Group name
-            $file_gname     = $this->__parseNullPaddedString(substr($this->tar_file,$main_offset + 297,32));
+            $file_gname     = $this->__parseNullPaddedString(substr($this->tar_file, $main_offset + 297, 32));
 
-            $file_type = substr($this->tar_file,$main_offset + 156,1);
+            $file_type = substr($this->tar_file, $main_offset + 156, 1);
 
             // Make sure our file is valid
-            if($this->__computeUnsignedChecksum(substr($this->tar_file,$main_offset,512)) != $file_chksum)
+            if ($this->__computeUnsignedChecksum(substr($this->tar_file, $main_offset, 512)) != $file_chksum)
                 return false;
 
             // Parse File Contents
-            $file_contents      = substr($this->tar_file,$main_offset + 512,$file_size);
+            $file_contents = substr($this->tar_file, $main_offset + 512, $file_size);
 
             /*  ### Unused Header Information ###
                 $activeFile["typeflag"]     = substr($this->tar_file,$main_offset + 156,1);
@@ -166,12 +166,12 @@ 
                 $activeFile["endheader"]    = substr($this->tar_file,$main_offset + 500,12);
             */
 
-			if(strtolower($file_type) == 'l' || $file_name == '././@LongLink')
+			if (strtolower($file_type) == 'l' || $file_name == '././@LongLink')
 			{
 				$flag_longlink = true;
 				$longlink_name = $this->__parseNullPaddedString($file_contents);
 			}
-			elseif($file_type == '0') {
+			elseif ($file_type == '0') {
 				// Increment number of files
 				$this->numFiles++;
 
@@ -179,13 +179,13 @@ 
 				$activeFile = &$this->files[];
 
 				// Asign Values
-				if($flag_longlink)
+				if ($flag_longlink)
 				{
-					$activeFile["name"]     = $longlink_name;
+					$activeFile["name"] = $longlink_name;
 				}
 				else
 				{
-					$activeFile["name"]     = $file_name;
+					$activeFile["name"] = $file_name;
 				}
 				$activeFile["type"]     = $file_type;
 				$activeFile["mode"]     = $file_mode;
@@ -196,11 +196,11 @@ 
 				$activeFile["user_name"]    = $file_uname;
 				$activeFile["group_name"]   = $file_gname;
 				$activeFile["checksum"]     = $file_chksum;
-				$activeFile["file"]     = $file_contents;
+				$activeFile["file"] = $file_contents;
 
 				$flag_longlink = false;
 
-			} elseif($file_type == '5') {
+			} elseif ($file_type == '5') {
 				// Increment number of directories
 				$this->numDirectories++;
 
@@ -208,9 +208,9 @@ 
 				$activeDir = &$this->directories[];
 
 				// Assign values
-				if($flag_longlink)
+				if ($flag_longlink)
 				{
-					$activeDir["name"]     = $longlink_name;
+					$activeDir["name"] = $longlink_name;
 				}
 				else
 				{
@@ -238,23 +238,23 @@ 
 
     // Read a non gzipped tar file in for processing
     // PRIVATE ACCESS FUNCTION
-    function __readTar($filename='') {
+    function __readTar($filename = '') {
         // Set the filename to load
-        if(!$filename)
+        if (!$filename)
             $filename = $this->filename;
 
         // Read in the TAR file
-        $fp = fopen($filename,"rb");
-        $this->tar_file = fread($fp,filesize($filename));
+        $fp = fopen($filename, "rb");
+        $this->tar_file = fread($fp, filesize($filename));
         fclose($fp);
 
-        if($this->tar_file[0] == chr(31) && $this->tar_file[1] == chr(139) && $this->tar_file[2] == chr(8)) {
-            if(!function_exists("gzinflate"))
+        if ($this->tar_file[0] == chr(31) && $this->tar_file[1] == chr(139) && $this->tar_file[2] == chr(8)) {
+            if (!function_exists("gzinflate"))
                 return false;
 
             $this->isGzipped = TRUE;
 
-            $this->tar_file = gzinflate(substr($this->tar_file,10,-4));
+            $this->tar_file = gzinflate(substr($this->tar_file, 10, -4));
         }
 
         // Parse the TAR file
@@ -271,34 +271,34 @@ 
         unset($this->tar_file);
 
         // Generate Records for each directory, if we have directories
-        if($this->numDirectories > 0) {
-            foreach($this->directories as $key => $information) {
+        if ($this->numDirectories > 0) {
+            foreach ($this->directories as $key => $information) {
                 unset($header);
 
                 // Generate tar header for this directory
                 // Filename, Permissions, UID, GID, size, Time, checksum, typeflag, linkname, magic, version, user name, group name, devmajor, devminor, prefix, end
-                $header .= str_pad($information["name"],100,chr(0));
-                $header .= str_pad(decoct($information["mode"]),7,"0",STR_PAD_LEFT) . chr(0);
-                $header .= str_pad(decoct($information["user_id"]),7,"0",STR_PAD_LEFT) . chr(0);
-                $header .= str_pad(decoct($information["group_id"]),7,"0",STR_PAD_LEFT) . chr(0);
-                $header .= str_pad(decoct(0),11,"0",STR_PAD_LEFT) . chr(0);
-                $header .= str_pad(decoct($information["time"]),11,"0",STR_PAD_LEFT) . chr(0);
-                $header .= str_repeat(" ",8);
+                $header .= str_pad($information["name"], 100, chr(0));
+                $header .= str_pad(decoct($information["mode"]), 7, "0", STR_PAD_LEFT).chr(0);
+                $header .= str_pad(decoct($information["user_id"]), 7, "0", STR_PAD_LEFT).chr(0);
+                $header .= str_pad(decoct($information["group_id"]), 7, "0", STR_PAD_LEFT).chr(0);
+                $header .= str_pad(decoct(0), 11, "0", STR_PAD_LEFT).chr(0);
+                $header .= str_pad(decoct($information["time"]), 11, "0", STR_PAD_LEFT).chr(0);
+                $header .= str_repeat(" ", 8);
                 $header .= "5";
-                $header .= str_repeat(chr(0),100);
-                $header .= str_pad("ustar",6,chr(32));
-                $header .= chr(32) . chr(0);
-                $header .= str_pad("",32,chr(0));
-                $header .= str_pad("",32,chr(0));
-                $header .= str_repeat(chr(0),8);
-                $header .= str_repeat(chr(0),8);
-                $header .= str_repeat(chr(0),155);
-                $header .= str_repeat(chr(0),12);
+                $header .= str_repeat(chr(0), 100);
+                $header .= str_pad("ustar", 6, chr(32));
+                $header .= chr(32).chr(0);
+                $header .= str_pad("", 32, chr(0));
+                $header .= str_pad("", 32, chr(0));
+                $header .= str_repeat(chr(0), 8);
+                $header .= str_repeat(chr(0), 8);
+                $header .= str_repeat(chr(0), 155);
+                $header .= str_repeat(chr(0), 12);
 
                 // Compute header checksum
-                $checksum = str_pad(decoct($this->__computeUnsignedChecksum($header)),6,"0",STR_PAD_LEFT);
-                for($i=0; $i<6; $i++) {
-                    $header[(148 + $i)] = substr($checksum,$i,1);
+                $checksum = str_pad(decoct($this->__computeUnsignedChecksum($header)), 6, "0", STR_PAD_LEFT);
+                for ($i = 0; $i < 6; $i++) {
+                    $header[(148 + $i)] = substr($checksum, $i, 1);
                 }
                 $header[154] = chr(0);
                 $header[155] = chr(32);
@@ -309,48 +309,48 @@ 
         }
 
         // Generate Records for each file, if we have files (We should...)
-        if($this->numFiles > 0) {
-            foreach($this->files as $key => $information) {
+        if ($this->numFiles > 0) {
+            foreach ($this->files as $key => $information) {
                 unset($header);
 
                 // Generate the TAR header for this file
                 // Filename, Permissions, UID, GID, size, Time, checksum, typeflag, linkname, magic, version, user name, group name, devmajor, devminor, prefix, end
-                $header .= str_pad($information["name"],100,chr(0));
-                $header .= str_pad(decoct($information["mode"]),7,"0",STR_PAD_LEFT) . chr(0);
-                $header .= str_pad(decoct($information["user_id"]),7,"0",STR_PAD_LEFT) . chr(0);
-                $header .= str_pad(decoct($information["group_id"]),7,"0",STR_PAD_LEFT) . chr(0);
-                $header .= str_pad(decoct($information["size"]),11,"0",STR_PAD_LEFT) . chr(0);
-                $header .= str_pad(decoct($information["time"]),11,"0",STR_PAD_LEFT) . chr(0);
-                $header .= str_repeat(" ",8);
+                $header .= str_pad($information["name"], 100, chr(0));
+                $header .= str_pad(decoct($information["mode"]), 7, "0", STR_PAD_LEFT).chr(0);
+                $header .= str_pad(decoct($information["user_id"]), 7, "0", STR_PAD_LEFT).chr(0);
+                $header .= str_pad(decoct($information["group_id"]), 7, "0", STR_PAD_LEFT).chr(0);
+                $header .= str_pad(decoct($information["size"]), 11, "0", STR_PAD_LEFT).chr(0);
+                $header .= str_pad(decoct($information["time"]), 11, "0", STR_PAD_LEFT).chr(0);
+                $header .= str_repeat(" ", 8);
                 $header .= "0";
-                $header .= str_repeat(chr(0),100);
-                $header .= str_pad("ustar",6,chr(32));
-                $header .= chr(32) . chr(0);
-                $header .= str_pad($information["user_name"],32,chr(0));    // How do I get a file's user name from PHP?
-                $header .= str_pad($information["group_name"],32,chr(0));   // How do I get a file's group name from PHP?
-                $header .= str_repeat(chr(0),8);
-                $header .= str_repeat(chr(0),8);
-                $header .= str_repeat(chr(0),155);
-                $header .= str_repeat(chr(0),12);
+                $header .= str_repeat(chr(0), 100);
+                $header .= str_pad("ustar", 6, chr(32));
+                $header .= chr(32).chr(0);
+                $header .= str_pad($information["user_name"], 32, chr(0)); // How do I get a file's user name from PHP?
+                $header .= str_pad($information["group_name"], 32, chr(0)); // How do I get a file's group name from PHP?
+                $header .= str_repeat(chr(0), 8);
+                $header .= str_repeat(chr(0), 8);
+                $header .= str_repeat(chr(0), 155);
+                $header .= str_repeat(chr(0), 12);
 
                 // Compute header checksum
-                $checksum = str_pad(decoct($this->__computeUnsignedChecksum($header)),6,"0",STR_PAD_LEFT);
-                for($i=0; $i<6; $i++) {
-                    $header[(148 + $i)] = substr($checksum,$i,1);
+                $checksum = str_pad(decoct($this->__computeUnsignedChecksum($header)), 6, "0", STR_PAD_LEFT);
+                for ($i = 0; $i < 6; $i++) {
+                    $header[(148 + $i)] = substr($checksum, $i, 1);
                 }
                 $header[154] = chr(0);
                 $header[155] = chr(32);
 
                 // Pad file contents to byte count divisible by 512
-                $file_contents = str_pad($information["file"],(ceil($information["size"] / 512) * 512),chr(0));
+                $file_contents = str_pad($information["file"], (ceil($information["size"] / 512) * 512), chr(0));
 
                 // Add new tar formatted data to tar file contents
-                $this->tar_file .= $header . $file_contents;
+                $this->tar_file .= $header.$file_contents;
             }
         }
 
         // Add 512 bytes of NULLs to designate EOF
-        $this->tar_file .= str_repeat(chr(0),512);
+        $this->tar_file .= str_repeat(chr(0), 512);
 
         return true;
     }
@@ -368,7 +368,7 @@ 
         unset($this->numDirectories);
 
         // If the tar file doesn't exist...
-        if(!file_exists($filename))
+        if (!file_exists($filename))
             return false;
 
         $this->filename = $filename;
@@ -383,7 +383,7 @@ 
     // Appends a tar file to the end of the currently opened tar file
     function appendTar($filename) {
         // If the tar file doesn't exist...
-        if(!file_exists($filename))
+        if (!file_exists($filename))
             return false;
 
         $this->__readTar($filename);
@@ -394,9 +394,9 @@ 
 
     // Retrieves information about a file in the current tar archive
     function getFile($filename) {
-        if($this->numFiles > 0) {
-            foreach($this->files as $key => $information) {
-                if($information["name"] == $filename)
+        if ($this->numFiles > 0) {
+            foreach ($this->files as $key => $information) {
+                if ($information["name"] == $filename)
                     return $information;
             }
         }
@@ -407,9 +407,9 @@ 
 
     // Retrieves information about a directory in the current tar archive
     function getDirectory($dirname) {
-        if($this->numDirectories > 0) {
-            foreach($this->directories as $key => $information) {
-                if($information["name"] == $dirname)
+        if ($this->numDirectories > 0) {
+            foreach ($this->directories as $key => $information) {
+                if ($information["name"] == $dirname)
                     return $information;
             }
         }
@@ -420,9 +420,9 @@ 
 
     // Check if this tar archive contains a specific file
     function containsFile($filename) {
-        if($this->numFiles > 0) {
-            foreach($this->files as $key => $information) {
-                if($information["name"] == $filename)
+        if ($this->numFiles > 0) {
+            foreach ($this->files as $key => $information) {
+                if ($information["name"] == $filename)
                     return true;
             }
         }
@@ -433,9 +433,9 @@ 
 
     // Check if this tar archive contains a specific directory
     function containsDirectory($dirname) {
-        if($this->numDirectories > 0) {
-            foreach($this->directories as $key => $information) {
-                if($information["name"] == $dirname)
+        if ($this->numDirectories > 0) {
+            foreach ($this->directories as $key => $information) {
+                if ($information["name"] == $dirname)
                     return true;
             }
         }
@@ -446,7 +446,7 @@ 
 
     // Add a directory to this tar archive
     function addDirectory($dirname) {
-        if(!file_exists($dirname))
+        if (!file_exists($dirname))
             return false;
 
         // Get directory information
@@ -454,7 +454,7 @@ 
 
         // Add directory to processed data
         $this->numDirectories++;
-        $activeDir      = &$this->directories[];
+        $activeDir = &$this->directories[];
         $activeDir["name"]  = $dirname;
         $activeDir["mode"]  = $file_information["mode"];
         $activeDir["time"]  = $file_information["time"];
@@ -467,34 +467,34 @@ 
 
 
     // Add a file to the tar archive
-    function addFile($filename,$from=null,$to=null) {
+    function addFile($filename, $from = null, $to = null) {
         // Make sure the file we are adding exists!
-        if(!file_exists($filename))
+        if (!file_exists($filename))
             return false;
 
-        if(filesize($filename)==0)
+        if (filesize($filename) == 0)
             return false;
 
         // Make sure there are no other files in the archive that have this same filename
-        if($this->containsFile($filename))
+        if ($this->containsFile($filename))
             return false;
 
         // Get file information
         $file_information = stat($filename);
 
         // Read in the file's contents
-        $fp = fopen($filename,"rb");
-        $file_contents = fread($fp,filesize($filename));
+        $fp = fopen($filename, "rb");
+        $file_contents = fread($fp, filesize($filename));
         fclose($fp);
 
-        if($from && $to){
-            $file_contents = str_replace($from,$to,$file_contents);
+        if ($from && $to) {
+            $file_contents = str_replace($from, $to, $file_contents);
             $file_information["size"] = strlen($file_contents);
         }
 
         // Add file to processed data
         $this->numFiles++;
-        $activeFile         = &$this->files[];
+        $activeFile = &$this->files[];
         $activeFile["name"]     = $filename;
         $activeFile["mode"]     = $file_information["mode"];
         $activeFile["user_id"]      = $file_information["uid"];
@@ -504,7 +504,7 @@ 
         $activeFile["checksum"]     = $checksum;
         $activeFile["user_name"]    = "";
         $activeFile["group_name"]   = "";
-        $activeFile["file"]     = $file_contents;
+        $activeFile["file"] = $file_contents;
 
         return true;
     }
@@ -512,9 +512,9 @@ 
 
     // Remove a file from the tar archive
     function removeFile($filename) {
-        if($this->numFiles > 0) {
-            foreach($this->files as $key => $information) {
-                if($information["name"] == $filename) {
+        if ($this->numFiles > 0) {
+            foreach ($this->files as $key => $information) {
+                if ($information["name"] == $filename) {
                     $this->numFiles--;
                     unset($this->files[$key]);
                     return true;
@@ -528,9 +528,9 @@ 
 
     // Remove a directory from the tar archive
     function removeDirectory($dirname) {
-        if($this->numDirectories > 0) {
-            foreach($this->directories as $key => $information) {
-                if($information["name"] == $dirname) {
+        if ($this->numDirectories > 0) {
+            foreach ($this->directories as $key => $information) {
+                if ($information["name"] == $dirname) {
                     $this->numDirectories--;
                     unset($this->directories[$key]);
                     return true;
@@ -544,28 +544,28 @@ 
 
     // Write the currently loaded tar archive to disk
     function saveTar() {
-        if(!$this->filename)
+        if (!$this->filename)
             return false;
 
         // Write tar to current file using specified gzip compression
-        $this->toTar($this->filename,$this->isGzipped);
+        $this->toTar($this->filename, $this->isGzipped);
 
         return true;
     }
 
 
     // Saves tar archive to a different file than the current file
-    function toTar($filename,$useGzip) {
-        if(!$filename)
+    function toTar($filename, $useGzip) {
+        if (!$filename)
             return false;
 
         // Encode processed files into TAR file format
         $this->__generateTar();
 
         // GZ Compress the data if we need to
-        if($useGzip) {
+        if ($useGzip) {
             // Make sure we have gzip support
-            if(!function_exists("gzencode"))
+            if (!function_exists("gzencode"))
                 return false;
 
             $file = gzencode($this->tar_file);
@@ -574,8 +574,8 @@ 
         }
 
         // Write the TAR file
-        $fp = fopen($filename,"wb");
-        fwrite($fp,$file);
+        $fp = fopen($filename, "wb");
+        fwrite($fp, $file);
         fclose($fp);
 
         return true;

modules/addon/addon.admin.model.php

Doc Comments +1 added lines, -1 removed lines

@@ -141,7 +141,7 @@
 	 * @param string $addon Name to get information
 	 * @param int $site_srl Site srl
 	 * @param string $gtype site or global
-	 * @return object Returns a information
+	 * @return null|stdClass Returns a information
 	 */
 	function getAddonInfoXml($addon, $site_srl = 0, $gtype = 'site')
 	{

Spacing +53 added lines, -53 removed lines

@@ -27,7 +27,7 @@ 
 	function getAddonPath($addon_name)
 	{
 		$class_path = sprintf('./addons/%s/', $addon_name);
-		if(is_dir($class_path))
+		if (is_dir($class_path))
 		{
 			return $class_path;
 		}
@@ -44,7 +44,7 @@ 
 		$addonList = $this->getAddonList(0, 'site');
 
 		$oAutoinstallModel = getModel('autoinstall');
-		foreach($addonList as $key => $addon)
+		foreach ($addonList as $key => $addon)
 		{
 			// get easyinstall remove url
 			$packageSrl = $oAutoinstallModel->getPackageSrlByPath($addon->path);
@@ -55,7 +55,7 @@ 
 			$addonList[$key]->need_update = $package[$packageSrl]->need_update;
 
 			// get easyinstall update url
-			if($addonList[$key]->need_update == 'Y')
+			if ($addonList[$key]->need_update == 'Y')
 			{
 				$addonList[$key]->update_url = $oAutoinstallModel->getUpdateUrlByPackageSrl($packageSrl);
 			}
@@ -78,7 +78,7 @@ 
 		// Downloaded and installed add-on to the list of Wanted
 		$searched_list = FileHandler::readDir('./addons', '/^([a-zA-Z0-9-_]+)$/');
 		$searched_count = count($searched_list);
-		if(!$searched_count)
+		if (!$searched_count)
 		{
 			return;
 		}
@@ -87,11 +87,11 @@ 
 
 		$oAddonAdminController = getAdminController('addon');
 
-		for($i = 0; $i < $searched_count; $i++)
+		for ($i = 0; $i < $searched_count; $i++)
 		{
 			// Add the name of
 			$addon_name = $searched_list[$i];
-			if($addon_name == "smartphone")
+			if ($addon_name == "smartphone")
 			{
 				continue;
 			}
@@ -100,7 +100,7 @@ 
 			// Wanted information on the add-on
 			$info = $this->getAddonInfoXml($addon_name, $site_srl, $gtype);
 			
-			if(!$info) $info = new stdClass();
+			if (!$info) $info = new stdClass();
 
 			$info->addon = $addon_name;
 			$info->path = $path;
@@ -108,7 +108,7 @@ 
 			$info->mactivated = FALSE;
 			$info->fixed = FALSE;
 			// Check if a permossion is granted entered in DB
-			if(!in_array($addon_name, array_keys($inserted_addons)))
+			if (!in_array($addon_name, array_keys($inserted_addons)))
 			{
 				// If not, type in the DB type (model, perhaps because of the hate doing this haneungeo .. ㅡ. ㅜ)
 				$oAddonAdminController->doInsert($addon_name, $site_srl, $type);
@@ -116,15 +116,15 @@ 
 			}
 			else
 			{
-				if($inserted_addons[$addon_name]->is_used == 'Y')
+				if ($inserted_addons[$addon_name]->is_used == 'Y')
 				{
 					$info->activated = TRUE;
 				}
-				if($inserted_addons[$addon_name]->is_used_m == 'Y')
+				if ($inserted_addons[$addon_name]->is_used_m == 'Y')
 				{
 					$info->mactivated = TRUE;
 				}
-				if($gtype == 'global' && $inserted_addons[$addon_name]->is_fixed == 'Y')
+				if ($gtype == 'global' && $inserted_addons[$addon_name]->is_fixed == 'Y')
 				{
 					$info->fixed = TRUE;
 				}
@@ -147,14 +147,14 @@ 
 	{
 		// Get a path of the requested module. Return if not exists.
 		$addon_path = $this->getAddonPath($addon);
-		if(!$addon_path)
+		if (!$addon_path)
 		{
 			return;
 		}
 
 		// Read the xml file for module skin information
 		$xml_file = sprintf("%sconf/info.xml", FileHandler::getRealpath($addon_path));
-		if(!file_exists($xml_file))
+		if (!file_exists($xml_file))
 		{
 			return;
 		}
@@ -163,7 +163,7 @@ 
 		$tmp_xml_obj = $oXmlParser->loadXmlFile($xml_file);
 		$xml_obj = $tmp_xml_obj->addon;
 
-		if(!$xml_obj)
+		if (!$xml_obj)
 		{
 			return;
 		}
@@ -171,7 +171,7 @@ 
 		// DB is set to bring history
 		$db_args = new stdClass();
 		$db_args->addon = $addon;
-		if($gtype == 'global')
+		if ($gtype == 'global')
 		{
 			$output = executeQuery('addon.getAddonInfo', $db_args);
 		}
@@ -183,7 +183,7 @@ 
 		$extra_vals = unserialize($output->data->extra_vars);
 
 		$addon_info = new stdClass();
-		if($extra_vals->mid_list)
+		if ($extra_vals->mid_list)
 		{
 			$addon_info->mid_list = $extra_vals->mid_list;
 		}
@@ -192,13 +192,13 @@ 
 			$addon_info->mid_list = array();
 		}
 
-		if($extra_vals->xe_run_method)
+		if ($extra_vals->xe_run_method)
 		{
 			$addon_info->xe_run_method = $extra_vals->xe_run_method;
 		}
 
 		// Add information
-		if($xml_obj->version && $xml_obj->attrs->version == '0.2')
+		if ($xml_obj->version && $xml_obj->attrs->version == '0.2')
 		{
 			// addon format v0.2
 			$date_obj = new stdClass();
@@ -213,7 +213,7 @@ 
 			$addon_info->license = $xml_obj->license->body;
 			$addon_info->license_link = $xml_obj->license->attrs->link;
 
-			if(!is_array($xml_obj->author))
+			if (!is_array($xml_obj->author))
 			{
 				$author_list = array();
 				$author_list[] = $xml_obj->author;
@@ -224,7 +224,7 @@ 
 			}
 
 			$addon_info->author = array();
-			foreach($author_list as $author)
+			foreach ($author_list as $author)
 			{
 				$author_obj = new stdClass();
 				$author_obj->name = $author->name->body;
@@ -234,39 +234,39 @@ 
 			}
 
 			// Expand the variable order
-			if($xml_obj->extra_vars)
+			if ($xml_obj->extra_vars)
 			{
 				$extra_var_groups = $xml_obj->extra_vars->group;
-				if(!$extra_var_groups)
+				if (!$extra_var_groups)
 				{
 					$extra_var_groups = $xml_obj->extra_vars;
 				}
-				if(!is_array($extra_var_groups))
+				if (!is_array($extra_var_groups))
 				{
 					$extra_var_groups = array($extra_var_groups);
 				}
 
-				foreach($extra_var_groups as $group)
+				foreach ($extra_var_groups as $group)
 				{
 					$extra_vars = $group->var;
-					if(!is_array($group->var))
+					if (!is_array($group->var))
 					{
 						$extra_vars = array($group->var);
 					}
 
-					foreach($extra_vars as $key => $val)
+					foreach ($extra_vars as $key => $val)
 					{
-						if(!$val)
+						if (!$val)
 						{
 							continue;
 						}
 
 						$obj = new stdClass();
-						if(!$val->attrs)
+						if (!$val->attrs)
 						{
 							$val->attrs = new stdClass();
 						}
-						if(!$val->attrs->type)
+						if (!$val->attrs->type)
 						{
 							$val->attrs->type = 'text';
 						}
@@ -276,26 +276,26 @@ 
 						$obj->title = $val->title->body;
 						$obj->type = $val->attrs->type;
 						$obj->description = $val->description->body;
-						if($obj->name)
+						if ($obj->name)
 						{
 							$obj->value = $extra_vals->{$obj->name};
 						}
-						if(strpos($obj->value, '|@|') != FALSE)
+						if (strpos($obj->value, '|@|') != FALSE)
 						{
 							$obj->value = explode('|@|', $obj->value);
 						}
-						if($obj->type == 'mid_list' && !is_array($obj->value))
+						if ($obj->type == 'mid_list' && !is_array($obj->value))
 						{
 							$obj->value = array($obj->value);
 						}
 
 						// 'Select'type obtained from the option list.
-						if($val->options && !is_array($val->options))
+						if ($val->options && !is_array($val->options))
 						{
 							$val->options = array($val->options);
 						}
 
-						for($i = 0, $c = count($val->options); $i < $c; $i++)
+						for ($i = 0, $c = count($val->options); $i < $c; $i++)
 						{
 							$obj->options[$i] = new stdClass();
 							$obj->options[$i]->title = $val->options[$i]->title->body;
@@ -328,30 +328,30 @@ 
 			$addon_info->author = array();
 			$addon_info->author[] = $author_obj;
 
-			if($xml_obj->extra_vars)
+			if ($xml_obj->extra_vars)
 			{
 				// Expand the variable order
 				$extra_var_groups = $xml_obj->extra_vars->group;
-				if(!$extra_var_groups)
+				if (!$extra_var_groups)
 				{
 					$extra_var_groups = $xml_obj->extra_vars;
 				}
-				if(!is_array($extra_var_groups))
+				if (!is_array($extra_var_groups))
 				{
 					$extra_var_groups = array($extra_var_groups);
 				}
-				foreach($extra_var_groups as $group)
+				foreach ($extra_var_groups as $group)
 				{
 					$extra_vars = $group->var;
-					if(!is_array($group->var))
+					if (!is_array($group->var))
 					{
 						$extra_vars = array($group->var);
 					}
 
 					$addon_info->extra_vars = array();
-					foreach($extra_vars as $key => $val)
+					foreach ($extra_vars as $key => $val)
 					{
-						if(!$val)
+						if (!$val)
 						{
 							continue;
 						}
@@ -363,26 +363,26 @@ 
 						$obj->title = $val->title->body;
 						$obj->type = $val->type->body ? $val->type->body : 'text';
 						$obj->description = $val->description->body;
-						if($obj->name)
+						if ($obj->name)
 						{
 							$obj->value = $extra_vals->{$obj->name};
 						}
-						if(strpos($obj->value, '|@|') != false)
+						if (strpos($obj->value, '|@|') != false)
 						{
 							$obj->value = explode('|@|', $obj->value);
 						}
-						if($obj->type == 'mid_list' && !is_array($obj->value))
+						if ($obj->type == 'mid_list' && !is_array($obj->value))
 						{
 							$obj->value = array($obj->value);
 						}
 						// 'Select'type obtained from the option list.
-						if($val->options && !is_array($val->options))
+						if ($val->options && !is_array($val->options))
 						{
 							$val->options = array($val->options);
 						}
 
 						$obj->options = array();
-						for($i = 0, $c = count($val->options); $i < $c; $i++)
+						for ($i = 0, $c = count($val->options); $i < $c; $i++)
 						{
 							$obj->options[$i]->title = $val->options[$i]->title->body;
 							$obj->options[$i]->value = $val->options[$i]->value->body;
@@ -406,7 +406,7 @@ 
 	{
 		$args = new stdClass();
 		$args->list_order = 'addon';
-		if($gtype == 'global')
+		if ($gtype == 'global')
 		{
 			$output = executeQueryArray('addon.getAddons', $args);
 		}
@@ -415,14 +415,14 @@ 
 			$args->site_srl = $site_srl;
 			$output = executeQueryArray('addon.getSiteAddons', $args);
 		}
-		if(!$output->data)
+		if (!$output->data)
 		{
 			return array();
 		}
 
 		$activated_count = count($output->data);
 		$addon_list = array();
-		for($i = 0; $i < $activated_count; $i++)
+		for ($i = 0; $i < $activated_count; $i++)
 		{
 			$addon = $output->data[$i];
 			$addon_list[$addon->addon] = $addon;
@@ -443,9 +443,9 @@ 
 	{
 		$args = new stdClass();
 		$args->addon = $addon;
-		if($gtype == 'global')
+		if ($gtype == 'global')
 		{
-			if($type == "pc")
+			if ($type == "pc")
 			{
 				$output = executeQuery('addon.getAddonIsActivated', $args);
 			}
@@ -457,7 +457,7 @@ 
 		else
 		{
 			$args->site_srl = $site_srl;
-			if($type == "pc")
+			if ($type == "pc")
 			{
 				$output = executeQuery('addon.getSiteAddonIsActivated', $args);
 			}
@@ -466,7 +466,7 @@ 
 				$output = executeQuery('addon.getSiteMAddonIsActivated', $args);
 			}
 		}
-		if($output->data->count > 0)
+		if ($output->data->count > 0)
 		{
 			return TRUE;
 		}

Braces +12 added lines, -19 removed lines

@@ -100,7 +100,9 @@ 
 			// Wanted information on the add-on
 			$info = $this->getAddonInfoXml($addon_name, $site_srl, $gtype);
 			
-			if(!$info) $info = new stdClass();
+			if(!$info) {
+				$info = new stdClass();
+			}
 
 			$info->addon = $addon_name;
 			$info->path = $path;
@@ -113,8 +115,7 @@ 
 				// If not, type in the DB type (model, perhaps because of the hate doing this haneungeo .. ㅡ. ㅜ)
 				$oAddonAdminController->doInsert($addon_name, $site_srl, $type);
 				// Is activated
-			}
-			else
+			} else
 			{
 				if($inserted_addons[$addon_name]->is_used == 'Y')
 				{
@@ -174,8 +175,7 @@ 
 		if($gtype == 'global')
 		{
 			$output = executeQuery('addon.getAddonInfo', $db_args);
-		}
-		else
+		} else
 		{
 			$db_args->site_srl = $site_srl;
 			$output = executeQuery('addon.getSiteAddonInfo', $db_args);
@@ -186,8 +186,7 @@ 
 		if($extra_vals->mid_list)
 		{
 			$addon_info->mid_list = $extra_vals->mid_list;
-		}
-		else
+		} else
 		{
 			$addon_info->mid_list = array();
 		}
@@ -217,8 +216,7 @@ 
 			{
 				$author_list = array();
 				$author_list[] = $xml_obj->author;
-			}
-			else
+			} else
 			{
 				$author_list = $xml_obj->author;
 			}
@@ -306,8 +304,7 @@ 
 					}
 				}
 			}
-		}
-		else
+		} else
 		{
 			// addon format 0.1
 			$addon_info = new stdClass();
@@ -409,8 +406,7 @@ 
 		if($gtype == 'global')
 		{
 			$output = executeQueryArray('addon.getAddons', $args);
-		}
-		else
+		} else
 		{
 			$args->site_srl = $site_srl;
 			$output = executeQueryArray('addon.getSiteAddons', $args);
@@ -448,20 +444,17 @@ 
 			if($type == "pc")
 			{
 				$output = executeQuery('addon.getAddonIsActivated', $args);
-			}
-			else
+			} else
 			{
 				$output = executeQuery('addon.getMAddonIsActivated', $args);
 			}
-		}
-		else
+		} else
 		{
 			$args->site_srl = $site_srl;
 			if($type == "pc")
 			{
 				$output = executeQuery('addon.getSiteAddonIsActivated', $args);
-			}
-			else
+			} else
 			{
 				$output = executeQuery('addon.getSiteMAddonIsActivated', $args);
 			}

modules/admin/admin.admin.view.php

Doc Comments +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 
 	/**
 	 * Initilization
-	 * @return void
+	 * @return ModuleObject|null
 	 */
 	function init()
 	{

Indentation +1 added lines, -1 removed lines

@@ -566,7 +566,7 @@
 	/**
 	 * Retrun server environment to XML string
 	 * @return object
-	*/
+	 */
 	function dispAdminViewServerEnv()
 	{
 		$info = array();

Spacing +77 added lines, -77 removed lines

@@ -28,7 +28,7 @@ 
 	{
 		$db_info = Context::getDBInfo();
 
-		if(strpos($db_info->default_url, 'xn--') !== FALSE)
+		if (strpos($db_info->default_url, 'xn--') !== FALSE)
 		{
 			$xe_default_url = Context::decodeIdna($db_info->default_url);
 		}
@@ -48,13 +48,13 @@ 
 		// forbit access if the user is not an administrator
 		$oMemberModel = getModel('member');
 		$logged_info = $oMemberModel->getLoggedInfo();
-		if($logged_info->is_admin != 'Y')
+		if ($logged_info->is_admin != 'Y')
 		{
 			return $this->stop("msg_is_not_administrator");
 		}
 
 		// change into administration layout
-		$this->setTemplatePath($this->module_path . 'tpl');
+		$this->setTemplatePath($this->module_path.'tpl');
 		$this->setLayoutPath($this->getTemplatePath());
 		$this->setLayoutFile('layout.html');
 
@@ -74,11 +74,11 @@ 
 		Context::set('use_db_session', $db_info->use_db_session == 'N' ? 'N' : 'Y');
 		Context::set('use_mobile_view', $db_info->use_mobile_view == 'Y' ? 'Y' : 'N');
 		Context::set('use_ssl', $db_info->use_ssl ? $db_info->use_ssl : "none");
-		if($db_info->http_port)
+		if ($db_info->http_port)
 		{
 			Context::set('http_port', $db_info->http_port);
 		}
-		if($db_info->https_port)
+		if ($db_info->https_port)
 		{
 			Context::set('https_port', $db_info->https_port);
 		}
@@ -94,7 +94,7 @@ 
 	function checkEasyinstall()
 	{
 		$lastTime = (int) FileHandler::readFile($this->easyinstallCheckFile);
-		if($lastTime > $_SERVER['REQUEST_TIME'] - 60 * 60 * 24 * 30)
+		if ($lastTime > $_SERVER['REQUEST_TIME'] - 60 * 60 * 24 * 30)
 		{
 			return;
 		}
@@ -108,14 +108,14 @@ 
 		$lUpdateDoc = $xml_lUpdate->parse($buff);
 		$updateDate = $lUpdateDoc->response->updatedate->body;
 
-		if(!$updateDate)
+		if (!$updateDate)
 		{
 			$this->_markingCheckEasyinstall();
 			return;
 		}
 
 		$item = $oAutoinstallModel->getLatestPackage();
-		if(!$item || $item->updatedate < $updateDate)
+		if (!$item || $item->updatedate < $updateDate)
 		{
 			$oController = getAdminController('autoinstall');
 			$oController->_updateinfo();
@@ -144,7 +144,7 @@ 
 
 		// Check is_shortcut column
 		$oDB = DB::getInstance();
-		if(!$oDB->isColumnExists('menu_item', 'is_shortcut'))
+		if (!$oDB->isColumnExists('menu_item', 'is_shortcut'))
 		{
 			return;
 		}
@@ -162,9 +162,9 @@ 
 		$currentAct = Context::get('act');
 		$subMenuTitle = '';
 
-		foreach((array) $moduleActionInfo->menu as $key => $value)
+		foreach ((array) $moduleActionInfo->menu as $key => $value)
 		{
-			if(isset($value->acts) && is_array($value->acts) && in_array($currentAct, $value->acts))
+			if (isset($value->acts) && is_array($value->acts) && in_array($currentAct, $value->acts))
 			{
 				$subMenuTitle = $value->title;
 				break;
@@ -173,21 +173,21 @@ 
 		// get current menu's srl(=parentSrl)
 		$parentSrl = 0;
 		$oMenuAdminConroller = getAdminController('menu');
-		foreach((array) $menu->list as $parentKey => $parentMenu)
+		foreach ((array) $menu->list as $parentKey => $parentMenu)
 		{
-			if(!is_array($parentMenu['list']) || !count($parentMenu['list']))
+			if (!is_array($parentMenu['list']) || !count($parentMenu['list']))
 			{
 				continue;
 			}
-			if($parentMenu['href'] == '#' && count($parentMenu['list']))
+			if ($parentMenu['href'] == '#' && count($parentMenu['list']))
 			{
 				$firstChild = current($parentMenu['list']);
 				$menu->list[$parentKey]['href'] = $firstChild['href'];
 			}
 
-			foreach($parentMenu['list'] as $childKey => $childMenu)
+			foreach ($parentMenu['list'] as $childKey => $childMenu)
 			{
-				if($subMenuTitle == $childMenu['text'] && $parentSrl == 0)
+				if ($subMenuTitle == $childMenu['text'] && $parentSrl == 0)
 				{
 					$parentSrl = $childMenu['parent_srl'];
 				}
@@ -200,7 +200,7 @@ 
 		$gnbTitleInfo->adminTitle = $objConfig->adminTitle ? $objConfig->adminTitle : 'XE Admin';
 		$gnbTitleInfo->adminLogo = $objConfig->adminLogo ? $objConfig->adminLogo : 'modules/admin/tpl/img/xe.h1.png';
 
-		$browserTitle = ($subMenuTitle ? $subMenuTitle : 'Dashboard') . ' - ' . $gnbTitleInfo->adminTitle;
+		$browserTitle = ($subMenuTitle ? $subMenuTitle : 'Dashboard').' - '.$gnbTitleInfo->adminTitle;
 
 		// Get list of favorite
 		$oAdminAdminModel = getAdminModel('admin');
@@ -211,7 +211,7 @@ 
 		// move from index method, because use in admin footer
 		$newest_news_url = sprintf("http://news.xpressengine.com/%s/news.php?version=%s&package=%s", _XE_LOCATION_, __XE_VERSION__, _XE_PACKAGE_);
 		$cache_file = sprintf("%sfiles/cache/newest_news.%s.cache.php", _XE_PATH_, _XE_LOCATION_);
-		if(!file_exists($cache_file) || filemtime($cache_file) + 60 * 60 < $_SERVER['REQUEST_TIME'])
+		if (!file_exists($cache_file) || filemtime($cache_file) + 60 * 60 < $_SERVER['REQUEST_TIME'])
 		{
 			// Considering if data cannot be retrieved due to network problem, modify filemtime to prevent trying to reload again when refreshing administration page
 			// Ensure to access the administration page even though news cannot be displayed
@@ -219,20 +219,20 @@ 
 			FileHandler::getRemoteFile($newest_news_url, $cache_file, null, 1, 'GET', 'text/html', array('REQUESTURL' => getFullUrl('')));
 		}
 
-		if(file_exists($cache_file))
+		if (file_exists($cache_file))
 		{
 			$oXml = new XmlParser();
 			$buff = $oXml->parse(FileHandler::readFile($cache_file));
 
 			$item = $buff->zbxe_news->item;
-			if($item)
+			if ($item)
 			{
-				if(!is_array($item))
+				if (!is_array($item))
 				{
 					$item = array($item);
 				}
 
-				foreach($item as $key => $val)
+				foreach ($item as $key => $val)
 				{
 					$obj = new stdClass();
 					$obj->title = $val->body;
@@ -241,7 +241,7 @@ 
 					$news[] = $obj;
 				}
 				Context::set('news', $news);
-				if(isset($news) && is_array($news))
+				if (isset($news) && is_array($news))
 				{
 					Context::set('latestVersion', array_shift($news));
 				}
@@ -264,7 +264,7 @@ 
 	function dispAdminIndex()
 	{
 		$db_info = Context::getDBInfo();
-		Context::set('db_info',$db_info);
+		Context::set('db_info', $db_info);
 
 		// Get statistics
 		$args = new stdClass();
@@ -301,9 +301,9 @@ 
 		$args = new stdClass();
 		$args->list_count = 5;
 		$output = $oCommentModel->getNewestCommentList($args, $columnList);
-		if(is_array($output))
+		if (is_array($output))
 		{
-			foreach($output AS $key => $value)
+			foreach ($output AS $key => $value)
 			{
 				$value->content = strip_tags($value->content);
 			}
@@ -314,17 +314,17 @@ 
 		// Get list of modules
 		$oModuleModel = getModel('module');
 		$module_list = $oModuleModel->getModuleList();
-		if(is_array($module_list))
+		if (is_array($module_list))
 		{
 			$needUpdate = FALSE;
 			$addTables = FALSE;
-			foreach($module_list AS $key => $value)
+			foreach ($module_list AS $key => $value)
 			{
-				if($value->need_install)
+				if ($value->need_install)
 				{
 					$addTables = TRUE;
 				}
-				if($value->need_update)
+				if ($value->need_update)
 				{
 					$needUpdate = TRUE;
 				}
@@ -335,12 +335,12 @@ 
 		$oAutoinstallAdminModel = getAdminModel('autoinstall');
 		$needUpdateList = $oAutoinstallAdminModel->getNeedUpdateList();
 
-		if(is_array($needUpdateList))
+		if (is_array($needUpdateList))
 		{
-			foreach($needUpdateList AS $key => $value)
+			foreach ($needUpdateList AS $key => $value)
 			{
 				$helpUrl = './admin/help/index.html#';
-				switch($value->type)
+				switch ($value->type)
 				{
 					case 'addon':
 						$helpUrl .= 'UMAN_terminology_addon';
@@ -367,8 +367,8 @@ 
 
 		$site_module_info = Context::get('site_module_info');
 		$oAddonAdminModel = getAdminModel('addon');
-		$counterAddonActivated = $oAddonAdminModel->isActivatedAddon('counter', $site_module_info->site_srl );
-		if(!$counterAddonActivated)
+		$counterAddonActivated = $oAddonAdminModel->isActivatedAddon('counter', $site_module_info->site_srl);
+		if (!$counterAddonActivated)
 		{
 			$columnList = array('member_srl', 'nick_name', 'user_name', 'user_id', 'email_address');
 			$args = new stdClass;
@@ -391,9 +391,9 @@ 
 
 		// gathering enviroment check
 		$mainVersion = join('.', array_slice(explode('.', __XE_VERSION__), 0, 2));
-		$path = FileHandler::getRealPath('./files/env/' . $mainVersion);
+		$path = FileHandler::getRealPath('./files/env/'.$mainVersion);
 		$isEnviromentGatheringAgreement = FALSE;
-		if(file_exists($path))
+		if (file_exists($path))
 		{
 			$isEnviromentGatheringAgreement = TRUE;
 		}
@@ -403,7 +403,7 @@ 
 		$isLicenseAgreement = FALSE;
 		$path = FileHandler::getRealPath('./files/env/license_agreement');
 		$isLicenseAgreement = FALSE;
-		if(file_exists($path))
+		if (file_exists($path))
 		{
 			$isLicenseAgreement = TRUE;
 		}
@@ -425,7 +425,7 @@ 
 
 		Context::set('selected_lang', $db_info->lang_type);
 
-		if(strpos($db_info->default_url, 'xn--') !== FALSE)
+		if (strpos($db_info->default_url, 'xn--') !== FALSE)
 		{
 			$db_info->default_url = Context::decodeIdna($db_info->default_url);
 		}
@@ -434,9 +434,9 @@ 
 
 		// site lock
 		Context::set('IP', $_SERVER['REMOTE_ADDR']);
-		if(!$db_info->sitelock_title) $db_info->sitelock_title = 'Maintenance in progress...';
-		if(!in_array('127.0.0.1', $db_info->sitelock_whitelist)) $db_info->sitelock_whitelist[] = '127.0.0.1';
-		if(!in_array($_SERVER['REMOTE_ADDR'], $db_info->sitelock_whitelist)) $db_info->sitelock_whitelist[] = $_SERVER['REMOTE_ADDR'];
+		if (!$db_info->sitelock_title) $db_info->sitelock_title = 'Maintenance in progress...';
+		if (!in_array('127.0.0.1', $db_info->sitelock_whitelist)) $db_info->sitelock_whitelist[] = '127.0.0.1';
+		if (!in_array($_SERVER['REMOTE_ADDR'], $db_info->sitelock_whitelist)) $db_info->sitelock_whitelist[] = $_SERVER['REMOTE_ADDR'];
 		$db_info->sitelock_whitelist = array_unique($db_info->sitelock_whitelist);
 		Context::set('remote_addr', $_SERVER['REMOTE_ADDR']);
 		Context::set('use_sitelock', $db_info->use_sitelock);
@@ -447,7 +447,7 @@ 
 		Context::set('sitelock_whitelist', $whitelist);
 
 
-		if($db_info->admin_ip_list) $admin_ip_list = implode("\r\n", $db_info->admin_ip_list);
+		if ($db_info->admin_ip_list) $admin_ip_list = implode("\r\n", $db_info->admin_ip_list);
 		else $admin_ip_list = '';
 		Context::set('admin_ip_list', $admin_ip_list);
 
@@ -470,7 +470,7 @@ 
 		Context::set('htmlFooter', htmlspecialchars($config->htmlFooter));
 
 		// embed filter
-		require_once(_XE_PATH_ . 'classes/security/EmbedFilter.class.php');
+		require_once(_XE_PATH_.'classes/security/EmbedFilter.class.php');
 		$oEmbedFilter = EmbedFilter::getInstance();
 		context::set('embed_white_object', implode(PHP_EOL, $oEmbedFilter->whiteUrlList));
 		context::set('embed_white_iframe', implode(PHP_EOL, $oEmbedFilter->whiteIframeUrlList));
@@ -529,36 +529,36 @@ 
 	 */
 	function showSendEnv()
 	{
-		if(Context::getResponseMethod() != 'HTML')
+		if (Context::getResponseMethod() != 'HTML')
 		{
 			return;
 		}
 
 		$server = 'http://collect.xpressengine.com/env/img.php?';
 		$path = './files/env/';
-		$install_env = $path . 'install';
+		$install_env = $path.'install';
 		$mainVersion = join('.', array_slice(explode('.', __XE_VERSION__), 0, 2));
 
-		if(file_exists(FileHandler::getRealPath($install_env)))
+		if (file_exists(FileHandler::getRealPath($install_env)))
 		{
 			$oAdminAdminModel = getAdminModel('admin');
 			$params = $oAdminAdminModel->getEnv('INSTALL');
-			$img = sprintf('<img src="%s" alt="" style="height:0px;width:0px" />', $server . $params);
+			$img = sprintf('<img src="%s" alt="" style="height:0px;width:0px" />', $server.$params);
 			Context::addHtmlFooter($img);
 
-			FileHandler::writeFile($path . $mainVersion, '1');
+			FileHandler::writeFile($path.$mainVersion, '1');
 		}
-		else if(isset($_SESSION['enviroment_gather']) && !file_exists(FileHandler::getRealPath($path . $mainVersion)))
+		else if (isset($_SESSION['enviroment_gather']) && !file_exists(FileHandler::getRealPath($path.$mainVersion)))
 		{
-			if($_SESSION['enviroment_gather'] == 'Y')
+			if ($_SESSION['enviroment_gather'] == 'Y')
 			{
 				$oAdminAdminModel = getAdminModel('admin');
 				$params = $oAdminAdminModel->getEnv();
-				$img = sprintf('<img src="%s" alt="" style="height:0px;width:0px" />', $server . $params);
+				$img = sprintf('<img src="%s" alt="" style="height:0px;width:0px" />', $server.$params);
 				Context::addHtmlFooter($img);
 			}
 
-			FileHandler::writeFile($path . $mainVersion, '1');
+			FileHandler::writeFile($path.$mainVersion, '1');
 			unset($_SESSION['enviroment_gather']);
 		}
 	}
@@ -576,64 +576,64 @@ 
 		$tmp = explode("&", $envInfo);
 		$arrInfo = array();
 		$xe_check_env = array();
-		foreach($tmp as $value) {
+		foreach ($tmp as $value) {
 			$arr = explode("=", $value);
-			if($arr[0]=="type") {
+			if ($arr[0] == "type") {
 				continue;
-			}elseif($arr[0]=="phpext" ) {
+			}elseif ($arr[0] == "phpext") {
 				$str = urldecode($arr[1]);
-				$xe_check_env[$arr[0]]= str_replace("|", ", ", $str);
-			} elseif($arr[0]=="module" ) {
+				$xe_check_env[$arr[0]] = str_replace("|", ", ", $str);
+			} elseif ($arr[0] == "module") {
 				$str = urldecode($arr[1]);
 				$arrModuleName = explode("|", $str);
 				$oModuleModel = getModel("module");
 				$mInfo = array();
-				foreach($arrModuleName as $moduleName) {
+				foreach ($arrModuleName as $moduleName) {
 					$moduleInfo = $oModuleModel->getModuleInfoXml($moduleName);
 					$mInfo[] = "{$moduleName}({$moduleInfo->version})";
 				}
-				$xe_check_env[$arr[0]]= join(", ", $mInfo);
-			} elseif($arr[0]=="addon") {
+				$xe_check_env[$arr[0]] = join(", ", $mInfo);
+			} elseif ($arr[0] == "addon") {
 				$str = urldecode($arr[1]);
 				$arrAddonName = explode("|", $str);
 				$oAddonModel = getAdminModel("addon");
 				$mInfo = array();
-				foreach($arrAddonName as $addonName) {
+				foreach ($arrAddonName as $addonName) {
 					$addonInfo = $oAddonModel->getAddonInfoXml($addonName);
 					$mInfo[] = "{$addonName}({$addonInfo->version})";
 				}
-				$xe_check_env[$arr[0]]= join(", ", $mInfo);
-			} elseif($arr[0]=="widget") {
+				$xe_check_env[$arr[0]] = join(", ", $mInfo);
+			} elseif ($arr[0] == "widget") {
 				$str = urldecode($arr[1]);
 				$arrWidgetName = explode("|", $str);
 				$oWidgetModel = getModel("widget");
 				$mInfo = array();
-				foreach($arrWidgetName as $widgetName) {
+				foreach ($arrWidgetName as $widgetName) {
 					$widgetInfo = $oWidgetModel->getWidgetInfo($widgetName);
 					$mInfo[] = "{$widgetName}({$widgetInfo->version})";
 				}
-				$xe_check_env[$arr[0]]= join(", ", $mInfo);
-			} elseif($arr[0]=="widgetstyle") {
+				$xe_check_env[$arr[0]] = join(", ", $mInfo);
+			} elseif ($arr[0] == "widgetstyle") {
 				$str = urldecode($arr[1]);
 				$arrWidgetstyleName = explode("|", $str);
 				$oWidgetModel = getModel("widget");
 				$mInfo = array();
-				foreach($arrWidgetstyleName as $widgetstyleName) {
+				foreach ($arrWidgetstyleName as $widgetstyleName) {
 					$widgetstyleInfo = $oWidgetModel->getWidgetStyleInfo($widgetstyleName);
 					$mInfo[] = "{$widgetstyleName}({$widgetstyleInfo->version})";
 				}
-				$xe_check_env[$arr[0]]= join(", ", $mInfo);
+				$xe_check_env[$arr[0]] = join(", ", $mInfo);
 
-			} elseif($arr[0]=="layout") {
+			} elseif ($arr[0] == "layout") {
 				$str = urldecode($arr[1]);
 				$arrLayoutName = explode("|", $str);
 				$oLayoutModel = getModel("layout");
 				$mInfo = array();
-				foreach($arrLayoutName as $layoutName) {
+				foreach ($arrLayoutName as $layoutName) {
 					$layoutInfo = $oLayoutModel->getLayoutInfo($layoutName);
 					$mInfo[] = "{$layoutName}({$layoutInfo->version})";
 				}
-				$xe_check_env[$arr[0]]= join(", ", $mInfo);
+				$xe_check_env[$arr[0]] = join(", ", $mInfo);
 			} else {
 				$xe_check_env[$arr[0]] = urldecode($arr[1]);
 			}
@@ -647,15 +647,15 @@ 
 		$php_core['memory_limit'] = "{$ini_info['memory_limit']['local_value']}";
 		$info['PHP_Core'] = $php_core;
 
-		$str_info = "[XE Server Environment " . date("Y-m-d") . "]\n\n";
+		$str_info = "[XE Server Environment ".date("Y-m-d")."]\n\n";
 		$str_info .= "realpath : ".realpath('./')."\n";
-		foreach( $info as $key=>$value )
+		foreach ($info as $key=>$value)
 		{
-			if( is_array( $value ) == false ) {
+			if (is_array($value) == false) {
 				$str_info .= "{$key} : {$value}\n";
 			} else {
 				//$str_info .= "\n{$key} \n";
-				foreach( $value as $key2=>$value2 )
+				foreach ($value as $key2=>$value2)
 					$str_info .= "{$key2} : {$value2}\n";
 			}
 		}
@@ -672,7 +672,7 @@ 
 		Context::set('use_rewrite', $useRewrite); 
 
 		// nginx 체크, rewrite 사용법 안내
-		if($useRewrite == 'N' && stripos($_SERVER['SERVER_SOFTWARE'], 'nginx') !== false) Context::set('use_nginx', 'Y');
+		if ($useRewrite == 'N' && stripos($_SERVER['SERVER_SOFTWARE'], 'nginx') !== false) Context::set('use_nginx', 'Y');
 		
 		Context::set('useable', $oInstallController->checkInstallEnv());
 		$this->setTemplateFile('check_env.html');

Braces +23 added lines, -13 removed lines

@@ -31,8 +31,7 @@ 
 		if(strpos($db_info->default_url, 'xn--') !== FALSE)
 		{
 			$xe_default_url = Context::decodeIdna($db_info->default_url);
-		}
-		else
+		} else
 		{
 			$xe_default_url = $db_info->default_url;
 		}
@@ -434,9 +433,15 @@ 
 
 		// site lock
 		Context::set('IP', $_SERVER['REMOTE_ADDR']);
-		if(!$db_info->sitelock_title) $db_info->sitelock_title = 'Maintenance in progress...';
-		if(!in_array('127.0.0.1', $db_info->sitelock_whitelist)) $db_info->sitelock_whitelist[] = '127.0.0.1';
-		if(!in_array($_SERVER['REMOTE_ADDR'], $db_info->sitelock_whitelist)) $db_info->sitelock_whitelist[] = $_SERVER['REMOTE_ADDR'];
+		if(!$db_info->sitelock_title) {
+			$db_info->sitelock_title = 'Maintenance in progress...';
+		}
+		if(!in_array('127.0.0.1', $db_info->sitelock_whitelist)) {
+			$db_info->sitelock_whitelist[] = '127.0.0.1';
+		}
+		if(!in_array($_SERVER['REMOTE_ADDR'], $db_info->sitelock_whitelist)) {
+			$db_info->sitelock_whitelist[] = $_SERVER['REMOTE_ADDR'];
+		}
 		$db_info->sitelock_whitelist = array_unique($db_info->sitelock_whitelist);
 		Context::set('remote_addr', $_SERVER['REMOTE_ADDR']);
 		Context::set('use_sitelock', $db_info->use_sitelock);
@@ -447,8 +452,11 @@ 
 		Context::set('sitelock_whitelist', $whitelist);
 
 
-		if($db_info->admin_ip_list) $admin_ip_list = implode("\r\n", $db_info->admin_ip_list);
-		else $admin_ip_list = '';
+		if($db_info->admin_ip_list) {
+			$admin_ip_list = implode("\r\n", $db_info->admin_ip_list);
+		} else {
+			$admin_ip_list = '';
+		}
 		Context::set('admin_ip_list', $admin_ip_list);
 
 		Context::set('lang_selected', Context::loadLangSelected());
@@ -547,8 +555,7 @@ 
 			Context::addHtmlFooter($img);
 
 			FileHandler::writeFile($path . $mainVersion, '1');
-		}
-		else if(isset($_SESSION['enviroment_gather']) && !file_exists(FileHandler::getRealPath($path . $mainVersion)))
+		} else if(isset($_SESSION['enviroment_gather']) && !file_exists(FileHandler::getRealPath($path . $mainVersion)))
 		{
 			if($_SESSION['enviroment_gather'] == 'Y')
 			{
@@ -580,7 +587,7 @@ 
 			$arr = explode("=", $value);
 			if($arr[0]=="type") {
 				continue;
-			}elseif($arr[0]=="phpext" ) {
+			} elseif($arr[0]=="phpext" ) {
 				$str = urldecode($arr[1]);
 				$xe_check_env[$arr[0]]= str_replace("|", ", ", $str);
 			} elseif($arr[0]=="module" ) {
@@ -655,8 +662,9 @@ 
 				$str_info .= "{$key} : {$value}\n";
 			} else {
 				//$str_info .= "\n{$key} \n";
-				foreach( $value as $key2=>$value2 )
-					$str_info .= "{$key2} : {$value2}\n";
+				foreach( $value as $key2=>$value2 ) {
+									$str_info .= "{$key2} : {$value2}\n";
+				}
 			}
 		}
 
@@ -672,7 +680,9 @@ 
 		Context::set('use_rewrite', $useRewrite); 
 
 		// nginx 체크, rewrite 사용법 안내
-		if($useRewrite == 'N' && stripos($_SERVER['SERVER_SOFTWARE'], 'nginx') !== false) Context::set('use_nginx', 'Y');
+		if($useRewrite == 'N' && stripos($_SERVER['SERVER_SOFTWARE'], 'nginx') !== false) {
+			Context::set('use_nginx', 'Y');
+		}
 		
 		Context::set('useable', $oInstallController->checkInstallEnv());
 		$this->setTemplateFile('check_env.html');

modules/adminlogging/adminlogging.controller.php

Doc Comments +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 
 	/**
 	 * Initialization
-	 * @return void
+	 * @return ModuleObject|null
 	 */
 	function init()
 	{

Spacing +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@ 
 		// forbit access if the user is not an administrator
 		$oMemberModel = getModel('member');
 		$logged_info = $oMemberModel->getLoggedInfo();
-		if($logged_info->is_admin != 'Y')
+		if ($logged_info->is_admin != 'Y')
 		{
 			return $this->stop("msg_is_not_administrator");
 		}
@@ -33,7 +33,7 @@ 
 	 */
 	function insertLog($module, $act)
 	{
-		if(!$module || !$act)
+		if (!$module || !$act)
 		{
 			return;
 		}

modules/autoinstall/autoinstall.admin.model.php

Doc Comments +7 added lines

@@ -15,6 +15,9 @@ 
 
 	/**
 	 * Pre process parameters
+	 * @param string $order_target
+	 * @param string $order_type
+	 * @param string $page
 	 */
 	function preProcParam(&$order_target, &$order_type, &$page)
 	{
@@ -115,6 +118,10 @@ 
 
 	/**
 	 * Get Package List
+	 * @param string $type
+	 * @param string $search_keyword
+	 * @param integer $category_srl
+	 * @param string $parent_program
 	 */
 	function getPackageList($type, $order_target = 'newest', $order_type = 'desc', $page = '1', $search_keyword = NULL, $category_srl = NULL, $parent_program = NULL)
 	{

Braces +10 added lines, -20 removed lines

@@ -71,8 +71,7 @@ 
 		if($type == 'P')
 		{
 			$category_srl = $this->layout_category_srl;
-		}
-		else
+		} else
 		{
 			$category_srl = $this->mobile_layout_category_srl;
 		}
@@ -103,8 +102,7 @@ 
 		if($type == 'P')
 		{
 			$category_srl = $this->module_skin_category_srl;
-		}
-		else
+		} else
 		{
 			$category_srl = $this->module_mobile_skin_category_srl;
 		}
@@ -121,13 +119,11 @@ 
 		if($type == 'menu')
 		{
 			$params["act"] = "getResourceapiMenuPackageList";
-		}
-		elseif($type == 'skin')
+		} elseif($type == 'skin')
 		{
 			$params["act"] = "getResourceapiSkinPackageList";
 			$params['parent_program'] = $parent_program;
-		}
-		else
+		} else
 		{
 			$params["act"] = "getResourceapiPackagelist";
 		}
@@ -172,15 +168,13 @@ 
 		if($output->toBool()==TRUE)
 		{
 			$is_authed = 1;
-		}
-		else
+		} else
 		{
 			$ftp_info = Context::getFTPInfo();
 			if(!$ftp_info->ftp_root_path)
 			{
 				$is_authed = -1;
-			}
-			else
+			} else
 			{
 				$is_authed = (int) isset($_SESSION['ftp_password']);
 			}
@@ -216,8 +210,7 @@ 
 			if($packageInfo->type == 'core')
 			{
 				$title = 'XpressEngine';
-			}
-			else
+			} else
 			{
 				$configFile = $oModel->getConfigFilePath($packageInfo->type);
 				$xmlDoc = $xml->loadXmlFile(FileHandler::getRealPath($package->path) . $configFile);
@@ -238,8 +231,7 @@ 
 						$type = "layout";
 					}
 					$title = $xmlDoc->{$type}->title->body;
-				}
-				else
+				} else
 				{
 					$pathInfo = explode('/', $package->path);
 					$title = $pathInfo[count($pathInfo) - 1];
@@ -303,8 +295,7 @@ 
 					{
 						$package->depends[$key]->installed = FALSE;
 						$package->package_srl .= "," . $dep->package_srl;
-					}
-					else
+					} else
 					{
 						$package->depends[$key]->installed = TRUE;
 						$package->depends[$key]->cur_version = $packages[$dep->package_srl]->current_version;
@@ -318,8 +309,7 @@ 
 								$package->contain_core = TRUE;
 								$package->contain_core_version = $dep->version;
 							}
-						}
-						else
+						} else
 						{
 							$package->need_update = FALSE;
 						}

Spacing +43 added lines, -43 removed lines

@@ -19,19 +19,19 @@ 
 	function preProcParam(&$order_target, &$order_type, &$page)
 	{
 		$order_target_array = array('newest' => 1, 'download' => 1, 'popular' => 1);
-		if(!isset($order_target_array[$order_target]))
+		if (!isset($order_target_array[$order_target]))
 		{
 			$order_target = 'newest';
 		}
 
 		$order_type_array = array('asc' => 1, 'desc' => 1);
-		if(!isset($order_type_array[$order_type]))
+		if (!isset($order_type_array[$order_type]))
 		{
 			$order_type = 'desc';
 		}
 
 		$page = (int) $page;
-		if($page < 1)
+		if ($page < 1)
 		{
 			$page = 1;
 		}
@@ -63,12 +63,12 @@ 
 
 		$type_array = array('M' => 1, 'P' => 1);
 		$type = Context::get('type');
-		if(!isset($type_array[$type]))
+		if (!isset($type_array[$type]))
 		{
 			$type = 'P';
 		}
 
-		if($type == 'P')
+		if ($type == 'P')
 		{
 			$category_srl = $this->layout_category_srl;
 		}
@@ -95,12 +95,12 @@ 
 
 		$type_array = array('M' => 1, 'P' => 1);
 		$type = Context::get('type');
-		if(!isset($type_array[$type]))
+		if (!isset($type_array[$type]))
 		{
 			$type = 'P';
 		}
 
-		if($type == 'P')
+		if ($type == 'P')
 		{
 			$category_srl = $this->module_skin_category_srl;
 		}
@@ -118,11 +118,11 @@ 
 	 */
 	function getPackageList($type, $order_target = 'newest', $order_type = 'desc', $page = '1', $search_keyword = NULL, $category_srl = NULL, $parent_program = NULL)
 	{
-		if($type == 'menu')
+		if ($type == 'menu')
 		{
 			$params["act"] = "getResourceapiMenuPackageList";
 		}
-		elseif($type == 'skin')
+		elseif ($type == 'skin')
 		{
 			$params["act"] = "getResourceapiSkinPackageList";
 			$params['parent_program'] = $parent_program;
@@ -137,18 +137,18 @@ 
 		$params["order_type"] = $order_type;
 		$params["page"] = $page;
 
-		if($category_srl)
+		if ($category_srl)
 		{
 			$params["category_srl"] = $category_srl;
 		}
 
-		if($search_keyword)
+		if ($search_keyword)
 		{
 			$params["search_keyword"] = $search_keyword;
 		}
 
 		$xmlDoc = XmlGenerater::getXmlDoc($params);
-		if($xmlDoc && $xmlDoc->response->packagelist->item)
+		if ($xmlDoc && $xmlDoc->response->packagelist->item)
 		{
 			$item_list = $oAdminView->rearranges($xmlDoc->response->packagelist->item);
 			$this->add('item_list', $item_list);
@@ -169,14 +169,14 @@ 
 		
 		$is_authed = 0;
 		$output = $oAdminModel->checkUseDirectModuleInstall($package);
-		if($output->toBool()==TRUE)
+		if ($output->toBool() == TRUE)
 		{
 			$is_authed = 1;
 		}
 		else
 		{
 			$ftp_info = Context::getFTPInfo();
-			if(!$ftp_info->ftp_root_path)
+			if (!$ftp_info->ftp_root_path)
 			{
 				$is_authed = -1;
 			}
@@ -196,14 +196,14 @@ 
 	{
 		$oModel = getModel('autoinstall');
 		$output = executeQueryArray('autoinstall.getNeedUpdate');
-		if(!is_array($output->data))
+		if (!is_array($output->data))
 		{
 			return NULL;
 		}
 
 		$result = array();
 		$xml = new XmlParser();
-		foreach($output->data as $package)
+		foreach ($output->data as $package)
 		{
 			$packageSrl = $package->package_srl;
 
@@ -213,27 +213,27 @@ 
 			$packageInfo->type = $oModel->getTypeFromPath($package->path);
 			$packageInfo->url = $oModel->getUpdateUrlByPackageSrl($package->package_srl);
 
-			if($packageInfo->type == 'core')
+			if ($packageInfo->type == 'core')
 			{
 				$title = 'XpressEngine';
 			}
 			else
 			{
 				$configFile = $oModel->getConfigFilePath($packageInfo->type);
-				$xmlDoc = $xml->loadXmlFile(FileHandler::getRealPath($package->path) . $configFile);
+				$xmlDoc = $xml->loadXmlFile(FileHandler::getRealPath($package->path).$configFile);
 
-				if($xmlDoc)
+				if ($xmlDoc)
 				{
 					$type = $packageInfo->type;
-					if($type == "drcomponent")
+					if ($type == "drcomponent")
 					{
 						$type = "component";
 					}
-					if($type == "style" || $type == "m.skin")
+					if ($type == "style" || $type == "m.skin")
 					{
 						$type = "skin";
 					}
-					if($type == "m.layout")
+					if ($type == "m.layout")
 					{
 						$type = "layout";
 					}
@@ -267,7 +267,7 @@ 
 		$oModel = getModel('autoinstall');
 
 		$targetpackages = array();
-		if($xmlDoc)
+		if ($xmlDoc)
 		{
 			$xmlPackage = $xmlDoc->response->package;
 			$package = new stdClass();
@@ -276,15 +276,15 @@ 
 			$package->package_description = $xmlPackage->package_description->body;
 			$package->version = $xmlPackage->version->body;
 			$package->path = $xmlPackage->path->body;
-			if($xmlPackage->depends)
+			if ($xmlPackage->depends)
 			{
-				if(!is_array($xmlPackage->depends->item))
+				if (!is_array($xmlPackage->depends->item))
 				{
 					$xmlPackage->depends->item = array($xmlPackage->depends->item);
 				}
 
 				$package->depends = array();
-				foreach($xmlPackage->depends->item as $item)
+				foreach ($xmlPackage->depends->item as $item)
 				{
 					$dep_item = new stdClass();
 					$dep_item->package_srl = $item->package_srl->body;
@@ -297,23 +297,23 @@ 
 
 				$packages = $oModel->getInstalledPackages(array_keys($targetpackages));
 				$package->deplist = "";
-				foreach($package->depends as $key => $dep)
+				foreach ($package->depends as $key => $dep)
 				{
-					if(!$packages[$dep->package_srl])
+					if (!$packages[$dep->package_srl])
 					{
 						$package->depends[$key]->installed = FALSE;
-						$package->package_srl .= "," . $dep->package_srl;
+						$package->package_srl .= ",".$dep->package_srl;
 					}
 					else
 					{
 						$package->depends[$key]->installed = TRUE;
 						$package->depends[$key]->cur_version = $packages[$dep->package_srl]->current_version;
-						if(version_compare($dep->version, $packages[$dep->package_srl]->current_version, ">"))
+						if (version_compare($dep->version, $packages[$dep->package_srl]->current_version, ">"))
 						{
 							$package->depends[$key]->need_update = TRUE;
-							$package->package_srl .= "," . $dep->package_srl;
+							$package->package_srl .= ",".$dep->package_srl;
 
-							if($dep->path === '.')
+							if ($dep->path === '.')
 							{
 								$package->contain_core = TRUE;
 								$package->contain_core_version = $dep->version;
@@ -328,14 +328,14 @@ 
 			}
 
 			$installedPackage = $oModel->getInstalledPackage($packageSrl);
-			if($installedPackage)
+			if ($installedPackage)
 			{
 				$package->installed = TRUE;
 				$package->cur_version = $installedPackage->current_version;
 				$package->need_update = version_compare($package->version, $installedPackage->current_version, ">");
 			}
 
-			if($package->path === '.')
+			if ($package->path === '.')
 			{
 				$package->contain_core = TRUE;
 				$package->contain_core_version = $package->version;
@@ -351,7 +351,7 @@ 
 	public function getAutoInstallAdminInstallInfo()
 	{
 		$packageSrl = Context::get('package_srl');
-		if(!$packageSrl)
+		if (!$packageSrl)
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
@@ -365,23 +365,23 @@ 
 		$directModuleInstall = TRUE;
 		$arrUnwritableDir = array();
 		$output = $this->isWritableDir($package->path);
-		if($output->toBool()==FALSE)
+		if ($output->toBool() == FALSE)
 		{
 			$directModuleInstall = FALSE;
 			$arrUnwritableDir[] = $output->get('path');
 		}
 
-		foreach($package->depends as $dep)
+		foreach ($package->depends as $dep)
 		{
 			$output = $this->isWritableDir($dep->path);
-			if($output->toBool()==FALSE)
+			if ($output->toBool() == FALSE)
 			{
 				$directModuleInstall = FALSE;
 				$arrUnwritableDir[] = $output->get('path');
 			}
 		}
 
-		if($directModuleInstall==FALSE)
+		if ($directModuleInstall == FALSE)
 		{
 			$output = new BaseObject(-1, 'msg_direct_inall_invalid');
 			$output->add('path', $arrUnwritableDir);
@@ -396,17 +396,17 @@ 
 		$path_list = explode('/', dirname($path));
 		$real_path = './';
 
-		while($path_list)
+		while ($path_list)
 		{
-			$check_path = realpath($real_path . implode('/', $path_list));
-			if(FileHandler::isDir($check_path))
+			$check_path = realpath($real_path.implode('/', $path_list));
+			if (FileHandler::isDir($check_path))
 			{
 				break;
 			}
 			array_pop($path_list);
 		}
 
-		if(FileHandler::isWritableDir($check_path)==FALSE)
+		if (FileHandler::isWritableDir($check_path) == FALSE)
 		{
 			$output = new BaseObject(-1, 'msg_unwritable_directory');
 			$output->add('path', FileHandler::getRealPath($check_path));

modules/board/board.admin.model.php

Doc Comments +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 
 	/**
 	 * Get the board module admin simple setting page
-	 * @return void
+	 * @return null|string
 	 */
 	public function getBoardAdminSimpleSetup($moduleSrl, $setupUrl)
 	{

Spacing +3 added lines, -3 removed lines

@@ -25,7 +25,7 @@ 
 	 */
 	public function getBoardAdminSimpleSetup($moduleSrl, $setupUrl)
 	{
-		if(!$moduleSrl)
+		if (!$moduleSrl)
 		{
 			return;
 		}
@@ -35,7 +35,7 @@ 
 		$oModuleModel = getModel('module');
 		$moduleInfo = $oModuleModel->getModuleInfoByModuleSrl($moduleSrl);
 		$moduleInfo->use_status = explode('|@|', $moduleInfo->use_status);
-		if($moduleInfo)
+		if ($moduleInfo)
 		{
 			Context::set('module_info', $moduleInfo);
 		}
@@ -46,7 +46,7 @@ 
 		Context::set('document_status_list', $documentStatusList);
 
 		// set order target list
-		foreach($this->order_target AS $key)
+		foreach ($this->order_target AS $key)
 		{
 			$order_target[$key] = Context::getLang($key);
 		}

modules/board/board.api.php

Doc Comments +9 added lines

@@ -87,6 +87,9 @@ 
 		$oModule->add('comment_list',$this->arrangeComment(Context::get('comment_list')));

 	}

 

+	/**
+	 * @param string $content_list
+	 */
 	function arrangeContentList($content_list) {

 		$output = array();

 		if(count($content_list)) {

@@ -120,6 +123,9 @@ 
 		return $output;

 	}

 

+	/**
+	 * @param string $comment_list
+	 */
 	function arrangeComment($comment_list) {

 		$output = array();

 		if(count($comment_list) > 0 ) {

@@ -133,6 +139,9 @@ 
 	}

 

 

+	/**
+	 * @param string $file_list
+	 */
 	function arrangeFile($file_list) {

 		$output = array();

 		if(count($file_list) > 0) {

Spacing +27 added lines, -27 removed lines

@@ -18,7 +18,7 @@ 
 	 * @brief notice list

 	 **/

 	function dispBoardNoticeList(&$oModule) {

-		 $oModule->add('notice_list',$this->arrangeContentList(Context::get('notice_list')));

+		 $oModule->add('notice_list', $this->arrangeContentList(Context::get('notice_list')));

 	}

 

 

@@ -29,11 +29,11 @@ 
 		$api_type = Context::get('api_type');

 		$document_list = $this->arrangeContentList(Context::get('document_list'));

 

-		if($api_type =='summary')

+		if ($api_type == 'summary')

 		{

 			$content_cut_size = Context::get('content_cut_size');

-			$content_cut_size = $content_cut_size?$content_cut_size:50;

-			foreach($document_list as $k=>$v)

+			$content_cut_size = $content_cut_size ? $content_cut_size : 50;

+			foreach ($document_list as $k=>$v)

 			{

 				$oDocument = new documentItem();

 				$oDocument->setAttribute($v, false);

@@ -42,8 +42,8 @@ 
 			}

 		}

 

-		$oModule->add('document_list',$document_list);

-		$oModule->add('page_navigation',Context::get('page_navigation'));

+		$oModule->add('document_list', $document_list);

+		$oModule->add('page_navigation', Context::get('page_navigation'));

 	}

 

 

@@ -51,7 +51,7 @@ 
 	 * @brief category list

 	 **/

 	function dispBoardCategoryList(&$oModule) {

-		$oModule->add('category_list',Context::get('category_list'));

+		$oModule->add('category_list', Context::get('category_list'));

 	}

 

 	/**

@@ -60,11 +60,11 @@ 
 	function dispBoardContentView(&$oModule) {

 		$oDocument = Context::get('oDocument');

 		$extra_vars = $oDocument->getExtraVars();
-		if($oDocument->isGranted())
+		if ($oDocument->isGranted())
 		{

-			$oDocument->add('extra_vars',$this->arrangeExtraVars($extra_vars));
+			$oDocument->add('extra_vars', $this->arrangeExtraVars($extra_vars));
 		}

-		$oModule->add('oDocument',$this->arrangeContent($oDocument));

+		$oModule->add('oDocument', $this->arrangeContent($oDocument));

 	}

 

 

@@ -73,7 +73,7 @@ 
 	 **/

 	function dispBoardContentFileList(&$oModule) {

 		$oDocument = Context::get('oDocument');
-		if($oDocument->isAccessible())
+		if ($oDocument->isAccessible())
 		{
 			$oModule->add('file_list', $this->arrangeFile(Context::get('file_list')));
 		}
@@ -88,20 +88,20 @@ 
 	 * @brief tag list

 	 **/

 	function dispBoardTagList(&$oModule) {

-		$oModule->add('tag_list',Context::get('tag_list'));

+		$oModule->add('tag_list', Context::get('tag_list'));

 	}

 

 	/**

 	 * @brief comments list

 	 **/

 	function dispBoardContentCommentList(&$oModule) {

-		$oModule->add('comment_list',$this->arrangeComment(Context::get('comment_list')));

+		$oModule->add('comment_list', $this->arrangeComment(Context::get('comment_list')));

 	}

 

 	function arrangeContentList($content_list) {

 		$output = array();

-		if(count($content_list)) {

-			foreach($content_list as $key => $val) $output[] = $this->arrangeContent($val);

+		if (count($content_list)) {

+			foreach ($content_list as $key => $val) $output[] = $this->arrangeContent($val);

 		}

 		return $output;

 	}

@@ -110,16 +110,16 @@ 
 	function arrangeContent($content) {

 		$oBoardView = getView('board');

 		$output = new stdClass;

-		if($content){

-			$output = $content->gets('document_srl','category_srl','member_srl','nick_name','title','content','tags','readed_count','voted_count','blamed_count','comment_count','regdate','last_update','extra_vars','status');

+		if ($content) {

+			$output = $content->gets('document_srl', 'category_srl', 'member_srl', 'nick_name', 'title', 'content', 'tags', 'readed_count', 'voted_count', 'blamed_count', 'comment_count', 'regdate', 'last_update', 'extra_vars', 'status');

 

-			if(!$oBoardView->grant->view)

+			if (!$oBoardView->grant->view)

 			{

 				unset($output->content);

 				unset($output->tags);

 				unset($output->extra_vars);

 			}
-			if(!$content->isAccessible())
+			if (!$content->isAccessible())
 			{
 				$output->content = Context::getLang('msg_is_secret');
 			}

@@ -137,11 +137,11 @@ 
 

 	function arrangeComment($comment_list) {

 		$output = array();

-		if(count($comment_list) > 0 ) {

-			foreach($comment_list as $key => $val){

+		if (count($comment_list) > 0) {

+			foreach ($comment_list as $key => $val) {

 				$item = null;

-				$item = $val->gets('comment_srl','parent_srl','depth','nick_name','content','is_secret','voted_count','blamed_count','regdate','last_update');

-				if(!$val->isAccessible())
+				$item = $val->gets('comment_srl', 'parent_srl', 'depth', 'nick_name', 'content', 'is_secret', 'voted_count', 'blamed_count', 'regdate', 'last_update');

+				if (!$val->isAccessible())
 				{
 					$item->content = Context::getLang('msg_is_secret');
 				}
@@ -154,8 +154,8 @@ 
 

 	function arrangeFile($file_list) {

 		$output = array();

-		if(count($file_list) > 0) {

-			foreach($file_list as $key => $val){

+		if (count($file_list) > 0) {

+			foreach ($file_list as $key => $val) {

 				$item = new stdClass;

 				$item->download_count = $val->download_count;

 				$item->source_filename = $val->source_filename;

@@ -169,8 +169,8 @@ 
 

 	function arrangeExtraVars($list) {

 		$output = array();

-		if(count($list)) {

-			foreach($list as $key => $val){

+		if (count($list)) {

+			foreach ($list as $key => $val) {

 				$item = new stdClass;

 				$item->name = $val->name;

 				$item->type = $val->type;

Braces +4 added lines, -3 removed lines

@@ -76,8 +76,7 @@ 
 		if($oDocument->isAccessible())
 		{
 			$oModule->add('file_list', $this->arrangeFile(Context::get('file_list')));
-		}
-		else
+		} else
 		{
 			$oModule->add('file_list', array());
 		}

@@ -101,7 +100,9 @@ 
 	function arrangeContentList($content_list) {

 		$output = array();

 		if(count($content_list)) {

-			foreach($content_list as $key => $val) $output[] = $this->arrangeContent($val);

+			foreach($content_list as $key => $val) {
+				$output[] = $this->arrangeContent($val);
+			}
 		}

 		return $output;

 	}