From 6f4929396039ab0c12e1f87317a69d32a86f5c44 Mon Sep 17 00:00:00 2001
From: Brian Canini <canini.16@osu.edu>
Date: Mon, 8 Feb 2021 14:27:17 -0500
Subject: [PATCH] Updating phpmailer/phpmailer (v6.1.7 => v6.2.0) Updating
drupal/smtp (1.0.0-rc4 => 1.0.0)
---
composer.json | 2 +-
composer.lock | 48 +++---
vendor/composer/installed.json | 52 +++---
vendor/phpmailer/phpmailer/README.md | 10 +-
vendor/phpmailer/phpmailer/VERSION | 2 +-
vendor/phpmailer/phpmailer/composer.json | 20 ++-
.../phpmailer/phpmailer/get_oauth_token.php | 10 +-
.../phpmailer/language/phpmailer.lang-af.php | 1 +
.../phpmailer/language/phpmailer.lang-ar.php | 1 +
.../phpmailer/language/phpmailer.lang-az.php | 1 +
.../phpmailer/language/phpmailer.lang-ba.php | 3 +-
.../phpmailer/language/phpmailer.lang-be.php | 1 +
.../phpmailer/language/phpmailer.lang-bg.php | 1 +
.../phpmailer/language/phpmailer.lang-ca.php | 1 +
.../phpmailer/language/phpmailer.lang-ch.php | 1 +
.../phpmailer/language/phpmailer.lang-cs.php | 1 +
.../phpmailer/language/phpmailer.lang-da.php | 5 +-
.../phpmailer/language/phpmailer.lang-de.php | 3 +
.../phpmailer/language/phpmailer.lang-el.php | 1 +
.../phpmailer/language/phpmailer.lang-eo.php | 1 +
.../phpmailer/language/phpmailer.lang-es.php | 1 +
.../phpmailer/language/phpmailer.lang-et.php | 1 +
.../phpmailer/language/phpmailer.lang-fa.php | 1 +
.../phpmailer/language/phpmailer.lang-fi.php | 1 +
.../phpmailer/language/phpmailer.lang-fo.php | 1 +
.../phpmailer/language/phpmailer.lang-fr.php | 3 +
.../phpmailer/language/phpmailer.lang-gl.php | 1 +
.../phpmailer/language/phpmailer.lang-he.php | 1 +
.../phpmailer/language/phpmailer.lang-hi.php | 3 +-
.../phpmailer/language/phpmailer.lang-hr.php | 1 +
.../phpmailer/language/phpmailer.lang-hu.php | 1 +
.../phpmailer/language/phpmailer.lang-hy.php | 3 +-
.../phpmailer/language/phpmailer.lang-id.php | 28 +--
.../phpmailer/language/phpmailer.lang-it.php | 1 +
.../phpmailer/language/phpmailer.lang-ja.php | 1 +
.../phpmailer/language/phpmailer.lang-ka.php | 1 +
.../phpmailer/language/phpmailer.lang-ko.php | 1 +
.../phpmailer/language/phpmailer.lang-lt.php | 1 +
.../phpmailer/language/phpmailer.lang-lv.php | 1 +
.../phpmailer/language/phpmailer.lang-mg.php | 2 +
.../phpmailer/language/phpmailer.lang-ms.php | 1 +
.../phpmailer/language/phpmailer.lang-nb.php | 1 +
.../phpmailer/language/phpmailer.lang-nl.php | 1 +
.../phpmailer/language/phpmailer.lang-pl.php | 3 +-
.../phpmailer/language/phpmailer.lang-pt.php | 1 +
.../language/phpmailer.lang-pt_br.php | 1 +
.../phpmailer/language/phpmailer.lang-ro.php | 1 +
.../phpmailer/language/phpmailer.lang-ru.php | 1 +
.../phpmailer/language/phpmailer.lang-sk.php | 1 +
.../phpmailer/language/phpmailer.lang-sl.php | 6 +-
.../phpmailer/language/phpmailer.lang-sr.php | 1 +
.../phpmailer/language/phpmailer.lang-sv.php | 1 +
.../phpmailer/language/phpmailer.lang-tl.php | 25 +--
.../phpmailer/language/phpmailer.lang-tr.php | 1 +
.../phpmailer/language/phpmailer.lang-uk.php | 1 +
.../phpmailer/language/phpmailer.lang-vi.php | 1 +
.../phpmailer/language/phpmailer.lang-zh.php | 1 +
.../language/phpmailer.lang-zh_cn.php | 1 +
vendor/phpmailer/phpmailer/src/Exception.php | 3 +-
vendor/phpmailer/phpmailer/src/OAuth.php | 3 +-
vendor/phpmailer/phpmailer/src/PHPMailer.php | 161 +++++++++++-------
vendor/phpmailer/phpmailer/src/POP3.php | 43 ++++-
vendor/phpmailer/phpmailer/src/SMTP.php | 29 ++--
web/modules/smtp/composer.json | 4 +-
web/modules/smtp/ludwig.json | 4 +-
web/modules/smtp/smtp.info.yml | 8 +-
web/modules/smtp/smtp.install | 2 +-
.../Unit/Plugin/Mail/SMTPMailSystemTest.php | 58 ++++---
68 files changed, 377 insertions(+), 206 deletions(-)
diff --git a/composer.json b/composer.json
index 9700723327..d18927f130 100644
--- a/composer.json
+++ b/composer.json
@@ -168,7 +168,7 @@
"drupal/simple_megamenu": "1.0-beta3",
"drupal/simple_sitemap": "3.8",
"drupal/simplesamlphp_auth": "3.1",
- "drupal/smtp": "1.0-rc4",
+ "drupal/smtp": "1.0",
"drupal/social_media": "1.8",
"drupal/social_media_links": "^2.7",
"drupal/superfish": "1.2",
diff --git a/composer.lock b/composer.lock
index 3f5bcca64b..817000c4f2 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "cf9dbe7bb1771287f68ffec2f43f12ce",
+ "content-hash": "821120c3a9bb51aae54dd1eb9d260995",
"packages": [
{
"name": "alchemy/zippy",
@@ -7615,21 +7615,21 @@
},
{
"name": "drupal/smtp",
- "version": "1.0.0-rc4",
+ "version": "1.0.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/smtp.git",
- "reference": "8.x-1.0-rc4"
+ "reference": "8.x-1.0"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/smtp-8.x-1.0-rc4.zip",
- "reference": "8.x-1.0-rc4",
- "shasum": "2879396e26bb356b1d17646c324d455eda3044af"
+ "url": "https://ftp.drupal.org/files/projects/smtp-8.x-1.0.zip",
+ "reference": "8.x-1.0",
+ "shasum": "c40cc7a3c20d3f743e3a4e53f4cc296748da89fd"
},
"require": {
- "drupal/core": "^8.7.7 || ^9",
- "phpmailer/phpmailer": "^6.1.5"
+ "drupal/core": "^8.8 || ^9",
+ "phpmailer/phpmailer": "^6.1.7"
},
"suggest": {
"drupal/mailsystem": "Allows using SMTP alongside other mail modules."
@@ -7637,11 +7637,11 @@
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "8.x-1.0-rc4",
- "datestamp": "1595628445",
+ "version": "8.x-1.0",
+ "datestamp": "1601070985",
"security-coverage": {
- "status": "not-covered",
- "message": "RC releases are not covered by Drupal security advisories."
+ "status": "covered",
+ "message": "Covered by Drupal's security advisory policy"
}
},
"branch-alias": {
@@ -10799,27 +10799,31 @@
},
{
"name": "phpmailer/phpmailer",
- "version": "v6.1.7",
+ "version": "v6.2.0",
"source": {
"type": "git",
"url": "https://github.com/PHPMailer/PHPMailer.git",
- "reference": "2c2370ba3df7034f9eb7b8f387c97b52b2ba5ad0"
+ "reference": "e38888a75c070304ca5514197d4847a59a5c853f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/2c2370ba3df7034f9eb7b8f387c97b52b2ba5ad0",
- "reference": "2c2370ba3df7034f9eb7b8f387c97b52b2ba5ad0",
+ "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/e38888a75c070304ca5514197d4847a59a5c853f",
+ "reference": "e38888a75c070304ca5514197d4847a59a5c853f",
"shasum": ""
},
"require": {
"ext-ctype": "*",
"ext-filter": "*",
+ "ext-hash": "*",
"php": ">=5.5.0"
},
"require-dev": {
+ "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
"doctrine/annotations": "^1.2",
- "friendsofphp/php-cs-fixer": "^2.2",
- "phpunit/phpunit": "^4.8 || ^5.7"
+ "phpcompatibility/php-compatibility": "^9.3.5",
+ "roave/security-advisories": "dev-latest",
+ "squizlabs/php_codesniffer": "^3.5.6",
+ "yoast/phpunit-polyfills": "^0.2.0"
},
"suggest": {
"ext-mbstring": "Needed to send email in multibyte encoding charset",
@@ -10857,7 +10861,13 @@
}
],
"description": "PHPMailer is a full-featured email creation and transfer class for PHP",
- "time": "2020-07-14T18:50:27+00:00"
+ "funding": [
+ {
+ "url": "https://github.com/Synchro",
+ "type": "github"
+ }
+ ],
+ "time": "2020-11-25T15:24:57+00:00"
},
{
"name": "psr/container",
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index f42a9ad2d8..a5c92fff50 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -7850,22 +7850,22 @@
},
{
"name": "drupal/smtp",
- "version": "1.0.0-rc4",
- "version_normalized": "1.0.0.0-RC4",
+ "version": "1.0.0",
+ "version_normalized": "1.0.0.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/smtp.git",
- "reference": "8.x-1.0-rc4"
+ "reference": "8.x-1.0"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/smtp-8.x-1.0-rc4.zip",
- "reference": "8.x-1.0-rc4",
- "shasum": "2879396e26bb356b1d17646c324d455eda3044af"
+ "url": "https://ftp.drupal.org/files/projects/smtp-8.x-1.0.zip",
+ "reference": "8.x-1.0",
+ "shasum": "c40cc7a3c20d3f743e3a4e53f4cc296748da89fd"
},
"require": {
- "drupal/core": "^8.7.7 || ^9",
- "phpmailer/phpmailer": "^6.1.5"
+ "drupal/core": "^8.8 || ^9",
+ "phpmailer/phpmailer": "^6.1.7"
},
"suggest": {
"drupal/mailsystem": "Allows using SMTP alongside other mail modules."
@@ -7873,11 +7873,11 @@
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "8.x-1.0-rc4",
- "datestamp": "1595628445",
+ "version": "8.x-1.0",
+ "datestamp": "1601070985",
"security-coverage": {
- "status": "not-covered",
- "message": "RC releases are not covered by Drupal security advisories."
+ "status": "covered",
+ "message": "Covered by Drupal's security advisory policy"
}
},
"branch-alias": {
@@ -11146,28 +11146,32 @@
},
{
"name": "phpmailer/phpmailer",
- "version": "v6.1.7",
- "version_normalized": "6.1.7.0",
+ "version": "v6.2.0",
+ "version_normalized": "6.2.0.0",
"source": {
"type": "git",
"url": "https://github.com/PHPMailer/PHPMailer.git",
- "reference": "2c2370ba3df7034f9eb7b8f387c97b52b2ba5ad0"
+ "reference": "e38888a75c070304ca5514197d4847a59a5c853f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/2c2370ba3df7034f9eb7b8f387c97b52b2ba5ad0",
- "reference": "2c2370ba3df7034f9eb7b8f387c97b52b2ba5ad0",
+ "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/e38888a75c070304ca5514197d4847a59a5c853f",
+ "reference": "e38888a75c070304ca5514197d4847a59a5c853f",
"shasum": ""
},
"require": {
"ext-ctype": "*",
"ext-filter": "*",
+ "ext-hash": "*",
"php": ">=5.5.0"
},
"require-dev": {
+ "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
"doctrine/annotations": "^1.2",
- "friendsofphp/php-cs-fixer": "^2.2",
- "phpunit/phpunit": "^4.8 || ^5.7"
+ "phpcompatibility/php-compatibility": "^9.3.5",
+ "roave/security-advisories": "dev-latest",
+ "squizlabs/php_codesniffer": "^3.5.6",
+ "yoast/phpunit-polyfills": "^0.2.0"
},
"suggest": {
"ext-mbstring": "Needed to send email in multibyte encoding charset",
@@ -11177,7 +11181,7 @@
"stevenmaguire/oauth2-microsoft": "Needed for Microsoft XOAUTH2 authentication",
"symfony/polyfill-mbstring": "To support UTF-8 if the Mbstring PHP extension is not enabled (^1.2)"
},
- "time": "2020-07-14T18:50:27+00:00",
+ "time": "2020-11-25T15:24:57+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -11206,7 +11210,13 @@
"name": "Brent R. Matzelle"
}
],
- "description": "PHPMailer is a full-featured email creation and transfer class for PHP"
+ "description": "PHPMailer is a full-featured email creation and transfer class for PHP",
+ "funding": [
+ {
+ "url": "https://github.com/Synchro",
+ "type": "github"
+ }
+ ]
},
{
"name": "psr/container",
diff --git a/vendor/phpmailer/phpmailer/README.md b/vendor/phpmailer/phpmailer/README.md
index c287e307a6..d9cbbaaf97 100644
--- a/vendor/phpmailer/phpmailer/README.md
+++ b/vendor/phpmailer/phpmailer/README.md
@@ -167,15 +167,9 @@ Build status: [](h
If this isn't passing, is there something you can do to help?
## Security
-Please disclose any vulnerabilities found responsibly - report any security problems found to the maintainers privately.
+Please disclose any vulnerabilities found responsibly – report security issues to the maintainers privately.
-PHPMailer versions prior to 5.2.22 (released January 9th 2017) have a local file disclosure vulnerability, [CVE-2017-5223](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2017-5223). If content passed into `msgHTML()` is sourced from unfiltered user input, relative paths can map to absolute local file paths and added as attachments. Also note that `addAttachment` (just like `file_get_contents`, `passthru`, `unlink`, etc) should not be passed user-sourced params either! Reported by Yongxiang Li of Asiasecurity.
-
-PHPMailer versions prior to 5.2.20 (released December 28th 2016) are vulnerable to [CVE-2016-10045](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-10045) a remote code execution vulnerability, responsibly reported by [Dawid Golunski](https://legalhackers.com/advisories/PHPMailer-Exploit-Remote-Code-Exec-CVE-2016-10045-Vuln-Patch-Bypass.html), and patched by Paul Buonopane (@Zenexer).
-
-PHPMailer versions prior to 5.2.18 (released December 2016) are vulnerable to [CVE-2016-10033](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-10033) a critical remote code execution vulnerability, responsibly reported by [Dawid Golunski](http://legalhackers.com/advisories/PHPMailer-Exploit-Remote-Code-Exec-CVE-2016-10033-Vuln.html).
-
-See [SECURITY](https://github.com/PHPMailer/PHPMailer/tree/master/SECURITY.md) for more detail on security issues.
+See [SECURITY](https://github.com/PHPMailer/PHPMailer/tree/master/SECURITY.md) for details on security issues.
## Contributing
Please submit bug reports, suggestions and pull requests to the [GitHub issue tracker](https://github.com/PHPMailer/PHPMailer/issues).
diff --git a/vendor/phpmailer/phpmailer/VERSION b/vendor/phpmailer/phpmailer/VERSION
index cb6b1ffdc8..4ac4fded49 100644
--- a/vendor/phpmailer/phpmailer/VERSION
+++ b/vendor/phpmailer/phpmailer/VERSION
@@ -1 +1 @@
-6.1.7
\ No newline at end of file
+6.2.0
\ No newline at end of file
diff --git a/vendor/phpmailer/phpmailer/composer.json b/vendor/phpmailer/phpmailer/composer.json
index 90d2576f56..7388bd98b9 100644
--- a/vendor/phpmailer/phpmailer/composer.json
+++ b/vendor/phpmailer/phpmailer/composer.json
@@ -21,26 +21,30 @@
],
"funding": [
{
- "url": "https://github.com/synchro",
+ "url": "https://github.com/Synchro",
"type": "github"
}
],
"require": {
"php": ">=5.5.0",
"ext-ctype": "*",
- "ext-filter": "*"
+ "ext-filter": "*",
+ "ext-hash": "*"
},
"require-dev": {
- "friendsofphp/php-cs-fixer": "^2.2",
- "phpunit/phpunit": "^4.8 || ^5.7",
- "doctrine/annotations": "^1.2"
+ "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
+ "doctrine/annotations": "^1.2",
+ "phpcompatibility/php-compatibility": "^9.3.5",
+ "roave/security-advisories": "dev-latest",
+ "squizlabs/php_codesniffer": "^3.5.6",
+ "yoast/phpunit-polyfills": "^0.2.0"
},
"suggest": {
- "psr/log": "For optional PSR-3 debug logging",
- "league/oauth2-google": "Needed for Google XOAUTH2 authentication",
+ "ext-mbstring": "Needed to send email in multibyte encoding charset",
"hayageek/oauth2-yahoo": "Needed for Yahoo XOAUTH2 authentication",
+ "league/oauth2-google": "Needed for Google XOAUTH2 authentication",
+ "psr/log": "For optional PSR-3 debug logging",
"stevenmaguire/oauth2-microsoft": "Needed for Microsoft XOAUTH2 authentication",
- "ext-mbstring": "Needed to send email in multibyte encoding charset",
"symfony/polyfill-mbstring": "To support UTF-8 if the Mbstring PHP extension is not enabled (^1.2)"
},
"autoload": {
diff --git a/vendor/phpmailer/phpmailer/get_oauth_token.php b/vendor/phpmailer/phpmailer/get_oauth_token.php
index 1237b57be8..560d364584 100644
--- a/vendor/phpmailer/phpmailer/get_oauth_token.php
+++ b/vendor/phpmailer/phpmailer/get_oauth_token.php
@@ -1,4 +1,5 @@
<?php
+
/**
* PHPMailer - PHP email creation and transport class.
* PHP Version 5.5
@@ -8,7 +9,7 @@
* @author Jim Jagielski (jimjag) <jimjag@gmail.com>
* @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
* @author Brent R. Matzelle (original founder)
- * @copyright 2012 - 2017 Marcus Bointon
+ * @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
@@ -16,6 +17,7 @@
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE.
*/
+
/**
* Get an OAuth2 token from an OAuth2 provider.
* * Install this script on your server so that it's accessible
@@ -44,7 +46,7 @@
use Stevenmaguire\OAuth2\Client\Provider\Microsoft;
if (!isset($_GET['code']) && !isset($_GET['provider'])) {
-?>
+ ?>
<html>
<body>Select Provider:<br/>
<a href='?provider=Google'>Google</a><br/>
@@ -52,8 +54,8 @@
<a href='?provider=Microsoft'>Microsoft/Outlook/Hotmail/Live/Office365</a><br/>
</body>
</html>
-<?php
-exit;
+ <?php
+ exit;
}
require 'vendor/autoload.php';
diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-af.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-af.php
index 3c42d78e15..0b2a72d524 100644
--- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-af.php
+++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-af.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Afrikaans PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-ar.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-ar.php
index 865d0b7329..8ab485c449 100644
--- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-ar.php
+++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-ar.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Arabic PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-az.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-az.php
index 3749d83d60..552167ef62 100644
--- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-az.php
+++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-az.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Azerbaijani PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-ba.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-ba.php
index 576c4bb534..3694f344ab 100644
--- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-ba.php
+++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-ba.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Bosnian PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
@@ -23,4 +24,4 @@
$PHPMAILER_LANG['smtp_connect_failed'] = 'Spajanje na SMTP server nije uspjelo.';
$PHPMAILER_LANG['smtp_error'] = 'SMTP greška: ';
$PHPMAILER_LANG['variable_set'] = 'Nije moguće postaviti varijablu ili je vratiti nazad: ';
-$PHPMAILER_LANG['extension_missing'] = 'Nedostaje ekstenzija: ';
\ No newline at end of file
+$PHPMAILER_LANG['extension_missing'] = 'Nedostaje ekstenzija: ';
diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-be.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-be.php
index e2f98f0f6d..9e92ddaaf7 100644
--- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-be.php
+++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-be.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Belarusian PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-bg.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-bg.php
index b22941f6b5..c41f675dfd 100644
--- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-bg.php
+++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-bg.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Bulgarian PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-ca.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-ca.php
index 4117596c6f..34684855a5 100644
--- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-ca.php
+++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-ca.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Catalan PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-ch.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-ch.php
index 4fda6b85d7..500c952676 100644
--- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-ch.php
+++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-ch.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Chinese PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-cs.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-cs.php
index 1160cf0cc4..55bdd9c89e 100644
--- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-cs.php
+++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-cs.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Czech PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-da.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-da.php
index 5febb516e0..1edba1d7a4 100644
--- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-da.php
+++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-da.php
@@ -1,10 +1,11 @@
<?php
+
/**
* Danish PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
* @author John Sebastian <jms@iwb.dk>
- * Rewrite and extension of the work by Mikael Stokkebro <info@stokkebro.dk>
- *
+ * Rewrite and extension of the work by Mikael Stokkebro <info@stokkebro.dk>
+ *
*/
$PHPMAILER_LANG['authenticate'] = 'SMTP fejl: Login mislykkedes.';
diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-de.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-de.php
index aa987a9caf..e7e59d2b67 100644
--- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-de.php
+++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-de.php
@@ -1,4 +1,5 @@
<?php
+
/**
* German PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
@@ -15,6 +16,8 @@
$PHPMAILER_LANG['from_failed'] = 'Die folgende Absenderadresse ist nicht korrekt: ';
$PHPMAILER_LANG['instantiate'] = 'Mail-Funktion konnte nicht initialisiert werden.';
$PHPMAILER_LANG['invalid_address'] = 'Die Adresse ist ungültig: ';
+$PHPMAILER_LANG['invalid_hostentry'] = 'Ungültiger Hosteintrag: ';
+$PHPMAILER_LANG['invalid_host'] = 'Ungültiger Host: ';
$PHPMAILER_LANG['mailer_not_supported'] = ' mailer wird nicht unterstützt.';
$PHPMAILER_LANG['provide_address'] = 'Bitte geben Sie mindestens eine Empfängeradresse an.';
$PHPMAILER_LANG['recipients_failed'] = 'SMTP-Fehler: Die folgenden Empfänger sind nicht korrekt: ';
diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-el.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-el.php
index 7109641e49..b3d5ca94bd 100644
--- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-el.php
+++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-el.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Greek PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-eo.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-eo.php
index 5ca6cb7095..fa8c2c1758 100644
--- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-eo.php
+++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-eo.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Esperanto PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-es.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-es.php
index f2c4e8316c..6ba7462730 100644
--- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-es.php
+++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-es.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Spanish PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-et.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-et.php
index 7e06da13e6..93addc9e33 100644
--- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-et.php
+++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-et.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Estonian PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-fa.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-fa.php
index 8aa0ad2218..295a47f95c 100644
--- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-fa.php
+++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-fa.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Persian/Farsi PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-fi.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-fi.php
index ec4e752349..243c05489e 100644
--- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-fi.php
+++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-fi.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Finnish PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-fo.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-fo.php
index 68cdef1d09..b30f052014 100644
--- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-fo.php
+++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-fo.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Faroese PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-fr.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-fr.php
index af68c92368..b57f0ec660 100644
--- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-fr.php
+++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-fr.php
@@ -1,4 +1,5 @@
<?php
+
/**
* French PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
@@ -19,6 +20,8 @@
$PHPMAILER_LANG['from_failed'] = 'L\'adresse d\'expéditeur suivante a échoué : ';
$PHPMAILER_LANG['instantiate'] = 'Impossible d\'instancier la fonction mail.';
$PHPMAILER_LANG['invalid_address'] = 'L\'adresse courriel n\'est pas valide : ';
+$PHPMAILER_LANG['invalid_hostentry'] = 'L\'entrée hôte n\'est pas valide : ';
+$PHPMAILER_LANG['invalid_host'] = 'L\'hôte n\'est pas valide : ';
$PHPMAILER_LANG['mailer_not_supported'] = ' client de messagerie non supporté.';
$PHPMAILER_LANG['provide_address'] = 'Vous devez fournir au moins une adresse de destinataire.';
$PHPMAILER_LANG['recipients_failed'] = 'Erreur SMTP : les destinataires suivants sont en erreur : ';
diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-gl.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-gl.php
index 9b4ce4d8de..3f3ab37609 100644
--- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-gl.php
+++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-gl.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Galician PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-he.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-he.php
index 70eb717578..b123aa5fc0 100644
--- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-he.php
+++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-he.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Hebrew PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-hi.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-hi.php
index 607a5ee3f9..d973a35961 100644
--- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-hi.php
+++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-hi.php
@@ -1,10 +1,11 @@
<?php
+
/**
* Hindi PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
* @author Yash Karanke <mr.karanke@gmail.com>
*/
-
+
$PHPMAILER_LANG['authenticate'] = 'SMTP त्रुटि: प्रामाणिकता की जांच नहीं हो सका। ';
$PHPMAILER_LANG['connect_host'] = 'SMTP त्रुटि: SMTP सर्वर से कनेक्ट नहीं हो सका। ';
$PHPMAILER_LANG['data_not_accepted'] = 'SMTP त्रुटि: डेटा स्वीकार नहीं किया जाता है। ';
diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-hr.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-hr.php
index 3822920add..cacb6c37e5 100644
--- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-hr.php
+++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-hr.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Croatian PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-hu.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-hu.php
index 196cddc224..e6b58b0dbe 100644
--- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-hu.php
+++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-hu.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Hungarian PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-hy.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-hy.php
index ff2a969501..bb05d2d923 100644
--- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-hy.php
+++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-hy.php
@@ -1,10 +1,11 @@
<?php
+
/**
* Armenian PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
* @author Hrayr Grigoryan <hrayr@bits.am>
*/
-
+
$PHPMAILER_LANG['authenticate'] = 'SMTP -ի սխալ: չհաջողվեց ստուգել իսկությունը.';
$PHPMAILER_LANG['connect_host'] = 'SMTP -ի սխալ: չհաջողվեց կապ հաստատել SMTP սերվերի հետ.';
$PHPMAILER_LANG['data_not_accepted'] = 'SMTP -ի սխալ: տվյալները ընդունված չեն.';
diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-id.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-id.php
index ba6ca5faca..212a11f135 100644
--- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-id.php
+++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-id.php
@@ -1,9 +1,11 @@
<?php
+
/**
* Indonesian PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
* @author Cecep Prawiro <cecep.prawiro@gmail.com>
* @author @januridp
+ * @author Ian Mustafa <mail@ianmustafa.com>
*/
$PHPMAILER_LANG['authenticate'] = 'Kesalahan SMTP: Tidak dapat mengotentikasi.';
@@ -11,17 +13,19 @@
$PHPMAILER_LANG['data_not_accepted'] = 'Kesalahan SMTP: Data tidak diterima.';
$PHPMAILER_LANG['empty_message'] = 'Isi pesan kosong';
$PHPMAILER_LANG['encoding'] = 'Pengkodean karakter tidak dikenali: ';
-$PHPMAILER_LANG['execute'] = 'Tidak dapat menjalankan proses : ';
-$PHPMAILER_LANG['file_access'] = 'Tidak dapat mengakses berkas : ';
-$PHPMAILER_LANG['file_open'] = 'Kesalahan File: Berkas tidak dapat dibuka : ';
-$PHPMAILER_LANG['from_failed'] = 'Alamat pengirim berikut mengakibatkan kesalahan : ';
-$PHPMAILER_LANG['instantiate'] = 'Tidak dapat menginisialisasi fungsi surel';
-$PHPMAILER_LANG['invalid_address'] = 'Gagal terkirim, alamat surel tidak benar : ';
-$PHPMAILER_LANG['provide_address'] = 'Harus disediakan minimal satu alamat tujuan';
+$PHPMAILER_LANG['execute'] = 'Tidak dapat menjalankan proses: ';
+$PHPMAILER_LANG['file_access'] = 'Tidak dapat mengakses berkas: ';
+$PHPMAILER_LANG['file_open'] = 'Kesalahan Berkas: Berkas tidak dapat dibuka: ';
+$PHPMAILER_LANG['from_failed'] = 'Alamat pengirim berikut mengakibatkan kesalahan: ';
+$PHPMAILER_LANG['instantiate'] = 'Tidak dapat menginisialisasi fungsi surel.';
+$PHPMAILER_LANG['invalid_address'] = 'Gagal terkirim, alamat surel tidak sesuai: ';
+$PHPMAILER_LANG['invalid_hostentry'] = 'Gagal terkirim, entri host tidak sesuai: ';
+$PHPMAILER_LANG['invalid_host'] = 'Gagal terkirim, host tidak sesuai: ';
+$PHPMAILER_LANG['provide_address'] = 'Harus tersedia minimal satu alamat tujuan';
$PHPMAILER_LANG['mailer_not_supported'] = ' mailer tidak didukung';
-$PHPMAILER_LANG['recipients_failed'] = 'Kesalahan SMTP: Alamat tujuan berikut menghasilkan kesalahan : ';
-$PHPMAILER_LANG['signing'] = 'Kesalahan dalam tanda tangan : ';
+$PHPMAILER_LANG['recipients_failed'] = 'Kesalahan SMTP: Alamat tujuan berikut menyebabkan kesalahan: ';
+$PHPMAILER_LANG['signing'] = 'Kesalahan dalam penandatangan SSL: ';
$PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP Connect() gagal.';
-$PHPMAILER_LANG['smtp_error'] = 'Kesalahan pada pelayan SMTP : ';
-$PHPMAILER_LANG['variable_set'] = 'Tidak dapat mengatur atau mengatur ulang variable : ';
-$PHPMAILER_LANG['extension_missing'] = 'Ekstensi hilang: ';
+$PHPMAILER_LANG['smtp_error'] = 'Kesalahan pada pelayan SMTP: ';
+$PHPMAILER_LANG['variable_set'] = 'Tidak dapat mengatur atau mengatur ulang variabel: ';
+$PHPMAILER_LANG['extension_missing'] = 'Ekstensi PHP tidak tersedia: ';
diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-it.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-it.php
index e67b6f72c6..08a6b73331 100644
--- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-it.php
+++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-it.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Italian PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-ja.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-ja.php
index 2d778728d7..eee7989881 100644
--- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-ja.php
+++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-ja.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Japanese PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-ka.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-ka.php
index dd1af8abec..51fe403b40 100644
--- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-ka.php
+++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-ka.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Georgian PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-ko.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-ko.php
index 9599fa6819..8c97dd947c 100644
--- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-ko.php
+++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-ko.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Korean PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-lt.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-lt.php
index 1253a4fdb4..4f115b1c58 100644
--- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-lt.php
+++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-lt.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Lithuanian PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-lv.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-lv.php
index 39bf9a19e2..679b18cf9f 100644
--- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-lv.php
+++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-lv.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Latvian PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-mg.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-mg.php
index f4c7563030..8a94f6a044 100644
--- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-mg.php
+++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-mg.php
@@ -1,9 +1,11 @@
<?php
+
/**
* Malagasy PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
* @author Hackinet <piyushjha8164@gmail.com>
*/
+
$PHPMAILER_LANG['authenticate'] = 'Hadisoana SMTP: Tsy nahomby ny fanamarinana.';
$PHPMAILER_LANG['connect_host'] = 'SMTP Error: Tsy afaka mampifandray amin\'ny mpampiantrano SMTP.';
$PHPMAILER_LANG['data_not_accepted'] = 'SMTP diso: tsy voarakitra ny angona.';
diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-ms.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-ms.php
index f12a6ad486..71db338343 100644
--- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-ms.php
+++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-ms.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Malaysian PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-nb.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-nb.php
index 97403e73ca..65793ce2b9 100644
--- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-nb.php
+++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-nb.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Norwegian Bokmål PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-nl.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-nl.php
index f4d0e7cd3b..bf41ade8fa 100644
--- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-nl.php
+++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-nl.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Dutch PHPMailer language file: refer to PHPMailer.php for definitive list.
* @package PHPMailer
diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-pl.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-pl.php
index 3da0dee91f..23caa71bee 100644
--- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-pl.php
+++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-pl.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Polish PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
@@ -14,7 +15,7 @@
$PHPMAILER_LANG['file_open'] = 'Nie można otworzyć pliku: ';
$PHPMAILER_LANG['from_failed'] = 'Następujący adres Nadawcy jest nieprawidłowy: ';
$PHPMAILER_LANG['instantiate'] = 'Nie można wywołać funkcji mail(). Sprawdź konfigurację serwera.';
-$PHPMAILER_LANG['invalid_address'] = 'Nie można wysłać wiadomości, '.
+$PHPMAILER_LANG['invalid_address'] = 'Nie można wysłać wiadomości, ' .
'następujący adres Odbiorcy jest nieprawidłowy: ';
$PHPMAILER_LANG['provide_address'] = 'Należy podać prawidłowy adres email Odbiorcy.';
$PHPMAILER_LANG['mailer_not_supported'] = 'Wybrana metoda wysyłki wiadomości nie jest obsługiwana.';
diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-pt.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-pt.php
index f365d5d0b4..f1ce946e72 100644
--- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-pt.php
+++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-pt.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Portuguese (European) PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-pt_br.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-pt_br.php
index 62d692d426..d8638098ce 100644
--- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-pt_br.php
+++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-pt_br.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Brazilian Portuguese PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-ro.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-ro.php
index fa100eaa20..292ec1e48f 100644
--- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-ro.php
+++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-ro.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Romanian PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-ru.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-ru.php
index 720e9a116d..8c8c5e8177 100644
--- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-ru.php
+++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-ru.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Russian PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-sk.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-sk.php
index 69cfb0fc1d..a1cfb2889a 100644
--- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-sk.php
+++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-sk.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Slovak PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-sl.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-sl.php
index 1e3cb7fa9b..c437a88622 100644
--- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-sl.php
+++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-sl.php
@@ -1,9 +1,11 @@
<?php
+
/**
* Slovene PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
* @author Klemen Tušar <techouse@gmail.com>
* @author Filip Š <projects@filips.si>
+ * @author Blaž Oražem <blaz@orazem.si>
*/
$PHPMAILER_LANG['authenticate'] = 'SMTP napaka: Avtentikacija ni uspela.';
@@ -17,8 +19,10 @@
$PHPMAILER_LANG['from_failed'] = 'Neveljaven e-naslov pošiljatelja: ';
$PHPMAILER_LANG['instantiate'] = 'Ne morem inicializirati mail funkcije.';
$PHPMAILER_LANG['invalid_address'] = 'E-poštno sporočilo ni bilo poslano. E-naslov je neveljaven: ';
+$PHPMAILER_LANG['invalid_hostentry'] = 'Neveljaven vnos gostitelja: ';
+$PHPMAILER_LANG['invalid_host'] = 'Neveljaven gostitelj: ';
$PHPMAILER_LANG['mailer_not_supported'] = ' mailer ni podprt.';
-$PHPMAILER_LANG['provide_address'] = 'Prosim vnesite vsaj enega naslovnika.';
+$PHPMAILER_LANG['provide_address'] = 'Prosimo, vnesite vsaj enega naslovnika.';
$PHPMAILER_LANG['recipients_failed'] = 'SMTP napaka: Sledeči naslovniki so neveljavni: ';
$PHPMAILER_LANG['signing'] = 'Napaka pri podpisovanju: ';
$PHPMAILER_LANG['smtp_connect_failed'] = 'Ne morem vzpostaviti povezave s SMTP strežnikom.';
diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-sr.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-sr.php
index 34c1e182a0..0b5280f75e 100644
--- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-sr.php
+++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-sr.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Serbian PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-sv.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-sv.php
index c78237e7c4..9872c19219 100644
--- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-sv.php
+++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-sv.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Swedish PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-tl.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-tl.php
index ed51d4c601..d15bed1c83 100644
--- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-tl.php
+++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-tl.php
@@ -1,27 +1,28 @@
<?php
+
/**
* Tagalog PHPMailer language file: refer to English translation for definitive list
*
* @package PHPMailer
- * @author Adriane Justine Tan <adrianetan12@gmail.com>
+ * @author Adriane Justine Tan <eidoriantan@gmail.com>
*/
-
+
$PHPMAILER_LANG['authenticate'] = 'SMTP Error: Hindi mapatotohanan.';
$PHPMAILER_LANG['connect_host'] = 'SMTP Error: Hindi makakonekta sa SMTP host.';
-$PHPMAILER_LANG['data_not_accepted'] = 'SMTP Error: Ang datos ay hindi maaaring matatanggap.';
+$PHPMAILER_LANG['data_not_accepted'] = 'SMTP Error: Ang datos ay hindi naitanggap.';
$PHPMAILER_LANG['empty_message'] = 'Walang laman ang mensahe';
$PHPMAILER_LANG['encoding'] = 'Hindi alam ang encoding: ';
$PHPMAILER_LANG['execute'] = 'Hindi maisasagawa: ';
$PHPMAILER_LANG['file_access'] = 'Hindi ma-access ang file: ';
-$PHPMAILER_LANG['file_open'] = 'Hindi mabuksan ang file: ';
+$PHPMAILER_LANG['file_open'] = 'File Error: Hindi mabuksan ang file: ';
$PHPMAILER_LANG['from_failed'] = 'Ang sumusunod na address ay nabigo: ';
-$PHPMAILER_LANG['instantiate'] = 'Hindi maaaring magbigay ng institusyon ang mail';
+$PHPMAILER_LANG['instantiate'] = 'Hindi maisimulan ang instance ng mail function.';
$PHPMAILER_LANG['invalid_address'] = 'Hindi wasto ang address na naibigay: ';
-$PHPMAILER_LANG['mailer_not_supported'] = 'Ang mailer ay hindi suportado';
-$PHPMAILER_LANG['provide_address'] = 'Kailangan mong magbigay ng kahit isang email address na tatanggap';
+$PHPMAILER_LANG['mailer_not_supported'] = 'Ang mailer ay hindi suportado.';
+$PHPMAILER_LANG['provide_address'] = 'Kailangan mong magbigay ng kahit isang email address na tatanggap.';
$PHPMAILER_LANG['recipients_failed'] = 'SMTP Error: Ang mga sumusunod na tatanggap ay nabigo: ';
-$PHPMAILER_LANG['signing'] = 'Hindi ma-sign';
-$PHPMAILER_LANG['smtp_connect_failed'] = 'Ang SMTP connect() ay nabigo';
-$PHPMAILER_LANG['smtp_error'] = 'Ang server ng SMTP ay nabigo';
-$PHPMAILER_LANG['variable_set'] = 'Hindi matatakda ang mga variables: ';
-$PHPMAILER_LANG['extension_missing'] = 'Nawawala ang extension';
+$PHPMAILER_LANG['signing'] = 'Hindi ma-sign: ';
+$PHPMAILER_LANG['smtp_connect_failed'] = 'Ang SMTP connect() ay nabigo.';
+$PHPMAILER_LANG['smtp_error'] = 'Ang server ng SMTP ay nabigo: ';
+$PHPMAILER_LANG['variable_set'] = 'Hindi matatakda o ma-reset ang mga variables: ';
+$PHPMAILER_LANG['extension_missing'] = 'Nawawala ang extension: ';
diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-tr.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-tr.php
index cfe8eaae24..f938f8020e 100644
--- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-tr.php
+++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-tr.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Turkish PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-uk.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-uk.php
index fcd77ade9c..9fa60cf190 100644
--- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-uk.php
+++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-uk.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Ukrainian PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-vi.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-vi.php
index c60dadebdb..d65576e2d4 100644
--- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-vi.php
+++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-vi.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Vietnamese (Tiếng Việt) PHPMailer language file: refer to English translation for definitive list.
* @package PHPMailer
diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-zh.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-zh.php
index 3e9e358ceb..35e4e7000e 100644
--- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-zh.php
+++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-zh.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Traditional Chinese PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-zh_cn.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-zh_cn.php
index 37537802aa..728a4994c5 100644
--- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-zh_cn.php
+++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-zh_cn.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Simplified Chinese PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/vendor/phpmailer/phpmailer/src/Exception.php b/vendor/phpmailer/phpmailer/src/Exception.php
index b1e552f50b..a50a8991f7 100644
--- a/vendor/phpmailer/phpmailer/src/Exception.php
+++ b/vendor/phpmailer/phpmailer/src/Exception.php
@@ -1,4 +1,5 @@
<?php
+
/**
* PHPMailer Exception class.
* PHP Version 5.5.
@@ -9,7 +10,7 @@
* @author Jim Jagielski (jimjag) <jimjag@gmail.com>
* @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
* @author Brent R. Matzelle (original founder)
- * @copyright 2012 - 2017 Marcus Bointon
+ * @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
diff --git a/vendor/phpmailer/phpmailer/src/OAuth.php b/vendor/phpmailer/phpmailer/src/OAuth.php
index 0271963cee..07fde4c815 100644
--- a/vendor/phpmailer/phpmailer/src/OAuth.php
+++ b/vendor/phpmailer/phpmailer/src/OAuth.php
@@ -1,4 +1,5 @@
<?php
+
/**
* PHPMailer - PHP email creation and transport class.
* PHP Version 5.5.
@@ -9,7 +10,7 @@
* @author Jim Jagielski (jimjag) <jimjag@gmail.com>
* @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
* @author Brent R. Matzelle (original founder)
- * @copyright 2012 - 2015 Marcus Bointon
+ * @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
diff --git a/vendor/phpmailer/phpmailer/src/PHPMailer.php b/vendor/phpmailer/phpmailer/src/PHPMailer.php
index 2d4156f4e8..c8fc1a8243 100644
--- a/vendor/phpmailer/phpmailer/src/PHPMailer.php
+++ b/vendor/phpmailer/phpmailer/src/PHPMailer.php
@@ -1,4 +1,5 @@
<?php
+
/**
* PHPMailer - PHP email creation and transport class.
* PHP Version 5.5.
@@ -9,7 +10,7 @@
* @author Jim Jagielski (jimjag) <jimjag@gmail.com>
* @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
* @author Brent R. Matzelle (original founder)
- * @copyright 2012 - 2019 Marcus Bointon
+ * @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
@@ -388,11 +389,11 @@ class PHPMailer
* SMTP class debug output mode.
* Debug output level.
* Options:
- * * SMTP::DEBUG_OFF: No output
- * * SMTP::DEBUG_CLIENT: Client messages
- * * SMTP::DEBUG_SERVER: Client and server messages
- * * SMTP::DEBUG_CONNECTION: As SERVER plus connection status
- * * SMTP::DEBUG_LOWLEVEL: Noisy, low-level data output, rarely needed
+ * @see SMTP::DEBUG_OFF: No output
+ * @see SMTP::DEBUG_CLIENT: Client messages
+ * @see SMTP::DEBUG_SERVER: Client and server messages
+ * @see SMTP::DEBUG_CONNECTION: As SERVER plus connection status
+ * @see SMTP::DEBUG_LOWLEVEL: Noisy, low-level data output, rarely needed
*
* @see SMTP::$do_debug
*
@@ -747,7 +748,7 @@ class PHPMailer
*
* @var string
*/
- const VERSION = '6.1.7';
+ const VERSION = '6.2.0';
/**
* Error severity: message only, continue processing.
@@ -899,6 +900,7 @@ protected function edebug($str)
switch ($this->Debugoutput) {
case 'error_log':
//Don't output, just log
+ /** @noinspection ForgottenDebugOutputInspection */
error_log($str);
break;
case 'html':
@@ -1184,9 +1186,11 @@ public static function parseAddresses($addrstr, $useimap = true)
//Use this built-in parser if it's available
$list = imap_rfc822_parse_adrlist($addrstr, '');
foreach ($list as $address) {
- if (('.SYNTAX-ERROR.' !== $address->host) && static::validateAddress(
- $address->mailbox . '@' . $address->host
- )) {
+ if (
+ ('.SYNTAX-ERROR.' !== $address->host) && static::validateAddress(
+ $address->mailbox . '@' . $address->host
+ )
+ ) {
$addresses[] = [
'name' => (property_exists($address, 'personal') ? $address->personal : ''),
'address' => $address->mailbox . '@' . $address->host,
@@ -1240,7 +1244,8 @@ public function setFrom($address, $name = '', $auto = true)
$name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
// Don't validate now addresses with IDN. Will be done in send().
$pos = strrpos($address, '@');
- if ((false === $pos)
+ if (
+ (false === $pos)
|| ((!$this->has8bitChars(substr($address, ++$pos)) || !static::idnSupported())
&& !static::validateAddress($address))
) {
@@ -1350,7 +1355,7 @@ public static function validateAddress($address, $patternselect = null)
/*
* This is the pattern used in the HTML5 spec for validation of 'email' type form input elements.
*
- * @see http://www.whatwg.org/specs/web-apps/current-work/#e-mail-state-(type=email)
+ * @see https://html.spec.whatwg.org/#e-mail-state-(type=email)
*/
return (bool) preg_match(
'/^[a-zA-Z0-9.!#$%&\'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}' .
@@ -1392,7 +1397,8 @@ public function punyencodeAddress($address)
{
// Verify we have required functions, CharSet, and at-sign.
$pos = strrpos($address, '@');
- if (!empty($this->CharSet) &&
+ if (
+ !empty($this->CharSet) &&
false !== $pos &&
static::idnSupported()
) {
@@ -1454,8 +1460,9 @@ public function send()
*/
public function preSend()
{
- if ('smtp' === $this->Mailer
- || ('mail' === $this->Mailer && stripos(PHP_OS, 'WIN') === 0)
+ if (
+ 'smtp' === $this->Mailer
+ || ('mail' === $this->Mailer && (PHP_VERSION_ID >= 80000 || stripos(PHP_OS, 'WIN') === 0))
) {
//SMTP mandates RFC-compliant line endings
//and it's also used with mail() on Windows
@@ -1465,7 +1472,8 @@ public function preSend()
static::setLE(PHP_EOL);
}
//Check for buggy PHP versions that add a header with an incorrect line break
- if ('mail' === $this->Mailer
+ if (
+ 'mail' === $this->Mailer
&& ((PHP_VERSION_ID >= 70000 && PHP_VERSION_ID < 70017)
|| (PHP_VERSION_ID >= 70100 && PHP_VERSION_ID < 70103))
&& ini_get('mail.add_x_header') === '1'
@@ -1552,7 +1560,8 @@ public function preSend()
}
// Sign with DKIM if enabled
- if (!empty($this->DKIM_domain)
+ if (
+ !empty($this->DKIM_domain)
&& !empty($this->DKIM_selector)
&& (!empty($this->DKIM_private_string)
|| (!empty($this->DKIM_private)
@@ -1609,6 +1618,9 @@ public function postSend()
return $this->mailSend($this->MIMEHeader, $this->MIMEBody);
}
} catch (Exception $exc) {
+ if ($this->Mailer === 'smtp' && $this->SMTPKeepAlive == true) {
+ $this->smtp->reset();
+ }
$this->setError($exc->getMessage());
$this->edebug($exc->getMessage());
if ($this->exceptions) {
@@ -1713,7 +1725,8 @@ protected function sendmailSend($header, $body)
protected static function isShellSafe($string)
{
// Future-proof
- if (escapeshellcmd($string) !== $string
+ if (
+ escapeshellcmd($string) !== $string
|| !in_array(escapeshellarg($string), ["'$string'", "\"$string\""])
) {
return false;
@@ -1749,6 +1762,23 @@ protected static function isPermittedPath($path)
return !preg_match('#^[a-z]+://#i', $path);
}
+ /**
+ * Check whether a file path is safe, accessible, and readable.
+ *
+ * @param string $path A relative or absolute path to a file
+ *
+ * @return bool
+ */
+ protected static function fileIsAccessible($path)
+ {
+ $readable = file_exists($path);
+ //If not a UNC path (expected to start with \\), check read permission, see #2069
+ if (strpos($path, '\\\\') !== 0) {
+ $readable = $readable && is_readable($path);
+ }
+ return static::isPermittedPath($path) && $readable;
+ }
+
/**
* Send mail using the PHP mail() function.
*
@@ -1880,7 +1910,7 @@ protected function smtpSend($header, $body)
$isSent = true;
}
- $callbacks[] = ['issent'=>$isSent, 'to'=>$to[0]];
+ $callbacks[] = ['issent' => $isSent, 'to' => $to[0]];
}
}
@@ -1960,11 +1990,13 @@ public function smtpConnect($options = null)
foreach ($hosts as $hostentry) {
$hostinfo = [];
- if (!preg_match(
- '/^(?:(ssl|tls):\/\/)?(.+?)(?::(\d+))?$/',
- trim($hostentry),
- $hostinfo
- )) {
+ if (
+ !preg_match(
+ '/^(?:(ssl|tls):\/\/)?(.+?)(?::(\d+))?$/',
+ trim($hostentry),
+ $hostinfo
+ )
+ ) {
$this->edebug($this->lang('invalid_hostentry') . ' ' . trim($hostentry));
// Not a valid host entry
continue;
@@ -2002,7 +2034,12 @@ public function smtpConnect($options = null)
}
$host = $hostinfo[2];
$port = $this->Port;
- if (array_key_exists(3, $hostinfo) && is_numeric($hostinfo[3]) && $hostinfo[3] > 0 && $hostinfo[3] < 65536) {
+ if (
+ array_key_exists(3, $hostinfo) &&
+ is_numeric($hostinfo[3]) &&
+ $hostinfo[3] > 0 &&
+ $hostinfo[3] < 65536
+ ) {
$port = (int) $hostinfo[3];
}
if ($this->smtp->connect($prefix . $host, $port, $this->Timeout, $options)) {
@@ -2028,12 +2065,14 @@ public function smtpConnect($options = null)
// We must resend EHLO after TLS negotiation
$this->smtp->hello($hello);
}
- if ($this->SMTPAuth && !$this->smtp->authenticate(
- $this->Username,
- $this->Password,
- $this->AuthType,
- $this->oauth
- )) {
+ if (
+ $this->SMTPAuth && !$this->smtp->authenticate(
+ $this->Username,
+ $this->Password,
+ $this->AuthType,
+ $this->oauth
+ )
+ ) {
throw new Exception($this->lang('authenticate'));
}
@@ -2091,7 +2130,7 @@ public function setLanguage($langcode = 'en', $lang_path = '')
'am' => 'hy',
];
- if (isset($renamed_langcodes[$langcode])) {
+ if (array_key_exists($langcode, $renamed_langcodes)) {
$langcode = $renamed_langcodes[$langcode];
}
@@ -2132,7 +2171,7 @@ public function setLanguage($langcode = 'en', $lang_path = '')
// There is no English translation file
if ('en' !== $langcode) {
// Make sure language file path is readable
- if (!static::isPermittedPath($lang_file) || !file_exists($lang_file)) {
+ if (!static::fileIsAccessible($lang_file)) {
$foundlang = false;
} else {
// Overwrite language-specific strings.
@@ -2380,21 +2419,18 @@ public function createHeader()
$result .= $this->headerLine('Date', '' === $this->MessageDate ? self::rfcDate() : $this->MessageDate);
- // To be created automatically by mail()
- if ($this->SingleTo) {
- if ('mail' !== $this->Mailer) {
+ // The To header is created automatically by mail(), so needs to be omitted here
+ if ('mail' !== $this->Mailer) {
+ if ($this->SingleTo) {
foreach ($this->to as $toaddr) {
$this->SingleToArray[] = $this->addrFormat($toaddr);
}
- }
- } elseif (count($this->to) > 0) {
- if ('mail' !== $this->Mailer) {
+ } elseif (count($this->to) > 0) {
$result .= $this->addrAppend('To', $this->to);
+ } elseif (count($this->cc) === 0) {
+ $result .= $this->headerLine('To', 'undisclosed-recipients:;');
}
- } elseif (count($this->cc) === 0) {
- $result .= $this->headerLine('To', 'undisclosed-recipients:;');
}
-
$result .= $this->addrAppend('From', [[trim($this->From), $this->FromName]]);
// sendmail and mail() extract Cc from the header before sending
@@ -2403,7 +2439,8 @@ public function createHeader()
}
// sendmail and mail() extract Bcc from the header before sending
- if ((
+ if (
+ (
'sendmail' === $this->Mailer || 'qmail' === $this->Mailer || 'mail' === $this->Mailer
)
&& count($this->bcc) > 0
@@ -2949,7 +2986,7 @@ public function textLine($value)
* @param string $path Path to the attachment
* @param string $name Overrides the attachment name
* @param string $encoding File encoding (see $Encoding)
- * @param string $type File extension (MIME) type
+ * @param string $type MIME type, e.g. `image/jpeg`; determined automatically from $path if not specified
* @param string $disposition Disposition to use
*
* @throws Exception
@@ -2964,7 +3001,7 @@ public function addAttachment(
$disposition = 'attachment'
) {
try {
- if (!static::isPermittedPath($path) || !@is_file($path) || !is_readable($path)) {
+ if (!static::fileIsAccessible($path)) {
throw new Exception($this->lang('file_access') . $path, self::STOP_CONTINUE);
}
@@ -3138,7 +3175,7 @@ protected function attachAll($disposition_type, $boundary)
protected function encodeFile($path, $encoding = self::ENCODING_BASE64)
{
try {
- if (!static::isPermittedPath($path) || !file_exists($path) || !is_readable($path)) {
+ if (!static::fileIsAccessible($path)) {
throw new Exception($this->lang('file_open') . $path, self::STOP_CONTINUE);
}
$file_buffer = file_get_contents($path);
@@ -3524,7 +3561,7 @@ public function addEmbeddedImage(
$disposition = 'inline'
) {
try {
- if (!static::isPermittedPath($path) || !@is_file($path) || !is_readable($path)) {
+ if (!static::fileIsAccessible($path)) {
throw new Exception($this->lang('file_access') . $path, self::STOP_CONTINUE);
}
@@ -3873,7 +3910,8 @@ protected function serverHostname()
public static function isValidHost($host)
{
//Simple syntax limits
- if (empty($host)
+ if (
+ empty($host)
|| !is_string($host)
|| strlen($host) > 256
|| !preg_match('/^([a-zA-Z\d.-]*|\[[a-fA-F\d:]+])$/', $host)
@@ -4039,7 +4077,8 @@ public function msgHTML($message, $basedir = '', $advanced = false)
);
continue;
}
- if (// Only process relative URLs if a basedir is provided (i.e. no absolute local paths)
+ if (
+ // Only process relative URLs if a basedir is provided (i.e. no absolute local paths)
!empty($basedir)
// Ignore URLs containing parent dir traversal (..)
&& (strpos($url, '..') === false)
@@ -4061,13 +4100,14 @@ public function msgHTML($message, $basedir = '', $advanced = false)
if (strlen($directory) > 1 && '/' !== substr($directory, -1)) {
$directory .= '/';
}
- if ($this->addEmbeddedImage(
- $basedir . $directory . $filename,
- $cid,
- $filename,
- static::ENCODING_BASE64,
- static::_mime_types((string) static::mb_pathinfo($filename, PATHINFO_EXTENSION))
- )
+ if (
+ $this->addEmbeddedImage(
+ $basedir . $directory . $filename,
+ $cid,
+ $filename,
+ static::ENCODING_BASE64,
+ static::_mime_types((string) static::mb_pathinfo($filename, PATHINFO_EXTENSION))
+ )
) {
$message = preg_replace(
'/' . $images[1][$imgindex] . '=["\']' . preg_quote($url, '/') . '["\']/Ui',
@@ -4215,6 +4255,7 @@ public static function _mime_types($ext = '')
'tiff' => 'image/tiff',
'tif' => 'image/tiff',
'webp' => 'image/webp',
+ 'avif' => 'image/avif',
'heif' => 'image/heif',
'heifs' => 'image/heif-sequence',
'heic' => 'image/heic',
@@ -4485,11 +4526,15 @@ public function DKIM_Sign($signHeader)
$privKey = openssl_pkey_get_private($privKeyStr);
}
if (openssl_sign($signHeader, $signature, $privKey, 'sha256WithRSAEncryption')) {
- openssl_pkey_free($privKey);
+ if (PHP_MAJOR_VERSION < 8) {
+ openssl_pkey_free($privKey);
+ }
return base64_encode($signature);
}
- openssl_pkey_free($privKey);
+ if (PHP_MAJOR_VERSION < 8) {
+ openssl_pkey_free($privKey);
+ }
return '';
}
diff --git a/vendor/phpmailer/phpmailer/src/POP3.php b/vendor/phpmailer/phpmailer/src/POP3.php
index 9a3b07ccab..235e6372d2 100644
--- a/vendor/phpmailer/phpmailer/src/POP3.php
+++ b/vendor/phpmailer/phpmailer/src/POP3.php
@@ -1,4 +1,5 @@
<?php
+
/**
* PHPMailer POP-Before-SMTP Authentication Class.
* PHP Version 5.5.
@@ -9,7 +10,7 @@
* @author Jim Jagielski (jimjag) <jimjag@gmail.com>
* @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
* @author Brent R. Matzelle (original founder)
- * @copyright 2012 - 2019 Marcus Bointon
+ * @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
@@ -45,7 +46,7 @@ class POP3
*
* @var string
*/
- const VERSION = '6.1.7';
+ const VERSION = '6.2.0';
/**
* Default POP3 port number.
@@ -62,12 +63,16 @@ class POP3
const DEFAULT_TIMEOUT = 30;
/**
- * Debug display level.
- * Options: 0 = no, 1+ = yes.
+ * POP3 class debug output mode.
+ * Debug output level.
+ * Options:
+ * @see POP3::DEBUG_OFF: No output
+ * @see POP3::DEBUG_SERVER: Server messages, connection/server errors
+ * @see POP3::DEBUG_CLIENT: Client and Server messages, connection/server errors
*
* @var int
*/
- public $do_debug = 0;
+ public $do_debug = self::DEBUG_OFF;
/**
* POP3 mail server hostname.
@@ -130,6 +135,28 @@ class POP3
*/
const LE = "\r\n";
+ /**
+ * Debug level for no output.
+ *
+ * @var int
+ */
+ const DEBUG_OFF = 0;
+
+ /**
+ * Debug level to show server -> client messages
+ * also shows clients connection errors or errors from server
+ *
+ * @var int
+ */
+ const DEBUG_SERVER = 1;
+
+ /**
+ * Debug level to show client -> server and server -> client messages.
+ *
+ * @var int
+ */
+ const DEBUG_CLIENT = 2;
+
/**
* Simple static wrapper for all-in-one POP before SMTP.
*
@@ -329,7 +356,7 @@ public function disconnect()
protected function getResponse($size = 128)
{
$response = fgets($this->pop_conn, $size);
- if ($this->do_debug >= 1) {
+ if ($this->do_debug >= self::DEBUG_SERVER) {
echo 'Server -> Client: ', $response;
}
@@ -346,7 +373,7 @@ protected function getResponse($size = 128)
protected function sendString($string)
{
if ($this->pop_conn) {
- if ($this->do_debug >= 2) { //Show client messages when debug >= 2
+ if ($this->do_debug >= self::DEBUG_CLIENT) { //Show client messages when debug >= 2
echo 'Client -> Server: ', $string;
}
@@ -384,7 +411,7 @@ protected function checkResponse($string)
protected function setError($error)
{
$this->errors[] = $error;
- if ($this->do_debug >= 1) {
+ if ($this->do_debug >= self::DEBUG_SERVER) {
echo '<pre>';
foreach ($this->errors as $e) {
print_r($e);
diff --git a/vendor/phpmailer/phpmailer/src/SMTP.php b/vendor/phpmailer/phpmailer/src/SMTP.php
index 6b0b73ddd9..ab7f46e4c8 100644
--- a/vendor/phpmailer/phpmailer/src/SMTP.php
+++ b/vendor/phpmailer/phpmailer/src/SMTP.php
@@ -1,4 +1,5 @@
<?php
+
/**
* PHPMailer RFC821 SMTP email transport class.
* PHP Version 5.5.
@@ -9,7 +10,7 @@
* @author Jim Jagielski (jimjag) <jimjag@gmail.com>
* @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
* @author Brent R. Matzelle (original founder)
- * @copyright 2012 - 2019 Marcus Bointon
+ * @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
@@ -34,7 +35,7 @@ class SMTP
*
* @var string
*/
- const VERSION = '6.1.7';
+ const VERSION = '6.2.0';
/**
* SMTP line break constant.
@@ -417,8 +418,8 @@ protected function getSMTPConnection($host, $port = null, $timeout = 30, $option
// Windows does not have support for this timeout function
if (strpos(PHP_OS, 'WIN') !== 0) {
$max = (int)ini_get('max_execution_time');
- // Don't bother if unlimited
- if (0 !== $max && $timeout > $max) {
+ // Don't bother if unlimited, or if set_time_limit is disabled
+ if (0 !== $max && $timeout > $max && strpos(ini_get('disable_functions'), 'set_time_limit') === false) {
@set_time_limit($timeout);
}
stream_set_timeout($connection, $timeout, 0);
@@ -539,11 +540,12 @@ public function authenticate(
return false;
}
// Send encoded username and password
- if (!$this->sendCommand(
- 'User & Password',
- base64_encode("\0" . $username . "\0" . $password),
- 235
- )
+ if (
+ !$this->sendCommand(
+ 'User & Password',
+ base64_encode("\0" . $username . "\0" . $password),
+ 235
+ )
) {
return false;
}
@@ -1086,8 +1088,10 @@ public function client_send($data, $command = '')
{
//If SMTP transcripts are left enabled, or debug output is posted online
//it can leak credentials, so hide credentials in all but lowest level
- if (self::DEBUG_LOWLEVEL > $this->do_debug &&
- in_array($command, ['User & Password', 'Username', 'Password'], true)) {
+ if (
+ self::DEBUG_LOWLEVEL > $this->do_debug &&
+ in_array($command, ['User & Password', 'Username', 'Password'], true)
+ ) {
$this->edebug('CLIENT -> SERVER: [credentials hidden]', self::DEBUG_CLIENT);
} else {
$this->edebug('CLIENT -> SERVER: ' . $data, self::DEBUG_CLIENT);
@@ -1207,7 +1211,8 @@ protected function get_lines()
self::DEBUG_LOWLEVEL
);
- //stream_select returns false when the `select` system call is interrupted by an incoming signal, try the select again
+ //stream_select returns false when the `select` system call is interrupted
+ //by an incoming signal, try the select again
if (stripos($message, 'interrupted system call') !== false) {
$this->edebug(
'SMTP -> get_lines(): retrying stream_select',
diff --git a/web/modules/smtp/composer.json b/web/modules/smtp/composer.json
index c83862c273..d6c1428cce 100644
--- a/web/modules/smtp/composer.json
+++ b/web/modules/smtp/composer.json
@@ -8,8 +8,8 @@
"issues": "https://www.drupal.org/project/issues/smtp"
},
"require": {
- "drupal/core": "^8.7.7 || ^9",
- "phpmailer/phpmailer": "^6.1.5"
+ "drupal/core": "^8.8 || ^9",
+ "phpmailer/phpmailer": "^6.1.7"
},
"extra": {
"branch-alias": {
diff --git a/web/modules/smtp/ludwig.json b/web/modules/smtp/ludwig.json
index b3907de7c8..6a858f9cac 100644
--- a/web/modules/smtp/ludwig.json
+++ b/web/modules/smtp/ludwig.json
@@ -1,8 +1,8 @@
{
"require": {
"phpmailer/phpmailer": {
- "version": "^6.1.5",
- "url": "https://github.com/PHPMailer/PHPMailer/archive/v6.1.5.zip"
+ "version": "^6.1.7",
+ "url": "https://github.com/PHPMailer/PHPMailer/archive/v6.1.7.zip"
}
}
}
diff --git a/web/modules/smtp/smtp.info.yml b/web/modules/smtp/smtp.info.yml
index 3629d899b6..7ddac81337 100644
--- a/web/modules/smtp/smtp.info.yml
+++ b/web/modules/smtp/smtp.info.yml
@@ -2,10 +2,10 @@ name: SMTP Authentication Support
description: "Allow for site emails to be sent through an SMTP server of your choice."
package: Mail
type: module
-core_version_requirement: ^8.7.7 || ^9
+core_version_requirement: ^8.8 || ^9
configure: smtp.config
-# Information added by Drupal.org packaging script on 2020-07-24
-version: '8.x-1.0-rc4'
+# Information added by Drupal.org packaging script on 2020-09-25
+version: '8.x-1.0'
project: 'smtp'
-datestamp: 1595628447
+datestamp: 1601070987
diff --git a/web/modules/smtp/smtp.install b/web/modules/smtp/smtp.install
index 195f4b49f6..0385768ef4 100644
--- a/web/modules/smtp/smtp.install
+++ b/web/modules/smtp/smtp.install
@@ -104,7 +104,7 @@ function smtp_requirements(string $phase) {
return $requirements;
}
else {
- $required_version = '6.1.5';
+ $required_version = '6.1.7';
$installed_version = $mail::VERSION;
$reflector = new \ReflectionClass('\PHPMailer\PHPMailer\PHPMailer');
diff --git a/web/modules/smtp/tests/src/Unit/Plugin/Mail/SMTPMailSystemTest.php b/web/modules/smtp/tests/src/Unit/Plugin/Mail/SMTPMailSystemTest.php
index e767518e97..369e4e253e 100644
--- a/web/modules/smtp/tests/src/Unit/Plugin/Mail/SMTPMailSystemTest.php
+++ b/web/modules/smtp/tests/src/Unit/Plugin/Mail/SMTPMailSystemTest.php
@@ -4,8 +4,6 @@
use Drupal\Component\Utility\EmailValidator;
use Drupal\Component\Utility\EmailValidatorInterface;
-use Drupal\Core\Config\Config;
-use Drupal\Core\Config\ConfigFactoryInterface;
use Drupal\Core\File\FileSystem;
use Drupal\Core\File\MimeType\MimeTypeGuesser;
use Drupal\Core\Logger\LoggerChannelFactoryInterface;
@@ -16,6 +14,7 @@
use Drupal\smtp\Plugin\Mail\SMTPMailSystem;
use Drupal\Tests\UnitTestCase;
use PHPMailer\PHPMailer\PHPMailer;
+use PHPMailer\PHPMailer\Exception as PHPMailerException;
use Prophecy\Argument;
use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -26,16 +25,21 @@
*/
class SMTPMailSystemTest extends UnitTestCase {
- private $emailValidator;
+ /**
+ * The email validator.
+ *
+ * @var \Drupal\Component\Utility\EmailValidatorInterface
+ */
+ protected $emailValidator;
/**
- * Test setup.
+ * {@inheritdoc}
*/
- public function setup() {
- $this->mockConfig = $this->prophesize(Config::class);
- $this->mockConfigFactory = $this->prophesize(ConfigFactoryInterface::class);
- $this->mockConfigFactory->get('smtp.settings')->willReturn($this->mockConfig->reveal());
- $this->mockConfigFactory->getEditable('smtp.settings')->willReturn($this->mockConfig->reveal());
+ protected function setUp() {
+ $this->mockConfigFactory = $this->getConfigFactoryStub([
+ 'smtp.settings' => ['smtp_timeout' => 30],
+ 'system.site' => ['name' => 'Mock site name'],
+ ]);
$this->mockLogger = $this->prophesize(LoggerChannelFactoryInterface::class);
$this->mockLogger->get('smtp')->willReturn($this->prophesize(LoggerChannelInterface::class));
@@ -45,7 +49,7 @@ public function setup() {
$this->mimeTypeGuesser = $this->prophesize(MimeTypeGuesser::class);
$mockContainer = $this->mockContainer = $this->prophesize(ContainerInterface::class);
- $mockContainer->get('config.factory')->willReturn($this->mockConfigFactory->reveal());
+ $mockContainer->get('config.factory')->willReturn($this->mockConfigFactory);
$mockContainer->get('logger.factory')->willReturn($this->mockLogger->reveal());
$mockContainer->get('messenger')->willReturn($this->mockMessenger->reveal());
$mockContainer->get('current_user')->willReturn($this->mockCurrentUser->reveal());
@@ -124,7 +128,7 @@ public function getComponentsProvider() {
* @dataProvider getComponentsProvider
*/
public function testGetComponents($input, $expected) {
- $mailSystem = new SMTPMailSystemTestHelper([], '', [], $this->mockLogger->reveal(), $this->mockMessenger->reveal(), $this->emailValidator, $this->mockConfigFactory->reveal(), $this->mockCurrentUser->reveal(), $this->mockFileSystem->reveal(), $this->mimeTypeGuesser->reveal());
+ $mailSystem = new SMTPMailSystemTestHelper([], '', [], $this->mockLogger->reveal(), $this->mockMessenger->reveal(), $this->emailValidator, $this->mockConfigFactory, $this->mockCurrentUser->reveal(), $this->mockFileSystem->reveal(), $this->mimeTypeGuesser->reveal());
$ret = $mailSystem->publiGetComponents($input);
@@ -156,19 +160,19 @@ public function mailValidatorProvider() {
'testmüller@drupal.org',
'PhpUnit Localhost <phpunit@localhost.com>',
$emailValidatorPhpMailerDefault,
- \PHPMailer\PHPMailer\Exception::class,
+ PHPMailerException::class,
],
'With umlauts in domain part, PHPMailer default validator, exception' => [
'test@müllertest.de',
'PhpUnit Localhost <phpunit@localhost.com>',
$emailValidatorPhpMailerDefault,
- \PHPMailer\PHPMailer\Exception::class,
+ PHPMailerException::class,
],
'Without top-level domain in domain part, PHPMailer default validator, exception' => [
'test@drupal',
'PhpUnit Localhost <phpunit@localhost.com>',
$emailValidatorPhpMailerDefault,
- \PHPMailer\PHPMailer\Exception::class,
+ PHPMailerException::class,
],
'Without umlauts, Drupal mail validator, no exception' => [
'test@drupal.org',
@@ -197,7 +201,6 @@ public function mailValidatorProvider() {
];
}
-
/**
* Test mail() with focus on the mail validator.
*
@@ -206,16 +209,18 @@ public function mailValidatorProvider() {
public function testMailValidator(string $to, string $from, EmailValidatorInterface $validator, $exception) {
$this->emailValidator = $validator;
- $mailSystem = new SMTPMailSystemTestHelper([],
+ $mailSystem = new SMTPMailSystemTestHelper(
+ [],
'',
[],
$this->mockLogger->reveal(),
$this->mockMessenger->reveal(),
$validator,
- $this->mockConfigFactory->reveal(),
+ $this->mockConfigFactory,
$this->mockCurrentUser->reveal(),
$this->mockFileSystem->reveal(),
- $this->mimeTypeGuesser->reveal());
+ $this->mimeTypeGuesser->reveal()
+ );
$message = [
'to' => $to,
'from' => $from,
@@ -229,11 +234,11 @@ public function testMailValidator(string $to, string $from, EmailValidatorInterf
if (isset($exception)) {
$this->expectException($exception);
}
- // Call function
+ // Call function.
$result = $mailSystem->mail($message);
// More important than the result is that no exception was thrown, if
- // $exception is unset
+ // $exception is unset.
self::assertTrue($result);
}
@@ -254,18 +259,23 @@ public function publiGetComponents($input) {
/**
* Dummy of smtpMailerSend.
*/
- function smtpMailerSend($mailerArr) {
- return true;
+ public function smtpMailerSend($mailerArr) {
+ return TRUE;
}
}
/**
- * Test helper email validator implementation for default behaviour of PHPMailer.php
+ * An adaptor class wrapping the default PHPMailer validator.
*/
class EmailValidatorPhpMailerDefault implements EmailValidatorInterface {
- // This function validates in same way the PHPMailer class does in its default behaviour.
+ /**
+ * {@inheritdoc}
+ *
+ * This function validates in same way the PHPMailer class does in its
+ * default behavior.
+ */
public function isValid($email) {
PHPMailer::$validator = 'php';
return PHPMailer::validateAddress($email);
--
GitLab