site_iri: comparison web/wp-includes/class-phpmailer.php

equal deleted inserted replaced

-:2f6f6f7551ca
+:32102edaa81b
 <?php
 /*~ class.phpmailer.php
 .---------------------------------------------------------------------------.
 |  Software: PHPMailer - PHP email class                                    |
-|   Version: 2.0.4                                                          |
+|   Version: 5.2.1                                                          |
-|   Contact: via sourceforge.net support pages (also www.codeworxtech.com)  |
+|      Site: https://code.google.com/a/apache-extras.org/p/phpmailer/       |
-|      Info: http://phpmailer.sourceforge.net                               |
-|   Support: http://sourceforge.net/projects/phpmailer/                     |
 | ------------------------------------------------------------------------- |
-|    Author: Andy Prevost (project admininistrator)                         |
+|     Admin: Jim Jagielski (project admininistrator)                        |
-|    Author: Brent R. Matzelle (original founder)                           |
+|   Authors: Andy Prevost (codeworxtech) codeworxtech@users.sourceforge.net |
-| Copyright (c) 2004-2007, Andy Prevost. All Rights Reserved.               |
+|          : Marcus Bointon (coolbru) coolbru@users.sourceforge.net         |
+|          : Jim Jagielski (jimjag) jimjag@gmail.com                        |
+|   Founder: Brent R. Matzelle (original founder)                           |
+| Copyright (c) 2010-2012, Jim Jagielski. All Rights Reserved.              |
+| Copyright (c) 2004-2009, Andy Prevost. All Rights Reserved.               |
 | 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.                                         |
-| ------------------------------------------------------------------------- |
-| We offer a number of paid services (www.codeworxtech.com):                |
-| - Web Hosting on highly optimized fast and secure servers                 |
-| - Technology Consulting                                                   |
-| - Oursourcing (highly qualified programmers and graphic designers)        |
 '---------------------------------------------------------------------------'
 */
 /**
 * PHPMailer - PHP email transport class
+* NOTE: Requires PHP version 5 or later
 * @package PHPMailer
 * @author Andy Prevost
+* @author Marcus Bointon
+* @author Jim Jagielski
+* @copyright 2010 - 2012 Jim Jagielski
 * @copyright 2004 - 2009 Andy Prevost
+* @version $Id: class.phpmailer.php 450 2010-06-23 16:46:33Z coolbru $
+* @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
 */
+if (version_compare(PHP_VERSION, '5.0.0', '<') ) exit("Sorry, this version of PHPMailer will only run on PHP version 5 or greater!\n");
 class PHPMailer {
 /////////////////////////////////////////////////
 // PROPERTIES, PUBLIC
 /**
 * Email priority (1 = High, 3 = Normal, 5 = low).
 * @var int
 */
-var $Priority          = 3;
+public $Priority          = 3;
 /**
 * Sets the CharSet of the message.
 * @var string
 */
-var $CharSet           = 'iso-8859-1';
+public $CharSet           = 'iso-8859-1';
 /**
 * Sets the Content-type of the message.
 * @var string
 */
-var $ContentType        = 'text/plain';
+public $ContentType       = 'text/plain';
 /**
-* Sets the Encoding of the message. Options for this are "8bit",
+* Sets the Encoding of the message. Options for this are
-* "7bit", "binary", "base64", and "quoted-printable".
+*  "8bit", "7bit", "binary", "base64", and "quoted-printable".
 * @var string
 */
-var $Encoding          = '8bit';
+public $Encoding          = '8bit';
 /**
 * Holds the most recent mailer error message.
 * @var string
 */
-var $ErrorInfo         = '';
+public $ErrorInfo         = '';
 /**
 * Sets the From email address for the message.
 * @var string
 */
-var $From              = 'root@localhost';
+public $From              = 'root@localhost';
 /**
 * Sets the From name of the message.
 * @var string
 */
-var $FromName          = 'Root User';
+public $FromName          = 'Root User';
 /**
 * Sets the Sender email (Return-Path) of the message.  If not empty,
 * will be sent via -f to sendmail or as 'MAIL FROM' in smtp mode.
 * @var string
 */
-var $Sender            = '';
+public $Sender            = '';
 /**
 * Sets the Subject of the message.
 * @var string
 */
-var $Subject           = '';
+public $Subject           = '';
 /**
 * Sets the Body of the message.  This can be either an HTML or text body.
 * If HTML then run IsHTML(true).
 * @var string
 */
-var $Body              = '';
+public $Body              = '';
 /**
 * 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.
 * @var string
 */
-var $AltBody           = '';
+public $AltBody           = '';
+/**
+* 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     = '';
+/**
+* Stores the complete sent MIME message (Body and Headers)
+* @var string
+* @access protected
+*/
+protected $SentMIMEMessage     = '';
 /**
 * Sets word wrapping on the body of the message to a given number of
 * characters.
 * @var int
 */
-var $WordWrap          = 0;
+public $WordWrap          = 0;
 /**
 * Method to send mail: ("mail", "sendmail", or "smtp").
 * @var string
 */
-var $Mailer            = 'mail';
+public $Mailer            = 'mail';
 /**
 * Sets the path of the sendmail program.
 * @var string
 */
-var $Sendmail          = '/usr/sbin/sendmail';
+public $Sendmail          = '/usr/sbin/sendmail';
 /**
-* Path to PHPMailer plugins.  This is now only useful if the SMTP class
+* Path to PHPMailer plugins.  Useful if the SMTP class
 * is in a different directory than the PHP include path.
 * @var string
 */
-var $PluginDir         = '';
+public $PluginDir         = '';
-/**
-* Holds PHPMailer version.
-* @var string
-*/
-var $Version           = "2.0.4";
 /**
 * Sets the email address that a reading confirmation will be sent.
 * @var string
 */
-var $ConfirmReadingTo  = '';
+public $ConfirmReadingTo  = '';
 /**
 * 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'.
 * @var string
 */
-var $Hostname          = '';
+public $Hostname          = '';
 /**
 * Sets the message ID to be used in the Message-Id header.
 * If empty, a unique id will be generated.
 * @var string
 */
-var $MessageID         = '';
+public $MessageID         = '';
 /////////////////////////////////////////////////
 // PROPERTIES FOR SMTP
 /////////////////////////////////////////////////
 * for each host by using this format: [hostname:port]
 * (e.g. "smtp1.example.com:25;smtp2.example.com").
 * Hosts will be tried in order.
 * @var string
 */
-var $Host        = 'localhost';
+public $Host          = 'localhost';
 /**
 * Sets the default SMTP server port.
 * @var int
 */
-var $Port        = 25;
+public $Port          = 25;
 /**
 * Sets the SMTP HELO of the message (Default is $Hostname).
 * @var string
 */
-var $Helo        = '';
+public $Helo          = '';
 /**
 * Sets connection prefix.
 * Options are "", "ssl" or "tls"
 * @var string
 */
-var $SMTPSecure = "";
+public $SMTPSecure    = '';
 /**
 * Sets SMTP authentication. Utilizes the Username and Password variables.
 * @var bool
 */
-var $SMTPAuth     = false;
+public $SMTPAuth      = false;
 /**
 * Sets SMTP username.
 * @var string
 */
-var $Username     = '';
+public $Username      = '';
 /**
 * Sets SMTP password.
 * @var string
 */
-var $Password     = '';
+public $Password      = '';
 /**
-* Sets the SMTP server timeout in seconds. This function will not
+* Sets the SMTP server timeout in seconds.
-* work with the win32 version.
+* This function will not work with the win32 version.
 * @var int
 */
-var $Timeout      = 10;
+public $Timeout       = 10;
 /**
 * Sets SMTP class debugging on or off.
 * @var bool
 */
-var $SMTPDebug    = false;
+public $SMTPDebug     = false;
 /**
 * 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().
 * @var bool
 */
-var $SMTPKeepAlive = false;
+public $SMTPKeepAlive = false;
 /**
 * Provides the ability to have the TO field process individual
 * emails, instead of sending to entire TO addresses
 * @var bool
 */
-var $SingleTo = false;
+public $SingleTo      = false;
+/**
+* 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
+* @var string
+*/
+public $DKIM_passphrase   = '';
+/**
+* Used with DKIM DNS Resource Record
+* 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
+*/
+public $Version         = '5.2.1';
+/**
+* What to use in the X-Mailer header
+* @var string
+*/
+public $XMailer         = '';
 /////////////////////////////////////////////////
-// PROPERTIES, PRIVATE
+// PROPERTIES, PRIVATE AND PROTECTED
 /////////////////////////////////////////////////
-var $smtp            = NULL;
+protected   $smtp           = NULL;
-var $to              = array();
+protected   $to             = array();
-var $cc              = array();
+protected   $cc             = array();
-var $bcc             = array();
+protected   $bcc            = array();
-var $ReplyTo         = array();
+protected   $ReplyTo        = array();
-var $attachment      = array();
+protected   $all_recipients = array();
-var $CustomHeader    = array();
+protected   $attachment     = array();
-var $message_type    = '';
+protected   $CustomHeader   = array();
-var $boundary        = array();
+protected   $message_type   = '';
-var $language        = array();
+protected   $boundary       = array();
-var $error_count     = 0;
+protected   $language       = array();
-var $LE              = "\n";
+protected   $error_count    = 0;
-var $sign_cert_file  = "";
+protected   $sign_cert_file = '';
-var $sign_key_file   = "";
+protected   $sign_key_file  = '';
-var $sign_key_pass   = "";
+protected   $sign_key_pass  = '';
+protected   $exceptions     = false;
+/////////////////////////////////////////////////
+// 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
 /////////////////////////////////////////////////
 // METHODS, VARIABLES
 /////////////////////////////////////////////////
 /**
+* Constructor
+* @param boolean $exceptions Should we throw external exceptions?
+*/
+public function __construct($exceptions = false) {
+$this->exceptions = ($exceptions == true);
+}
+/**
 * Sets message type to HTML.
-* @param bool $bool
+* @param bool $ishtml
 * @return void
 */
-function IsHTML($bool) {
+public function IsHTML($ishtml = true) {
-if($bool == true) {
+if ($ishtml) {
 $this->ContentType = 'text/html';
 } else {
 $this->ContentType = 'text/plain';
 }
 }
 /**
 * Sets Mailer to send message using SMTP.
 * @return void
 */
-function IsSMTP() {
+public function IsSMTP() {
 $this->Mailer = 'smtp';
 }
 /**
 * Sets Mailer to send message using PHP mail() function.
 * @return void
 */
-function IsMail() {
+public function IsMail() {
 $this->Mailer = 'mail';
 }
 /**
 * Sets Mailer to send message using the $Sendmail program.
 * @return void
 */
-function IsSendmail() {
+public function IsSendmail() {
+if (!stristr(ini_get('sendmail_path'), 'sendmail')) {
+$this->Sendmail = '/var/qmail/bin/sendmail';
+}
 $this->Mailer = 'sendmail';
 }
 /**
 * Sets Mailer to send message using the qmail MTA.
 * @return void
 */
-function IsQmail() {
+public function IsQmail() {
-$this->Sendmail = '/var/qmail/bin/sendmail';
+if (stristr(ini_get('sendmail_path'), 'qmail')) {
+$this->Sendmail = '/var/qmail/bin/sendmail';
+}
 $this->Mailer = 'sendmail';
 }
 /////////////////////////////////////////////////
 // METHODS, RECIPIENTS
 /**
 * Adds a "To" address.
 * @param string $address
 * @param string $name
-* @return void
+* @return boolean true on success, false if address already used
 */
-function AddAddress($address, $name = '') {
+public function AddAddress($address, $name = '') {
-$cur = count($this->to);
+return $this->AddAnAddress('to', $address, $name);
-$this->to[$cur][0] = trim($address);
+}
-$this->to[$cur][1] = $name;
-}
+/**
+* Adds a "Cc" address.
-/**
+* Note: this function works with the SMTP mailer on win32, not with the "mail" mailer.
-* 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 void
+* @return boolean true on success, false if address already used
 */
-function AddCC($address, $name = '') {
+public function AddCC($address, $name = '') {
-$cur = count($this->cc);
+return $this->AddAnAddress('cc', $address, $name);
-$this->cc[$cur][0] = trim($address);
+}
-$this->cc[$cur][1] = $name;
-}
+/**
+* Adds a "Bcc" address.
-/**
+* Note: this function works with the SMTP mailer on win32, not with the "mail" mailer.
-* 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 void
+* @return boolean true on success, false if address already used
 */
-function AddBCC($address, $name = '') {
+public function AddBCC($address, $name = '') {
-$cur = count($this->bcc);
+return $this->AddAnAddress('bcc', $address, $name);
-$this->bcc[$cur][0] = trim($address);
+}
-$this->bcc[$cur][1] = $name;
-}
+/**
+* Adds a "Reply-to" address.
-/**
-* Adds a "Reply-To" address.
 * @param string $address
 * @param string $name
-* @return void
+* @return boolean
 */
-function AddReplyTo($address, $name = '') {
+public function AddReplyTo($address, $name = '') {
-$cur = count($this->ReplyTo);
+return $this->AddAnAddress('Reply-To', $address, $name);
-$this->ReplyTo[$cur][0] = trim($address);
+}
-$this->ReplyTo[$cur][1] = $name;
+/**
+* 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
+* @access protected
+*/
+protected function AddAnAddress($kind, $address, $name = '') {
+if (!preg_match('/^(to|cc|bcc|Reply-To)$/', $kind)) {
+$this->SetError($this->Lang('Invalid recipient array').': '.$kind);
+if ($this->exceptions) {
+throw new phpmailerException('Invalid recipient array: ' . $kind);
+}
+	  if ($this->SMTPDebug) {
+echo $this->Lang('Invalid recipient array').': '.$kind;
+}
+return false;
+}
+$address = trim($address);
+$name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
+if (!self::ValidateAddress($address)) {
+$this->SetError($this->Lang('invalid_address').': '. $address);
+if ($this->exceptions) {
+throw new phpmailerException($this->Lang('invalid_address').': '.$address);
+}
+	  if ($this->SMTPDebug) {
+echo $this->Lang('invalid_address').': '.$address;
+}
+return false;
+}
+if ($kind != 'Reply-To') {
+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
+*/
+public function SetFrom($address, $name = '', $auto = 1) {
+$address = trim($address);
+$name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
+if (!self::ValidateAddress($address)) {
+$this->SetError($this->Lang('invalid_address').': '. $address);
+if ($this->exceptions) {
+throw new phpmailerException($this->Lang('invalid_address').': '.$address);
+}
+	  if ($this->SMTPDebug) {
+echo $this->Lang('invalid_address').': '.$address;
+}
+return false;
+}
+$this->From = $address;
+$this->FromName = $name;
+if ($auto) {
+if (empty($this->ReplyTo)) {
+$this->AddAnAddress('Reply-To', $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);
+}
 }
 /////////////////////////////////////////////////
 // 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.
 * @return bool
 */
-function Send() {
+public function Send() {
-$header = '';
+try {
-$body = '';
+if(!$this->PreSend()) return false;
-$result = true;
+return $this->PostSend();
+} catch (phpmailerException $e) {
-if((count($this->to) + count($this->cc) + count($this->bcc)) < 1) {
+	  $this->SentMIMEMessage = '';
-$this->SetError($this->Lang('provide_address'));
+$this->SetError($e->getMessage());
+if ($this->exceptions) {
+throw $e;
+}
 return false;
 }
+}
-/* Set whether the message is multipart/alternative */
-if(!empty($this->AltBody)) {
+protected function PreSend() {
-$this->ContentType = 'multipart/alternative';
+try {
-}
+	  $mailHeader = "";
+if ((count($this->to) + count($this->cc) + count($this->bcc)) < 1) {
-$this->error_count = 0; // reset errors
+throw new phpmailerException($this->Lang('provide_address'), self::STOP_CRITICAL);
-$this->SetMessageType();
+}
-$header .= $this->CreateHeader();
-$body = $this->CreateBody();
+// Set whether the message is multipart/alternative
+if(!empty($this->AltBody)) {
-if($body == '') {
+$this->ContentType = 'multipart/alternative';
+}
+$this->error_count = 0; // reset errors
+$this->SetMessageType();
+//Refuse to send an empty message
+if (empty($this->Body)) {
+throw new phpmailerException($this->Lang('empty_message'), self::STOP_CRITICAL);
+}
+$this->MIMEHeader = $this->CreateHeader();
+$this->MIMEBody = $this->CreateBody();
+// To capture the complete message when using mail(), create
+	  // an extra header list which CreateHeader() doesn't fold in
+if ($this->Mailer == 'mail') {
+if (count($this->to) > 0) {
+$mailHeader .= $this->AddrAppend("To", $this->to);
+} else {
+$mailHeader .= $this->HeaderLine("To", "undisclosed-recipients:;");
+}
+$mailHeader .= $this->HeaderLine('Subject', $this->EncodeHeader($this->SecureHeader(trim($this->Subject))));
+// if(count($this->cc) > 0) {
+// $mailHeader .= $this->AddrAppend("Cc", $this->cc);
+// }
+}
+// digitally sign with DKIM if enabled
+if ($this->DKIM_domain && $this->DKIM_private) {
+$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;
+}
+$this->SentMIMEMessage = sprintf("%s%s\r\n\r\n%s",$this->MIMEHeader,$mailHeader,$this->MIMEBody);
+return true;
+} catch (phpmailerException $e) {
+$this->SetError($e->getMessage());
+if ($this->exceptions) {
+throw $e;
+}
 return false;
 }
+}
-/* Choose the mailer */
-switch($this->Mailer) {
+protected function PostSend() {
-case 'sendmail':
+try {
-$result = $this->SendmailSend($header, $body);
+// Choose the mailer and send through it
-break;
+switch($this->Mailer) {
-case 'smtp':
+case 'sendmail':
-$result = $this->SmtpSend($header, $body);
+return $this->SendmailSend($this->MIMEHeader, $this->MIMEBody);
-break;
+case 'smtp':
-case 'mail':
+return $this->SmtpSend($this->MIMEHeader, $this->MIMEBody);
-$result = $this->MailSend($header, $body);
+case 'mail':
-break;
+return $this->MailSend($this->MIMEHeader, $this->MIMEBody);
 default:
-$result = $this->MailSend($header, $body);
+return $this->MailSend($this->MIMEHeader, $this->MIMEBody);
-break;
+}
-//$this->SetError($this->Mailer . $this->Lang('mailer_not_supported'));
-//$result = false;
+} catch (phpmailerException $e) {
-//break;
+$this->SetError($e->getMessage());
-}
+if ($this->exceptions) {
+throw $e;
-return $result;
+}
+	  if ($this->SMTPDebug) {
+echo $e->getMessage()."\n";
+}
+return false;
+}
 }
 /**
 * Sends mail using the $Sendmail program.
-* @access private
+* @param string $header The message headers
+* @param string $body The message body
+* @access protected
 * @return bool
 */
-function SendmailSend($header, $body) {
+protected function SendmailSend($header, $body) {
 if ($this->Sender != '') {
 $sendmail = sprintf("%s -oi -f %s -t", escapeshellcmd($this->Sendmail), escapeshellarg($this->Sender));
 } else {
 $sendmail = sprintf("%s -oi -t", escapeshellcmd($this->Sendmail));
 }
+if ($this->SingleTo === true) {
-if(!@$mail = popen($sendmail, 'w')) {
+foreach ($this->SingleToArray as $key => $val) {
-$this->SetError($this->Lang('execute') . $this->Sendmail);
+if(!@$mail = popen($sendmail, 'w')) {
-return false;
+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);
-$result = pclose($mail);
+// implement call back function if it exists
-if (version_compare(phpversion(), '4.2.3') == -1) {
+$isSent = ($result == 0) ? 1 : 0;
-$result = $result >> 8 & 0xFF;
+$this->doCallback($isSent, $val, $this->cc, $this->bcc, $this->Subject, $body);
-}
+if($result != 0) {
-if($result != 0) {
+throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
-$this->SetError($this->Lang('execute') . $this->Sendmail);
+}
-return false;
+}
+} else {
+if(!@$mail = popen($sendmail, 'w')) {
+throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+}
+fputs($mail, $header);
+fputs($mail, $body);
+$result = pclose($mail);
+// implement call back function if it exists
+$isSent = ($result == 0) ? 1 : 0;
+$this->doCallback($isSent, $this->to, $this->cc, $this->bcc, $this->Subject, $body);
+if($result != 0) {
+throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+}
 }
 return true;
 }
 /**
 * Sends mail using the PHP mail() function.
-* @access private
+* @param string $header The message headers
+* @param string $body The message body
+* @access protected
 * @return bool
 */
-function MailSend($header, $body) {
+protected function MailSend($header, $body) {
+$toArr = array();
-$to = '';
+foreach($this->to as $t) {
-for($i = 0; $i < count($this->to); $i++) {
+$toArr[] = $this->AddrFormat($t);
-if($i != 0) { $to .= ', '; }
+}
-$to .= $this->AddrFormat($this->to[$i]);
+$to = implode(', ', $toArr);
-}
+if (empty($this->Sender)) {
-$toArr = split(',', $to);
+$params = "-oi ";
+} else {
 $params = sprintf("-oi -f %s", $this->Sender);
-if ($this->Sender != '' && strlen(ini_get('safe_mode')) < 1) {
+}
+if ($this->Sender != '' and !ini_get('safe_mode')) {
 $old_from = ini_get('sendmail_from');
 ini_set('sendmail_from', $this->Sender);
 if ($this->SingleTo === true && count($toArr) > 1) {
 foreach ($toArr as $key => $val) {
 $rt = @mail($val, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
+// implement call back function if it exists
+$isSent = ($rt == 1) ? 1 : 0;
+$this->doCallback($isSent, $val, $this->cc, $this->bcc, $this->Subject, $body);
 }
 } else {
 $rt = @mail($to, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
+// implement call back function if it exists
+$isSent = ($rt == 1) ? 1 : 0;
+$this->doCallback($isSent, $to, $this->cc, $this->bcc, $this->Subject, $body);
 }
 } else {
 if ($this->SingleTo === true && count($toArr) > 1) {
 foreach ($toArr as $key => $val) {
-$rt = @mail($val, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
+$rt = @mail($val, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header);
+// implement call back function if it exists
+$isSent = ($rt == 1) ? 1 : 0;
+$this->doCallback($isSent, $val, $this->cc, $this->bcc, $this->Subject, $body);
 }
 } else {
 $rt = @mail($to, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header);
-}
+// implement call back function if it exists
-}
+$isSent = ($rt == 1) ? 1 : 0;
+$this->doCallback($isSent, $to, $this->cc, $this->bcc, $this->Subject, $body);
+}
+}
 if (isset($old_from)) {
 ini_set('sendmail_from', $old_from);
 }
 if(!$rt) {
-$this->SetError($this->Lang('instantiate'));
+throw new phpmailerException($this->Lang('instantiate'), self::STOP_CRITICAL);
-return false;
+}
-}
 return true;
 }
 /**
-* Sends mail via SMTP using PhpSMTP (Author:
+* Sends mail via SMTP using PhpSMTP
-* Chris Ryan).  Returns bool.  Returns false if there is a
+* Returns false if there is a bad MAIL FROM, RCPT, or DATA input.
-* bad MAIL FROM, RCPT, or DATA input.
+* @param string $header The message headers
-* @access private
+* @param string $body The message body
+* @uses SMTP
+* @access protected
 * @return bool
 */
-function SmtpSend($header, $body) {
+protected function SmtpSend($header, $body) {
-include_once($this->PluginDir . 'class-smtp.php');
+require_once $this->PluginDir . 'class-smtp.php';
-$error = '';
 $bad_rcpt = array();
 if(!$this->SmtpConnect()) {
-return false;
+throw new phpmailerException($this->Lang('smtp_connect_failed'), self::STOP_CRITICAL);
 }
 $smtp_from = ($this->Sender == '') ? $this->From : $this->Sender;
 if(!$this->smtp->Mail($smtp_from)) {
-$error = $this->Lang('from_failed') . $smtp_from;
+throw new phpmailerException($this->Lang('from_failed') . $smtp_from, self::STOP_CRITICAL);
-$this->SetError($error);
+}
-$this->smtp->Reset();
-return false;
+// Attempt to send attach all recipients
-}
+foreach($this->to as $to) {
+if (!$this->smtp->Recipient($to[0])) {
-/* Attempt to send attach all recipients */
+$bad_rcpt[] = $to[0];
-for($i = 0; $i < count($this->to); $i++) {
+// implement call back function if it exists
-if(!$this->smtp->Recipient($this->to[$i][0])) {
+$isSent = 0;
-$bad_rcpt[] = $this->to[$i][0];
+$this->doCallback($isSent, $to[0], '', '', $this->Subject, $body);
-}
+} else {
-}
+// implement call back function if it exists
-for($i = 0; $i < count($this->cc); $i++) {
+$isSent = 1;
-if(!$this->smtp->Recipient($this->cc[$i][0])) {
+$this->doCallback($isSent, $to[0], '', '', $this->Subject, $body);
-$bad_rcpt[] = $this->cc[$i][0];
+}
 }
-}
+foreach($this->cc as $cc) {
-for($i = 0; $i < count($this->bcc); $i++) {
+if (!$this->smtp->Recipient($cc[0])) {
-if(!$this->smtp->Recipient($this->bcc[$i][0])) {
+$bad_rcpt[] = $cc[0];
-$bad_rcpt[] = $this->bcc[$i][0];
+// implement call back function if it exists
-}
+$isSent = 0;
-}
+$this->doCallback($isSent, '', $cc[0], '', $this->Subject, $body);
+} else {
-if(count($bad_rcpt) > 0) { // Create error message
+// implement call back function if it exists
-for($i = 0; $i < count($bad_rcpt); $i++) {
+$isSent = 1;
-if($i != 0) {
+$this->doCallback($isSent, '', $cc[0], '', $this->Subject, $body);
-$error .= ', ';
+}
 }
-$error .= $bad_rcpt[$i];
+foreach($this->bcc as $bcc) {
-}
+if (!$this->smtp->Recipient($bcc[0])) {
-$error = $this->Lang('recipients_failed') . $error;
+$bad_rcpt[] = $bcc[0];
-$this->SetError($error);
+// implement call back function if it exists
-$this->smtp->Reset();
+$isSent = 0;
-return false;
+$this->doCallback($isSent, '', '', $bcc[0], $this->Subject, $body);
-}
+} else {
+// implement call back function if it exists
+$isSent = 1;
+$this->doCallback($isSent, '', '', $bcc[0], $this->Subject, $body);
+}
+}
+if (count($bad_rcpt) > 0 ) { //Create error message for any bad addresses
+$badaddresses = implode(', ', $bad_rcpt);
+throw new phpmailerException($this->Lang('recipients_failed') . $badaddresses);
+}
 if(!$this->smtp->Data($header . $body)) {
-$this->SetError($this->Lang('data_not_accepted'));
+throw new phpmailerException($this->Lang('data_not_accepted'), self::STOP_CRITICAL);
-$this->smtp->Reset();
-return false;
 }
 if($this->SMTPKeepAlive == true) {
 $this->smtp->Reset();
-} else {
+}
-$this->SmtpClose();
-}
 return true;
 }
 /**
-* Initiates a connection to an SMTP server.  Returns false if the
+* Initiates a connection to an SMTP server.
-* operation failed.
+* Returns false if the operation failed.
-* @access private
+* @uses SMTP
+* @access public
 * @return bool
 */
-function SmtpConnect() {
+public function SmtpConnect() {
-if($this->smtp == NULL) {
+if(is_null($this->smtp)) {
 $this->smtp = new SMTP();
 }
 $this->smtp->do_debug = $this->SMTPDebug;
 $hosts = explode(';', $this->Host);
 $index = 0;
-$connection = ($this->smtp->Connected());
+$connection = $this->smtp->Connected();
-/* Retry while there is no connection */
+// Retry while there is no connection
-while($index < count($hosts) && $connection == false) {
+try {
-$hostinfo = array();
+while($index < count($hosts) && !$connection) {
-if(eregi('^(.+):([0-9]+)$', $hosts[$index], $hostinfo)) {
+$hostinfo = array();
-$host = $hostinfo[1];
+if (preg_match('/^(.+):([0-9]+)$/', $hosts[$index], $hostinfo)) {
-$port = $hostinfo[2];
+$host = $hostinfo[1];
-} else {
+$port = $hostinfo[2];
-$host = $hosts[$index];
-$port = $this->Port;
-}
-if($this->smtp->Connect(((!empty($this->SMTPSecure))?$this->SMTPSecure.'://':'').$host, $port, $this->Timeout)) {
-if ($this->Helo != '') {
-$this->smtp->Hello($this->Helo);
 } else {
-$this->smtp->Hello($this->ServerHostname());
+$host = $hosts[$index];
+$port = $this->Port;
 }
-$connection = true;
+$tls = ($this->SMTPSecure == 'tls');
-if($this->SMTPAuth) {
+$ssl = ($this->SMTPSecure == 'ssl');
-if(!$this->smtp->Authenticate($this->Username, $this->Password)) {
-$this->SetError($this->Lang('authenticate'));
+if ($this->smtp->Connect(($ssl ? 'ssl://':'').$host, $port, $this->Timeout)) {
-$this->smtp->Reset();
-$connection = false;
+$hello = ($this->Helo != '' ? $this->Helo : $this->ServerHostname());
+$this->smtp->Hello($hello);
+if ($tls) {
+if (!$this->smtp->StartTLS()) {
+throw new phpmailerException($this->Lang('tls'));
+}
+//We must resend HELO after tls negotiation
+$this->smtp->Hello($hello);
+}
+$connection = true;
+if ($this->SMTPAuth) {
+if (!$this->smtp->Authenticate($this->Username, $this->Password)) {
+throw new phpmailerException($this->Lang('authenticate'));
+}
 }
 }
-}
+$index++;
-$index++;
+if (!$connection) {
-}
+throw new phpmailerException($this->Lang('connect_host'));
-if(!$connection) {
+}
-$this->SetError($this->Lang('connect_host'));
+}
-}
+} catch (phpmailerException $e) {
+$this->smtp->Reset();
-return $connection;
+	  if ($this->exceptions) {
+throw $e;
+}
+}
+return true;
 }
 /**
 * Closes the active SMTP session if one exists.
 * @return void
 */
-function SmtpClose() {
+public function SmtpClose() {
-if($this->smtp != NULL) {
+if(!is_null($this->smtp)) {
 if($this->smtp->Connected()) {
 $this->smtp->Quit();
 $this->smtp->Close();
 }
 }
 }
 /**
-* Sets the language for all class error messages.  Returns false
+* Sets the language for all class error messages.
-* if it cannot load the language file.  The default language type
+* Returns false if it cannot load the language file.  The default language is English.
-* is English.
+* @param string $langcode ISO 639-1 2-character language code (e.g. Portuguese: "br")
-* @param string $lang_type Type of language (e.g. Portuguese: "br")
+* @param string $lang_path Path to the language file directory
-* @param string $lang_path Path to the language file directory
+* @access public
-* @access public
+*/
-* @return bool
+function SetLanguage($langcode = 'en', $lang_path = 'language/') {
-*/
+//Define full set of translatable strings
-function SetLanguage($lang_type, $lang_path = 'language/') {
+$PHPMAILER_LANG = array(
-if(file_exists($lang_path.'phpmailer.lang-'.$lang_type.'.php')) {
+'provide_address' => 'You must provide at least one recipient email address.',
-include($lang_path.'phpmailer.lang-'.$lang_type.'.php');
+'mailer_not_supported' => ' mailer is not supported.',
-} elseif (file_exists($lang_path.'phpmailer.lang-en.php')) {
+'execute' => 'Could not execute: ',
-include($lang_path.'phpmailer.lang-en.php');
+'instantiate' => 'Could not instantiate mail function.',
-} else {
+'authenticate' => 'SMTP Error: Could not authenticate.',
-$PHPMAILER_LANG = array();
+'from_failed' => 'The following From address failed: ',
-$PHPMAILER_LANG["provide_address"]      = 'You must provide at least one ' .
+'recipients_failed' => 'SMTP Error: The following recipients failed: ',
-$PHPMAILER_LANG["mailer_not_supported"] = ' mailer is not supported.';
+'data_not_accepted' => 'SMTP Error: Data not accepted.',
-$PHPMAILER_LANG["execute"]              = 'Could not execute: ';
+'connect_host' => 'SMTP Error: Could not connect to SMTP host.',
-$PHPMAILER_LANG["instantiate"]          = 'Could not instantiate mail function.';
+'file_access' => 'Could not access file: ',
-$PHPMAILER_LANG["authenticate"]         = 'SMTP Error: Could not authenticate.';
+'file_open' => 'File Error: Could not open file: ',
-$PHPMAILER_LANG["from_failed"]          = 'The following From address failed: ';
+'encoding' => 'Unknown encoding: ',
-$PHPMAILER_LANG["recipients_failed"]    = 'SMTP Error: The following ' .
+'signing' => 'Signing Error: ',
-$PHPMAILER_LANG["data_not_accepted"]    = 'SMTP Error: Data not accepted.';
+'smtp_error' => 'SMTP server error: ',
-$PHPMAILER_LANG["connect_host"]         = 'SMTP Error: Could not connect to SMTP host.';
+'empty_message' => 'Message body empty',
-$PHPMAILER_LANG["file_access"]          = 'Could not access file: ';
+'invalid_address' => 'Invalid address',
-$PHPMAILER_LANG["file_open"]            = 'File Error: Could not open file: ';
+'variable_set' => 'Cannot set or reset variable: '
-$PHPMAILER_LANG["encoding"]             = 'Unknown encoding: ';
+);
-$PHPMAILER_LANG["signing"]              = 'Signing Error: ';
+//Overwrite language-specific strings. This way we'll never have missing translations - no more "language string failed to load"!
+$l = true;
+if ($langcode != 'en') { //There is no English translation file
+$l = @include $lang_path.'phpmailer.lang-'.$langcode.'.php';
 }
 $this->language = $PHPMAILER_LANG;
+return ($l == true); //Returns false if language not found
-return true;
+}
+/**
+* Return the current array of language strings
+* @return array
+*/
+public function GetTranslations() {
+return $this->language;
 }
 /////////////////////////////////////////////////
 // METHODS, MESSAGE CREATION
 /////////////////////////////////////////////////
 /**
 * Creates recipient headers.
-* @access private
+* @access public
 * @return string
 */
-function AddrAppend($type, $addr) {
+public function AddrAppend($type, $addr) {
 $addr_str = $type . ': ';
-$addr_str .= $this->AddrFormat($addr[0]);
+$addresses = array();
-if(count($addr) > 1) {
+foreach ($addr as $a) {
-for($i = 1; $i < count($addr); $i++) {
+$addresses[] = $this->AddrFormat($a);
-$addr_str .= ', ' . $this->AddrFormat($addr[$i]);
+}
-}
+$addr_str .= implode(', ', $addresses);
-}
 $addr_str .= $this->LE;
 return $addr_str;
 }
 /**
 * Formats an address correctly.
-* @access private
+* @access public
 * @return string
 */
-function AddrFormat($addr) {
+public function AddrFormat($addr) {
-if(empty($addr[1])) {
+if (empty($addr[1])) {
-$formatted = $this->SecureHeader($addr[0]);
+return $this->SecureHeader($addr[0]);
 } else {
-$formatted = $this->EncodeHeader($this->SecureHeader($addr[1]), 'phrase') . " <" . $this->SecureHeader($addr[0]) . ">";
+return $this->EncodeHeader($this->SecureHeader($addr[1]), 'phrase') . " <" . $this->SecureHeader($addr[0]) . ">";
 }
-return $formatted;
 }
 /**
 * Wraps message for use with mailers that do not
 * automatically perform wrapping and for quoted-printable.
 * Original written by philippe.
-* @access private
+* @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
 */
-function WrapText($message, $length, $qp_mode = false) {
+public function WrapText($message, $length, $qp_mode = false) {
 $soft_break = ($qp_mode) ? sprintf(" =%s", $this->LE) : $this->LE;
 // If utf-8 encoding is used, we will need to make sure we don't
 // split multibyte characters when we wrap
 $is_utf8 = (strtolower($this->CharSet) == "utf-8");
 $message = substr($message, 0, -1);
 }
 $line = explode($this->LE, $message);
 $message = '';
-for ($i=0 ;$i < count($line); $i++) {
+for ($i = 0 ;$i < count($line); $i++) {
 $line_part = explode(' ', $line[$i]);
 $buf = '';
 for ($e = 0; $e<count($line_part); $e++) {
 $word = $line_part[$e];
 if ($qp_mode and (strlen($word) > $length)) {
 /**
 * Finds last character boundary prior to maxLength in a utf-8
 * quoted (printable) encoded string.
 * Original written by Colin Brown.
-* @access private
+* @access public
 * @param string $encodedText utf-8 QP text
 * @param int    $maxLength   find last character boundary prior to this length
 * @return int
 */
-function UTF8CharBoundary($encodedText, $maxLength) {
+public function UTF8CharBoundary($encodedText, $maxLength) {
 $foundSplitPos = false;
 $lookBack = 3;
 while (!$foundSplitPos) {
 $lastChunk = substr($encodedText, $maxLength - $lookBack, $lookBack);
 $encodedCharPos = strpos($lastChunk, "=");
 }
 }
 return $maxLength;
 }
 /**
 * Set the body wrapping.
-* @access private
+* @access public
 * @return void
 */
-function SetWordWrap() {
+public function SetWordWrap() {
 if($this->WordWrap < 1) {
 return;
 }
 switch($this->message_type) {
 case 'alt':
-/* fall through */
+case 'alt_inline':
-case 'alt_attachments':
+case 'alt_attach':
+case 'alt_inline_attach':
 $this->AltBody = $this->WrapText($this->AltBody, $this->WordWrap);
 break;
 default:
 $this->Body = $this->WrapText($this->Body, $this->WordWrap);
 break;
 }
 }
 /**
 * Assembles message header.
-* @access private
+* @access public
-* @return string
+* @return string The assembled header
 */
-function CreateHeader() {
+public function CreateHeader() {
 $result = '';
-/* Set the boundaries */
+// Set the boundaries
 $uniq_id = md5(uniqid(time()));
 $this->boundary[1] = 'b1_' . $uniq_id;
 $this->boundary[2] = 'b2_' . $uniq_id;
+$this->boundary[3] = 'b3_' . $uniq_id;
-$result .= $this->HeaderLine('Date', $this->RFCDate());
+$result .= $this->HeaderLine('Date', self::RFCDate());
 if($this->Sender == '') {
 $result .= $this->HeaderLine('Return-Path', trim($this->From));
 } else {
 $result .= $this->HeaderLine('Return-Path', trim($this->Sender));
 }
-/* To be created automatically by mail() */
+// To be created automatically by mail()
 if($this->Mailer != 'mail') {
-if(count($this->to) > 0) {
+if ($this->SingleTo === true) {
-$result .= $this->AddrAppend('To', $this->to);
+foreach($this->to as $t) {
-} elseif (count($this->cc) == 0) {
+$this->SingleToArray[] = $this->AddrFormat($t);
-$result .= $this->HeaderLine('To', 'undisclosed-recipients:;');
+}
-}
+} else {
-}
+if(count($this->to) > 0) {
+$result .= $this->AddrAppend('To', $this->to);
+} elseif (count($this->cc) == 0) {
+$result .= $this->HeaderLine('To', 'undisclosed-recipients:;');
+}
+}
+	}
 $from = array();
 $from[0][0] = trim($this->From);
 $from[0][1] = $this->FromName;
 $result .= $this->AddrAppend('From', $from);
-/* sendmail and mail() extract Cc from the header before sending */
+// sendmail and mail() extract Cc from the header before sending
-if((($this->Mailer == 'sendmail') || ($this->Mailer == 'mail')) && (count($this->cc) > 0)) {
+if(count($this->cc) > 0) {
 $result .= $this->AddrAppend('Cc', $this->cc);
 }
-/* sendmail and mail() extract Bcc from the header before sending */
+// sendmail and mail() extract Bcc from the header before sending
 if((($this->Mailer == 'sendmail') || ($this->Mailer == 'mail')) && (count($this->bcc) > 0)) {
 $result .= $this->AddrAppend('Bcc', $this->bcc);
 }
 if(count($this->ReplyTo) > 0) {
 $result .= $this->AddrAppend('Reply-To', $this->ReplyTo);
 }
-/* mail() sets the subject itself */
+// mail() sets the subject itself
 if($this->Mailer != 'mail') {
 $result .= $this->HeaderLine('Subject', $this->EncodeHeader($this->SecureHeader($this->Subject)));
 }
 if($this->MessageID != '') {
-$result .= $this->HeaderLine('Message-ID',$this->MessageID);
+$result .= $this->HeaderLine('Message-ID', $this->MessageID);
 } else {
 $result .= sprintf("Message-ID: <%s@%s>%s", $uniq_id, $this->ServerHostname(), $this->LE);
 }
 $result .= $this->HeaderLine('X-Priority', $this->Priority);
-$result .= $this->HeaderLine('X-Mailer', 'PHPMailer (phpmailer.sourceforge.net) [version ' . $this->Version . ']');
+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/)');
+}
 if($this->ConfirmReadingTo != '') {
 $result .= $this->HeaderLine('Disposition-Notification-To', '<' . trim($this->ConfirmReadingTo) . '>');
 }
 return $result;
 }
 /**
 * Returns the message MIME.
-* @access private
+* @access public
 * @return string
 */
-function GetMailMIME() {
+public function GetMailMIME() {
 $result = '';
 switch($this->message_type) {
 case 'plain':
 $result .= $this->HeaderLine('Content-Transfer-Encoding', $this->Encoding);
-$result .= sprintf("Content-Type: %s; charset=\"%s\"", $this->ContentType, $this->CharSet);
+$result .= $this->TextLine('Content-Type: '.$this->ContentType.'; charset="'.$this->CharSet.'"');
 break;
-case 'attachments':
+case 'inline':
-/* fall through */
+$result .= $this->HeaderLine('Content-Type', 'multipart/related;');
-case 'alt_attachments':
+$result .= $this->TextLine("\tboundary=\"" . $this->boundary[1] . '"');
-if($this->InlineImageExists()){
+break;
-$result .= sprintf("Content-Type: %s;%s\ttype=\"text/html\";%s\tboundary=\"%s\"%s", 'multipart/related', $this->LE, $this->LE, $this->boundary[1], $this->LE);
+case 'attach':
-} else {
+case 'inline_attach':
-$result .= $this->HeaderLine('Content-Type', 'multipart/mixed;');
+case 'alt_attach':
-$result .= $this->TextLine("\tboundary=\"" . $this->boundary[1] . '"');
+case 'alt_inline_attach':
-}
+$result .= $this->HeaderLine('Content-Type', 'multipart/mixed;');
+$result .= $this->TextLine("\tboundary=\"" . $this->boundary[1] . '"');
 break;
 case 'alt':
+case 'alt_inline':
 $result .= $this->HeaderLine('Content-Type', 'multipart/alternative;');
 $result .= $this->TextLine("\tboundary=\"" . $this->boundary[1] . '"');
 break;
 }
 return $result;
 }
 /**
+* Returns the MIME message (headers and body). Only really valid post PreSend().
+* @access public
+* @return string
+*/
+public function GetSentMIMEMessage() {
+return $this->SentMIMEMessage;
+}
+/**
 * Assembles the message body.  Returns an empty string on failure.
-* @access private
+* @access public
+* @return string The assembled message body
+*/
+public function CreateBody() {
+$body = '';
+if ($this->sign_key_file) {
+$body .= $this->GetMailMIME();
+}
+$this->SetWordWrap();
+switch($this->message_type) {
+case '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;
+case 'alt':
+$body .= $this->GetBoundary($this->boundary[1], '', 'text/plain', '');
+$body .= $this->EncodeString($this->AltBody, $this->Encoding);
+$body .= $this->LE.$this->LE;
+$body .= $this->GetBoundary($this->boundary[1], '', 'text/html', '');
+$body .= $this->EncodeString($this->Body, $this->Encoding);
+$body .= $this->LE.$this->LE;
+$body .= $this->EndBoundary($this->boundary[1]);
+break;
+case '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', '');
+$body .= $this->EncodeString($this->Body, $this->Encoding);
+$body .= $this->LE.$this->LE;
+$body .= $this->AttachAll("inline", $this->boundary[2]);
+$body .= $this->LE;
+$body .= $this->EndBoundary($this->boundary[1]);
+break;
+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', '');
+$body .= $this->EncodeString($this->Body, $this->Encoding);
+$body .= $this->LE.$this->LE;
+$body .= $this->EndBoundary($this->boundary[2]);
+$body .= $this->LE;
+$body .= $this->AttachAll("attachment", $this->boundary[1]);
+break;
+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', '');
+$body .= $this->EncodeString($this->AltBody, $this->Encoding);
+$body .= $this->LE.$this->LE;
+$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', '');
+$body .= $this->EncodeString($this->Body, $this->Encoding);
+$body .= $this->LE.$this->LE;
+$body .= $this->AttachAll("inline", $this->boundary[3]);
+$body .= $this->LE;
+$body .= $this->EndBoundary($this->boundary[2]);
+$body .= $this->LE;
+$body .= $this->AttachAll("attachment", $this->boundary[1]);
+break;
+}
+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);
+$body = file_get_contents($signed);
+@unlink($signed);
+} else {
+@unlink($file);
+@unlink($signed);
+throw new phpmailerException($this->Lang("signing").openssl_error_string());
+}
+} catch (phpmailerException $e) {
+$body = '';
+if ($this->exceptions) {
+throw $e;
+}
+}
+}
+return $body;
+}
+/**
+* Returns the start of a message boundary.
+* @access protected
 * @return string
 */
-function CreateBody() {
+protected function GetBoundary($boundary, $charSet, $contentType, $encoding) {
-$result = '';
-if ($this->sign_key_file) {
-$result .= $this->GetMailMIME();
-}
-$this->SetWordWrap();
-switch($this->message_type) {
-case 'alt':
-$result .= $this->GetBoundary($this->boundary[1], '', 'text/plain', '');
-$result .= $this->EncodeString($this->AltBody, $this->Encoding);
-$result .= $this->LE.$this->LE;
-$result .= $this->GetBoundary($this->boundary[1], '', 'text/html', '');
-$result .= $this->EncodeString($this->Body, $this->Encoding);
-$result .= $this->LE.$this->LE;
-$result .= $this->EndBoundary($this->boundary[1]);
-break;
-case 'plain':
-$result .= $this->EncodeString($this->Body, $this->Encoding);
-break;
-case 'attachments':
-$result .= $this->GetBoundary($this->boundary[1], '', '', '');
-$result .= $this->EncodeString($this->Body, $this->Encoding);
-$result .= $this->LE;
-$result .= $this->AttachAll();
-break;
-case 'alt_attachments':
-$result .= sprintf("--%s%s", $this->boundary[1], $this->LE);
-$result .= sprintf("Content-Type: %s;%s" . "\tboundary=\"%s\"%s", 'multipart/alternative', $this->LE, $this->boundary[2], $this->LE.$this->LE);
-$result .= $this->GetBoundary($this->boundary[2], '', 'text/plain', '') . $this->LE; // Create text body
-$result .= $this->EncodeString($this->AltBody, $this->Encoding);
-$result .= $this->LE.$this->LE;
-$result .= $this->GetBoundary($this->boundary[2], '', 'text/html', '') . $this->LE; // Create the HTML body
-$result .= $this->EncodeString($this->Body, $this->Encoding);
-$result .= $this->LE.$this->LE;
-$result .= $this->EndBoundary($this->boundary[2]);
-$result .= $this->AttachAll();
-break;
-}
-if($this->IsError()) {
-$result = '';
-} else if ($this->sign_key_file) {
-$file = tempnam("", "mail");
-$fp = fopen($file, "w");
-fwrite($fp, $result);
-fclose($fp);
-$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)) {
-$fp = fopen($signed, "r");
-$result = fread($fp, filesize($this->sign_key_file));
-$result = '';
-while(!feof($fp)){
-$result = $result . fread($fp, 1024);
-}
-fclose($fp);
-} else {
-$this->SetError($this->Lang("signing").openssl_error_string());
-$result = '';
-}
-unlink($file);
-unlink($signed);
-}
-return $result;
-}
-/**
-* Returns the start of a message boundary.
-* @access private
-*/
-function GetBoundary($boundary, $charSet, $contentType, $encoding) {
 $result = '';
 if($charSet == '') {
 $charSet = $this->CharSet;
 }
 if($contentType == '') {
 }
 if($encoding == '') {
 $encoding = $this->Encoding;
 }
 $result .= $this->TextLine('--' . $boundary);
-$result .= sprintf("Content-Type: %s; charset = \"%s\"", $contentType, $charSet);
+$result .= sprintf("Content-Type: %s; charset=\"%s\"", $contentType, $charSet);
 $result .= $this->LE;
 $result .= $this->HeaderLine('Content-Transfer-Encoding', $encoding);
 $result .= $this->LE;
 return $result;
 }
 /**
 * Returns the end of a message boundary.
-* @access private
+* @access protected
-*/
+* @return string
-function EndBoundary($boundary) {
+*/
+protected function EndBoundary($boundary) {
 return $this->LE . '--' . $boundary . '--' . $this->LE;
 }
 /**
 * Sets the message type.
-* @access private
+* @access protected
 * @return void
 */
-function SetMessageType() {
+protected function SetMessageType() {
-if(count($this->attachment) < 1 && strlen($this->AltBody) < 1) {
+$this->message_type = array();
-$this->message_type = 'plain';
+if($this->AlternativeExists()) $this->message_type[] = "alt";
-} else {
+if($this->InlineImageExists()) $this->message_type[] = "inline";
-if(count($this->attachment) > 0) {
+if($this->AttachmentExists()) $this->message_type[] = "attach";
-$this->message_type = 'attachments';
+$this->message_type = implode("_", $this->message_type);
-}
+if($this->message_type == "") $this->message_type = "plain";
-if(strlen($this->AltBody) > 0 && count($this->attachment) < 1) {
+}
-$this->message_type = 'alt';
-}
+/**
-if(strlen($this->AltBody) > 0 && count($this->attachment) > 0) {
+*  Returns a formatted header line.
-$this->message_type = 'alt_attachments';
+* @access public
-}
-}
-}
-/* Returns a formatted header line.
-* @access private
 * @return string
 */
-function HeaderLine($name, $value) {
+public function HeaderLine($name, $value) {
 return $name . ': ' . $value . $this->LE;
 }
 /**
 * Returns a formatted mail line.
-* @access private
+* @access public
 * @return string
 */
-function TextLine($value) {
+public function TextLine($value) {
 return $value . $this->LE;
 }
 /////////////////////////////////////////////////
 // CLASS METHODS, ATTACHMENTS
 * @param string $name Overrides the attachment name.
 * @param string $encoding File encoding (see $Encoding).
 * @param string $type File extension (MIME) type.
 * @return bool
 */
-function AddAttachment($path, $name = '', $encoding = 'base64', $type = 'application/octet-stream') {
+public function AddAttachment($path, $name = '', $encoding = 'base64', $type = 'application/octet-stream') {
-if(!@is_file($path)) {
+try {
-$this->SetError($this->Lang('file_access') . $path);
+if ( !@is_file($path) ) {
-return false;
+throw new phpmailerException($this->Lang('file_access') . $path, self::STOP_CONTINUE);
 }
+$filename = basename($path);
-$filename = basename($path);
+if ( $name == '' ) {
-if($name == '') {
+$name = $filename;
-$name = $filename;
+}
-}
+$this->attachment[] = array(
-$cur = count($this->attachment);
+0 => $path,
-$this->attachment[$cur][0] = $path;
+1 => $filename,
-$this->attachment[$cur][1] = $filename;
+2 => $name,
-$this->attachment[$cur][2] = $name;
+3 => $encoding,
-$this->attachment[$cur][3] = $encoding;
+4 => $type,
-$this->attachment[$cur][4] = $type;
+5 => false,  // isStringAttachment
-$this->attachment[$cur][5] = false; // isStringAttachment
+6 => 'attachment',
-$this->attachment[$cur][6] = 'attachment';
+7 => 0
-$this->attachment[$cur][7] = 0;
+);
+} catch (phpmailerException $e) {
+$this->SetError($e->getMessage());
+if ($this->exceptions) {
+throw $e;
+}
+	  if ($this->SMTPDebug) {
+echo $e->getMessage()."\n";
+}
+if ( $e->getCode() == self::STOP_CRITICAL ) {
+return false;
+}
+}
 return true;
+}
+/**
+* Return the current array of attachments
+* @return array
+*/
+public function GetAttachments() {
+return $this->attachment;
 }
 /**
 * Attaches all fs, string, and binary attachments to the message.
 * Returns an empty string on failure.
-* @access private
+* @access protected
 * @return string
 */
-function AttachAll() {
+protected function AttachAll($disposition_type, $boundary) {
-/* Return text of body */
+// Return text of body
 $mime = array();
+$cidUniq = array();
-/* Add all attachments */
+$incl = array();
-for($i = 0; $i < count($this->attachment); $i++) {
-/* Check for string attachment */
+// Add all attachments
-$bString = $this->attachment[$i][5];
+foreach ($this->attachment as $attachment) {
-if ($bString) {
+// CHECK IF IT IS A VALID DISPOSITION_FILTER
-$string = $this->attachment[$i][0];
+if($attachment[6] == $disposition_type) {
-} else {
+// Check for string attachment
-$path = $this->attachment[$i][0];
+$bString = $attachment[5];
-}
+if ($bString) {
+$string = $attachment[0];
-$filename    = $this->attachment[$i][1];
+} else {
-$name        = $this->attachment[$i][2];
+$path = $attachment[0];
-$encoding    = $this->attachment[$i][3];
-$type        = $this->attachment[$i][4];
-$disposition = $this->attachment[$i][6];
-$cid         = $this->attachment[$i][7];
-$mime[] = sprintf("--%s%s", $this->boundary[1], $this->LE);
-$mime[] = sprintf("Content-Type: %s; name=\"%s\"%s", $type, $this->EncodeHeader($this->SecureHeader($name)), $this->LE);
-$mime[] = sprintf("Content-Transfer-Encoding: %s%s", $encoding, $this->LE);
-if($disposition == 'inline') {
-$mime[] = sprintf("Content-ID: <%s>%s", $cid, $this->LE);
-}
-$mime[] = sprintf("Content-Disposition: %s; filename=\"%s\"%s", $disposition, $this->EncodeHeader($this->SecureHeader($name)), $this->LE.$this->LE);
-/* Encode as string attachment */
-if($bString) {
-$mime[] = $this->EncodeString($string, $encoding);
-if($this->IsError()) {
-return '';
 }
-$mime[] = $this->LE.$this->LE;
-} else {
+$inclhash = md5(serialize($attachment));
-$mime[] = $this->EncodeFile($path, $encoding);
+if (in_array($inclhash, $incl)) { continue; }
-if($this->IsError()) {
+$incl[]      = $inclhash;
-return '';
+$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;
+$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);
+if($disposition == 'inline') {
+$mime[] = sprintf("Content-ID: <%s>%s", $cid, $this->LE);
 }
-$mime[] = $this->LE.$this->LE;
-}
+$mime[] = sprintf("Content-Disposition: %s; filename=\"%s\"%s", $disposition, $this->EncodeHeader($this->SecureHeader($name)), $this->LE.$this->LE);
-}
+// Encode as string attachment
-$mime[] = sprintf("--%s--%s", $this->boundary[1], $this->LE);
+if($bString) {
+$mime[] = $this->EncodeString($string, $encoding);
-return join('', $mime);
+if($this->IsError()) {
-}
+return '';
+}
-/**
+$mime[] = $this->LE.$this->LE;
-* Encodes attachment in requested format.  Returns an
+} else {
-* empty string on failure.
+$mime[] = $this->EncodeFile($path, $encoding);
-* @access private
+if($this->IsError()) {
+return '';
+}
+$mime[] = $this->LE.$this->LE;
+}
+}
+}
+$mime[] = sprintf("--%s--%s", $boundary, $this->LE);
+return implode("", $mime);
+}
+/**
+* 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()
+* @access protected
 * @return string
 */
-function EncodeFile ($path, $encoding = 'base64') {
+protected function EncodeFile($path, $encoding = 'base64') {
-if(!@$fd = fopen($path, 'rb')) {
+try {
-$this->SetError($this->Lang('file_open') . $path);
+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;
+}
+}
+	  $magic_quotes = get_magic_quotes_runtime();
+	  if ($magic_quotes) {
+if (version_compare(PHP_VERSION, '5.3.0', '<')) {
+set_magic_quotes_runtime(0);
+} else {
+		  ini_set('magic_quotes_runtime', 0);
+		}
+	  }
+$file_buffer  = file_get_contents($path);
+$file_buffer  = $this->EncodeString($file_buffer, $encoding);
+	  if ($magic_quotes) {
+if (version_compare(PHP_VERSION, '5.3.0', '<')) {
+set_magic_quotes_runtime($magic_quotes);
+} else {
+		  ini_set('magic_quotes_runtime', $magic_quotes);
+	    }
+	  }
+return $file_buffer;
+} catch (Exception $e) {
+$this->SetError($e->getMessage());
 return '';
 }
-$magic_quotes = get_magic_quotes_runtime();
+}
-set_magic_quotes_runtime(0);
-$file_buffer = fread($fd, filesize($path));
+/**
-$file_buffer = $this->EncodeString($file_buffer, $encoding);
+* Encodes string to requested format.
-fclose($fd);
+* Returns an empty string on failure.
-set_magic_quotes_runtime($magic_quotes);
+* @param string $str The text to encode
+* @param string $encoding The encoding to use; one of 'base64', '7bit', '8bit', 'binary', 'quoted-printable'
-return $file_buffer;
+* @access public
-}
-/**
-* Encodes string to requested format. Returns an
-* empty string on failure.
-* @access private
 * @return string
 */
-function EncodeString ($str, $encoding = 'base64') {
+public function EncodeString($str, $encoding = 'base64') {
 $encoded = '';
 switch(strtolower($encoding)) {
 case 'base64':
-/* chunk_split is found in PHP >= 3.0.6 */
 $encoded = chunk_split(base64_encode($str), 76, $this->LE);
 break;
 case '7bit':
 case '8bit':
 $encoded = $this->FixEOL($str);
+//Make sure it ends with a line break
 if (substr($encoded, -(strlen($this->LE))) != $this->LE)
 $encoded .= $this->LE;
 break;
 case 'binary':
 $encoded = $str;
 }
 return $encoded;
 }
 /**
-* Encode a header string to best of Q, B, quoted or none.
+* Encode a header string to best (shortest) of Q, B, quoted or none.
-* @access private
+* @access public
 * @return string
 */
-function EncodeHeader ($str, $position = 'text') {
+public function EncodeHeader($str, $position = 'text') {
 $x = 0;
 switch (strtolower($position)) {
 case 'phrase':
 if (!preg_match('/[\200-\377]/', $str)) {
-/* Can't use addslashes as we don't know what value has magic_quotes_sybase. */
+// Can't use addslashes as we don't know what value has magic_quotes_sybase
 $encoded = addcslashes($str, "\0..\37\177\\\"");
 if (($str == $encoded) && !preg_match('/[^A-Za-z0-9!#$%&\'*+\/=?^_`{|}~ -]/', $str)) {
 return ($encoded);
 } else {
 return ("\"$encoded\"");
 }
 $x = preg_match_all('/[^\040\041\043-\133\135-\176]/', $str, $matches);
 break;
 case 'comment':
 $x = preg_match_all('/[()"]/', $str, $matches);
-/* Fall-through */
+// Fall-through
 case 'text':
 default:
 $x += preg_match_all('/[\000-\010\013\014\016-\037\177-\377]/', $str, $matches);
 break;
 }
 if ($x == 0) {
 return ($str);
 }
 $maxlen = 75 - 7 - strlen($this->CharSet);
-/* Try to select the encoding which should produce the shortest output */
+// Try to select the encoding which should produce the shortest output
 if (strlen($str)/3 < $x) {
 $encoding = 'B';
 if (function_exists('mb_strlen') && $this->HasMultiBytes($str)) {
 // Use a custom function which correctly encodes and wraps long
 // multibyte strings without breaking lines within a character
 $encoded = $this->Base64EncodeWrapMB($str);
 } else {
 $encoded = base64_encode($str);
 $maxlen -= $maxlen % 4;
 $encoded = trim(chunk_split($encoded, $maxlen, "\n"));
 return $encoded;
 }
 /**
 * Checks if a string contains multibyte characters.
-* @access private
+* @access public
 * @param string $str multi-byte text to wrap encode
 * @return bool
 */
-function HasMultiBytes($str) {
+public function HasMultiBytes($str) {
 if (function_exists('mb_strlen')) {
 return (strlen($str) > mb_strlen($str, $this->CharSet));
 } else { // Assume no multibytes (we can't handle without mbstring functions anyway)
-return False;
+return false;
 }
 }
 /**
 * 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
-* @access private
+* @access public
 * @param string $str multi-byte text to wrap encode
 * @return string
 */
-function Base64EncodeWrapMB($str) {
+public function Base64EncodeWrapMB($str) {
 $start = "=?".$this->CharSet."?B?";
 $end = "?=";
 $encoded = "";
 $mb_length = mb_strlen($str, $this->CharSet);
 $encoded = substr($encoded, 0, -strlen($this->LE));
 return $encoded;
 }
 /**
 * Encode string to quoted-printable.
-* @access private
+* Only uses standard PHP, slow, but will always work
-* @return string
+* @access public
-*/
+* @param string $string the text to encode
-function EncodeQP( $input = '', $line_max = 76, $space_conv = false ) {
+* @param integer $line_max Number of chars allowed on a line before wrapping
-$hex = array('0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F');
+* @return string
+*/
+public function EncodeQPphp( $input = '', $line_max = 76, $space_conv = false) {
+$hex = array('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F');
 $lines = preg_split('/(?:\r\n|\r|\n)/', $input);
 $eol = "\r\n";
 $escape = '=';
 $output = '';
 while( list(, $line) = each($lines) ) {
 } // end of while
 return $output;
 }
 /**
-* Callback for converting to "=XX".
+* Encode string to RFC2045 (6.7) quoted-printable format
-* @access private
+* 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;
+}
+/**
+* Encode string to q encoding.
+* @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
 */
-function EncodeQ_callback ($matches) {
+public function EncodeQ($str, $position = 'text') {
-return sprintf('=%02X', ord($matches[1]));
+// There should not be any EOL in the string
-}
+$encoded = preg_replace('/[\r\n]*/', '', $str);
-/**
-* Encode string to q encoding.
-* @access private
-* @return string
-*/
-function EncodeQ ($str, $position = 'text') {
-/* There should not be any EOL in the string */
-$encoded = preg_replace("/[\r\n]/", '', $str);
 switch (strtolower($position)) {
 case 'phrase':
-$encoded = preg_replace_callback("/([^A-Za-z0-9!*+\/ -])/",
+$encoded = preg_replace("/([^A-Za-z0-9!*+\/ -])/e", "'='.sprintf('%02X', ord('\\1'))", $encoded);
-array('PHPMailer', 'EncodeQ_callback'), $encoded);
 break;
 case 'comment':
-$encoded = preg_replace_callback("/([\(\)\"])/",
+$encoded = preg_replace("/([\(\)\"])/e", "'='.sprintf('%02X', ord('\\1'))", $encoded);
-array('PHPMailer', 'EncodeQ_callback'), $encoded);
-break;
 case 'text':
 default:
-/* Replace every high ascii, control =, ? and _ characters */
+// Replace every high ascii, control =, ? and _ characters
-$encoded = preg_replace_callback('/([\000-\011\013\014\016-\037\075\077\137\177-\377])/',
+//TODO using /e (equivalent to eval()) is probably not a good idea
-array('PHPMailer', 'EncodeQ_callback'), $encoded);
+$encoded = preg_replace('/([\000-\011\013\014\016-\037\075\077\137\177-\377])/e',
+"'='.sprintf('%02X', ord(stripslashes('\\1')))", $encoded);
 break;
 }
-/* Replace every spaces to _ (more readable than =20) */
+// Replace every spaces to _ (more readable than =20)
 $encoded = str_replace(' ', '_', $encoded);
 return $encoded;
 }
 * @param string $filename Name of the attachment.
 * @param string $encoding File encoding (see $Encoding).
 * @param string $type File extension (MIME) type.
 * @return void
 */
-function AddStringAttachment($string, $filename, $encoding = 'base64', $type = 'application/octet-stream') {
+public function AddStringAttachment($string, $filename, $encoding = 'base64', $type = 'application/octet-stream') {
-/* Append to $attachment array */
+// Append to $attachment array
-$cur = count($this->attachment);
+$this->attachment[] = array(
-$this->attachment[$cur][0] = $string;
+0 => $string,
-$this->attachment[$cur][1] = $filename;
+1 => $filename,
-$this->attachment[$cur][2] = $filename;
+2 => basename($filename),
-$this->attachment[$cur][3] = $encoding;
+3 => $encoding,
-$this->attachment[$cur][4] = $type;
+4 => $type,
-$this->attachment[$cur][5] = true; // isString
+5 => true,  // isStringAttachment
-$this->attachment[$cur][6] = 'attachment';
+6 => 'attachment',
-$this->attachment[$cur][7] = 0;
+7 => 0
+);
 }
 /**
 * Adds an embedded attachment.  This can include images, sounds, and
 * just about any other document.  Make sure to set the $type to an
 * @param string $name Overrides the attachment name.
 * @param string $encoding File encoding (see $Encoding).
 * @param string $type File extension (MIME) type.
 * @return bool
 */
-function AddEmbeddedImage($path, $cid, $name = '', $encoding = 'base64', $type = 'application/octet-stream') {
+public function AddEmbeddedImage($path, $cid, $name = '', $encoding = 'base64', $type = 'application/octet-stream') {
-if(!@is_file($path)) {
+if ( !@is_file($path) ) {
 $this->SetError($this->Lang('file_access') . $path);
 return false;
 }
 $filename = basename($path);
-if($name == '') {
+if ( $name == '' ) {
 $name = $filename;
 }
-/* Append to $attachment array */
+// Append to $attachment array
-$cur = count($this->attachment);
+$this->attachment[] = array(
-$this->attachment[$cur][0] = $path;
+0 => $path,
-$this->attachment[$cur][1] = $filename;
+1 => $filename,
-$this->attachment[$cur][2] = $name;
+2 => $name,
-$this->attachment[$cur][3] = $encoding;
+3 => $encoding,
-$this->attachment[$cur][4] = $type;
+4 => $type,
-$this->attachment[$cur][5] = false;
+5 => false,  // isStringAttachment
-$this->attachment[$cur][6] = 'inline';
+6 => 'inline',
-$this->attachment[$cur][7] = $cid;
+7 => $cid
+);
 return true;
 }
+public function AddStringEmbeddedImage($string, $cid, $filename = '', $encoding = 'base64', $type = 'application/octet-stream') {
+// Append to $attachment array
+$this->attachment[] = array(
+0 => $string,
+1 => $filename,
+2 => basename($filename),
+3 => $encoding,
+4 => $type,
+5 => true,  // isStringAttachment
+6 => 'inline',
+7 => $cid
+);
+}
 /**
 * Returns true if an inline attachment is present.
-* @access private
+* @access public
 * @return bool
 */
-function InlineImageExists() {
+public function InlineImageExists() {
-$result = false;
+foreach($this->attachment as $attachment) {
-for($i = 0; $i < count($this->attachment); $i++) {
+if ($attachment[6] == 'inline') {
-if($this->attachment[$i][6] == 'inline') {
+return true;
-$result = true;
+}
-break;
+}
-}
+return false;
 }
-return $result;
+public function AttachmentExists() {
+foreach($this->attachment as $attachment) {
+if ($attachment[6] == 'attachment') {
+return true;
+}
+}
+return false;
+}
+public function AlternativeExists() {
+return strlen($this->AltBody)>0;
 }
 /////////////////////////////////////////////////
 // CLASS METHODS, MESSAGE RESET
 /////////////////////////////////////////////////
 /**
 * Clears all recipients assigned in the TO array.  Returns void.
 * @return void
 */
-function ClearAddresses() {
+public function ClearAddresses() {
+foreach($this->to as $to) {
+unset($this->all_recipients[strtolower($to[0])]);
+}
 $this->to = array();
 }
 /**
 * Clears all recipients assigned in the CC array.  Returns void.
 * @return void
 */
-function ClearCCs() {
+public function ClearCCs() {
+foreach($this->cc as $cc) {
+unset($this->all_recipients[strtolower($cc[0])]);
+}
 $this->cc = array();
 }
 /**
 * Clears all recipients assigned in the BCC array.  Returns void.
 * @return void
 */
-function ClearBCCs() {
+public function ClearBCCs() {
+foreach($this->bcc as $bcc) {
+unset($this->all_recipients[strtolower($bcc[0])]);
+}
 $this->bcc = array();
 }
 /**
 * Clears all recipients assigned in the ReplyTo array.  Returns void.
 * @return void
 */
-function ClearReplyTos() {
+public function ClearReplyTos() {
 $this->ReplyTo = array();
 }
 /**
 * Clears all recipients assigned in the TO, CC and BCC
 * array.  Returns void.
 * @return void
 */
-function ClearAllRecipients() {
+public function ClearAllRecipients() {
 $this->to = array();
 $this->cc = array();
 $this->bcc = array();
+$this->all_recipients = array();
 }
 /**
 * Clears all previously set filesystem, string, and binary
 * attachments.  Returns void.
 * @return void
 */
-function ClearAttachments() {
+public function ClearAttachments() {
 $this->attachment = array();
 }
 /**
 * Clears all custom headers.  Returns void.
 * @return void
 */
-function ClearCustomHeaders() {
+public function ClearCustomHeaders() {
 $this->CustomHeader = array();
 }
 /////////////////////////////////////////////////
 // CLASS METHODS, MISCELLANEOUS
 /////////////////////////////////////////////////
 /**
 * Adds the error message to the error container.
-* Returns void.
+* @access protected
-* @access private
 * @return void
 */
-function SetError($msg) {
+protected function SetError($msg) {
 $this->error_count++;
+if ($this->Mailer == 'smtp' and !is_null($this->smtp)) {
+$lasterror = $this->smtp->getError();
+if (!empty($lasterror) and array_key_exists('smtp_msg', $lasterror)) {
+$msg .= '<p>' . $this->Lang('smtp_error') . $lasterror['smtp_msg'] . "</p>\n";
+}
+}
 $this->ErrorInfo = $msg;
 }
 /**
 * Returns the proper RFC 822 formatted date.
-* @access private
+* @access public
 * @return string
-*/
+* @static
-function RFCDate() {
+*/
+public static function RFCDate() {
 $tz = date('Z');
 $tzs = ($tz < 0) ? '-' : '+';
 $tz = abs($tz);
 $tz = (int)($tz/3600)*100 + ($tz%3600)/60;
 $result = sprintf("%s %s%04d", date('D, j M Y H:i:s'), $tzs, $tz);
 return $result;
 }
 /**
-* Returns the appropriate server variable.  Should work with both
-* PHP 4.1.0+ as well as older versions.  Returns an empty string
-* if nothing is found.
-* @access private
-* @return mixed
-*/
-function ServerVar($varName) {
-global $HTTP_SERVER_VARS;
-global $HTTP_ENV_VARS;
-if(!isset($_SERVER)) {
-$_SERVER = $HTTP_SERVER_VARS;
-if(!isset($_SERVER['REMOTE_ADDR'])) {
-$_SERVER = $HTTP_ENV_VARS; // must be Apache
-}
-}
-if(isset($_SERVER[$varName])) {
-return $_SERVER[$varName];
-} else {
-return '';
-}
-}
-/**
 * Returns the server hostname or 'localhost.localdomain' if unknown.
-* @access private
+* @access protected
 * @return string
 */
-function ServerHostname() {
+protected function ServerHostname() {
-if ($this->Hostname != '') {
+if (!empty($this->Hostname)) {
 $result = $this->Hostname;
-} elseif ($this->ServerVar('SERVER_NAME') != '') {
+} elseif (isset($_SERVER['SERVER_NAME'])) {
-$result = $this->ServerVar('SERVER_NAME');
+$result = $_SERVER['SERVER_NAME'];
 } else {
 $result = 'localhost.localdomain';
 }
 return $result;
 }
 /**
 * Returns a message in the appropriate language.
-* @access private
+* @access protected
 * @return string
 */
-function Lang($key) {
+protected function Lang($key) {
 if(count($this->language) < 1) {
 $this->SetLanguage('en'); // set the default language
 }
 if(isset($this->language[$key])) {
 }
 }
 /**
 * Returns true if an error occurred.
+* @access public
 * @return bool
 */
-function IsError() {
+public function IsError() {
 return ($this->error_count > 0);
 }
 /**
 * Changes every end of line from CR or LF to CRLF.
-* @access private
+* @access public
 * @return string
 */
-function FixEOL($str) {
+public function FixEOL($str) {
 $str = str_replace("\r\n", "\n", $str);
 $str = str_replace("\r", "\n", $str);
 $str = str_replace("\n", $this->LE, $str);
 return $str;
 }
 /**
 * Adds a custom header.
+* @access public
 * @return void
 */
-function AddCustomHeader($custom_header) {
+public function AddCustomHeader($custom_header) {
 $this->CustomHeader[] = explode(':', $custom_header, 2);
 }
 /**
 * Evaluates the message and returns modifications for inline images and backgrounds
 * @access public
 * @return $message
 */
-function MsgHTML($message,$basedir='') {
+public function MsgHTML($message, $basedir = '') {
-preg_match_all("/(src|background)=\"(.*)\"/Ui", $message, $images);
+preg_match_all("/(src|background)=[\"'](.*)[\"']/Ui", $message, $images);
 if(isset($images[2])) {
 foreach($images[2] as $i => $url) {
 // do not change urls for absolute images (thanks to corvuscorax)
-if (!preg_match('/^[A-z][A-z]*:\/\//',$url)) {
+if (!preg_match('#^[A-z]+://#', $url)) {
 $filename = basename($url);
 $directory = dirname($url);
-($directory == '.')?$directory='':'';
+($directory == '.') ? $directory='': '';
 $cid = 'cid:' . md5($filename);
-$fileParts = split("\.", $filename);
+$ext = pathinfo($filename, PATHINFO_EXTENSION);
-$ext = $fileParts[1];
+$mimeType  = self::_mime_types($ext);
-$mimeType = $this->_mime_types($ext);
+if ( strlen($basedir) > 1 && substr($basedir, -1) != '/') { $basedir .= '/'; }
-if ( strlen($basedir) > 1 && substr($basedir,-1) != '/') { $basedir .= '/'; }
+if ( strlen($directory) > 1 && substr($directory, -1) != '/') { $directory .= '/'; }
-if ( strlen($directory) > 1 && substr($directory,-1) != '/') { $directory .= '/'; }
+if ( $this->AddEmbeddedImage($basedir.$directory.$filename, md5($filename), $filename, 'base64', $mimeType) ) {
-if ( $this->AddEmbeddedImage($basedir.$directory.$filename, md5($filename), $filename, 'base64',$mimeType) ) {
+$message = preg_replace("/".$images[1][$i]."=[\"']".preg_quote($url, '/')."[\"']/Ui", $images[1][$i]."=\"".$cid."\"", $message);
-$message = preg_replace("/".$images[1][$i]."=\"".preg_quote($url, '/')."\"/Ui", $images[1][$i]."=\"".$cid."\"", $message);
 }
 }
 }
 }
 $this->IsHTML(true);
 $this->Body = $message;
-$textMsg = trim(strip_tags(preg_replace('/<(head|title|style|script)[^>]*>.*?<\/\\1>/s','',$message)));
+	if (empty($this->AltBody)) {
-if ( !empty($textMsg) && empty($this->AltBody) ) {
+		$textMsg = trim(strip_tags(preg_replace('/<(head|title|style|script)[^>]*>.*?<\/\\1>/s', '', $message)));
-$this->AltBody = html_entity_decode($textMsg);
+		if (!empty($textMsg)) {
-}
+			$this->AltBody = html_entity_decode($textMsg, ENT_QUOTES, $this->CharSet);
-if ( empty($this->AltBody) ) {
+		}
-$this->AltBody = 'To view this email message, open the email in with HTML compatibility!' . "\n\n";
+	}
-}
+if (empty($this->AltBody)) {
-}
+$this->AltBody = 'To view this email message, open it in a program that understands HTML!' . "\n\n";
+}
-/**
+	return $message;
-* Gets the mime type of the embedded or inline image
+}
-* @access private
-* @return mime type of ext
+/**
-*/
+* Gets the MIME type of the embedded or inline image
-function _mime_types($ext = '') {
+* @param string File extension
+* @access public
+* @return string MIME type of ext
+* @static
+*/
+public static function _mime_types($ext = '') {
 $mimes = array(
+'hqx'   =>  'application/mac-binhex40',
+'cpt'   =>  'application/mac-compactpro',
+'doc'   =>  'application/msword',
+'bin'   =>  'application/macbinary',
+'dms'   =>  'application/octet-stream',
+'lha'   =>  'application/octet-stream',
+'lzh'   =>  'application/octet-stream',
+'exe'   =>  'application/octet-stream',
+'class' =>  'application/octet-stream',
+'psd'   =>  'application/octet-stream',
+'so'    =>  'application/octet-stream',
+'sea'   =>  'application/octet-stream',
+'dll'   =>  'application/octet-stream',
+'oda'   =>  'application/oda',
+'pdf'   =>  'application/pdf',
 'ai'    =>  'application/postscript',
-'aif'   =>  'audio/x-aiff',
+'eps'   =>  'application/postscript',
-'aifc'  =>  'audio/x-aiff',
+'ps'    =>  'application/postscript',
-'aiff'  =>  'audio/x-aiff',
+'smi'   =>  'application/smil',
-'avi'   =>  'video/x-msvideo',
+'smil'  =>  'application/smil',
-'bin'   =>  'application/macbinary',
+'mif'   =>  'application/vnd.mif',
-'bmp'   =>  'image/bmp',
+'xls'   =>  'application/vnd.ms-excel',
-'class' =>  'application/octet-stream',
+'ppt'   =>  'application/vnd.ms-powerpoint',
-'cpt'   =>  'application/mac-compactpro',
+'wbxml' =>  'application/vnd.wap.wbxml',
-'css'   =>  'text/css',
+'wmlc'  =>  'application/vnd.wap.wmlc',
 'dcr'   =>  'application/x-director',
 'dir'   =>  'application/x-director',
-'dll'   =>  'application/octet-stream',
+'dxr'   =>  'application/x-director',
-'dms'   =>  'application/octet-stream',
-'doc'   =>  'application/msword',
 'dvi'   =>  'application/x-dvi',
-'dxr'   =>  'application/x-director',
-'eml'   =>  'message/rfc822',
-'eps'   =>  'application/postscript',
-'exe'   =>  'application/octet-stream',
-'gif'   =>  'image/gif',
 'gtar'  =>  'application/x-gtar',
-'htm'   =>  'text/html',
+'php'   =>  'application/x-httpd-php',
-'html'  =>  'text/html',
+'php4'  =>  'application/x-httpd-php',
-'jpe'   =>  'image/jpeg',
+'php3'  =>  'application/x-httpd-php',
-'jpeg'  =>  'image/jpeg',
+'phtml' =>  'application/x-httpd-php',
-'jpg'   =>  'image/jpeg',
+'phps'  =>  'application/x-httpd-php-source',
-'hqx'   =>  'application/mac-binhex40',
 'js'    =>  'application/x-javascript',
-'lha'   =>  'application/octet-stream',
+'swf'   =>  'application/x-shockwave-flash',
-'log'   =>  'text/plain',
+'sit'   =>  'application/x-stuffit',
-'lzh'   =>  'application/octet-stream',
+'tar'   =>  'application/x-tar',
+'tgz'   =>  'application/x-tar',
+'xhtml' =>  'application/xhtml+xml',
+'xht'   =>  'application/xhtml+xml',
+'zip'   =>  'application/zip',
 'mid'   =>  'audio/midi',
 'midi'  =>  'audio/midi',
-'mif'   =>  'application/vnd.mif',
+'mpga'  =>  'audio/mpeg',
-'mov'   =>  'video/quicktime',
-'movie' =>  'video/x-sgi-movie',
 'mp2'   =>  'audio/mpeg',
 'mp3'   =>  'audio/mpeg',
-'mpe'   =>  'video/mpeg',
+'aif'   =>  'audio/x-aiff',
-'mpeg'  =>  'video/mpeg',
+'aiff'  =>  'audio/x-aiff',
-'mpg'   =>  'video/mpeg',
+'aifc'  =>  'audio/x-aiff',
-'mpga'  =>  'audio/mpeg',
-'oda'   =>  'application/oda',
-'pdf'   =>  'application/pdf',
-'php'   =>  'application/x-httpd-php',
-'php3'  =>  'application/x-httpd-php',
-'php4'  =>  'application/x-httpd-php',
-'phps'  =>  'application/x-httpd-php-source',
-'phtml' =>  'application/x-httpd-php',
-'png'   =>  'image/png',
-'ppt'   =>  'application/vnd.ms-powerpoint',
-'ps'    =>  'application/postscript',
-'psd'   =>  'application/octet-stream',
-'qt'    =>  'video/quicktime',
-'ra'    =>  'audio/x-realaudio',
 'ram'   =>  'audio/x-pn-realaudio',
 'rm'    =>  'audio/x-pn-realaudio',
 'rpm'   =>  'audio/x-pn-realaudio-plugin',
+'ra'    =>  'audio/x-realaudio',
+'rv'    =>  'video/vnd.rn-realvideo',
+'wav'   =>  'audio/x-wav',
+'bmp'   =>  'image/bmp',
+'gif'   =>  'image/gif',
+'jpeg'  =>  'image/jpeg',
+'jpg'   =>  'image/jpeg',
+'jpe'   =>  'image/jpeg',
+'png'   =>  'image/png',
+'tiff'  =>  'image/tiff',
+'tif'   =>  'image/tiff',
+'css'   =>  'text/css',
+'html'  =>  'text/html',
+'htm'   =>  'text/html',
+'shtml' =>  'text/html',
+'txt'   =>  'text/plain',
+'text'  =>  'text/plain',
+'log'   =>  'text/plain',
+'rtx'   =>  'text/richtext',
 'rtf'   =>  'text/rtf',
-'rtx'   =>  'text/richtext',
-'rv'    =>  'video/vnd.rn-realvideo',
-'sea'   =>  'application/octet-stream',
-'shtml' =>  'text/html',
-'sit'   =>  'application/x-stuffit',
-'so'    =>  'application/octet-stream',
-'smi'   =>  'application/smil',
-'smil'  =>  'application/smil',
-'swf'   =>  'application/x-shockwave-flash',
-'tar'   =>  'application/x-tar',
-'text'  =>  'text/plain',
-'txt'   =>  'text/plain',
-'tgz'   =>  'application/x-tar',
-'tif'   =>  'image/tiff',
-'tiff'  =>  'image/tiff',
-'wav'   =>  'audio/x-wav',
-'wbxml' =>  'application/vnd.wap.wbxml',
-'wmlc'  =>  'application/vnd.wap.wmlc',
-'word'  =>  'application/msword',
-'xht'   =>  'application/xhtml+xml',
-'xhtml' =>  'application/xhtml+xml',
-'xl'    =>  'application/excel',
-'xls'   =>  'application/vnd.ms-excel',
 'xml'   =>  'text/xml',
 'xsl'   =>  'text/xml',
-'zip'   =>  'application/zip'
+'mpeg'  =>  'video/mpeg',
+'mpg'   =>  'video/mpeg',
+'mpe'   =>  'video/mpeg',
+'qt'    =>  'video/quicktime',
+'mov'   =>  'video/quicktime',
+'avi'   =>  'video/x-msvideo',
+'movie' =>  'video/x-sgi-movie',
+'doc'   =>  'application/msword',
+'word'  =>  'application/msword',
+'xl'    =>  'application/excel',
+'eml'   =>  'message/rfc822'
 );
-return ( ! isset($mimes[strtolower($ext)])) ? 'application/octet-stream' : $mimes[strtolower($ext)];
+return (!isset($mimes[strtolower($ext)])) ? 'application/octet-stream' : $mimes[strtolower($ext)];
 }
 /**
 * Set (or reset) Class Objects (variables)
 *
 * Usage Example:
 * $page->set('X-Priority', '3');
 *
 * @access public
 * @param string $name Parameter Name
 * @param mixed $value Parameter Value
 * NOTE: will not work with arrays, there are no arrays to set/reset
-*/
+* @todo Should this not be using __set() magic function?
-function set ( $name, $value = '' ) {
+*/
-if ( isset($this->$name) ) {
+public function set($name, $value = '') {
-$this->$name = $value;
+try {
-} else {
+if (isset($this->$name) ) {
-$this->SetError('Cannot set or reset variable ' . $name);
+$this->$name = $value;
-return false;
+} else {
-}
+throw new phpmailerException($this->Lang('variable_set') . $name, self::STOP_CRITICAL);
 }
+} catch (Exception $e) {
-/**
+$this->SetError($e->getMessage());
-* Read a file from a supplied filename and return it.
+if ($e->getCode() == self::STOP_CRITICAL) {
-*
+return false;
-* @access public
+}
-* @param string $filename Parameter File Name
+}
-*/
+return true;
-function getFile($filename) {
-$return = '';
-if ($fp = fopen($filename, 'rb')) {
-while (!feof($fp)) {
-$return .= fread($fp, 1024);
-}
-fclose($fp);
-return $return;
-} else {
-return false;
-}
 }
 /**
 * Strips newlines to prevent header injection.
-* @access private
+* @access public
 * @param string $str String
 * @return string
 */
-function SecureHeader($str) {
+public function SecureHeader($str) {
-$str = trim($str);
+$str = str_replace("\r", '', $str);
-$str = str_replace("\r", "", $str);
+$str = str_replace("\n", '', $str);
-$str = str_replace("\n", "", $str);
+return trim($str);
-return $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
 */
-function Sign($cert_filename, $key_filename, $key_pass) {
+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) {
+$tmp = '';
+$line = '';
+for ($i = 0; $i < strlen($txt); $i++) {
+$ord = ord($txt[$i]);
+if ( ((0x21 <= $ord) && ($ord <= 0x3A)) || $ord == 0x3C || ((0x3E <= $ord) && ($ord <= 0x7E)) ) {
+$line .= $txt[$i];
+} else {
+$line .= "=".sprintf("%02X", $ord);
+}
+}
+return $line;
+}
+/**
+* Generate DKIM signature
+*
+* @access public
+* @param string $s Header
+*/
+public function DKIM_Sign($s) {
+$privKeyStr = file_get_contents($this->DKIM_private);
+if ($this->DKIM_passphrase != '') {
+$privKey = openssl_pkey_get_private($privKeyStr, $this->DKIM_passphrase);
+} else {
+$privKey = $privKeyStr;
+}
+if (openssl_sign($s, $signature, $privKey)) {
+return base64_encode($signature);
+}
+}
+/**
+* Generate DKIM Canonicalization Header
+*
+* @access public
+* @param string $s Header
+*/
+public function DKIM_HeaderC($s) {
+$s = preg_replace("/\r\n\s+/", " ", $s);
+$lines = explode("\r\n", $s);
+foreach ($lines as $key => $line) {
+list($heading, $value) = explode(":", $line, 2);
+$heading = strtolower($heading);
+$value = preg_replace("/\s+/", " ", $value) ; // Compress useless spaces
+$lines[$key] = $heading.":".trim($value) ; // Don't forget to remove WSP around the value
+}
+$s = implode("\r\n", $lines);
+return $s;
+}
+/**
+* Generate DKIM Canonicalization Body
+*
+* @access public
+* @param string $body Message Body
+*/
+public function DKIM_BodyC($body) {
+if ($body == '') return "\r\n";
+// stabilize line endings
+$body = str_replace("\r\n", "\n", $body);
+$body = str_replace("\n", "\r\n", $body);
+// END stabilize line endings
+while (substr($body, strlen($body) - 4, 4) == "\r\n\r\n") {
+$body = substr($body, 0, strlen($body) - 2);
+}
+return $body;
+}
+/**
+* Create the DKIM header, body, as new header
+*
+* @access public
+* @param string $headers_line Header lines
+* @param string $subject Subject
+* @param string $body Body
+*/
+public function DKIM_Add($headers_line, $subject, $body) {
+$DKIMsignatureType    = 'rsa-sha1'; // Signature & hash algorithms
+$DKIMcanonicalization = 'relaxed/simple'; // Canonicalization of header/body
+$DKIMquery            = 'dns/txt'; // Query method
+$DKIMtime             = time() ; // Signature Timestamp = seconds since 00:00:00 - Jan 1, 1970 (UTC time zone)
+$subject_header       = "Subject: $subject";
+$headers              = explode($this->LE, $headers_line);
+foreach($headers as $header) {
+if (strpos($header, 'From:') === 0) {
+$from_header = $header;
+} elseif (strpos($header, 'To:') === 0) {
+$to_header = $header;
+}
+}
+$from     = str_replace('|', '=7C', $this->DKIM_QP($from_header));
+$to       = str_replace('|', '=7C', $this->DKIM_QP($to_header));
+$subject  = str_replace('|', '=7C', $this->DKIM_QP($subject_header)) ; // Copied header fields (dkim-quoted-printable
+$body     = $this->DKIM_BodyC($body);
+$DKIMlen  = strlen($body) ; // Length of body
+$DKIMb64  = base64_encode(pack("H*", sha1($body))) ; // Base64 of packed binary SHA-1 hash of body
+$ident    = ($this->DKIM_identity == '')? '' : " i=" . $this->DKIM_identity . ";";
+$dkimhdrs = "DKIM-Signature: v=1; a=" . $DKIMsignatureType . "; q=" . $DKIMquery . "; l=" . $DKIMlen . "; s=" . $this->DKIM_selector . ";\r\n".
+"\tt=" . $DKIMtime . "; c=" . $DKIMcanonicalization . ";\r\n".
+"\th=From:To:Subject;\r\n".
+"\td=" . $this->DKIM_domain . ";" . $ident . "\r\n".
+"\tz=$from\r\n".
+"\t|$to\r\n".
+"\t|$subject;\r\n".
+"\tbh=" . $DKIMb64 . ";\r\n".
+"\tb=";
+$toSign   = $this->DKIM_HeaderC($from_header . "\r\n" . $to_header . "\r\n" . $subject_header . "\r\n" . $dkimhdrs);
+$signed   = $this->DKIM_Sign($toSign);
+return "X-PHPMAILER-DKIM: phpmailer.worxware.com\r\n".$dkimhdrs.$signed."\r\n";
+}
+protected function doCallback($isSent, $to, $cc, $bcc, $subject, $body) {
+if (!empty($this->action_function) && function_exists($this->action_function)) {
+$params = array($isSent, $to, $cc, $bcc, $subject, $body);
+call_user_func_array($this->action_function, $params);
+}
+}
 }
+class phpmailerException extends Exception {
+public function errorMessage() {
+$errorMsg = '<strong>' . $this->getMessage() . "</strong><br />\n";
+return $errorMsg;
+}
+}
 ?>

changeset 194	32102edaa81b
parent 136	bde1974c263b