/branches/2.8.x/wb/include/phpmailer/class.phpmailer.php - Annotate - WB 2.08.x - Tracking

wb-archiv283/branches/2.8.x/wb/include/phpmailer/class.phpmailer.php @ 1574

-            Luisehahne
+<?php
 /*~ class.phpmailer.php
 .---------------------------------------------------------------------------.
 |  Software: PHPMailer - PHP email class                                    |
-            Luisehahne
+|   Version: 5.2                                                            |
 |      Site: https://code.google.com/a/apache-extras.org/p/phpmailer/       |
-            Luisehahne
+| ------------------------------------------------------------------------- |
-            Luisehahne
+|     Admin: Jim Jagielski (project admininistrator)                        |
-            Luisehahne
+|   Authors: Andy Prevost (codeworxtech) codeworxtech@users.sourceforge.net |
 |          : Marcus Bointon (coolbru) coolbru@users.sourceforge.net         |
-            Luisehahne
+|          : Jim Jagielski (jimjag) jimjag@gmail.com                        |
-            Luisehahne
+|   Founder: Brent R. Matzelle (original founder)                           |
-            Luisehahne
+| Copyright (c) 2010-2011, Jim Jagielski. All Rights Reserved.               |
-            Luisehahne
+| Copyright (c) 2004-2009, Andy Prevost. All Rights Reserved.               |
-            Luisehahne
+| Copyright (c) 2001-2003, Brent R. Matzelle                                |
 | ------------------------------------------------------------------------- |
 |   License: Distributed under the Lesser General Public License (LGPL)     |
 |            http://www.gnu.org/copyleft/lesser.html                        |
 | This program is distributed in the hope that it will be useful - WITHOUT  |
 | ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or     |
 | FITNESS FOR A PARTICULAR PURPOSE.                                         |
 '---------------------------------------------------------------------------'
 */
 /**
  * PHPMailer - PHP email transport class
-            Luisehahne
+ * NOTE: Requires PHP version 5 or later
-            Luisehahne
+ * @package PHPMailer
  * @author Andy Prevost
-            Luisehahne
+ * @author Marcus Bointon
-            Luisehahne
+ * @author Jim Jagielski
  * @copyright 2010 - 2011 Jim Jagielski
-            Luisehahne
+ * @copyright 2004 - 2009 Andy Prevost
-            Luisehahne
+ * @version $Id: class.phpmailer.php 450 2010-06-23 16:46:33Z coolbru $
-            Luisehahne
+ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
-            Luisehahne
+ */
-            Luisehahne
+if (version_compare(PHP_VERSION, '5.0.0', '<') ) exit("Sorry, this version of PHPMailer will only run on PHP version 5 or greater!\n");
-            Luisehahne
+class PHPMailer {
   /////////////////////////////////////////////////
   // PROPERTIES, PUBLIC
   /////////////////////////////////////////////////
   /**
    * Email priority (1 = High, 3 = Normal, 5 = low).
-            Luisehahne
+   * @var int
-            Luisehahne
+   */
-            Luisehahne
+  public $Priority          = 3;
             Luisehahne
   /**
    * Sets the CharSet of the message.
-            Luisehahne
+   * @var string
-            Luisehahne
+   */
-            Luisehahne
+  public $CharSet           = 'iso-8859-1';
             Luisehahne
   /**
    * Sets the Content-type of the message.
-            Luisehahne
+   * @var string
-            Luisehahne
+   */
-            Luisehahne
+  public $ContentType       = 'text/plain';
             Luisehahne
   /**
-            Luisehahne
+   * Sets the Encoding of the message. Options for this are
    *  "8bit", "7bit", "binary", "base64", and "quoted-printable".
    * @var string
-            Luisehahne
+   */
-            Luisehahne
+  public $Encoding          = '8bit';
             Luisehahne
   /**
    * Holds the most recent mailer error message.
-            Luisehahne
+   * @var string
-            Luisehahne
+   */
-            Luisehahne
+  public $ErrorInfo         = '';
             Luisehahne
   /**
    * Sets the From email address for the message.
-            Luisehahne
+   * @var string
-            Luisehahne
+   */
-            Luisehahne
+  public $From              = 'root@localhost';
             Luisehahne
   /**
    * Sets the From name of the message.
-            Luisehahne
+   * @var string
-            Luisehahne
+   */
-            Luisehahne
+  public $FromName          = 'Root User';
             Luisehahne
   /**
    * 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.
-            Luisehahne
+   * @var string
-            Luisehahne
+   */
-            Luisehahne
+  public $Sender            = '';
             Luisehahne
   /**
    * Sets the Subject of the message.
-            Luisehahne
+   * @var string
-            Luisehahne
+   */
-            Luisehahne
+  public $Subject           = '';
             Luisehahne
   /**
    * Sets the Body of the message.  This can be either an HTML or text body.
    * If HTML then run IsHTML(true).
-            Luisehahne
+   * @var string
-            Luisehahne
+   */
-            Luisehahne
+  public $Body              = '';
             Luisehahne
   /**
    * Sets the text-only body of the message.  This automatically sets the
    * email to multipart/alternative.  This body can be read by mail
    * clients that do not have HTML email capability such as mutt. Clients
    * that can read HTML will view the normal Body.
-            Luisehahne
+   * @var string
-            Luisehahne
+   */
-            Luisehahne
+  public $AltBody           = '';
             Luisehahne
   /**
-            Luisehahne
+   * Stores the complete compiled MIME message body.
    * @var string
    * @access protected
    */
   protected $MIMEBody       = '';
   /**
    * Stores the complete compiled MIME message headers.
    * @var string
    * @access protected
    */
   protected $MIMEHeader     = '';
   /**
-            Luisehahne
+   * Sets word wrapping on the body of the message to a given number of
    * characters.
-            Luisehahne
+   * @var int
-            Luisehahne
+   */
-            Luisehahne
+  public $WordWrap          = 0;
             Luisehahne
   /**
    * Method to send mail: ("mail", "sendmail", or "smtp").
-            Luisehahne
+   * @var string
-            Luisehahne
+   */
-            Luisehahne
+  public $Mailer            = 'mail';
             Luisehahne
   /**
    * Sets the path of the sendmail program.
-            Luisehahne
+   * @var string
-            Luisehahne
+   */
-            Luisehahne
+  public $Sendmail          = '/usr/sbin/sendmail';
             Luisehahne
   /**
-            Luisehahne
+   * Path to PHPMailer plugins.  Useful if the SMTP class
-            Luisehahne
+   * is in a different directory than the PHP include path.
-            Luisehahne
+   * @var string
-            Luisehahne
+   */
-            Luisehahne
+  public $PluginDir         = '';
             Luisehahne
   /**
    * Sets the email address that a reading confirmation will be sent.
-            Luisehahne
+   * @var string
-            Luisehahne
+   */
-            Luisehahne
+  public $ConfirmReadingTo  = '';
             Luisehahne
   /**
    * Sets the hostname to use in Message-Id and Received headers
    * and as default HELO string. If empty, the value returned
    * by SERVER_NAME is used or 'localhost.localdomain'.
-            Luisehahne
+   * @var string
-            Luisehahne
+   */
-            Luisehahne
+  public $Hostname          = '';
             Luisehahne
   /**
    * Sets the message ID to be used in the Message-Id header.
    * If empty, a unique id will be generated.
-            Luisehahne
+   * @var string
-            Luisehahne
+   */
-            Luisehahne
+  public $MessageID         = '';
             Luisehahne
   /////////////////////////////////////////////////
   // PROPERTIES FOR SMTP
   /////////////////////////////////////////////////
   /**
    * Sets the SMTP hosts.  All hosts must be separated by a
    * semicolon.  You can also specify a different port
    * for each host by using this format: [hostname:port]
    * (e.g. "smtp1.example.com:25;smtp2.example.com").
    * Hosts will be tried in order.
-            Luisehahne
+   * @var string
-            Luisehahne
+   */
-            Luisehahne
+  public $Host          = 'localhost';
             Luisehahne
   /**
    * Sets the default SMTP server port.
-            Luisehahne
+   * @var int
-            Luisehahne
+   */
-            Luisehahne
+  public $Port          = 25;
             Luisehahne
   /**
    * Sets the SMTP HELO of the message (Default is $Hostname).
-            Luisehahne
+   * @var string
-            Luisehahne
+   */
-            Luisehahne
+  public $Helo          = '';
             Luisehahne
   /**
    * Sets connection prefix.
    * Options are "", "ssl" or "tls"
-            Luisehahne
+   * @var string
-            Luisehahne
+   */
-            Luisehahne
+  public $SMTPSecure    = '';
             Luisehahne
   /**
    * Sets SMTP authentication. Utilizes the Username and Password variables.
-            Luisehahne
+   * @var bool
-            Luisehahne
+   */
-            Luisehahne
+  public $SMTPAuth      = false;
             Luisehahne
   /**
    * Sets SMTP username.
-            Luisehahne
+   * @var string
-            Luisehahne
+   */
-            Luisehahne
+  public $Username      = '';
             Luisehahne
   /**
    * Sets SMTP password.
-            Luisehahne
+   * @var string
-            Luisehahne
+   */
-            Luisehahne
+  public $Password      = '';
             Luisehahne
   /**
-            Luisehahne
+   * Sets the SMTP server timeout in seconds.
    * This function will not work with the win32 version.
    * @var int
-            Luisehahne
+   */
-            Luisehahne
+  public $Timeout       = 10;
             Luisehahne
   /**
    * Sets SMTP class debugging on or off.
-            Luisehahne
+   * @var bool
-            Luisehahne
+   */
-            Luisehahne
+  public $SMTPDebug     = false;
             Luisehahne
   /**
    * Prevents the SMTP connection from being closed after each mail
    * sending.  If this is set to true then to close the connection
    * requires an explicit call to SmtpClose().
-            Luisehahne
+   * @var bool
-            Luisehahne
+   */
-            Luisehahne
+  public $SMTPKeepAlive = false;
             Luisehahne
   /**
    * Provides the ability to have the TO field process individual
    * emails, instead of sending to entire TO addresses
-            Luisehahne
+   * @var bool
-            Luisehahne
+   */
-            Luisehahne
+  public $SingleTo      = false;
             Luisehahne
-            Luisehahne
+   /**
    * If SingleTo is true, this provides the array to hold the email addresses
    * @var bool
    */
   public $SingleToArray = array();
  /**
    * Provides the ability to change the line ending
    * @var string
    */
   public $LE              = "\n";
   /**
    * Used with DKIM DNS Resource Record
    * @var string
    */
   public $DKIM_selector   = 'phpmailer';
   /**
    * Used with DKIM DNS Resource Record
    * optional, in format of email address 'you@yourdomain.com'
    * @var string
    */
   public $DKIM_identity   = '';
   /**
    * Used with DKIM DNS Resource Record
-            Luisehahne
+   * @var string
    */
   public $DKIM_passphrase   = '';
   /**
    * Used with DKIM DNS Resource Record
-            Luisehahne
+   * optional, in format of email address 'you@yourdomain.com'
    * @var string
    */
   public $DKIM_domain     = '';
   /**
    * Used with DKIM DNS Resource Record
    * optional, in format of email address 'you@yourdomain.com'
    * @var string
    */
   public $DKIM_private    = '';
   /**
    * Callback Action function name
    * the function that handles the result of the send email action. Parameters:
    *   bool    $result        result of the send action
    *   string  $to            email address of the recipient
    *   string  $cc            cc email addresses
    *   string  $bcc           bcc email addresses
    *   string  $subject       the subject
    *   string  $body          the email body
    * @var string
    */
   public $action_function = ''; //'callbackAction';
   /**
    * Sets the PHPMailer Version number
    * @var string
    */
-            Luisehahne
+  public $Version         = '5.2';
             Luisehahne
-            Luisehahne
+  /**
    * What to use in the X-Mailer header
    * @var string
    */
   public $XMailer         = '';
-            Luisehahne
+  /////////////////////////////////////////////////
-            Luisehahne
+  // PROPERTIES, PRIVATE AND PROTECTED
-            Luisehahne
+  /////////////////////////////////////////////////
-            Luisehahne
+  protected   $smtp           = NULL;
   protected   $to             = array();
   protected   $cc             = array();
   protected   $bcc            = array();
   protected   $ReplyTo        = array();
   protected   $all_recipients = array();
   protected   $attachment     = array();
   protected   $CustomHeader   = array();
   protected   $message_type   = '';
   protected   $boundary       = array();
   protected   $language       = array();
   protected   $error_count    = 0;
   protected   $sign_cert_file = '';
   protected   $sign_key_file  = '';
   protected   $sign_key_pass  = '';
   protected   $exceptions     = false;
             Luisehahne
   /////////////////////////////////////////////////
-            Luisehahne
+  // CONSTANTS
   /////////////////////////////////////////////////
   const STOP_MESSAGE  = 0; // message only, continue processing
   const STOP_CONTINUE = 1; // message?, likely ok to continue processing
   const STOP_CRITICAL = 2; // message, plus full stop, critical error reached
   /////////////////////////////////////////////////
-            Luisehahne
+  // METHODS, VARIABLES
   /////////////////////////////////////////////////
   /**
-            Luisehahne
+   * Constructor
    * @param boolean $exceptions Should we throw external exceptions?
    */
   public function __construct($exceptions = false) {
     $this->exceptions = ($exceptions == true);
+  }
   /**
-            Luisehahne
+   * Sets message type to HTML.
-            Luisehahne
+   * @param bool $ishtml
    * @return void
-            Luisehahne
+   */
-            Luisehahne
+  public function IsHTML($ishtml = true) {
     if ($ishtml) {
-            Luisehahne
+      $this->ContentType = 'text/html';
     } else {
       $this->ContentType = 'text/plain';
+    }
+  }
   /**
    * Sets Mailer to send message using SMTP.
-            Luisehahne
+   * @return void
-            Luisehahne
+   */
-            Luisehahne
+  public function IsSMTP() {
-            Luisehahne
+    $this->Mailer = 'smtp';
+  }
   /**
    * Sets Mailer to send message using PHP mail() function.
-            Luisehahne
+   * @return void
-            Luisehahne
+   */
-            Luisehahne
+  public function IsMail() {
-            Luisehahne
+    $this->Mailer = 'mail';
+  }
   /**
    * Sets Mailer to send message using the $Sendmail program.
-            Luisehahne
+   * @return void
-            Luisehahne
+   */
-            Luisehahne
+  public function IsSendmail() {
     if (!stristr(ini_get('sendmail_path'), 'sendmail')) {
       $this->Sendmail = '/var/qmail/bin/sendmail';
+    }
-            Luisehahne
+    $this->Mailer = 'sendmail';
+  }
   /**
    * Sets Mailer to send message using the qmail MTA.
-            Luisehahne
+   * @return void
-            Luisehahne
+   */
-            Luisehahne
+  public function IsQmail() {
     if (stristr(ini_get('sendmail_path'), 'qmail')) {
       $this->Sendmail = '/var/qmail/bin/sendmail';
+    }
-            Luisehahne
+    $this->Mailer = 'sendmail';
+  }
   /////////////////////////////////////////////////
   // METHODS, RECIPIENTS
   /////////////////////////////////////////////////
   /**
    * Adds a "To" address.
-            Luisehahne
+   * @param string $address
    * @param string $name
    * @return boolean true on success, false if address already used
-            Luisehahne
+   */
-            Luisehahne
+  public function AddAddress($address, $name = '') {
     return $this->AddAnAddress('to', $address, $name);
             Luisehahne
   /**
-            Luisehahne
+   * Adds a "Cc" address.
    * Note: this function works with the SMTP mailer on win32, not with the "mail" mailer.
    * @param string $address
    * @param string $name
    * @return boolean true on success, false if address already used
-            Luisehahne
+   */
-            Luisehahne
+  public function AddCC($address, $name = '') {
     return $this->AddAnAddress('cc', $address, $name);
             Luisehahne
   /**
-            Luisehahne
+   * Adds a "Bcc" address.
    * Note: this function works with the SMTP mailer on win32, not with the "mail" mailer.
    * @param string $address
    * @param string $name
    * @return boolean true on success, false if address already used
-            Luisehahne
+   */
-            Luisehahne
+  public function AddBCC($address, $name = '') {
     return $this->AddAnAddress('bcc', $address, $name);
             Luisehahne
   /**
-            Luisehahne
+   * Adds a "Reply-to" address.
    * @param string $address
    * @param string $name
    * @return boolean
-            Luisehahne
+   */
-            Luisehahne
+  public function AddReplyTo($address, $name = '') {
     return $this->AddAnAddress('ReplyTo', $address, $name);
             Luisehahne
-            Luisehahne
+  /**
    * Adds an address to one of the recipient arrays
    * Addresses that have been added already return false, but do not throw exceptions
    * @param string $kind One of 'to', 'cc', 'bcc', 'ReplyTo'
    * @param string $address The email address to send to
    * @param string $name
    * @return boolean true on success, false if address already used or invalid in some way
-            Luisehahne
+   * @access protected
-            Luisehahne
+   */
-            Luisehahne
+  protected function AddAnAddress($kind, $address, $name = '') {
-            Luisehahne
+    if (!preg_match('/^(to|cc|bcc|ReplyTo)$/', $kind)) {
-            Luisehahne
+      $this->SetError($this->Lang('Invalid recipient array').': '.$kind);
       if ($this->exceptions) {
         throw new phpmailerException('Invalid recipient array: ' . $kind);
+      }
       echo $this->Lang('Invalid recipient array').': '.$kind;
-            Luisehahne
+      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;
+}
 /**
  * Set the From and FromName properties
  * @param string $address
  * @param string $name
  * @return boolean
  */
-            Luisehahne
+  public function SetFrom($address, $name = '', $auto = 1) {
-            Luisehahne
+    $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;
+  }
   /**
    * Check that a string looks roughly like an email address should
    * Static so it can be used without instantiation
    * Tries to use PHP built-in validator in the filter extension (from PHP 5.2), falls back to a reasonably competent regex validator
    * Conforms approximately to RFC2822
    * @link http://www.hexillion.com/samples/#Regex Original pattern found here
    * @param string $address The email address to check
    * @return boolean
    * @static
    * @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);
+    }
+  }
-            Luisehahne
+  /////////////////////////////////////////////////
   // METHODS, MAIL SENDING
   /////////////////////////////////////////////////
   /**
    * Creates message and assigns Mailer. If the message is
    * not sent successfully then it returns false.  Use the ErrorInfo
    * variable to view description of the error.
-            Luisehahne
+   * @return bool
-            Luisehahne
+   */
-            Luisehahne
+  public function Send() {
     try {
-            Luisehahne
+      if(!$this->PreSend()) return false;
       return $this->PostSend();
     } catch (phpmailerException $e) {
       $this->SetError($e->getMessage());
       if ($this->exceptions) {
         throw $e;
+      }
       return false;
+    }
+  }
   protected function PreSend() {
     try {
-            Luisehahne
+      if ((count($this->to) + count($this->cc) + count($this->bcc)) < 1) {
         throw new phpmailerException($this->Lang('provide_address'), self::STOP_CRITICAL);
+      }
             Luisehahne
-            Luisehahne
+      // Set whether the message is multipart/alternative
       if(!empty($this->AltBody)) {
         $this->ContentType = 'multipart/alternative';
+      }
             Luisehahne
-            Luisehahne
+      $this->error_count = 0; // reset errors
       $this->SetMessageType();
-            Luisehahne
+      //Refuse to send an empty message
-            Luisehahne
+      if (empty($this->Body)) {
         throw new phpmailerException($this->Lang('empty_message'), self::STOP_CRITICAL);
+      }
             Luisehahne
-            Luisehahne
+      $this->MIMEHeader = $this->CreateHeader();
       $this->MIMEBody = $this->CreateBody();
-            Luisehahne
+      // digitally sign with DKIM if enabled
       if ($this->DKIM_domain && $this->DKIM_private) {
-            Luisehahne
+        $header_dkim = $this->DKIM_Add($this->MIMEHeader, $this->EncodeHeader($this->SecureHeader($this->Subject)), $this->MIMEBody);
         $this->MIMEHeader = str_replace("\r\n", "\n", $header_dkim) . $this->MIMEHeader;
             Luisehahne
-            Luisehahne
+      return true;
     } catch (phpmailerException $e) {
       $this->SetError($e->getMessage());
       if ($this->exceptions) {
         throw $e;
+      }
       return false;
+    }
+  }
   protected function PostSend() {
     try {
-            Luisehahne
+      // Choose the mailer and send through it
       switch($this->Mailer) {
         case 'sendmail':
-            Luisehahne
+          return $this->SendmailSend($this->MIMEHeader, $this->MIMEBody);
-            Luisehahne
+        case 'smtp':
-            Luisehahne
+          return $this->SmtpSend($this->MIMEHeader, $this->MIMEBody);
-            Luisehahne
+        default:
-            Luisehahne
+          return $this->MailSend($this->MIMEHeader, $this->MIMEBody);
             Luisehahne
     } catch (phpmailerException $e) {
       $this->SetError($e->getMessage());
       if ($this->exceptions) {
         throw $e;
+      }
       echo $e->getMessage()."\n";
-            Luisehahne
+      return false;
+    }
+  }
   /**
    * Sends mail using the $Sendmail program.
-            Luisehahne
+   * @param string $header The message headers
    * @param string $body The message body
    * @access protected
    * @return bool
-            Luisehahne
+   */
-            Luisehahne
+  protected function SendmailSend($header, $body) {
-            Luisehahne
+    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));
+    }
-            Luisehahne
+    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;
-            Luisehahne
+        $this->doCallback($isSent, $val, $this->cc, $this->bcc, $this->Subject, $body);
-            Luisehahne
+        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;
-            Luisehahne
+      $this->doCallback($isSent, $this->to, $this->cc, $this->bcc, $this->Subject, $body);
-            Luisehahne
+      if($result != 0) {
         throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+      }
             Luisehahne
     return true;
+  }
   /**
    * Sends mail using the PHP mail() function.
-            Luisehahne
+   * @param string $header The message headers
    * @param string $body The message body
    * @access protected
    * @return bool
-            Luisehahne
+   */
-            Luisehahne
+  protected function MailSend($header, $body) {
     $toArr = array();
     foreach($this->to as $t) {
       $toArr[] = $this->AddrFormat($t);
             Luisehahne
-            Luisehahne
+    $to = implode(', ', $toArr);
             Luisehahne
-            Luisehahne
+    if (empty($this->Sender)) {
       $params = "-oi -f %s";
     } else {
       $params = sprintf("-oi -f %s", $this->Sender);
+    }
     if ($this->Sender != '' and !ini_get('safe_mode')) {
-            Luisehahne
+      $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);
-            Luisehahne
+          // implement call back function if it exists
           $isSent = ($rt == 1) ? 1 : 0;
-            Luisehahne
+          $this->doCallback($isSent, $val, $this->cc, $this->bcc, $this->Subject, $body);
             Luisehahne
       } else {
         $rt = @mail($to, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
-            Luisehahne
+        // implement call back function if it exists
         $isSent = ($rt == 1) ? 1 : 0;
-            Luisehahne
+        $this->doCallback($isSent, $to, $this->cc, $this->bcc, $this->Subject, $body);
             Luisehahne
     } 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);
-            Luisehahne
+          // implement call back function if it exists
           $isSent = ($rt == 1) ? 1 : 0;
-            Luisehahne
+          $this->doCallback($isSent, $val, $this->cc, $this->bcc, $this->Subject, $body);
             Luisehahne
       } else {
         $rt = @mail($to, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header);
-            Luisehahne
+        // implement call back function if it exists
         $isSent = ($rt == 1) ? 1 : 0;
-            Luisehahne
+        $this->doCallback($isSent, $to, $this->cc, $this->bcc, $this->Subject, $body);
             Luisehahne
+    }
     if (isset($old_from)) {
       ini_set('sendmail_from', $old_from);
+    }
     if(!$rt) {
-            Luisehahne
+      throw new phpmailerException($this->Lang('instantiate'), self::STOP_CRITICAL);
             Luisehahne
     return true;
+  }
   /**
-            Luisehahne
+   * Sends mail via SMTP using PhpSMTP
    * Returns false if there is a bad MAIL FROM, RCPT, or DATA input.
    * @param string $header The message headers
    * @param string $body The message body
    * @uses SMTP
    * @access protected
    * @return bool
-            Luisehahne
+   */
-            Luisehahne
+  protected function SmtpSend($header, $body) {
     require_once $this->PluginDir . 'class.smtp.php';
-            Luisehahne
+    $bad_rcpt = array();
     if(!$this->SmtpConnect()) {
-            Luisehahne
+      throw new phpmailerException($this->Lang('smtp_connect_failed'), self::STOP_CRITICAL);
             Luisehahne
     $smtp_from = ($this->Sender == '') ? $this->From : $this->Sender;
     if(!$this->smtp->Mail($smtp_from)) {
-            Luisehahne
+      throw new phpmailerException($this->Lang('from_failed') . $smtp_from, self::STOP_CRITICAL);
             Luisehahne
-            Luisehahne
+    // 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;
-            Luisehahne
+        $this->doCallback($isSent, $to[0], '', '', $this->Subject, $body);
-            Luisehahne
+      } else {
         // implement call back function if it exists
         $isSent = 1;
-            Luisehahne
+        $this->doCallback($isSent, $to[0], '', '', $this->Subject, $body);
             Luisehahne
+    }
-            Luisehahne
+    foreach($this->cc as $cc) {
       if (!$this->smtp->Recipient($cc[0])) {
         $bad_rcpt[] = $cc[0];
         // implement call back function if it exists
         $isSent = 0;
-            Luisehahne
+        $this->doCallback($isSent, '', $cc[0], '', $this->Subject, $body);
-            Luisehahne
+      } else {
         // implement call back function if it exists
         $isSent = 1;
-            Luisehahne
+        $this->doCallback($isSent, '', $cc[0], '', $this->Subject, $body);
             Luisehahne
+    }
-            Luisehahne
+    foreach($this->bcc as $bcc) {
       if (!$this->smtp->Recipient($bcc[0])) {
         $bad_rcpt[] = $bcc[0];
         // implement call back function if it exists
         $isSent = 0;
-            Luisehahne
+        $this->doCallback($isSent, '', '', $bcc[0], $this->Subject, $body);
-            Luisehahne
+      } else {
         // implement call back function if it exists
         $isSent = 1;
-            Luisehahne
+        $this->doCallback($isSent, '', '', $bcc[0], $this->Subject, $body);
             Luisehahne
+    }
             Luisehahne
     if (count($bad_rcpt) > 0 ) { //Create error message for any bad addresses
       $badaddresses = implode(', ', $bad_rcpt);
       throw new phpmailerException($this->Lang('recipients_failed') . $badaddresses);
             Luisehahne
     if(!$this->smtp->Data($header . $body)) {
-            Luisehahne
+      throw new phpmailerException($this->Lang('data_not_accepted'), self::STOP_CRITICAL);
             Luisehahne
     if($this->SMTPKeepAlive == true) {
       $this->smtp->Reset();
+    }
     return true;
+  }
   /**
-            Luisehahne
+   * Initiates a connection to an SMTP server.
    * Returns false if the operation failed.
    * @uses SMTP
    * @access public
    * @return bool
-            Luisehahne
+   */
-            Luisehahne
+  public function SmtpConnect() {
     if(is_null($this->smtp)) {
-            Luisehahne
+      $this->smtp = new SMTP();
+    }
     $this->smtp->do_debug = $this->SMTPDebug;
     $hosts = explode(';', $this->Host);
     $index = 0;
-            Luisehahne
+    $connection = $this->smtp->Connected();
             Luisehahne
-            Luisehahne
+    // 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];
-            Luisehahne
+        } else {
-            Luisehahne
+          $host = $hosts[$index];
           $port = $this->Port;
             Luisehahne
-            Luisehahne
+        $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);
             Luisehahne
             Luisehahne
           $connection = true;
           if ($this->SMTPAuth) {
             if (!$this->smtp->Authenticate($this->Username, $this->Password)) {
               throw new phpmailerException($this->Lang('authenticate'));
+            }
+          }
             Luisehahne
-            Luisehahne
+        $index++;
         if (!$connection) {
           throw new phpmailerException($this->Lang('connect_host'));
+        }
             Luisehahne
-            Luisehahne
+    } catch (phpmailerException $e) {
       $this->smtp->Reset();
       throw $e;
             Luisehahne
-            Luisehahne
+    return true;
             Luisehahne
   /**
    * Closes the active SMTP session if one exists.
-            Luisehahne
+   * @return void
-            Luisehahne
+   */
-            Luisehahne
+  public function SmtpClose() {
     if(!is_null($this->smtp)) {
-            Luisehahne
+      if($this->smtp->Connected()) {
         $this->smtp->Quit();
         $this->smtp->Close();
+      }
+    }
+  }
   /**
-            Luisehahne
+  * 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")
-            Luisehahne
+  * @param string $lang_path Path to the language file directory
   * @access public
-            Luisehahne
+  */
   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';
             Luisehahne
     $this->language = $PHPMAILER_LANG;
-            Luisehahne
+    return ($l == true); //Returns false if language not found
+  }
             Luisehahne
-            Luisehahne
+  /**
   * Return the current array of language strings
   * @return array
   */
   public function GetTranslations() {
     return $this->language;
             Luisehahne
   /////////////////////////////////////////////////
   // METHODS, MESSAGE CREATION
   /////////////////////////////////////////////////
   /**
    * Creates recipient headers.
-            Luisehahne
+   * @access public
    * @return string
-            Luisehahne
+   */
-            Luisehahne
+  public function AddrAppend($type, $addr) {
-            Luisehahne
+    $addr_str = $type . ': ';
-            Luisehahne
+    $addresses = array();
     foreach ($addr as $a) {
       $addresses[] = $this->AddrFormat($a);
             Luisehahne
-            Luisehahne
+    $addr_str .= implode(', ', $addresses);
-            Luisehahne
+    $addr_str .= $this->LE;
     return $addr_str;
+  }
   /**
    * Formats an address correctly.
-            Luisehahne
+   * @access public
    * @return string
-            Luisehahne
+   */
-            Luisehahne
+  public function AddrFormat($addr) {
     if (empty($addr[1])) {
       return $this->SecureHeader($addr[0]);
-            Luisehahne
+    } else {
-            Luisehahne
+      return $this->EncodeHeader($this->SecureHeader($addr[1]), 'phrase') . " <" . $this->SecureHeader($addr[0]) . ">";
             Luisehahne
+  }
   /**
    * Wraps message for use with mailers that do not
    * automatically perform wrapping and for quoted-printable.
    * Original written by philippe.
-            Luisehahne
+   * @param string $message The message to wrap
    * @param integer $length The line length to wrap to
    * @param boolean $qp_mode Whether to run in Quoted-Printable mode
    * @access public
    * @return string
-            Luisehahne
+   */
-            Luisehahne
+  public function WrapText($message, $length, $qp_mode = false) {
-            Luisehahne
+    $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 = '';
-            Luisehahne
+    for ($i = 0 ;$i < count($line); $i++) {
-            Luisehahne
+      $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;
+  }
   /**
    * Finds last character boundary prior to maxLength in a utf-8
    * quoted (printable) encoded string.
    * Original written by Colin Brown.
-            Luisehahne
+   * @access public
    * @param string $encodedText utf-8 QP text
    * @param int    $maxLength   find last character boundary prior to this length
    * @return int
-            Luisehahne
+   */
-            Luisehahne
+  public function UTF8CharBoundary($encodedText, $maxLength) {
-            Luisehahne
+    $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;
+  }
             Luisehahne
-            Luisehahne
+  /**
    * Set the body wrapping.
-            Luisehahne
+   * @access public
    * @return void
-            Luisehahne
+   */
-            Luisehahne
+  public function SetWordWrap() {
-            Luisehahne
+    if($this->WordWrap < 1) {
       return;
+    }
     switch($this->message_type) {
       case 'alt':
-            Luisehahne
+      case 'alt_inline':
       case 'alt_attach':
       case 'alt_inline_attach':
-            Luisehahne
+        $this->AltBody = $this->WrapText($this->AltBody, $this->WordWrap);
         break;
       default:
         $this->Body = $this->WrapText($this->Body, $this->WordWrap);
         break;
+    }
+  }
   /**
    * Assembles message header.
-            Luisehahne
+   * @access public
    * @return string The assembled header
-            Luisehahne
+   */
-            Luisehahne
+  public function CreateHeader() {
-            Luisehahne
+    $result = '';
-            Luisehahne
+    // Set the boundaries
-            Luisehahne
+    $uniq_id = md5(uniqid(time()));
     $this->boundary[1] = 'b1_' . $uniq_id;
     $this->boundary[2] = 'b2_' . $uniq_id;
-            Luisehahne
+    $this->boundary[3] = 'b3_' . $uniq_id;
             Luisehahne
-            Luisehahne
+    $result .= $this->HeaderLine('Date', self::RFCDate());
-            Luisehahne
+    if($this->Sender == '') {
       $result .= $this->HeaderLine('Return-Path', trim($this->From));
     } else {
       $result .= $this->HeaderLine('Return-Path', trim($this->Sender));
+    }
-            Luisehahne
+    // To be created automatically by mail()
-            Luisehahne
+    if($this->Mailer != 'mail') {
-            Luisehahne
+      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:;');
+        }
             Luisehahne
+    }
     $from = array();
     $from[0][0] = trim($this->From);
     $from[0][1] = $this->FromName;
     $result .= $this->AddrAppend('From', $from);
-            Luisehahne
+    // sendmail and mail() extract Cc from the header before sending
     if(count($this->cc) > 0) {
-            Luisehahne
+      $result .= $this->AddrAppend('Cc', $this->cc);
+    }
-            Luisehahne
+    // sendmail and mail() extract Bcc from the header before sending
-            Luisehahne
+    if((($this->Mailer == 'sendmail') || ($this->Mailer == 'mail')) && (count($this->bcc) > 0)) {
       $result .= $this->AddrAppend('Bcc', $this->bcc);
+    }
     if(count($this->ReplyTo) > 0) {
-            Luisehahne
+      $result .= $this->AddrAppend('Reply-to', $this->ReplyTo);
             Luisehahne
-            Luisehahne
+    // mail() sets the subject itself
-            Luisehahne
+    if($this->Mailer != 'mail') {
       $result .= $this->HeaderLine('Subject', $this->EncodeHeader($this->SecureHeader($this->Subject)));
+    }
     if($this->MessageID != '') {
-            Luisehahne
+      $result .= $this->HeaderLine('Message-ID', $this->MessageID);
-            Luisehahne
+    } else {
       $result .= sprintf("Message-ID: <%s@%s>%s", $uniq_id, $this->ServerHostname(), $this->LE);
+    }
     $result .= $this->HeaderLine('X-Priority', $this->Priority);
-            Luisehahne
+    if($this->XMailer) {
       $result .= $this->HeaderLine('X-Mailer', $this->XMailer);
     } else {
       $result .= $this->HeaderLine('X-Mailer', 'PHPMailer '.$this->Version.' (http://code.google.com/a/apache-extras.org/p/phpmailer/)');
+    }
             Luisehahne
     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;
+  }
   /**
    * Returns the message MIME.
-            Luisehahne
+   * @access public
    * @return string
-            Luisehahne
+   */
-            Luisehahne
+  public function GetMailMIME() {
-            Luisehahne
+    $result = '';
     switch($this->message_type) {
       case 'plain':
         $result .= $this->HeaderLine('Content-Transfer-Encoding', $this->Encoding);
-            Luisehahne
+        $result .= $this->TextLine('Content-Type: '.$this->ContentType.'; charset="'.$this->CharSet.'"');
-            Luisehahne
+        break;
-            Luisehahne
+      case 'inline':
         $result .= $this->HeaderLine('Content-Type', 'multipart/related;');
         $result .= $this->TextLine("\tboundary=\"" . $this->boundary[1] . '"');
-            Luisehahne
+        break;
-            Luisehahne
+      case 'attach':
       case 'inline_attach':
       case 'alt_attach':
       case 'alt_inline_attach':
         $result .= $this->HeaderLine('Content-Type', 'multipart/mixed;');
         $result .= $this->TextLine("\tboundary=\"" . $this->boundary[1] . '"');
         break;
-            Luisehahne
+      case 'alt':
-            Luisehahne
+      case 'alt_inline':
-            Luisehahne
+        $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;
+  }
   /**
    * Assembles the message body.  Returns an empty string on failure.
-            Luisehahne
+   * @access public
    * @return string The assembled message body
-            Luisehahne
+   */
-            Luisehahne
+  public function CreateBody() {
     $body = '';
-            Luisehahne
+    if ($this->sign_key_file) {
-            Luisehahne
+      $body .= $this->GetMailMIME();
             Luisehahne
     $this->SetWordWrap();
     switch($this->message_type) {
-            Luisehahne
+      case 'plain':
         $body .= $this->EncodeString($this->Body, $this->Encoding);
         break;
       case 'inline':
         $body .= $this->GetBoundary($this->boundary[1], '', '', '');
         $body .= $this->EncodeString($this->Body, $this->Encoding);
         $body .= $this->LE.$this->LE;
         $body .= $this->AttachAll("inline", $this->boundary[1]);
         break;
       case 'attach':
         $body .= $this->GetBoundary($this->boundary[1], '', '', '');
         $body .= $this->EncodeString($this->Body, $this->Encoding);
         $body .= $this->LE.$this->LE;
         $body .= $this->AttachAll("attachment", $this->boundary[1]);
         break;
       case 'inline_attach':
         $body .= $this->TextLine("--" . $this->boundary[1]);
         $body .= $this->HeaderLine('Content-Type', 'multipart/related;');
         $body .= $this->TextLine("\tboundary=\"" . $this->boundary[2] . '"');
         $body .= $this->LE;
         $body .= $this->GetBoundary($this->boundary[2], '', '', '');
         $body .= $this->EncodeString($this->Body, $this->Encoding);
         $body .= $this->LE.$this->LE;
         $body .= $this->AttachAll("inline", $this->boundary[2]);
         $body .= $this->LE;
         $body .= $this->AttachAll("attachment", $this->boundary[1]);
         break;
-            Luisehahne
+      case 'alt':
-            Luisehahne
+        $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]);
-            Luisehahne
+        break;
-            Luisehahne
+      case 'alt_inline':
         $body .= $this->GetBoundary($this->boundary[1], '', 'text/plain', '');
         $body .= $this->EncodeString($this->AltBody, $this->Encoding);
         $body .= $this->LE.$this->LE;
         $body .= $this->TextLine("--" . $this->boundary[1]);
         $body .= $this->HeaderLine('Content-Type', 'multipart/related;');
         $body .= $this->TextLine("\tboundary=\"" . $this->boundary[2] . '"');
         $body .= $this->LE;
         $body .= $this->GetBoundary($this->boundary[2], '', 'text/html', '');
-            Luisehahne
+        $body .= $this->EncodeString($this->Body, $this->Encoding);
-            Luisehahne
+        $body .= $this->LE.$this->LE;
         $body .= $this->AttachAll("inline", $this->boundary[2]);
         $body .= $this->LE;
         $body .= $this->EndBoundary($this->boundary[1]);
-            Luisehahne
+        break;
-            Luisehahne
+      case 'alt_attach':
         $body .= $this->TextLine("--" . $this->boundary[1]);
         $body .= $this->HeaderLine('Content-Type', 'multipart/alternative;');
         $body .= $this->TextLine("\tboundary=\"" . $this->boundary[2] . '"');
         $body .= $this->LE;
         $body .= $this->GetBoundary($this->boundary[2], '', 'text/plain', '');
         $body .= $this->EncodeString($this->AltBody, $this->Encoding);
         $body .= $this->LE.$this->LE;
         $body .= $this->GetBoundary($this->boundary[2], '', 'text/html', '');
-            Luisehahne
+        $body .= $this->EncodeString($this->Body, $this->Encoding);
-            Luisehahne
+        $body .= $this->LE.$this->LE;
         $body .= $this->EndBoundary($this->boundary[2]);
-            Luisehahne
+        $body .= $this->LE;
-            Luisehahne
+        $body .= $this->AttachAll("attachment", $this->boundary[1]);
-            Luisehahne
+        break;
-            Luisehahne
+      case 'alt_inline_attach':
         $body .= $this->TextLine("--" . $this->boundary[1]);
         $body .= $this->HeaderLine('Content-Type', 'multipart/alternative;');
         $body .= $this->TextLine("\tboundary=\"" . $this->boundary[2] . '"');
         $body .= $this->LE;
         $body .= $this->GetBoundary($this->boundary[2], '', 'text/plain', '');
-            Luisehahne
+        $body .= $this->EncodeString($this->AltBody, $this->Encoding);
         $body .= $this->LE.$this->LE;
-            Luisehahne
+        $body .= $this->TextLine("--" . $this->boundary[2]);
         $body .= $this->HeaderLine('Content-Type', 'multipart/related;');
         $body .= $this->TextLine("\tboundary=\"" . $this->boundary[3] . '"');
         $body .= $this->LE;
         $body .= $this->GetBoundary($this->boundary[3], '', 'text/html', '');
-            Luisehahne
+        $body .= $this->EncodeString($this->Body, $this->Encoding);
         $body .= $this->LE.$this->LE;
-            Luisehahne
+        $body .= $this->AttachAll("inline", $this->boundary[3]);
         $body .= $this->LE;
-            Luisehahne
+        $body .= $this->EndBoundary($this->boundary[2]);
-            Luisehahne
+        $body .= $this->LE;
         $body .= $this->AttachAll("attachment", $this->boundary[1]);
-            Luisehahne
+        break;
+    }
-            Luisehahne
+    if ($this->IsError()) {
       $body = '';
     } elseif ($this->sign_key_file) {
       try {
         $file = tempnam('', 'mail');
         file_put_contents($file, $body); //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());
             Luisehahne
-            Luisehahne
+      } catch (phpmailerException $e) {
         $body = '';
         if ($this->exceptions) {
           throw $e;
+        }
             Luisehahne
+    }
-            Luisehahne
+    return $body;
             Luisehahne
   /**
    * Returns the start of a message boundary.
-            Luisehahne
+   * @access protected
    * @return string
-            Luisehahne
+   */
-            Luisehahne
+  protected function GetBoundary($boundary, $charSet, $contentType, $encoding) {
-            Luisehahne
+    $result = '';
     if($charSet == '') {
       $charSet = $this->CharSet;
+    }
     if($contentType == '') {
       $contentType = $this->ContentType;
+    }
     if($encoding == '') {
       $encoding = $this->Encoding;
+    }
     $result .= $this->TextLine('--' . $boundary);
-            Luisehahne
+    $result .= sprintf("Content-Type: %s; charset=\"%s\"", $contentType, $charSet);
-            Luisehahne
+    $result .= $this->LE;
     $result .= $this->HeaderLine('Content-Transfer-Encoding', $encoding);
     $result .= $this->LE;
     return $result;
+  }
   /**
    * Returns the end of a message boundary.
-            Luisehahne
+   * @access protected
    * @return string
-            Luisehahne
+   */
-            Luisehahne
+  protected function EndBoundary($boundary) {
-            Luisehahne
+    return $this->LE . '--' . $boundary . '--' . $this->LE;
+  }
   /**
    * Sets the message type.
-            Luisehahne
+   * @access protected
-            Luisehahne
+   * @return void
-            Luisehahne
+   */
-            Luisehahne
+  protected function SetMessageType() {
     $this->message_type = array();
     if($this->AlternativeExists()) $this->message_type[] = "alt";
     if($this->InlineImageExists()) $this->message_type[] = "inline";
     if($this->AttachmentExists()) $this->message_type[] = "attach";
     $this->message_type = implode("_", $this->message_type);
     if($this->message_type == "") $this->message_type = "plain";
             Luisehahne
-            Luisehahne
+  /**
    *  Returns a formatted header line.
    * @access public
    * @return string
-            Luisehahne
+   */
-            Luisehahne
+  public function HeaderLine($name, $value) {
-            Luisehahne
+    return $name . ': ' . $value . $this->LE;
+  }
   /**
    * Returns a formatted mail line.
-            Luisehahne
+   * @access public
    * @return string
-            Luisehahne
+   */
-            Luisehahne
+  public function TextLine($value) {
-            Luisehahne
+    return $value . $this->LE;
+  }
   /////////////////////////////////////////////////
   // CLASS METHODS, ATTACHMENTS
   /////////////////////////////////////////////////
   /**
    * Adds an attachment from a path on the filesystem.
    * Returns false if the file could not be found
    * or accessed.
-            Luisehahne
+   * @param string $path Path to the attachment.
    * @param string $name Overrides the attachment name.
    * @param string $encoding File encoding (see $Encoding).
    * @param string $type File extension (MIME) type.
    * @return bool
-            Luisehahne
+   */
-            Luisehahne
+  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;
+      }
             Luisehahne
-            Luisehahne
+      $this->attachment[] = array(
 => $path,
 => $filename,
 => $name,
 => $encoding,
 => $type,
 => false,  // isStringAttachment
 => 'attachment',
 => 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;
+      }
             Luisehahne
     return true;
+  }
   /**
-            Luisehahne
+  * Return the current array of attachments
   * @return array
   */
   public function GetAttachments() {
     return $this->attachment;
+  }
   /**
-            Luisehahne
+   * Attaches all fs, string, and binary attachments to the message.
    * Returns an empty string on failure.
-            Luisehahne
+   * @access protected
-            Luisehahne
+   * @return string
-            Luisehahne
+   */
-            Luisehahne
+  protected function AttachAll($disposition_type, $boundary) {
-            Luisehahne
+    // Return text of body
-            Luisehahne
+    $mime = array();
-            Luisehahne
+    $cidUniq = array();
     $incl = array();
             Luisehahne
-            Luisehahne
+    // Add all attachments
     foreach ($this->attachment as $attachment) {
-            Luisehahne
+      // CHECK IF IT IS A VALID DISPOSITION_FILTER
       if($attachment[6] == $disposition_type) {
         // Check for string attachment
         $bString = $attachment[5];
         if ($bString) {
           $string = $attachment[0];
         } else {
           $path = $attachment[0];
+        }
             Luisehahne
-            Luisehahne
+        $inclhash = md5(serialize($attachment));
         if (in_array($inclhash, $incl)) { continue; }
         $incl[]      = $inclhash;
         $filename    = $attachment[1];
         $name        = $attachment[2];
         $encoding    = $attachment[3];
         $type        = $attachment[4];
         $disposition = $attachment[6];
         $cid         = $attachment[7];
         if ( $disposition == 'inline' && isset($cidUniq[$cid]) ) { continue; }
         $cidUniq[$cid] = true;
             Luisehahne
-            Luisehahne
+        $mime[] = sprintf("--%s%s", $boundary, $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);
             Luisehahne
-            Luisehahne
+        if($disposition == 'inline') {
           $mime[] = sprintf("Content-ID: <%s>%s", $cid, $this->LE);
+        }
             Luisehahne
-            Luisehahne
+        $mime[] = sprintf("Content-Disposition: %s; filename=\"%s\"%s", $disposition, $this->EncodeHeader($this->SecureHeader($name)), $this->LE.$this->LE);
             Luisehahne
-            Luisehahne
+        // 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;
             Luisehahne
+      }
+    }
-            Luisehahne
+    $mime[] = sprintf("--%s--%s", $boundary, $this->LE);
             Luisehahne
-            Luisehahne
+    return implode("", $mime);
             Luisehahne
   /**
-            Luisehahne
+   * Encodes attachment in requested format.
    * Returns an empty string on failure.
    * @param string $path The full path to the file
    * @param string $encoding The encoding to use; one of 'base64', '7bit', '8bit', 'binary', 'quoted-printable'
    * @see EncodeFile()
-            Luisehahne
+   * @access protected
-            Luisehahne
+   * @return string
-            Luisehahne
+   */
-            Luisehahne
+  protected function EncodeFile($path, $encoding = 'base64') {
-            Luisehahne
+    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;
+        }
+      }
-            Luisehahne
+      if (version_compare(PHP_VERSION, '5.3.0', '<')) {
-            Luisehahne
+        $magic_quotes = get_magic_quotes_runtime();
         set_magic_quotes_runtime(0);
+      }
       $file_buffer  = file_get_contents($path);
       $file_buffer  = $this->EncodeString($file_buffer, $encoding);
-            Luisehahne
+      if (version_compare(PHP_VERSION, '5.3.0', '<')) {
         set_magic_quotes_runtime($magic_quotes);
+      }
-            Luisehahne
+      return $file_buffer;
     } catch (Exception $e) {
       $this->SetError($e->getMessage());
-            Luisehahne
+      return '';
+    }
+  }
   /**
-            Luisehahne
+   * Encodes string to requested format.
    * Returns an empty string on failure.
    * @param string $str The text to encode
    * @param string $encoding The encoding to use; one of 'base64', '7bit', '8bit', 'binary', 'quoted-printable'
    * @access public
    * @return string
-            Luisehahne
+   */
-            Luisehahne
+  public function EncodeString($str, $encoding = 'base64') {
-            Luisehahne
+    $encoded = '';
     switch(strtolower($encoding)) {
       case 'base64':
         $encoded = chunk_split(base64_encode($str), 76, $this->LE);
         break;
       case '7bit':
       case '8bit':
         $encoded = $this->FixEOL($str);
-            Luisehahne
+        //Make sure it ends with a line break
-            Luisehahne
+        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;
+  }
   /**
-            Luisehahne
+   * Encode a header string to best (shortest) of Q, B, quoted or none.
    * @access public
    * @return string
-            Luisehahne
+   */
-            Luisehahne
+  public function EncodeHeader($str, $position = 'text') {
-            Luisehahne
+    $x = 0;
     switch (strtolower($position)) {
       case 'phrase':
         if (!preg_match('/[\200-\377]/', $str)) {
-            Luisehahne
+          // Can't use addslashes as we don't know what value has magic_quotes_sybase
-            Luisehahne
+          $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);
-            Luisehahne
+        // Fall-through
-            Luisehahne
+      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);
-            Luisehahne
+    // Try to select the encoding which should produce the shortest output
-            Luisehahne
+    if (strlen($str)/3 < $x) {
       $encoding = 'B';
       if (function_exists('mb_strlen') && $this->HasMultiBytes($str)) {
-            Luisehahne
+        // Use a custom function which correctly encodes and wraps long
         // multibyte strings without breaking lines within a character
-            Luisehahne
+        $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;
+  }
   /**
    * Checks if a string contains multibyte characters.
-            Luisehahne
+   * @access public
    * @param string $str multi-byte text to wrap encode
    * @return bool
-            Luisehahne
+   */
-            Luisehahne
+  public function HasMultiBytes($str) {
-            Luisehahne
+    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)
-            Luisehahne
+      return false;
             Luisehahne
+  }
   /**
    * Correctly encodes and wraps long multibyte strings for mail headers
    * without breaking lines within a character.
    * Adapted from a function by paravoid at http://uk.php.net/manual/en/function.mb-encode-mimeheader.php
-            Luisehahne
+   * @access public
    * @param string $str multi-byte text to wrap encode
    * @return string
-            Luisehahne
+   */
-            Luisehahne
+  public function Base64EncodeWrapMB($str) {
-            Luisehahne
+    $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;
+  }
   /**
-            Luisehahne
+  * 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
-            Luisehahne
+  * @return string
-            Luisehahne
+  */
   public function EncodeQPphp( $input = '', $line_max = 76, $space_conv = false) {
-            Luisehahne
+    $hex = array('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F');
-            Luisehahne
+    $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;
+  }
   /**
-            Luisehahne
+  * 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;
+  }
   /**
-            Luisehahne
+   * Encode string to q encoding.
-            Luisehahne
+   * @link http://tools.ietf.org/html/rfc2047
    * @param string $str the text to encode
    * @param string $position Where the text is going to be used, see the RFC for what that means
    * @access public
    * @return string
-            Luisehahne
+   */
-            Luisehahne
+  public function EncodeQ($str, $position = 'text') {
-            Luisehahne
+    // There should not be any EOL in the string
     $encoded = preg_replace('/[\r\n]*/', '', $str);
             Luisehahne
     switch (strtolower($position)) {
       case 'phrase':
         $encoded = preg_replace("/([^A-Za-z0-9!*+\/ -])/e", "'='.sprintf('%02X', ord('\\1'))", $encoded);
         break;
       case 'comment':
         $encoded = preg_replace("/([\(\)\"])/e", "'='.sprintf('%02X', ord('\\1'))", $encoded);
       case 'text':
       default:
-            Luisehahne
+        // Replace every high ascii, control =, ? and _ characters
         //TODO using /e (equivalent to eval()) is probably not a good idea
-            Luisehahne
+        $encoded = preg_replace('/([\000-\011\013\014\016-\037\075\077\137\177-\377])/e',
-            Luisehahne
+                                "'='.sprintf('%02X', ord(stripslashes('\\1')))", $encoded);
-            Luisehahne
+        break;
+    }
-            Luisehahne
+    // Replace every spaces to _ (more readable than =20)
-            Luisehahne
+    $encoded = str_replace(' ', '_', $encoded);
     return $encoded;
+  }
   /**
    * Adds a string or binary attachment (non-filesystem) to the list.
    * This method can be used to attach ascii or binary data,
    * such as a BLOB record from a database.
-            Luisehahne
+   * @param string $string String attachment data.
    * @param string $filename Name of the attachment.
    * @param string $encoding File encoding (see $Encoding).
    * @param string $type File extension (MIME) type.
    * @return void
-            Luisehahne
+   */
-            Luisehahne
+  public function AddStringAttachment($string, $filename, $encoding = 'base64', $type = 'application/octet-stream') {
     // Append to $attachment array
     $this->attachment[] = array(
 => $string,
 => $filename,
 => basename($filename),
 => $encoding,
 => $type,
 => true,  // isStringAttachment
 => 'attachment',
 => 0
     );
             Luisehahne
   /**
    * Adds an embedded attachment.  This can include images, sounds, and
    * just about any other document.  Make sure to set the $type to an
    * image type.  For JPEG images use "image/jpeg" and for GIF images
    * use "image/gif".
-            Luisehahne
+   * @param string $path Path to the attachment.
    * @param string $cid Content ID of the attachment.  Use this to identify
-            Luisehahne
+   *        the Id for accessing the image in an HTML form.
-            Luisehahne
+   * @param string $name Overrides the attachment name.
    * @param string $encoding File encoding (see $Encoding).
    * @param string $type File extension (MIME) type.
    * @return bool
-            Luisehahne
+   */
-            Luisehahne
+  public function AddEmbeddedImage($path, $cid, $name = '', $encoding = 'base64', $type = 'application/octet-stream') {
             Luisehahne
-            Luisehahne
+    if ( !@is_file($path) ) {
-            Luisehahne
+      $this->SetError($this->Lang('file_access') . $path);
       return false;
+    }
     $filename = basename($path);
-            Luisehahne
+    if ( $name == '' ) {
-            Luisehahne
+      $name = $filename;
+    }
-            Luisehahne
+    // Append to $attachment array
     $this->attachment[] = array(
 => $path,
 => $filename,
 => $name,
 => $encoding,
 => $type,
 => false,  // isStringAttachment
 => 'inline',
 => $cid
     );
             Luisehahne
     return true;
+  }
-            Luisehahne
+  public function AddStringEmbeddedImage($string, $cid, $filename = '', $encoding = 'base64', $type = 'application/octet-stream') {
     // Append to $attachment array
     $this->attachment[] = array(
 => $string,
 => $filename,
 => basename($filename),
 => $encoding,
 => $type,
 => true,  // isStringAttachment
 => 'inline',
 => $cid
     );
+  }
-            Luisehahne
+  /**
    * Returns true if an inline attachment is present.
-            Luisehahne
+   * @access public
    * @return bool
-            Luisehahne
+   */
-            Luisehahne
+  public function InlineImageExists() {
     foreach($this->attachment as $attachment) {
       if ($attachment[6] == 'inline') {
         return true;
             Luisehahne
+    }
-            Luisehahne
+    return false;
             Luisehahne
-            Luisehahne
+  public function AttachmentExists() {
     foreach($this->attachment as $attachment) {
       if ($attachment[6] == 'attachment') {
         return true;
+      }
+    }
     return false;
+  }
   public function AlternativeExists() {
     return strlen($this->AltBody)>0;
+  }
-            Luisehahne
+  /////////////////////////////////////////////////
   // CLASS METHODS, MESSAGE RESET
   /////////////////////////////////////////////////
   /**
    * Clears all recipients assigned in the TO array.  Returns void.
-            Luisehahne
+   * @return void
-            Luisehahne
+   */
-            Luisehahne
+  public function ClearAddresses() {
     foreach($this->to as $to) {
       unset($this->all_recipients[strtolower($to[0])]);
+    }
-            Luisehahne
+    $this->to = array();
+  }
   /**
    * Clears all recipients assigned in the CC array.  Returns void.
-            Luisehahne
+   * @return void
-            Luisehahne
+   */
-            Luisehahne
+  public function ClearCCs() {
     foreach($this->cc as $cc) {
       unset($this->all_recipients[strtolower($cc[0])]);
+    }
-            Luisehahne
+    $this->cc = array();
+  }
   /**
    * Clears all recipients assigned in the BCC array.  Returns void.
-            Luisehahne
+   * @return void
-            Luisehahne
+   */
-            Luisehahne
+  public function ClearBCCs() {
     foreach($this->bcc as $bcc) {
       unset($this->all_recipients[strtolower($bcc[0])]);
+    }
-            Luisehahne
+    $this->bcc = array();
+  }
   /**
    * Clears all recipients assigned in the ReplyTo array.  Returns void.
-            Luisehahne
+   * @return void
-            Luisehahne
+   */
-            Luisehahne
+  public function ClearReplyTos() {
-            Luisehahne
+    $this->ReplyTo = array();
+  }
   /**
    * Clears all recipients assigned in the TO, CC and BCC
    * array.  Returns void.
-            Luisehahne
+   * @return void
-            Luisehahne
+   */
-            Luisehahne
+  public function ClearAllRecipients() {
-            Luisehahne
+    $this->to = array();
     $this->cc = array();
     $this->bcc = array();
-            Luisehahne
+    $this->all_recipients = array();
             Luisehahne
   /**
    * Clears all previously set filesystem, string, and binary
    * attachments.  Returns void.
-            Luisehahne
+   * @return void
-            Luisehahne
+   */
-            Luisehahne
+  public function ClearAttachments() {
-            Luisehahne
+    $this->attachment = array();
+  }
   /**
    * Clears all custom headers.  Returns void.
-            Luisehahne
+   * @return void
-            Luisehahne
+   */
-            Luisehahne
+  public function ClearCustomHeaders() {
-            Luisehahne
+    $this->CustomHeader = array();
+  }
   /////////////////////////////////////////////////
   // CLASS METHODS, MISCELLANEOUS
   /////////////////////////////////////////////////
   /**
    * Adds the error message to the error container.
-            Luisehahne
+   * @access protected
    * @return void
-            Luisehahne
+   */
-            Luisehahne
+  protected function SetError($msg) {
-            Luisehahne
+    $this->error_count++;
-            Luisehahne
+    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";
+      }
+    }
-            Luisehahne
+    $this->ErrorInfo = $msg;
+  }
   /**
    * Returns the proper RFC 822 formatted date.
-            Luisehahne
+   * @access public
    * @return string
    * @static
-            Luisehahne
+   */
-            Luisehahne
+  public static function RFCDate() {
-            Luisehahne
+    $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;
+  }
   /**
    * Returns the server hostname or 'localhost.localdomain' if unknown.
-            Luisehahne
+   * @access protected
-            Luisehahne
+   * @return string
-            Luisehahne
+   */
-            Luisehahne
+  protected function ServerHostname() {
-            Luisehahne
+    if (!empty($this->Hostname)) {
-            Luisehahne
+      $result = $this->Hostname;
-            Luisehahne
+    } elseif (isset($_SERVER['SERVER_NAME'])) {
       $result = $_SERVER['SERVER_NAME'];
-            Luisehahne
+    } else {
       $result = 'localhost.localdomain';
+    }
     return $result;
+  }
   /**
    * Returns a message in the appropriate language.
-            Luisehahne
+   * @access protected
-            Luisehahne
+   * @return string
-            Luisehahne
+   */
-            Luisehahne
+  protected function Lang($key) {
-            Luisehahne
+    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;
+    }
+  }
   /**
    * Returns true if an error occurred.
-            Luisehahne
+   * @access public
    * @return bool
-            Luisehahne
+   */
-            Luisehahne
+  public function IsError() {
-            Luisehahne
+    return ($this->error_count > 0);
+  }
   /**
    * Changes every end of line from CR or LF to CRLF.
-            Luisehahne
+   * @access public
-            Luisehahne
+   * @return string
-            Luisehahne
+   */
-            Luisehahne
+  public function FixEOL($str) {
-            Luisehahne
+    $str = str_replace("\r\n", "\n", $str);
     $str = str_replace("\r", "\n", $str);
     $str = str_replace("\n", $this->LE, $str);
     return $str;
+  }
   /**
    * Adds a custom header.
-            Luisehahne
+   * @access public
    * @return void
-            Luisehahne
+   */
-            Luisehahne
+  public function AddCustomHeader($custom_header) {
-            Luisehahne
+    $this->CustomHeader[] = explode(':', $custom_header, 2);
+  }
   /**
    * Evaluates the message and returns modifications for inline images and backgrounds
-            Luisehahne
+   * @access public
    * @return $message
-            Luisehahne
+   */
-            Luisehahne
+  public function MsgHTML($message, $basedir = '') {
-            Luisehahne
+    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)
-            Luisehahne
+        if (!preg_match('#^[A-z]+://#', $url)) {
-            Luisehahne
+          $filename = basename($url);
           $directory = dirname($url);
-            Luisehahne
+          ($directory == '.') ? $directory='': '';
-            Luisehahne
+          $cid = 'cid:' . md5($filename);
-            Luisehahne
+          $ext = pathinfo($filename, PATHINFO_EXTENSION);
           $mimeType  = self::_mime_types($ext);
-            Luisehahne
+          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) ) {
-            Luisehahne
+            $message = preg_replace("/".$images[1][$i]."=\"".preg_quote($url, '/')."\"/Ui", $images[1][$i]."=\"".$cid."\"", $message);
+          }
+        }
+      }
+    }
     $this->IsHTML(true);
     $this->Body = $message;
-            Luisehahne
+    $textMsg = trim(strip_tags(preg_replace('/<(head|title|style|script)[^>]*>.*?<\/\\1>/s', '', $message)));
-            Luisehahne
+    if (!empty($textMsg) && empty($this->AltBody)) {
-            Luisehahne
+      $this->AltBody = html_entity_decode($textMsg);
+    }
-            Luisehahne
+    if (empty($this->AltBody)) {
       $this->AltBody = 'To view this email message, open it in a program that understands HTML!' . "\n\n";
             Luisehahne
+  }
   /**
-            Luisehahne
+   * Gets the MIME type of the embedded or inline image
    * @param string File extension
    * @access public
    * @return string MIME type of ext
    * @static
-            Luisehahne
+   */
-            Luisehahne
+  public static function _mime_types($ext = '') {
-            Luisehahne
+    $mimes = array(
-            Luisehahne
+      'hqx'   =>  'application/mac-binhex40',
       'cpt'   =>  'application/mac-compactpro',
       'doc'   =>  'application/msword',
-            Luisehahne
+      'bin'   =>  'application/macbinary',
-            Luisehahne
+      'dms'   =>  'application/octet-stream',
       'lha'   =>  'application/octet-stream',
       'lzh'   =>  'application/octet-stream',
       'exe'   =>  'application/octet-stream',
-            Luisehahne
+      'class' =>  'application/octet-stream',
-            Luisehahne
+      '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',
-            Luisehahne
+      'dcr'   =>  'application/x-director',
       'dir'   =>  'application/x-director',
-            Luisehahne
+      'dxr'   =>  'application/x-director',
-            Luisehahne
+      'dvi'   =>  'application/x-dvi',
       'gtar'  =>  'application/x-gtar',
-            Luisehahne
+      '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',
-            Luisehahne
+      'js'    =>  'application/x-javascript',
-            Luisehahne
+      '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',
-            Luisehahne
+      'mid'   =>  'audio/midi',
       'midi'  =>  'audio/midi',
-            Luisehahne
+      'mpga'  =>  'audio/mpeg',
-            Luisehahne
+      'mp2'   =>  'audio/mpeg',
       'mp3'   =>  'audio/mpeg',
-            Luisehahne
+      'aif'   =>  'audio/x-aiff',
       'aiff'  =>  'audio/x-aiff',
       'aifc'  =>  'audio/x-aiff',
-            Luisehahne
+      'ram'   =>  'audio/x-pn-realaudio',
       'rm'    =>  'audio/x-pn-realaudio',
       'rpm'   =>  'audio/x-pn-realaudio-plugin',
-            Luisehahne
+      'ra'    =>  'audio/x-realaudio',
-            Luisehahne
+      'rv'    =>  'video/vnd.rn-realvideo',
-            Luisehahne
+      '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',
-            Luisehahne
+      'shtml' =>  'text/html',
-            Luisehahne
+      'txt'   =>  'text/plain',
-            Luisehahne
+      'text'  =>  'text/plain',
-            Luisehahne
+      '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',
-            Luisehahne
+      'word'  =>  'application/msword',
       'xl'    =>  'application/excel',
-            Luisehahne
+      'eml'   =>  'message/rfc822'
-            Luisehahne
+    );
-            Luisehahne
+    return (!isset($mimes[strtolower($ext)])) ? 'application/octet-stream' : $mimes[strtolower($ext)];
             Luisehahne
   /**
-            Luisehahne
+  * Set (or reset) Class Objects (variables)
+  *
   * Usage Example:
   * $page->set('X-Priority', '3');
+  *
-            Luisehahne
+  * @access public
   * @param string $name Parameter Name
   * @param mixed $value Parameter Value
-            Luisehahne
+  * 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 = '') {
     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;
+      }
+    }
     return true;
+  }
   /**
    * Strips newlines to prevent header injection.
    * @access public
    * @param string $str String
    * @return string
-            Luisehahne
+   */
-            Luisehahne
+  public function SecureHeader($str) {
     $str = str_replace("\r", '', $str);
     $str = str_replace("\n", '', $str);
     return trim($str);
+  }
   /**
    * Set the private key file and password to sign the message.
+   *
    * @access public
    * @param string $key_filename Parameter File Name
    * @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;
+  }
   /**
    * Set the private key file and password to sign the message.
+   *
    * @access public
    * @param string $key_filename Parameter File Name
    * @param string $key_pass Password for private key
    */
   public function DKIM_QP($txt) {
-            Luisehahne
+    $tmp = '';
     $line = '';
     for ($i = 0; $i < strlen($txt); $i++) {
       $ord = ord($txt[$i]);
-            Luisehahne
+      if ( ((0x21 <= $ord) && ($ord <= 0x3A)) || $ord == 0x3C || ((0x3E <= $ord) && ($ord <= 0x7E)) ) {
-            Luisehahne
+        $line .= $txt[$i];
-            Luisehahne
+      } else {
-            Luisehahne
+        $line .= "=".sprintf("%02X", $ord);
             Luisehahne
             Luisehahne
-            Luisehahne
+    return $line;
             Luisehahne
   /**
-            Luisehahne
+   * Generate DKIM signature
             Luisehahne
-            Luisehahne
+   * @access public
    * @param string $s Header
-            Luisehahne
+   */
-            Luisehahne
+  public function DKIM_Sign($s) {
     $privKeyStr = file_get_contents($this->DKIM_private);
-            Luisehahne
+    if ($this->DKIM_passphrase != '') {
       $privKey = openssl_pkey_get_private($privKeyStr, $this->DKIM_passphrase);
-            Luisehahne
+    } else {
-            Luisehahne
+      $privKey = $privKeyStr;
             Luisehahne
-            Luisehahne
+    if (openssl_sign($s, $signature, $privKey)) {
       return base64_encode($signature);
+    }
             Luisehahne
   /**
-            Luisehahne
+   * Generate DKIM Canonicalization Header
+   *
    * @access public
    * @param string $s Header
-            Luisehahne
+   */
-            Luisehahne
+  public function DKIM_HeaderC($s) {
-            Luisehahne
+    $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
             Luisehahne
-            Luisehahne
+    $s = implode("\r\n", $lines);
-            Luisehahne
+    return $s;
             Luisehahne
   /**
-            Luisehahne
+   * Generate DKIM Canonicalization Body
             Luisehahne
-            Luisehahne
+   * @access public
    * @param string $body Message Body
-            Luisehahne
+   */
-            Luisehahne
+  public function DKIM_BodyC($body) {
     if ($body == '') return "\r\n";
     // stabilize line endings
-            Luisehahne
+    $body = str_replace("\r\n", "\n", $body);
     $body = str_replace("\n", "\r\n", $body);
-            Luisehahne
+    // END stabilize line endings
-            Luisehahne
+    while (substr($body, strlen($body) - 4, 4) == "\r\n\r\n") {
       $body = substr($body, 0, strlen($body) - 2);
             Luisehahne
     return $body;
             Luisehahne
-            Luisehahne
+  /**
    * Create the DKIM header, body, as new header
+   *
    * @access public
    * @param string $headers_line Header lines
    * @param string $subject Subject
    * @param string $body Body
    */
-            Luisehahne
+  public function DKIM_Add($headers_line, $subject, $body) {
-            Luisehahne
+    $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";
-            Luisehahne
+    $headers              = explode($this->LE, $headers_line);
-            Luisehahne
+    foreach($headers as $header) {
-            Luisehahne
+      if (strpos($header, 'From:') === 0) {
         $from_header = $header;
       } elseif (strpos($header, 'To:') === 0) {
         $to_header = $header;
             Luisehahne
+    }
-            Luisehahne
+    $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
-            Luisehahne
+    $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";
+  }
-            Luisehahne
+  protected function doCallback($isSent, $to, $cc, $bcc, $subject, $body) {
-            Luisehahne
+    if (!empty($this->action_function) && function_exists($this->action_function)) {
-            Luisehahne
+      $params = array($isSent, $to, $cc, $bcc, $subject, $body);
       call_user_func_array($this->action_function, $params);
             Luisehahne
+  }
             Luisehahne
-            Luisehahne
+class phpmailerException extends Exception {
   public function errorMessage() {
     $errorMsg = '<strong>' . $this->getMessage() . "</strong><br />\n";
     return $errorMsg;
+  }
+}
-            Luisehahne
+?>

Project

General

Profile

WB 2.08.x