|
|
@@ -13,7 +13,7 @@
|
|
|
* @copyright 2012 - 2020 Marcus Bointon
|
|
|
* @copyright 2010 - 2012 Jim Jagielski
|
|
|
* @copyright 2004 - 2009 Andy Prevost
|
|
|
- * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
|
|
|
+ * @license https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License
|
|
|
* @note 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.
|
|
|
@@ -152,8 +152,7 @@ class PHPMailer
|
|
|
* Only supported in simple alt or alt_inline message types
|
|
|
* To generate iCal event structures, use classes like EasyPeasyICS or iCalcreator.
|
|
|
*
|
|
|
- * @see http://sprain.ch/blog/downloads/php-class-easypeasyics-create-ical-files-with-php/
|
|
|
- * @see http://kigkonsult.se/iCalcreator/
|
|
|
+ * @see https://kigkonsult.se/iCalcreator/
|
|
|
*
|
|
|
* @var string
|
|
|
*/
|
|
|
@@ -358,7 +357,7 @@ class PHPMailer
|
|
|
public $AuthType = '';
|
|
|
|
|
|
/**
|
|
|
- * SMTP SMTPXClient command attibutes
|
|
|
+ * SMTP SMTPXClient command attributes
|
|
|
*
|
|
|
* @var array
|
|
|
*/
|
|
|
@@ -468,7 +467,7 @@ class PHPMailer
|
|
|
* Only applicable when sending via SMTP.
|
|
|
*
|
|
|
* @see https://en.wikipedia.org/wiki/Variable_envelope_return_path
|
|
|
- * @see http://www.postfix.org/VERP_README.html Postfix VERP info
|
|
|
+ * @see https://www.postfix.org/VERP_README.html Postfix VERP info
|
|
|
*
|
|
|
* @var bool
|
|
|
*/
|
|
|
@@ -551,10 +550,10 @@ class PHPMailer
|
|
|
* The function that handles the result of the send email action.
|
|
|
* It is called out by send() for each email sent.
|
|
|
*
|
|
|
- * Value can be any php callable: http://www.php.net/is_callable
|
|
|
+ * Value can be any php callable: https://www.php.net/is_callable
|
|
|
*
|
|
|
* Parameters:
|
|
|
- * bool $result result of the send action
|
|
|
+ * bool $result result of the send action
|
|
|
* array $to email addresses of the recipients
|
|
|
* array $cc cc email addresses
|
|
|
* array $bcc bcc email addresses
|
|
|
@@ -757,7 +756,7 @@ class PHPMailer
|
|
|
*
|
|
|
* @var string
|
|
|
*/
|
|
|
- const VERSION = '6.9.1';
|
|
|
+ const VERSION = '6.9.2';
|
|
|
|
|
|
/**
|
|
|
* Error severity: message only, continue processing.
|
|
|
@@ -903,7 +902,7 @@ class PHPMailer
|
|
|
}
|
|
|
//Is this a PSR-3 logger?
|
|
|
if ($this->Debugoutput instanceof \Psr\Log\LoggerInterface) {
|
|
|
- $this->Debugoutput->debug($str);
|
|
|
+ $this->Debugoutput->debug(rtrim($str, "\r\n"));
|
|
|
|
|
|
return;
|
|
|
}
|
|
|
@@ -1072,7 +1071,7 @@ class PHPMailer
|
|
|
* be modified after calling this function), addition of such addresses is delayed until send().
|
|
|
* Addresses that have been added already return false, but do not throw exceptions.
|
|
|
*
|
|
|
- * @param string $kind One of 'to', 'cc', 'bcc', or 'ReplyTo'
|
|
|
+ * @param string $kind One of 'to', 'cc', 'bcc', or 'Reply-To'
|
|
|
* @param string $address The email address
|
|
|
* @param string $name An optional username associated with the address
|
|
|
*
|
|
|
@@ -1212,7 +1211,7 @@ class PHPMailer
|
|
|
* Uses the imap_rfc822_parse_adrlist function if the IMAP extension is available.
|
|
|
* Note that quotes in the name part are removed.
|
|
|
*
|
|
|
- * @see http://www.andrew.cmu.edu/user/agreen1/testing/mrbs/web/Mail/RFC822.php A more careful implementation
|
|
|
+ * @see https://www.andrew.cmu.edu/user/agreen1/testing/mrbs/web/Mail/RFC822.php A more careful implementation
|
|
|
*
|
|
|
* @param string $addrstr The address list string
|
|
|
* @param bool $useimap Whether to use the IMAP extension to parse the list
|
|
|
@@ -1407,7 +1406,6 @@ class PHPMailer
|
|
|
* * IPv6 literals: 'first.last@[IPv6:a1::]'
|
|
|
* Not all of these will necessarily work for sending!
|
|
|
*
|
|
|
- * @see http://squiloople.com/2009/12/20/email-address-validation/
|
|
|
* @copyright 2009-2010 Michael Rushton
|
|
|
* Feel free to use and redistribute this code. But please keep this copyright notice.
|
|
|
*/
|
|
|
@@ -1734,9 +1732,8 @@ class PHPMailer
|
|
|
//This sets the SMTP envelope sender which gets turned into a return-path header by the receiver
|
|
|
//A space after `-f` is optional, but there is a long history of its presence
|
|
|
//causing problems, so we don't use one
|
|
|
- //Exim docs: http://www.exim.org/exim-html-current/doc/html/spec_html/ch-the_exim_command_line.html
|
|
|
- //Sendmail docs: http://www.sendmail.org/~ca/email/man/sendmail.html
|
|
|
- //Qmail docs: http://www.qmail.org/man/man8/qmail-inject.html
|
|
|
+ //Exim docs: https://www.exim.org/exim-html-current/doc/html/spec_html/ch-the_exim_command_line.html
|
|
|
+ //Sendmail docs: https://www.sendmail.org/~ca/email/man/sendmail.html
|
|
|
//Example problem: https://www.drupal.org/node/1057954
|
|
|
|
|
|
//PHP 5.6 workaround
|
|
|
@@ -1901,7 +1898,7 @@ class PHPMailer
|
|
|
/**
|
|
|
* Send mail using the PHP mail() function.
|
|
|
*
|
|
|
- * @see http://www.php.net/manual/en/book.mail.php
|
|
|
+ * @see https://www.php.net/manual/en/book.mail.php
|
|
|
*
|
|
|
* @param string $header The message headers
|
|
|
* @param string $body The message body
|
|
|
@@ -1931,9 +1928,8 @@ class PHPMailer
|
|
|
//This sets the SMTP envelope sender which gets turned into a return-path header by the receiver
|
|
|
//A space after `-f` is optional, but there is a long history of its presence
|
|
|
//causing problems, so we don't use one
|
|
|
- //Exim docs: http://www.exim.org/exim-html-current/doc/html/spec_html/ch-the_exim_command_line.html
|
|
|
- //Sendmail docs: http://www.sendmail.org/~ca/email/man/sendmail.html
|
|
|
- //Qmail docs: http://www.qmail.org/man/man8/qmail-inject.html
|
|
|
+ //Exim docs: https://www.exim.org/exim-html-current/doc/html/spec_html/ch-the_exim_command_line.html
|
|
|
+ //Sendmail docs: https://www.sendmail.org/~ca/email/man/sendmail.html
|
|
|
//Example problem: https://www.drupal.org/node/1057954
|
|
|
//CVE-2016-10033, CVE-2016-10045: Don't pass -f if characters will be escaped.
|
|
|
|
|
|
@@ -3634,7 +3630,7 @@ class PHPMailer
|
|
|
* without breaking lines within a character.
|
|
|
* Adapted from a function by paravoid.
|
|
|
*
|
|
|
- * @see http://www.php.net/manual/en/function.mb-encode-mimeheader.php#60283
|
|
|
+ * @see https://www.php.net/manual/en/function.mb-encode-mimeheader.php#60283
|
|
|
*
|
|
|
* @param string $str multi-byte text to wrap encode
|
|
|
* @param string $linebreak string to use as linefeed/end-of-line
|
|
|
@@ -3690,7 +3686,7 @@ class PHPMailer
|
|
|
/**
|
|
|
* Encode a string using Q encoding.
|
|
|
*
|
|
|
- * @see http://tools.ietf.org/html/rfc2047#section-4.2
|
|
|
+ * @see https://www.rfc-editor.org/rfc/rfc2047#section-4.2
|
|
|
*
|
|
|
* @param string $str the text to encode
|
|
|
* @param string $position Where the text is going to be used, see the RFC for what that means
|
|
|
@@ -4228,7 +4224,7 @@ class PHPMailer
|
|
|
$result = $_SERVER['SERVER_NAME'];
|
|
|
} elseif (function_exists('gethostname') && gethostname() !== false) {
|
|
|
$result = gethostname();
|
|
|
- } elseif (php_uname('n') !== false) {
|
|
|
+ } elseif (php_uname('n') !== '') {
|
|
|
$result = php_uname('n');
|
|
|
}
|
|
|
if (!static::isValidHost($result)) {
|
|
|
@@ -4253,7 +4249,7 @@ class PHPMailer
|
|
|
empty($host)
|
|
|
|| !is_string($host)
|
|
|
|| strlen($host) > 256
|
|
|
- || !preg_match('/^([a-zA-Z\d.-]*|\[[a-fA-F\d:]+\])$/', $host)
|
|
|
+ || !preg_match('/^([a-z\d.-]*|\[[a-f\d:]+\])$/i', $host)
|
|
|
) {
|
|
|
return false;
|
|
|
}
|
|
|
@@ -4267,8 +4263,8 @@ class PHPMailer
|
|
|
//Is it a valid IPv4 address?
|
|
|
return filter_var($host, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) !== false;
|
|
|
}
|
|
|
- //Is it a syntactically valid hostname (when embeded in a URL)?
|
|
|
- return filter_var('http://' . $host, FILTER_VALIDATE_URL) !== false;
|
|
|
+ //Is it a syntactically valid hostname (when embedded in a URL)?
|
|
|
+ return filter_var('https://' . $host, FILTER_VALIDATE_URL) !== false;
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -4679,7 +4675,7 @@ class PHPMailer
|
|
|
* Multi-byte-safe pathinfo replacement.
|
|
|
* Drop-in replacement for pathinfo(), but multibyte- and cross-platform-safe.
|
|
|
*
|
|
|
- * @see http://www.php.net/manual/en/function.pathinfo.php#107461
|
|
|
+ * @see https://www.php.net/manual/en/function.pathinfo.php#107461
|
|
|
*
|
|
|
* @param string $path A filename or path, does not need to exist as a file
|
|
|
* @param int|string $options Either a PATHINFO_* constant,
|
dependabot[bot]