Changeset:
f32b475f5377
https://sourceforge.net/p/mrbs/hg-code/ci/f32b475f53770947886c43d076ad7615519d80f6
Author:
Campbell Morrison <[email protected]>
Date:
Thu Dec 29 16:33:33 2016 +0000
Log message:
Upgraded PHPMailer to latest version (5.2.21)
diffstat:
web/functions_mail.inc | 6 +-
web/lib/PHPMailer/VERSION | 2 +-
web/lib/PHPMailer/class.phpmailer.php | 695 ++++++++++++++-----
web/lib/PHPMailer/class.phpmaileroauth.php | 18 +-
web/lib/PHPMailer/class.phpmaileroauthgoogle.php | 9 +-
web/lib/PHPMailer/class.pop3.php | 68 +-
web/lib/PHPMailer/class.smtp.php | 141 +++-
web/lib/PHPMailer/get_oauth_token.php | 226 ++++-
web/lib/PHPMailer/language/phpmailer.lang-ar.php | 2 +-
web/lib/PHPMailer/language/phpmailer.lang-bg.php | 2 +-
web/lib/PHPMailer/language/phpmailer.lang-ca.php | 2 +-
web/lib/PHPMailer/language/phpmailer.lang-ch.php | 2 +-
web/lib/PHPMailer/language/phpmailer.lang-cs.php | 25 +
web/lib/PHPMailer/language/phpmailer.lang-da.php | 26 +
web/lib/PHPMailer/language/phpmailer.lang-de.php | 26 +-
web/lib/PHPMailer/language/phpmailer.lang-el.php | 2 +-
web/lib/PHPMailer/language/phpmailer.lang-es.php | 2 +-
web/lib/PHPMailer/language/phpmailer.lang-fi.php | 2 +-
web/lib/PHPMailer/language/phpmailer.lang-fo.php | 2 +-
web/lib/PHPMailer/language/phpmailer.lang-gl.php | 1 -
web/lib/PHPMailer/language/phpmailer.lang-he.php | 3 +-
web/lib/PHPMailer/language/phpmailer.lang-hr.php | 2 +-
web/lib/PHPMailer/language/phpmailer.lang-ja.php | 2 +-
web/lib/PHPMailer/language/phpmailer.lang-ka.php | 2 +-
web/lib/PHPMailer/language/phpmailer.lang-ko.php | 2 +-
web/lib/PHPMailer/language/phpmailer.lang-lt.php | 2 +-
web/lib/PHPMailer/language/phpmailer.lang-lv.php | 2 +-
web/lib/PHPMailer/language/phpmailer.lang-ms.php | 2 +-
web/lib/PHPMailer/language/phpmailer.lang-nb.php | 25 +
web/lib/PHPMailer/language/phpmailer.lang-nl.php | 2 +-
web/lib/PHPMailer/language/phpmailer.lang-pl.php | 2 +-
web/lib/PHPMailer/language/phpmailer.lang-pt.php | 2 +-
web/lib/PHPMailer/language/phpmailer.lang-pt_br.php | 28 +
web/lib/PHPMailer/language/phpmailer.lang-ro.php | 34 +-
web/lib/PHPMailer/language/phpmailer.lang-ru.php | 9 +-
web/lib/PHPMailer/language/phpmailer.lang-sl.php | 4 +-
web/lib/PHPMailer/language/phpmailer.lang-sr.php | 2 +-
web/lib/PHPMailer/language/phpmailer.lang-sv.php | 26 +
web/lib/PHPMailer/language/phpmailer.lang-vi.php | 2 +-
web/lib/PHPMailer/language/phpmailer.lang-zh_cn.php | 2 +-
40 files changed, 1020 insertions(+), 394 deletions(-)
diffs (truncated from 3138 to 300 lines):
diff -r b1834d82b9e1 -r f32b475f5377 web/functions_mail.inc
--- a/web/functions_mail.inc Thu Dec 29 16:31:16 2016 +0000
+++ b/web/functions_mail.inc Thu Dec 29 16:33:33 2016 +0000
@@ -1360,7 +1360,11 @@
return true;
}
- if ($mail->postSend())
+ // We need to suppress errors because PHPMailer will throw
+ // a warning if escapeshellcmd() has been disabled. It seems
+ // to use it not just for the sendmail but also for the mail
+ // backend.
+ if (@$mail->postSend())
{
mail_debug('Email sent successfully');
return true;
diff -r b1834d82b9e1 -r f32b475f5377 web/lib/PHPMailer/VERSION
--- a/web/lib/PHPMailer/VERSION Thu Dec 29 16:31:16 2016 +0000
+++ b/web/lib/PHPMailer/VERSION Thu Dec 29 16:33:33 2016 +0000
@@ -1,1 +1,1 @@
-5.2.13
\ No newline at end of file
+5.2.21
diff -r b1834d82b9e1 -r f32b475f5377 web/lib/PHPMailer/class.phpmailer.php
--- a/web/lib/PHPMailer/class.phpmailer.php Thu Dec 29 16:31:16 2016 +0000
+++ b/web/lib/PHPMailer/class.phpmailer.php Thu Dec 29 16:33:33 2016 +0000
@@ -29,66 +29,66 @@
{
/**
* The PHPMailer Version number.
- * @type string
+ * @var string
*/
- public $Version = '5.2.13';
+ public $Version = '5.2.21';
/**
* Email priority.
* Options: null (default), 1 = High, 3 = Normal, 5 = low.
* When null, the header is not set at all.
- * @type integer
+ * @var integer
*/
public $Priority = null;
/**
* The character set of the message.
- * @type string
+ * @var string
*/
public $CharSet = 'iso-8859-1';
/**
* The MIME Content-type of the message.
- * @type string
+ * @var string
*/
public $ContentType = 'text/plain';
/**
* The message encoding.
* Options: "8bit", "7bit", "binary", "base64", and "quoted-printable".
- * @type string
+ * @var string
*/
public $Encoding = '8bit';
/**
* Holds the most recent mailer error message.
- * @type string
+ * @var string
*/
public $ErrorInfo = '';
/**
* The From email address for the message.
- * @type string
+ * @var string
*/
public $From = 'root@localhost';
/**
* The From name of the message.
- * @type string
+ * @var string
*/
public $FromName = 'Root User';
/**
* 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.
- * @type string
+ * @var string
*/
public $Sender = '';
/**
* The Return-Path of the message.
* If empty, it will be set to either From or Sender.
- * @type string
+ * @var string
* @deprecated Email senders should never set a return-path header;
* it's the receiver's job (RFC5321 section 4.4), so this no longer does
anything.
* @link https://tools.ietf.org/html/rfc5321#section-4.4 RFC5321 reference
@@ -97,14 +97,14 @@
/**
* The Subject of the message.
- * @type string
+ * @var string
*/
public $Subject = '';
/**
* An HTML or plain text message body.
* If HTML then call isHTML(true).
- * @type string
+ * @var string
*/
public $Body = '';
@@ -113,7 +113,7 @@
* This body can be read by mail clients that do not have HTML email
* capability such as mutt & Eudora.
* Clients that can read HTML will view the normal Body.
- * @type string
+ * @var string
*/
public $AltBody = '';
@@ -123,27 +123,27 @@
* To generate iCal events, use the bundled extras/EasyPeasyICS.php class
or iCalcreator
* @link
http://sprain.ch/blog/downloads/php-class-easypeasyics-create-ical-files-with-php/
* @link http://kigkonsult.se/iCalcreator/
- * @type string
+ * @var string
*/
public $Ical = '';
/**
* The complete compiled MIME message body.
* @access protected
- * @type string
+ * @var string
*/
protected $MIMEBody = '';
/**
* The complete compiled MIME message headers.
- * @type string
+ * @var string
* @access protected
*/
protected $MIMEHeader = '';
/**
* Extra headers that createHeader() doesn't fold in.
- * @type string
+ * @var string
* @access protected
*/
protected $mailHeader = '';
@@ -151,41 +151,41 @@
/**
* Word-wrap the message body to this number of chars.
* Set to 0 to not wrap. A useful value here is 78, for RFC2822 section
2.1.1 compliance.
- * @type integer
+ * @var integer
*/
public $WordWrap = 0;
/**
* Which method to use to send mail.
* Options: "mail", "sendmail", or "smtp".
- * @type string
+ * @var string
*/
public $Mailer = 'mail';
/**
* The path to the sendmail program.
- * @type string
+ * @var string
*/
public $Sendmail = '/usr/sbin/sendmail';
/**
* Whether mail() uses a fully sendmail-compatible MTA.
* One which supports sendmail's "-oi -f" options.
- * @type boolean
+ * @var boolean
*/
public $UseSendmailOptions = true;
/**
* Path to PHPMailer plugins.
* Useful if the SMTP class is not in the PHP include path.
- * @type string
+ * @var string
* @deprecated Should not be needed now there is an autoloader.
*/
public $PluginDir = '';
/**
- * The email address that a reading confirmation should be sent to.
- * @type string
+ * The email address that a reading confirmation should be sent to, also
known as read receipt.
+ * @var string
*/
public $ConfirmReadingTo = '';
@@ -194,21 +194,24 @@
* If empty, PHPMailer attempts to find one with, in order,
* $_SERVER['SERVER_NAME'], gethostname(), php_uname('n'), or the value
* 'localhost.localdomain'.
- * @type string
+ * @var string
*/
public $Hostname = '';
/**
* An ID to be used in the Message-ID header.
* If empty, a unique id will be generated.
- * @type string
+ * You can set your own, but it must be in the format "<id@domain>",
+ * as defined in RFC5322 section 3.6.4 or it will be ignored.
+ * @see https://tools.ietf.org/html/rfc5322#section-3.6.4
+ * @var string
*/
public $MessageID = '';
/**
* The message Date to be used in the Date header.
* If empty, the current date will be added.
- * @type string
+ * @var string
*/
public $MessageDate = '';
@@ -221,13 +224,13 @@
* You can also specify encryption type, for example:
* (e.g. "tls://smtp1.example.com:587;ssl://smtp2.example.com:465").
* Hosts will be tried in order.
- * @type string
+ * @var string
*/
public $Host = 'localhost';
/**
* The default SMTP server port.
- * @type integer
+ * @var integer
* @TODO Why is this needed when the SMTP class takes care of it?
*/
public $Port = 25;
@@ -236,7 +239,7 @@
* The SMTP HELO of the message.
* Default is $Hostname. If $Hostname is empty, PHPMailer attempts to find
* one with the same method described above for $Hostname.
- * @type string
+ * @var string
* @see PHPMailer::$Hostname
*/
public $Helo = '';
@@ -244,7 +247,7 @@
/**
* What kind of encryption to use on the SMTP connection.
* Options: '', 'ssl' or 'tls'
- * @type string
+ * @var string
*/
public $SMTPSecure = '';
@@ -252,14 +255,14 @@
* Whether to enable TLS encryption automatically if a server supports it,
* even if `SMTPSecure` is not set to 'tls'.
* Be aware that in PHP >= 5.6 this requires that the server's
certificates are valid.
- * @type boolean
+ * @var boolean
*/
public $SMTPAutoTLS = true;
/**
* Whether to use SMTP authentication.
* Uses the Username and Password properties.
- * @type boolean
+ * @var boolean
* @see PHPMailer::$Username
* @see PHPMailer::$Password
*/
@@ -267,47 +270,47 @@
/**
* Options array passed to stream_context_create when connecting via SMTP.
- * @type array
+ * @var array
*/
public $SMTPOptions = array();
/**
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
