Update PHPMailer to version 5.2. See #19677
git-svn-id: https://develop.svn.wordpress.org/trunk@19632 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Peter Westwood
parent
662639bbbe
commit
a6ae2bbba5
|
|
@ -2,15 +2,15 @@
|
|||
/*~ class.phpmailer.php
|
||||
.---------------------------------------------------------------------------.
|
||||
| Software: PHPMailer - PHP email class |
|
||||
| Version: 5.1 |
|
||||
| Contact: via sourceforge.net support pages (also www.worxware.com) |
|
||||
| Info: http://phpmailer.sourceforge.net |
|
||||
| Support: http://sourceforge.net/projects/phpmailer/ |
|
||||
| Version: 5.2 |
|
||||
| Site: https://code.google.com/a/apache-extras.org/p/phpmailer/ |
|
||||
| ------------------------------------------------------------------------- |
|
||||
| Admin: Andy Prevost (project admininistrator) |
|
||||
| Admin: Jim Jagielski (project admininistrator) |
|
||||
| Authors: Andy Prevost (codeworxtech) codeworxtech@users.sourceforge.net |
|
||||
| : Marcus Bointon (coolbru) coolbru@users.sourceforge.net |
|
||||
| : Jim Jagielski (jimjag) jimjag@gmail.com |
|
||||
| Founder: Brent R. Matzelle (original founder) |
|
||||
| Copyright (c) 2010-2011, Jim Jagielski. All Rights Reserved. |
|
||||
| Copyright (c) 2004-2009, Andy Prevost. All Rights Reserved. |
|
||||
| Copyright (c) 2001-2003, Brent R. Matzelle |
|
||||
| ------------------------------------------------------------------------- |
|
||||
|
|
@ -19,11 +19,6 @@
|
|||
| 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.worxware.com): |
|
||||
| - Web Hosting on highly optimized fast and secure servers |
|
||||
| - Technology Consulting |
|
||||
| - Oursourcing (highly qualified programmers and graphic designers) |
|
||||
'---------------------------------------------------------------------------'
|
||||
*/
|
||||
|
||||
|
|
@ -33,8 +28,10 @@
|
|||
* @package PHPMailer
|
||||
* @author Andy Prevost
|
||||
* @author Marcus Bointon
|
||||
* @author Jim Jagielski
|
||||
* @copyright 2010 - 2011 Jim Jagielski
|
||||
* @copyright 2004 - 2009 Andy Prevost
|
||||
* @version $Id: class.phpmailer.php 447 2009-05-25 01:36:38Z codeworxtech $
|
||||
* @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
|
||||
*/
|
||||
|
||||
|
|
@ -118,6 +115,20 @@ class PHPMailer {
|
|||
*/
|
||||
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 = '';
|
||||
|
||||
/**
|
||||
* Sets word wrapping on the body of the message to a given number of
|
||||
* characters.
|
||||
|
|
@ -269,6 +280,12 @@ class PHPMailer {
|
|||
*/
|
||||
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'
|
||||
|
|
@ -300,28 +317,34 @@ class PHPMailer {
|
|||
* Sets the PHPMailer Version number
|
||||
* @var string
|
||||
*/
|
||||
public $Version = '5.1';
|
||||
public $Version = '5.2';
|
||||
|
||||
/**
|
||||
* What to use in the X-Mailer header
|
||||
* @var string
|
||||
*/
|
||||
public $XMailer = '';
|
||||
|
||||
/////////////////////////////////////////////////
|
||||
// PROPERTIES, PRIVATE AND PROTECTED
|
||||
/////////////////////////////////////////////////
|
||||
|
||||
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 $smtp = NULL;
|
||||
protected $to = array();
|
||||
protected $cc = array();
|
||||
protected $bcc = array();
|
||||
protected $ReplyTo = array();
|
||||
protected $all_recipients = array();
|
||||
protected $attachment = array();
|
||||
protected $CustomHeader = array();
|
||||
protected $message_type = '';
|
||||
protected $boundary = array();
|
||||
protected $language = array();
|
||||
private $error_count = 0;
|
||||
private $sign_cert_file = "";
|
||||
private $sign_key_file = "";
|
||||
private $sign_key_pass = "";
|
||||
private $exceptions = false;
|
||||
protected $error_count = 0;
|
||||
protected $sign_cert_file = '';
|
||||
protected $sign_key_file = '';
|
||||
protected $sign_key_pass = '';
|
||||
protected $exceptions = false;
|
||||
|
||||
/////////////////////////////////////////////////
|
||||
// CONSTANTS
|
||||
|
|
@ -447,11 +470,15 @@ class PHPMailer {
|
|||
* @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
|
||||
* @access protected
|
||||
*/
|
||||
private function AddAnAddress($kind, $address, $name = '') {
|
||||
protected function AddAnAddress($kind, $address, $name = '') {
|
||||
if (!preg_match('/^(to|cc|bcc|ReplyTo)$/', $kind)) {
|
||||
echo 'Invalid recipient array: ' . $kind;
|
||||
$this->SetError($this->Lang('Invalid recipient array').': '.$kind);
|
||||
if ($this->exceptions) {
|
||||
throw new phpmailerException('Invalid recipient array: ' . $kind);
|
||||
}
|
||||
echo $this->Lang('Invalid recipient array').': '.$kind;
|
||||
return false;
|
||||
}
|
||||
$address = trim($address);
|
||||
|
|
@ -543,6 +570,19 @@ class PHPMailer {
|
|||
* @return bool
|
||||
*/
|
||||
public function Send() {
|
||||
try {
|
||||
if(!$this->PreSend()) return false;
|
||||
return $this->PostSend();
|
||||
} catch (phpmailerException $e) {
|
||||
$this->SetError($e->getMessage());
|
||||
if ($this->exceptions) {
|
||||
throw $e;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
protected function PreSend() {
|
||||
try {
|
||||
if ((count($this->to) + count($this->cc) + count($this->bcc)) < 1) {
|
||||
throw new phpmailerException($this->Lang('provide_address'), self::STOP_CRITICAL);
|
||||
|
|
@ -555,27 +595,41 @@ class PHPMailer {
|
|||
|
||||
$this->error_count = 0; // reset errors
|
||||
$this->SetMessageType();
|
||||
$header = $this->CreateHeader();
|
||||
$body = $this->CreateBody();
|
||||
|
||||
//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();
|
||||
|
||||
|
||||
// digitally sign with DKIM if enabled
|
||||
if ($this->DKIM_domain && $this->DKIM_private) {
|
||||
$header_dkim = $this->DKIM_Add($header,$this->Subject,$body);
|
||||
$header = str_replace("\r\n","\n",$header_dkim) . $header;
|
||||
$header_dkim = $this->DKIM_Add($this->MIMEHeader, $this->EncodeHeader($this->SecureHeader($this->Subject)), $this->MIMEBody);
|
||||
$this->MIMEHeader = str_replace("\r\n", "\n", $header_dkim) . $this->MIMEHeader;
|
||||
}
|
||||
|
||||
return true;
|
||||
} catch (phpmailerException $e) {
|
||||
$this->SetError($e->getMessage());
|
||||
if ($this->exceptions) {
|
||||
throw $e;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
protected function PostSend() {
|
||||
try {
|
||||
// Choose the mailer and send through it
|
||||
switch($this->Mailer) {
|
||||
case 'sendmail':
|
||||
return $this->SendmailSend($header, $body);
|
||||
return $this->SendmailSend($this->MIMEHeader, $this->MIMEBody);
|
||||
case 'smtp':
|
||||
return $this->SmtpSend($header, $body);
|
||||
return $this->SmtpSend($this->MIMEHeader, $this->MIMEBody);
|
||||
default:
|
||||
return $this->MailSend($header, $body);
|
||||
return $this->MailSend($this->MIMEHeader, $this->MIMEBody);
|
||||
}
|
||||
|
||||
} catch (phpmailerException $e) {
|
||||
|
|
@ -648,8 +702,12 @@ class PHPMailer {
|
|||
}
|
||||
$to = implode(', ', $toArr);
|
||||
|
||||
if (empty($this->Sender)) {
|
||||
$params = "-oi -f %s";
|
||||
} 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) {
|
||||
|
|
@ -699,7 +757,7 @@ class PHPMailer {
|
|||
* @return bool
|
||||
*/
|
||||
protected function SmtpSend($header, $body) {
|
||||
require_once $this->PluginDir . 'class-smtp.php';
|
||||
require_once $this->PluginDir . 'class.smtp.php';
|
||||
$bad_rcpt = array();
|
||||
|
||||
if(!$this->SmtpConnect()) {
|
||||
|
|
@ -1056,7 +1114,9 @@ class PHPMailer {
|
|||
|
||||
switch($this->message_type) {
|
||||
case 'alt':
|
||||
case 'alt_attachments':
|
||||
case 'alt_inline':
|
||||
case 'alt_attach':
|
||||
case 'alt_inline_attach':
|
||||
$this->AltBody = $this->WrapText($this->AltBody, $this->WordWrap);
|
||||
break;
|
||||
default:
|
||||
|
|
@ -1077,6 +1137,7 @@ class PHPMailer {
|
|||
$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', self::RFCDate());
|
||||
if($this->Sender == '') {
|
||||
|
|
@ -1130,7 +1191,11 @@ class PHPMailer {
|
|||
$result .= sprintf("Message-ID: <%s@%s>%s", $uniq_id, $this->ServerHostname(), $this->LE);
|
||||
}
|
||||
$result .= $this->HeaderLine('X-Priority', $this->Priority);
|
||||
$result .= $this->HeaderLine('X-Mailer', 'PHPMailer '.$this->Version.' (phpmailer.sourceforge.net)');
|
||||
if($this->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) . '>');
|
||||
|
|
@ -1158,18 +1223,21 @@ class PHPMailer {
|
|||
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 'alt_attachments':
|
||||
if($this->InlineImageExists()){
|
||||
$result .= sprintf("Content-Type: %s;%s\ttype=\"text/html\";%s\tboundary=\"%s\"%s", 'multipart/related', $this->LE, $this->LE, $this->boundary[1], $this->LE);
|
||||
} else {
|
||||
case 'inline':
|
||||
$result .= $this->HeaderLine('Content-Type', 'multipart/related;');
|
||||
$result .= $this->TextLine("\tboundary=\"" . $this->boundary[1] . '"');
|
||||
break;
|
||||
case 'attach':
|
||||
case 'inline_attach':
|
||||
case 'alt_attach':
|
||||
case 'alt_inline_attach':
|
||||
$result .= $this->HeaderLine('Content-Type', 'multipart/mixed;');
|
||||
$result .= $this->TextLine("\tboundary=\"" . $this->boundary[1] . '"');
|
||||
}
|
||||
break;
|
||||
case 'alt':
|
||||
case 'alt_inline':
|
||||
$result .= $this->HeaderLine('Content-Type', 'multipart/alternative;');
|
||||
$result .= $this->TextLine("\tboundary=\"" . $this->boundary[1] . '"');
|
||||
break;
|
||||
|
|
@ -1197,6 +1265,33 @@ class PHPMailer {
|
|||
$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);
|
||||
|
|
@ -1206,26 +1301,56 @@ class PHPMailer {
|
|||
$body .= $this->LE.$this->LE;
|
||||
$body .= $this->EndBoundary($this->boundary[1]);
|
||||
break;
|
||||
case 'plain':
|
||||
$body .= $this->EncodeString($this->Body, $this->Encoding);
|
||||
break;
|
||||
case 'attachments':
|
||||
$body .= $this->GetBoundary($this->boundary[1], '', '', '');
|
||||
$body .= $this->EncodeString($this->Body, $this->Encoding);
|
||||
$body .= $this->LE;
|
||||
$body .= $this->AttachAll();
|
||||
break;
|
||||
case 'alt_attachments':
|
||||
$body .= sprintf("--%s%s", $this->boundary[1], $this->LE);
|
||||
$body .= sprintf("Content-Type: %s;%s" . "\tboundary=\"%s\"%s", 'multipart/alternative', $this->LE, $this->boundary[2], $this->LE.$this->LE);
|
||||
$body .= $this->GetBoundary($this->boundary[2], '', 'text/plain', '') . $this->LE; // Create text body
|
||||
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->GetBoundary($this->boundary[2], '', 'text/html', '') . $this->LE; // Create the HTML body
|
||||
$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->AttachAll();
|
||||
$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;
|
||||
}
|
||||
|
||||
|
|
@ -1258,9 +1383,10 @@ class PHPMailer {
|
|||
|
||||
/**
|
||||
* Returns the start of a message boundary.
|
||||
* @access private
|
||||
* @access protected
|
||||
* @return string
|
||||
*/
|
||||
private function GetBoundary($boundary, $charSet, $contentType, $encoding) {
|
||||
protected function GetBoundary($boundary, $charSet, $contentType, $encoding) {
|
||||
$result = '';
|
||||
if($charSet == '') {
|
||||
$charSet = $this->CharSet;
|
||||
|
|
@ -1282,31 +1408,25 @@ class PHPMailer {
|
|||
|
||||
/**
|
||||
* Returns the end of a message boundary.
|
||||
* @access private
|
||||
* @access protected
|
||||
* @return string
|
||||
*/
|
||||
private function EndBoundary($boundary) {
|
||||
protected function EndBoundary($boundary) {
|
||||
return $this->LE . '--' . $boundary . '--' . $this->LE;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the message type.
|
||||
* @access private
|
||||
* @access protected
|
||||
* @return void
|
||||
*/
|
||||
private function SetMessageType() {
|
||||
if(count($this->attachment) < 1 && strlen($this->AltBody) < 1) {
|
||||
$this->message_type = 'plain';
|
||||
} else {
|
||||
if(count($this->attachment) > 0) {
|
||||
$this->message_type = 'attachments';
|
||||
}
|
||||
if(strlen($this->AltBody) > 0 && count($this->attachment) < 1) {
|
||||
$this->message_type = 'alt';
|
||||
}
|
||||
if(strlen($this->AltBody) > 0 && count($this->attachment) > 0) {
|
||||
$this->message_type = 'alt_attachments';
|
||||
}
|
||||
}
|
||||
protected function SetMessageType() {
|
||||
$this->message_type = array();
|
||||
if($this->AlternativeExists()) $this->message_type[] = "alt";
|
||||
if($this->InlineImageExists()) $this->message_type[] = "inline";
|
||||
if($this->AttachmentExists()) $this->message_type[] = "attach";
|
||||
$this->message_type = implode("_", $this->message_type);
|
||||
if($this->message_type == "") $this->message_type = "plain";
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -1386,10 +1506,10 @@ class PHPMailer {
|
|||
/**
|
||||
* Attaches all fs, string, and binary attachments to the message.
|
||||
* Returns an empty string on failure.
|
||||
* @access private
|
||||
* @access protected
|
||||
* @return string
|
||||
*/
|
||||
private function AttachAll() {
|
||||
protected function AttachAll($disposition_type, $boundary) {
|
||||
// Return text of body
|
||||
$mime = array();
|
||||
$cidUniq = array();
|
||||
|
|
@ -1397,6 +1517,8 @@ class PHPMailer {
|
|||
|
||||
// Add all attachments
|
||||
foreach ($this->attachment as $attachment) {
|
||||
// CHECK IF IT IS A VALID DISPOSITION_FILTER
|
||||
if($attachment[6] == $disposition_type) {
|
||||
// Check for string attachment
|
||||
$bString = $attachment[5];
|
||||
if ($bString) {
|
||||
|
|
@ -1405,18 +1527,19 @@ class PHPMailer {
|
|||
$path = $attachment[0];
|
||||
}
|
||||
|
||||
if (in_array($attachment[0], $incl)) { continue; }
|
||||
$inclhash = md5(serialize($attachment));
|
||||
if (in_array($inclhash, $incl)) { continue; }
|
||||
$incl[] = $inclhash;
|
||||
$filename = $attachment[1];
|
||||
$name = $attachment[2];
|
||||
$encoding = $attachment[3];
|
||||
$type = $attachment[4];
|
||||
$disposition = $attachment[6];
|
||||
$cid = $attachment[7];
|
||||
$incl[] = $attachment[0];
|
||||
if ( $disposition == 'inline' && isset($cidUniq[$cid]) ) { continue; }
|
||||
$cidUniq[$cid] = true;
|
||||
|
||||
$mime[] = sprintf("--%s%s", $this->boundary[1], $this->LE);
|
||||
$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);
|
||||
|
||||
|
|
@ -1441,10 +1564,11 @@ class PHPMailer {
|
|||
$mime[] = $this->LE.$this->LE;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$mime[] = sprintf("--%s--%s", $this->boundary[1], $this->LE);
|
||||
$mime[] = sprintf("--%s--%s", $boundary, $this->LE);
|
||||
|
||||
return join('', $mime);
|
||||
return implode("", $mime);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -1453,10 +1577,10 @@ class PHPMailer {
|
|||
* @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 private
|
||||
* @access protected
|
||||
* @return string
|
||||
*/
|
||||
private function EncodeFile($path, $encoding = 'base64') {
|
||||
protected function EncodeFile($path, $encoding = 'base64') {
|
||||
try {
|
||||
if (!is_readable($path)) {
|
||||
throw new phpmailerException($this->Lang('file_open') . $path, self::STOP_CONTINUE);
|
||||
|
|
@ -1466,13 +1590,15 @@ class PHPMailer {
|
|||
return false;
|
||||
}
|
||||
}
|
||||
if (PHP_VERSION < 6) {
|
||||
if (version_compare(PHP_VERSION, '5.3.0', '<')) {
|
||||
$magic_quotes = get_magic_quotes_runtime();
|
||||
set_magic_quotes_runtime(0);
|
||||
}
|
||||
$file_buffer = file_get_contents($path);
|
||||
$file_buffer = $this->EncodeString($file_buffer, $encoding);
|
||||
if (PHP_VERSION < 6) { set_magic_quotes_runtime($magic_quotes); }
|
||||
if (version_compare(PHP_VERSION, '5.3.0', '<')) {
|
||||
set_magic_quotes_runtime($magic_quotes);
|
||||
}
|
||||
return $file_buffer;
|
||||
} catch (Exception $e) {
|
||||
$this->SetError($e->getMessage());
|
||||
|
|
@ -1733,7 +1859,7 @@ class PHPMailer {
|
|||
// Replace every high ascii, control =, ? and _ characters
|
||||
//TODO using /e (equivalent to eval()) is probably not a good idea
|
||||
$encoded = preg_replace('/([\000-\011\013\014\016-\037\075\077\137\177-\377])/e',
|
||||
"'='.sprintf('%02X', ord('\\1'))", $encoded);
|
||||
"'='.sprintf('%02X', ord(stripslashes('\\1')))", $encoded);
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
@ -1807,6 +1933,20 @@ class PHPMailer {
|
|||
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 public
|
||||
|
|
@ -1821,6 +1961,19 @@ class PHPMailer {
|
|||
return false;
|
||||
}
|
||||
|
||||
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
|
||||
/////////////////////////////////////////////////
|
||||
|
|
@ -1933,10 +2086,10 @@ class PHPMailer {
|
|||
|
||||
/**
|
||||
* Returns the server hostname or 'localhost.localdomain' if unknown.
|
||||
* @access private
|
||||
* @access protected
|
||||
* @return string
|
||||
*/
|
||||
private function ServerHostname() {
|
||||
protected function ServerHostname() {
|
||||
if (!empty($this->Hostname)) {
|
||||
$result = $this->Hostname;
|
||||
} elseif (isset($_SERVER['SERVER_NAME'])) {
|
||||
|
|
@ -1950,10 +2103,10 @@ class PHPMailer {
|
|||
|
||||
/**
|
||||
* Returns a message in the appropriate language.
|
||||
* @access private
|
||||
* @access protected
|
||||
* @return string
|
||||
*/
|
||||
private function Lang($key) {
|
||||
protected function Lang($key) {
|
||||
if(count($this->language) < 1) {
|
||||
$this->SetLanguage('en'); // set the default language
|
||||
}
|
||||
|
|
@ -1976,10 +2129,10 @@ class PHPMailer {
|
|||
|
||||
/**
|
||||
* Changes every end of line from CR or LF to CRLF.
|
||||
* @access private
|
||||
* @access public
|
||||
* @return string
|
||||
*/
|
||||
private 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);
|
||||
|
|
@ -2192,8 +2345,8 @@ class PHPMailer {
|
|||
* @param string $key_pass Password for private key
|
||||
*/
|
||||
public function DKIM_QP($txt) {
|
||||
$tmp="";
|
||||
$line="";
|
||||
$tmp = '';
|
||||
$line = '';
|
||||
for ($i = 0; $i < strlen($txt); $i++) {
|
||||
$ord = ord($txt[$i]);
|
||||
if ( ((0x21 <= $ord) && ($ord <= 0x3A)) || $ord == 0x3C || ((0x3E <= $ord) && ($ord <= 0x7E)) ) {
|
||||
|
|
@ -2274,7 +2427,7 @@ class PHPMailer {
|
|||
$DKIMquery = 'dns/txt'; // Query method
|
||||
$DKIMtime = time() ; // Signature Timestamp = seconds since 00:00:00 - Jan 1, 1970 (UTC time zone)
|
||||
$subject_header = "Subject: $subject";
|
||||
$headers = explode("\r\n",$headers_line);
|
||||
$headers = explode($this->LE, $headers_line);
|
||||
foreach($headers as $header) {
|
||||
if (strpos($header, 'From:') === 0) {
|
||||
$from_header = $header;
|
||||
|
|
|
|||
|
|
@ -2,15 +2,15 @@
|
|||
/*~ class.smtp.php
|
||||
.---------------------------------------------------------------------------.
|
||||
| Software: PHPMailer - PHP email class |
|
||||
| Version: 5.1 |
|
||||
| Contact: via sourceforge.net support pages (also www.codeworxtech.com) |
|
||||
| Info: http://phpmailer.sourceforge.net |
|
||||
| Support: http://sourceforge.net/projects/phpmailer/ |
|
||||
| Version: 5.2 |
|
||||
| Site: https://code.google.com/a/apache-extras.org/p/phpmailer/ |
|
||||
| ------------------------------------------------------------------------- |
|
||||
| Admin: Andy Prevost (project admininistrator) |
|
||||
| Admin: Jim Jagielski (project admininistrator) |
|
||||
| Authors: Andy Prevost (codeworxtech) codeworxtech@users.sourceforge.net |
|
||||
| : Marcus Bointon (coolbru) coolbru@users.sourceforge.net |
|
||||
| : Jim Jagielski (jimjag) jimjag@gmail.com |
|
||||
| Founder: Brent R. Matzelle (original founder) |
|
||||
| Copyright (c) 2010-2011, Jim Jagielski. All Rights Reserved. |
|
||||
| Copyright (c) 2004-2009, Andy Prevost. All Rights Reserved. |
|
||||
| Copyright (c) 2001-2003, Brent R. Matzelle |
|
||||
| ------------------------------------------------------------------------- |
|
||||
|
|
@ -19,11 +19,6 @@
|
|||
| 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) |
|
||||
'---------------------------------------------------------------------------'
|
||||
*/
|
||||
|
||||
|
|
@ -34,8 +29,10 @@
|
|||
* @author Andy Prevost
|
||||
* @author Marcus Bointon
|
||||
* @copyright 2004 - 2008 Andy Prevost
|
||||
* @author Jim Jagielski
|
||||
* @copyright 2010 - 2011 Jim Jagielski
|
||||
* @license http://www.gnu.org/copyleft/lesser.html Distributed under the Lesser General Public License (LGPL)
|
||||
* @version $Id: class.smtp.php 444 2009-05-05 11:22:26Z coolbru $
|
||||
* @version $Id: class.smtp.php 450 2010-06-23 16:46:33Z coolbru $
|
||||
*/
|
||||
|
||||
/**
|
||||
|
|
@ -71,6 +68,12 @@ class SMTP {
|
|||
*/
|
||||
public $do_verp = false;
|
||||
|
||||
/**
|
||||
* Sets the SMTP PHPMailer Version number
|
||||
* @var string
|
||||
*/
|
||||
public $Version = '5.2';
|
||||
|
||||
/////////////////////////////////////////////////
|
||||
// PROPERTIES, PRIVATE AND PROTECTED
|
||||
/////////////////////////////////////////////////
|
||||
|
|
|
|||
Loading…
Reference in New Issue