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

« Previous | Next »

Revision 1539

Added by Dietmar almost 13 years ago

update phpmailer to version 5.1

     /*~ class.phpmailer.php
     .---------------------------------------------------------------------------.
     |  Software: PHPMailer - PHP email class                                    |
     |   Version: 2.0.4                                                          |
     |   Contact: via sourceforge.net support pages (also www.codeworxtech.com)  |
     |   Version: 5.1                                                            |
     |   Contact: via sourceforge.net support pages (also www.worxware.com)      |
     |      Info: http://phpmailer.sourceforge.net                               |
     |   Support: http://sourceforge.net/projects/phpmailer/                     |
     | ------------------------------------------------------------------------- |
     |    Author: Andy Prevost (project admininistrator)                         |
     |    Author: Brent R. Matzelle (original founder)                           |
     | Copyright (c) 2004-2007, Andy Prevost. All Rights Reserved.               |
     |     Admin: Andy Prevost (project admininistrator)                         |
     |   Authors: Andy Prevost (codeworxtech) codeworxtech@users.sourceforge.net |
     |          : Marcus Bointon (coolbru) coolbru@users.sourceforge.net         |
     |   Founder: Brent R. Matzelle (original founder)                           |
     | 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)     |
-...
     | 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):                |
     | We offer a number of paid services (www.worxware.com):                    |
     | - Web Hosting on highly optimized fast and secure servers                 |
     | - Technology Consulting                                                   |
     | - Oursourcing (highly qualified programmers and graphic designers)        |
     '---------------------------------------------------------------------------'
     /*
         Ticket #783
         fix Function "set_magic_quotes_runtime" is depriciated in PHP 5.3.x 2009/11/25
     */
     /**
      * PHPMailer - PHP email transport class
      * NOTE: Requires PHP version 5 or later
      * @package PHPMailer
      * @author Andy Prevost
      * @author Marcus Bointon
      * @copyright 2004 - 2009 Andy Prevost
      * @version $Id: class.phpmailer.php 447 2009-05-25 01:36:38Z codeworxtech $
      * @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 {
       /////////////////////////////////////////////////
-...
       /**
        * Email priority (1 = High, 3 = Normal, 5 = low).
       * @var int
        * @var int
        */
       var $Priority          = 3;
       public $Priority          = 3;
       /**
        * Sets the CharSet of the message.
       * @var string
        * @var string
        */
       var $CharSet           = 'iso-8859-1';
       public $CharSet           = 'iso-8859-1';
       /**
        * Sets the Content-type of the message.
       * @var string
        * @var string
        */
       var $ContentType        = 'text/plain';
       public $ContentType       = 'text/plain';
       /**
        * Sets the Encoding of the message. Options for this are "8bit",
        * "7bit", "binary", "base64", and "quoted-printable".
       * @var string
        * Sets the Encoding of the message. Options for this are
        *  "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 string
        */
       var $ErrorInfo         = '';
       public $ErrorInfo         = '';
       /**
        * Sets the From email address for the message.
       * @var string
        * @var string
        */
       var $From              = 'root@localhost';
       public $From              = 'root@localhost';
       /**
        * Sets the From name of the message.
       * @var string
        * @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 string
        */
       var $Sender            = '';
       public $Sender            = '';
       /**
        * Sets the Subject of the message.
       * @var string
        * @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 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 string
        */
       var $AltBody           = '';
       public $AltBody           = '';
       /**
        * Sets word wrapping on the body of the message to a given number of
        * characters.
       * @var int
        * @var int
        */
       var $WordWrap          = 0;
       public $WordWrap          = 0;
       /**
        * Method to send mail: ("mail", "sendmail", or "smtp").
       * @var string
        * @var string
        */
       var $Mailer            = 'mail';
       public $Mailer            = 'mail';
       /**
        * Sets the path of the sendmail program.
       * @var string
        * @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 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 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 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 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 string
        */
       var $Host        = 'localhost';
       public $Host          = 'localhost';
       /**
        * Sets the default SMTP server port.
       * @var int
        * @var int
        */
       var $Port        = 25;
       public $Port          = 25;
       /**
        * Sets the SMTP HELO of the message (Default is $Hostname).
       * @var string
        * @var string
        */
       var $Helo        = '';
       public $Helo          = '';
       /**
        * Sets connection prefix.
        * Options are "", "ssl" or "tls"
       * @var string
        * @var string
        */
       var $SMTPSecure = "";
       public $SMTPSecure    = '';
       /**
        * Sets SMTP authentication. Utilizes the Username and Password variables.
       * @var bool
        * @var bool
        */
       var $SMTPAuth     = false;
       public $SMTPAuth      = false;
       /**
        * Sets SMTP username.
       * @var string
        * @var string
        */
       var $Username     = '';
       public $Username      = '';
       /**
        * Sets SMTP password.
       * @var string
        * @var string
        */
       var $Password     = '';
       public $Password      = '';
       /**
        * Sets the SMTP server timeout in seconds. This function will not
        * work with the win32 version.
       * @var int
        * Sets the SMTP server timeout in seconds.
        * 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 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 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 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
        * 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.1';
       /////////////////////////////////////////////////
       // PROPERTIES, PRIVATE
       // PROPERTIES, PRIVATE AND PROTECTED
       /////////////////////////////////////////////////
       var $smtp            = NULL;
       var $to              = array();
       var $cc              = array();
       var $bcc             = array();
       var $ReplyTo         = array();
       var $attachment      = array();
       var $CustomHeader    = array();
       var $message_type    = '';
       var $boundary        = array();
       var $language        = array();
       var $error_count     = 0;
       var $LE              = "\n";
       var $sign_cert_file  = "";
       var $sign_key_file   = "";
       var $sign_key_pass   = "";
       private   $smtp           = NULL;
       private   $to             = array();
       private   $cc             = array();
       private   $bcc            = array();
       private   $ReplyTo        = array();
       private   $all_recipients = array();
       private   $attachment     = array();
       private   $CustomHeader   = array();
       private   $message_type   = '';
       private   $boundary       = array();
       protected $language       = array();
       private   $error_count    = 0;
       private   $sign_cert_file = "";
       private   $sign_key_file  = "";
       private   $sign_key_pass  = "";
       private   $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
       * @return void
        * @param bool $ishtml
        * @return void
        */
       function IsHTML($bool) {
         if($bool == true) {
       public function IsHTML($ishtml = true) {
         if ($ishtml) {
           $this->ContentType = 'text/html';
         } else {
           $this->ContentType = 'text/plain';
-...
       /**
        * Sets Mailer to send message using SMTP.
       * @return void
        * @return void
        */
       function IsSMTP() {
       public function IsSMTP() {
         $this->Mailer = 'smtp';
+      }
       /**
        * Sets Mailer to send message using PHP mail() function.
       * @return void
        * @return void
        */
       function IsMail() {
       public function IsMail() {
         $this->Mailer = 'mail';
+      }
       /**
        * Sets Mailer to send message using the $Sendmail program.
       * @return void
        * @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
        * @return void
        */
       function IsQmail() {
         $this->Sendmail = '/var/qmail/bin/sendmail';
       public function IsQmail() {
         if (stristr(ini_get('sendmail_path'), 'qmail')) {
           $this->Sendmail = '/var/qmail/bin/sendmail';
+        }
         $this->Mailer = 'sendmail';
+      }
-...
       /**
        * Adds a "To" address.
       * @param string $address
       * @param string $name
       * @return void
        * @param string $address
        * @param string $name
        * @return boolean true on success, false if address already used
        */
       function AddAddress($address, $name = '') {
         $cur = count($this->to);
         $this->to[$cur][0] = trim($address);
         $this->to[$cur][1] = $name;
       public function AddAddress($address, $name = '') {
         return $this->AddAnAddress('to', $address, $name);
+      }
       /**
        * 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
        * Adds a "Cc" address.
        * Note: this function works with the SMTP mailer on win32, not with the "mail" mailer.
        * @param string $address
        * @param string $name
        * @return boolean true on success, false if address already used
        */
       function AddCC($address, $name = '') {
         $cur = count($this->cc);
         $this->cc[$cur][0] = trim($address);
         $this->cc[$cur][1] = $name;
       public function AddCC($address, $name = '') {
         return $this->AddAnAddress('cc', $address, $name);
+      }
       /**
        * 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
        * Adds a "Bcc" address.
        * Note: this function works with the SMTP mailer on win32, not with the "mail" mailer.
        * @param string $address
        * @param string $name
        * @return boolean true on success, false if address already used
        */
       function AddBCC($address, $name = '') {
         $cur = count($this->bcc);
         $this->bcc[$cur][0] = trim($address);
         $this->bcc[$cur][1] = $name;
       public function AddBCC($address, $name = '') {
         return $this->AddAnAddress('bcc', $address, $name);
+      }
       /**
        * Adds a "Reply-To" address.
       * @param string $address
       * @param string $name
       * @return void
        * Adds a "Reply-to" address.
        * @param string $address
        * @param string $name
        * @return boolean
        */
       function AddReplyTo($address, $name = '') {
         $cur = count($this->ReplyTo);
         $this->ReplyTo[$cur][0] = trim($address);
         $this->ReplyTo[$cur][1] = $name;
       public function AddReplyTo($address, $name = '') {
         return $this->AddAnAddress('ReplyTo', $address, $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 private
        */
       private function AddAnAddress($kind, $address, $name = '') {
         if (!preg_match('/^(to|cc|bcc|ReplyTo)$/', $kind)) {
           echo 'Invalid recipient array: ' . kind;
           return false;
+        }
         $address = trim($address);
         $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
         if (!self::ValidateAddress($address)) {
           $this->SetError($this->Lang('invalid_address').': '. $address);
           if ($this->exceptions) {
             throw new phpmailerException($this->Lang('invalid_address').': '.$address);
+          }
           echo $this->Lang('invalid_address').': '.$address;
           return false;
+        }
         if ($kind != 'ReplyTo') {
           if (!isset($this->all_recipients[strtolower($address)])) {
             array_push($this->$kind, array($address, $name));
             $this->all_recipients[strtolower($address)] = true;
             return true;
+          }
         } else {
           if (!array_key_exists(strtolower($address), $this->ReplyTo)) {
             $this->ReplyTo[strtolower($address)] = array($address, $name);
           return true;
+        }
+      }
       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);
+          }
           echo $this->Lang('invalid_address').': '.$address;
           return false;
+        }
         $this->From = $address;
         $this->FromName = $name;
         if ($auto) {
           if (empty($this->ReplyTo)) {
             $this->AddAnAddress('ReplyTo', $address, $name);
+          }
           if (empty($this->Sender)) {
             $this->Sender = $address;
+          }
+        }
         return true;
+      }
       /**
        * Check that a string looks roughly like an email address should
        * Static so it can be used without instantiation
        * Tries to use PHP built-in validator in the filter extension (from PHP 5.2), falls back to a reasonably competent regex validator
        * Conforms approximately to RFC2822
        * @link http://www.hexillion.com/samples/#Regex Original pattern found here
        * @param string $address The email address to check
        * @return boolean
        * @static
        * @access public
        */
       public static function ValidateAddress($address) {
         if (function_exists('filter_var')) { //Introduced in PHP 5.2
           if(filter_var($address, FILTER_VALIDATE_EMAIL) === FALSE) {
             return false;
           } else {
             return true;
+          }
         } else {
           return preg_match('/^(?:[\w\!\#\$\%\&\'\*\+\-\/\=\?\^\`\{\|\}\~]+\.)*[\w\!\#\$\%\&\'\*\+\-\/\=\?\^\`\{\|\}\~]+@(?:(?:(?:[a-zA-Z0-9_](?:[a-zA-Z0-9_\-](?!\.)){0,61}[a-zA-Z0-9_-]?\.)+[a-zA-Z0-9_](?:[a-zA-Z0-9_\-](?!$)){0,61}[a-zA-Z0-9_]?)|(?:\[(?:(?:[01]?\d{1,2}|2[0-4]\d|25[0-5])\.){3}(?:[01]?\d{1,2}|2[0-4]\d|25[0-5])\]))$/', $address);
+        }
+      }
       /////////////////////////////////////////////////
       // 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
        * @return bool
        */
       function Send() {
         $header = '';
         $body = '';
         $result = true;
       public function Send() {
         try {
           if ((count($this->to) + count($this->cc) + count($this->bcc)) < 1) {
             throw new phpmailerException($this->Lang('provide_address'), self::STOP_CRITICAL);
+          }
         if((count($this->to) + count($this->cc) + count($this->bcc)) < 1) {
           $this->SetError($this->Lang('provide_address'));
           return false;
+        }
           // Set whether the message is multipart/alternative
           if(!empty($this->AltBody)) {
             $this->ContentType = 'multipart/alternative';
+          }
         /* Set whether the message is multipart/alternative */
         if(!empty($this->AltBody)) {
           $this->ContentType = 'multipart/alternative';
+        }
           $this->error_count = 0; // reset errors
           $this->SetMessageType();
           $header = $this->CreateHeader();
           $body = $this->CreateBody();
         $this->error_count = 0; // reset errors
         $this->SetMessageType();
         $header .= $this->CreateHeader();
         $body = $this->CreateBody();
           if (empty($this->Body)) {
             throw new phpmailerException($this->Lang('empty_message'), self::STOP_CRITICAL);
+          }
         if($body == '') {
           // digitally sign with DKIM if enabled
           if ($this->DKIM_domain && $this->DKIM_private) {
             $header_dkim = $this->DKIM_Add($header,$this->Subject,$body);
             $header = str_replace("\r\n","\n",$header_dkim) . $header;
+          }
           // Choose the mailer and send through it
           switch($this->Mailer) {
             case 'sendmail':
               return $this->SendmailSend($header, $body);
             case 'smtp':
               return $this->SmtpSend($header, $body);
             default:
               return $this->MailSend($header, $body);
+          }
         } catch (phpmailerException $e) {
           $this->SetError($e->getMessage());
           if ($this->exceptions) {
             throw $e;
+          }
           echo $e->getMessage()."\n";
           return false;
+        }
         /* Choose the mailer */
         switch($this->Mailer) {
           case 'sendmail':
             $result = $this->SendmailSend($header, $body);
             break;
           case 'smtp':
             $result = $this->SmtpSend($header, $body);
             break;
           case 'mail':
             $result = $this->MailSend($header, $body);
             break;
           default:
             $result = $this->MailSend($header, $body);
             break;
             //$this->SetError($this->Mailer . $this->Lang('mailer_not_supported'));
             //$result = false;
             //break;
+        }
         return $result;
+      }
       /**
        * Sends mail using the $Sendmail program.
       * @access private
       * @return bool
        * @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(!@$mail = popen($sendmail, 'w')) {
           $this->SetError($this->Lang('execute') . $this->Sendmail);
           return false;
         if ($this->SingleTo === true) {
           foreach ($this->SingleToArray as $key => $val) {
             if(!@$mail = popen($sendmail, 'w')) {
               throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+            }
             fputs($mail, "To: " . $val . "\n");
             fputs($mail, $header);
             fputs($mail, $body);
             $result = pclose($mail);
             // implement call back function if it exists
             $isSent = ($result == 0) ? 1 : 0;
             $this->doCallback($isSent,$val,$this->cc,$this->bcc,$this->Subject,$body);
             if($result != 0) {
               throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+            }
+          }
         } else {
           if(!@$mail = popen($sendmail, 'w')) {
             throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+          }
           fputs($mail, $header);
           fputs($mail, $body);
           $result = pclose($mail);
           // implement call back function if it exists
           $isSent = ($result == 0) ? 1 : 0;
           $this->doCallback($isSent,$this->to,$this->cc,$this->bcc,$this->Subject,$body);
           if($result != 0) {
             throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+          }
+        }
         fputs($mail, $header);
         fputs($mail, $body);
         $result = pclose($mail);
         if (version_compare(phpversion(), '4.2.3') == -1) {
           $result = $result >> 8 & 0xFF;
+        }
         if($result != 0) {
           $this->SetError($this->Lang('execute') . $this->Sendmail);
           return false;
+        }
         return true;
+      }
       /**
        * Sends mail using the PHP mail() function.
       * @access private
       * @return bool
        * @param string $header The message headers
        * @param string $body The message body
        * @access protected
        * @return bool
        */
       function MailSend($header, $body) {
         $to = '';
         for($i = 0; $i < count($this->to); $i++) {
           if($i != 0) { $to .= ', '; }
           $to .= $this->AddrFormat($this->to[$i]);
       protected function MailSend($header, $body) {
         $toArr = array();
         foreach($this->to as $t) {
           $toArr[] = $this->AddrFormat($t);
+        }
         $to = implode(', ', $toArr);
         $toArr = explode(",", $to);
         $params = sprintf("-oi -f %s", $this->Sender);
         if ($this->Sender != '' && strlen(ini_get('safe_mode')) < 1) {
         if ($this->Sender != '' && strlen(ini_get('safe_mode'))< 1) {
           $old_from = ini_get('sendmail_from');
           ini_set('sendmail_from', $this->Sender);
           if ($this->SingleTo === true && count($toArr) > 1) {
             foreach ($toArr as $key => $val) {
               $rt = @mail($val, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
               // implement call back function if it exists
               $isSent = ($rt == 1) ? 1 : 0;
               $this->doCallback($isSent,$val,$this->cc,$this->bcc,$this->Subject,$body);
+            }
           } else {
             $rt = @mail($to, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
             // implement call back function if it exists
             $isSent = ($rt == 1) ? 1 : 0;
             $this->doCallback($isSent,$to,$this->cc,$this->bcc,$this->Subject,$body);
+          }
         } else {
           if ($this->SingleTo === true && count($toArr) > 1) {
             foreach ($toArr as $key => $val) {
               $rt = @mail($val, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
               // implement call back function if it exists
               $isSent = ($rt == 1) ? 1 : 0;
               $this->doCallback($isSent,$val,$this->cc,$this->bcc,$this->Subject,$body);
+            }
           } else {
             $rt = @mail($to, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header);
             // implement call back function if it exists
             $isSent = ($rt == 1) ? 1 : 0;
             $this->doCallback($isSent,$to,$this->cc,$this->bcc,$this->Subject,$body);
+          }
+        }
         if (isset($old_from)) {
           ini_set('sendmail_from', $old_from);
+        }
         if(!$rt) {
           $this->SetError($this->Lang('instantiate'));
           return false;
           throw new phpmailerException($this->Lang('instantiate'), self::STOP_CRITICAL);
+        }
         return true;
+      }
       /**
        * Sends mail via SMTP using PhpSMTP (Author:
        * Chris Ryan).  Returns bool.  Returns false if there is a
        * bad MAIL FROM, RCPT, or DATA input.
       * @access private
       * @return bool
        * Sends mail via SMTP using PhpSMTP
        * Returns false if there is a bad MAIL FROM, RCPT, or DATA input.
        * @param string $header The message headers
        * @param string $body The message body
        * @uses SMTP
        * @access protected
        * @return bool
        */
       function SmtpSend($header, $body) {
         include_once($this->PluginDir . 'class.smtp.php');
         $error = '';
       protected function SmtpSend($header, $body) {
         require_once $this->PluginDir . 'class.smtp.php';
         $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;
           $this->SetError($error);
           $this->smtp->Reset();
           return false;
           throw new phpmailerException($this->Lang('from_failed') . $smtp_from, self::STOP_CRITICAL);
+        }
         /* Attempt to send attach all recipients */
         for($i = 0; $i < count($this->to); $i++) {
           if(!$this->smtp->Recipient($this->to[$i][0])) {
             $bad_rcpt[] = $this->to[$i][0];
         // Attempt to send attach all recipients
         foreach($this->to as $to) {
           if (!$this->smtp->Recipient($to[0])) {
             $bad_rcpt[] = $to[0];
             // implement call back function if it exists
             $isSent = 0;
             $this->doCallback($isSent,$to[0],'','',$this->Subject,$body);
           } else {
             // implement call back function if it exists
             $isSent = 1;
             $this->doCallback($isSent,$to[0],'','',$this->Subject,$body);
+          }
+        }
         for($i = 0; $i < count($this->cc); $i++) {
           if(!$this->smtp->Recipient($this->cc[$i][0])) {
             $bad_rcpt[] = $this->cc[$i][0];
         foreach($this->cc as $cc) {
           if (!$this->smtp->Recipient($cc[0])) {
             $bad_rcpt[] = $cc[0];
             // implement call back function if it exists
             $isSent = 0;
             $this->doCallback($isSent,'',$cc[0],'',$this->Subject,$body);
           } else {
             // implement call back function if it exists
             $isSent = 1;
             $this->doCallback($isSent,'',$cc[0],'',$this->Subject,$body);
+          }
+        }
         for($i = 0; $i < count($this->bcc); $i++) {
           if(!$this->smtp->Recipient($this->bcc[$i][0])) {
             $bad_rcpt[] = $this->bcc[$i][0];
         foreach($this->bcc as $bcc) {
           if (!$this->smtp->Recipient($bcc[0])) {
             $bad_rcpt[] = $bcc[0];
             // implement call back function if it exists
             $isSent = 0;
             $this->doCallback($isSent,'','',$bcc[0],$this->Subject,$body);
           } else {
             // implement call back function if it exists
             $isSent = 1;
             $this->doCallback($isSent,'','',$bcc[0],$this->Subject,$body);
+          }
+        }
         if(count($bad_rcpt) > 0) { // Create error message
           for($i = 0; $i < count($bad_rcpt); $i++) {
             if($i != 0) {
               $error .= ', ';
+            }
             $error .= $bad_rcpt[$i];
+          }
           $error = $this->Lang('recipients_failed') . $error;
           $this->SetError($error);
           $this->smtp->Reset();
           return false;
         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'));
           $this->smtp->Reset();
           return false;
           throw new phpmailerException($this->Lang('data_not_accepted'), self::STOP_CRITICAL);
+        }
         if($this->SMTPKeepAlive == true) {
           $this->smtp->Reset();
         } else {
           $this->SmtpClose();
+        }
         return true;
+      }
       /**
        * Initiates a connection to an SMTP server.  Returns false if the
        * operation failed.
       * @access private
       * @return bool
        * Initiates a connection to an SMTP server.
        * Returns false if the operation failed.
        * @uses SMTP
        * @access public
        * @return bool
        */
       function SmtpConnect()
+      {
         if($this->smtp == NULL)
+        {
       public function SmtpConnect() {
         if(is_null($this->smtp)) {
           $this->smtp = new SMTP();
+        }
         $this->smtp->do_debug = $this->SMTPDebug;
         $hosts = explode(';', $this->Host);
         $index = 0;
         $connection = ($this->smtp->Connected());
         $connection = $this->smtp->Connected();
         /* Retry while there is no connection */
         while($index < count($hosts) && $connection == false)
+        {
           $hostinfo = array();
           if(preg_match('/(.+):([0-9]+)/', $hosts[$index], $hostinfo))
+          {
             $host = $hostinfo[1];
             $port = $hostinfo[2];
           } else {
             $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);
         // Retry while there is no connection
         try {
           while($index < count($hosts) && !$connection) {
             $hostinfo = array();
             if (preg_match('/^(.+):([0-9]+)$/', $hosts[$index], $hostinfo)) {
               $host = $hostinfo[1];
               $port = $hostinfo[2];
             } else {
               $this->smtp->Hello($this->ServerHostname());
               $host = $hosts[$index];
               $port = $this->Port;
+            }
             $connection = true;
             if($this->SMTPAuth) {
               if(!$this->smtp->Authenticate($this->Username, $this->Password)) {
                 $this->SetError($this->Lang('authenticate'));
                 $this->smtp->Reset();
                 $connection = false;
             $tls = ($this->SMTPSecure == 'tls');
             $ssl = ($this->SMTPSecure == 'ssl');
             if ($this->smtp->Connect(($ssl ? 'ssl://':'').$host, $port, $this->Timeout)) {
               $hello = ($this->Helo != '' ? $this->Helo : $this->ServerHostname());
               $this->smtp->Hello($hello);
               if ($tls) {
                 if (!$this->smtp->StartTLS()) {
                   throw new phpmailerException($this->Lang('tls'));
+                }
                 //We must resend HELO after tls negotiation
                 $this->smtp->Hello($hello);
+              }
               $connection = true;
               if ($this->SMTPAuth) {
                 if (!$this->smtp->Authenticate($this->Username, $this->Password)) {
                   throw new phpmailerException($this->Lang('authenticate'));
+                }
+              }
+            }
             $index++;
             if (!$connection) {
               throw new phpmailerException($this->Lang('connect_host'));
+            }
+          }
           $index++;
         } catch (phpmailerException $e) {
           $this->smtp->Reset();
           throw $e;
+        }
         if(!$connection) {
           $this->SetError($this->Lang('connect_host'));
+        }
         return $connection;
         return true;
+      }
       /**
        * Closes the active SMTP session if one exists.
       * @return void
        * @return void
        */
       function SmtpClose() {
         if($this->smtp != NULL) {
       public function SmtpClose() {
         if(!is_null($this->smtp)) {
           if($this->smtp->Connected()) {
             $this->smtp->Quit();
             $this->smtp->Close();
-...
+      }
       /**
        * Sets the language for all class error messages.  Returns false
        * if it cannot load the language file.  The default language type
        * is English.
       * @param string $lang_type Type of language (e.g. Portuguese: "br")
       * Sets the language for all class error messages.
       * Returns false if it cannot load the language file.  The default language is English.
       * @param string $langcode ISO 639-1 2-character language code (e.g. Portuguese: "br")
       * @param string $lang_path Path to the language file directory
       * @access public
       * @return bool
        */
       function SetLanguage($lang_type, $lang_path = 'language/') {
         if(file_exists($lang_path.'phpmailer.lang-'.$lang_type.'.php')) {
           include($lang_path.'phpmailer.lang-'.$lang_type.'.php');
         } elseif (file_exists($lang_path.'phpmailer.lang-en.php')) {
           include($lang_path.'phpmailer.lang-en.php');
         } else {
           $PHPMAILER_LANG = array();
           $PHPMAILER_LANG["provide_address"]      = 'You must provide at least one ' .
           $PHPMAILER_LANG["mailer_not_supported"] = ' mailer is not supported.';
           $PHPMAILER_LANG["execute"]              = 'Could not execute: ';
           $PHPMAILER_LANG["instantiate"]          = 'Could not instantiate mail function.';
           $PHPMAILER_LANG["authenticate"]         = 'SMTP Error: Could not authenticate.';
           $PHPMAILER_LANG["from_failed"]          = 'The following From address failed: ';
           $PHPMAILER_LANG["recipients_failed"]    = 'SMTP Error: The following ' .
           $PHPMAILER_LANG["data_not_accepted"]    = 'SMTP Error: Data not accepted.';
           $PHPMAILER_LANG["connect_host"]         = 'SMTP Error: Could not connect to SMTP host.';
           $PHPMAILER_LANG["file_access"]          = 'Could not access file: ';
           $PHPMAILER_LANG["file_open"]            = 'File Error: Could not open file: ';
           $PHPMAILER_LANG["encoding"]             = 'Unknown encoding: ';
           $PHPMAILER_LANG["signing"]              = 'Signing Error: ';
       */
       function SetLanguage($langcode = 'en', $lang_path = 'language/') {
         //Define full set of translatable strings
         $PHPMAILER_LANG = array(
           'provide_address' => 'You must provide at least one recipient email address.',
           'mailer_not_supported' => ' mailer is not supported.',
           'execute' => 'Could not execute: ',
           'instantiate' => 'Could not instantiate mail function.',
           'authenticate' => 'SMTP Error: Could not authenticate.',
           'from_failed' => 'The following From address failed: ',
           'recipients_failed' => 'SMTP Error: The following recipients failed: ',
           'data_not_accepted' => 'SMTP Error: Data not accepted.',
           'connect_host' => 'SMTP Error: Could not connect to SMTP host.',
           'file_access' => 'Could not access file: ',
           'file_open' => 'File Error: Could not open file: ',
           'encoding' => 'Unknown encoding: ',
           'signing' => 'Signing Error: ',
           'smtp_error' => 'SMTP server error: ',
           'empty_message' => 'Message body empty',
           'invalid_address' => 'Invalid address',
           'variable_set' => 'Cannot set or reset variable: '
         );
         //Overwrite language-specific strings. This way we'll never have missing translations - no more "language string failed to load"!
         $l = true;
         if ($langcode != 'en') { //There is no English translation file
           $l = @include $lang_path.'phpmailer.lang-'.$langcode.'.php';
+        }
         $this->language = $PHPMAILER_LANG;
         return ($l == true); //Returns false if language not found
+      }
         return true;
       /**
       * Return the current array of language strings
       * @return array
       */
       public function GetTranslations() {
         return $this->language;
+      }
       /////////////////////////////////////////////////
-...
       /**
        * Creates recipient headers.
       * @access private
       * @return string
        * @access public
        * @return string
        */
       function AddrAppend($type, $addr) {
       public function AddrAppend($type, $addr) {
         $addr_str = $type . ': ';
         $addr_str .= $this->AddrFormat($addr[0]);
         if(count($addr) > 1) {
           for($i = 1; $i < count($addr); $i++) {
             $addr_str .= ', ' . $this->AddrFormat($addr[$i]);
+          }
         $addresses = array();
         foreach ($addr as $a) {
           $addresses[] = $this->AddrFormat($a);
+        }
         $addr_str .= implode(', ', $addresses);
         $addr_str .= $this->LE;
         return $addr_str;
-...
       /**
        * Formats an address correctly.
       * @access private
       * @return string
        * @access public
        * @return string
        */
       function AddrFormat($addr) {
         if(empty($addr[1])) {
           $formatted = $this->SecureHeader($addr[0]);
       public function AddrFormat($addr) {
         if (empty($addr[1])) {
           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
       * @return string
        * @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
-...
        * Finds last character boundary prior to maxLength in a utf-8
        * quoted (printable) encoded string.
        * Original written by Colin Brown.
       * @access private
       * @param string $encodedText utf-8 QP text
       * @param int    $maxLength   find last character boundary prior to this length
       * @return int
        * @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) {
-...
         return $maxLength;
+      }
       /**
        * Set the body wrapping.
       * @access private
       * @return void
        * @access public
        * @return void
        */
       function SetWordWrap() {
       public function SetWordWrap() {
         if($this->WordWrap < 1) {
           return;
+        }
         switch($this->message_type) {
           case 'alt':
             /* fall through */
           case 'alt_attachments':
             $this->AltBody = $this->WrapText($this->AltBody, $this->WordWrap);
             break;
-...
       /**
        * Assembles message header.
       * @access private
       * @return string
        * @access public
        * @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;
         $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) {
             $result .= $this->AddrAppend('To', $this->to);
           } elseif (count($this->cc) == 0) {
             $result .= $this->HeaderLine('To', 'undisclosed-recipients:;');
           if ($this->SingleTo === true) {
             foreach($this->to as $t) {
               $this->SingleToArray[] = $this->AddrFormat($t);
+            }
           } else {
             if(count($this->to) > 0) {
               $result .= $this->AddrAppend('To', $this->to);
             } elseif (count($this->cc) == 0) {
               $result .= $this->HeaderLine('To', 'undisclosed-recipients:;');
+            }
+          }
+        }
-...
         $from[0][1] = $this->FromName;
         $result .= $this->AddrAppend('From', $from);
         /* sendmail and mail() extract Cc from the header before sending */
         if((($this->Mailer == 'sendmail') || ($this->Mailer == 'mail')) && (count($this->cc) > 0)) {
         // sendmail and mail() extract Cc from the header before sending
         if(count($this->cc) > 0) {
           $result .= $this->AddrAppend('Cc', $this->cc);
+        }
         /* sendmail and mail() extract Bcc from the header before sending */
         // 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);
           $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)));
+        }
-...
           $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 . ']');
         $result .= $this->HeaderLine('X-Mailer', 'PHPMailer '.$this->Version.' (phpmailer.sourceforge.net)');
         if($this->ConfirmReadingTo != '') {
           $result .= $this->HeaderLine('Disposition-Notification-To', '<' . trim($this->ConfirmReadingTo) . '>');
-...
       /**
        * Returns the message MIME.
       * @access private
       * @return string
        * @access public
        * @return string
        */
       function GetMailMIME() {
       public function GetMailMIME() {
         $result = '';
         switch($this->message_type) {
           case 'plain':
-...
             $result .= sprintf("Content-Type: %s; charset=\"%s\"", $this->ContentType, $this->CharSet);
             break;
           case 'attachments':
             /* fall through */
           case 'alt_attachments':
             if($this->InlineImageExists()){
               $result .= sprintf("Content-Type: %s;%s\ttype=\"text/html\";%s\tboundary=\"%s\"%s", 'multipart/related', $this->LE, $this->LE, $this->boundary[1], $this->LE);
-...
       /**
        * Assembles the message body.  Returns an empty string on failure.
       * @access private
       * @return string
        * @access public
        * @return string The assembled message body
        */
       function CreateBody() {
         $result = '';
       public function CreateBody() {
         $body = '';
         if ($this->sign_key_file) {
           $result .= $this->GetMailMIME();
           $body .= $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]);
             $body .= $this->GetBoundary($this->boundary[1], '', 'text/plain', '');
             $body .= $this->EncodeString($this->AltBody, $this->Encoding);
             $body .= $this->LE.$this->LE;
             $body .= $this->GetBoundary($this->boundary[1], '', 'text/html', '');
             $body .= $this->EncodeString($this->Body, $this->Encoding);
             $body .= $this->LE.$this->LE;
             $body .= $this->EndBoundary($this->boundary[1]);
             break;
           case 'plain':
             $result .= $this->EncodeString($this->Body, $this->Encoding);
             $body .= $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();
             $body .= $this->GetBoundary($this->boundary[1], '', '', '');
             $body .= $this->EncodeString($this->Body, $this->Encoding);
             $body .= $this->LE;
             $body .= $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();
             $body .= sprintf("--%s%s", $this->boundary[1], $this->LE);
             $body .= sprintf("Content-Type: %s;%s" . "\tboundary=\"%s\"%s", 'multipart/alternative', $this->LE, $this->boundary[2], $this->LE.$this->LE);
             $body .= $this->GetBoundary($this->boundary[2], '', 'text/plain', '') . $this->LE; // Create text body
             $body .= $this->EncodeString($this->AltBody, $this->Encoding);
             $body .= $this->LE.$this->LE;
             $body .= $this->GetBoundary($this->boundary[2], '', 'text/html', '') . $this->LE; // Create the HTML body
             $body .= $this->EncodeString($this->Body, $this->Encoding);
             $body .= $this->LE.$this->LE;
             $body .= $this->EndBoundary($this->boundary[2]);
             $body .= $this->AttachAll();

... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff

Project

General

Profile

WB 2.08.x

Revision 1539

Added by Dietmar almost 13 years ago