diff --git a/web/lib/PHPMailer/README.md b/web/lib/PHPMailer/README.md index 53e66f1149..878274f48e 100644 --- a/web/lib/PHPMailer/README.md +++ b/web/lib/PHPMailer/README.md @@ -47,7 +47,7 @@ This software is distributed under the [LGPL 2.1](http://www.gnu.org/licenses/lg PHPMailer is available on [Packagist](https://packagist.org/packages/phpmailer/phpmailer) (using semantic versioning), and installation via [Composer](https://getcomposer.org) is the recommended way to install PHPMailer. Just add this line to your `composer.json` file: ```json -"phpmailer/phpmailer": "^6.8.0" +"phpmailer/phpmailer": "^6.8.1" ``` or run @@ -150,7 +150,7 @@ PHPMailer defaults to English, but in the [language](https://github.com/PHPMaile $mail->setLanguage('fr', '/optional/path/to/language/directory/'); ``` -We welcome corrections and new languages – if you're looking for corrections, run the [PHPMailerLangTest.php](https://github.com/PHPMailer/PHPMailer/tree/master/test/PHPMailerLangTest.php) script in the tests folder and it will show any missing translations. +We welcome corrections and new languages – if you're looking for corrections, run the [Language/TranslationCompletenessTest.php](https://github.com/PHPMailer/PHPMailer/blob/master/test/Language/TranslationCompletenessTest.php) script in the tests folder and it will show any missing translations. ## Documentation Start reading at the [GitHub wiki](https://github.com/PHPMailer/PHPMailer/wiki). If you're having trouble, head for [the troubleshooting guide](https://github.com/PHPMailer/PHPMailer/wiki/Troubleshooting) as it's frequently updated. diff --git a/web/lib/PHPMailer/VERSION b/web/lib/PHPMailer/VERSION index 8a1c5c7e99..23863d3def 100644 --- a/web/lib/PHPMailer/VERSION +++ b/web/lib/PHPMailer/VERSION @@ -1 +1 @@ -6.8.0 \ No newline at end of file +6.8.1 \ No newline at end of file diff --git a/web/lib/PHPMailer/composer.json b/web/lib/PHPMailer/composer.json index 37e3d6e704..2fd2f4c207 100644 --- a/web/lib/PHPMailer/composer.json +++ b/web/lib/PHPMailer/composer.json @@ -37,13 +37,13 @@ "ext-hash": "*" }, "require-dev": { - "dealerdirect/phpcodesniffer-composer-installer": "^0.7.2", + "dealerdirect/phpcodesniffer-composer-installer": "^1.0", "doctrine/annotations": "^1.2.6 || ^1.13.3", "php-parallel-lint/php-console-highlighter": "^1.0.0", "php-parallel-lint/php-parallel-lint": "^1.3.2", "phpcompatibility/php-compatibility": "^9.3.5", "roave/security-advisories": "dev-latest", - "squizlabs/php_codesniffer": "^3.7.1", + "squizlabs/php_codesniffer": "^3.7.2", "yoast/phpunit-polyfills": "^1.0.4" }, "suggest": { diff --git a/web/lib/PHPMailer/language/phpmailer.lang-fi.php b/web/lib/PHPMailer/language/phpmailer.lang-fi.php index 243c05489e..6d1e637390 100644 --- a/web/lib/PHPMailer/language/phpmailer.lang-fi.php +++ b/web/lib/PHPMailer/language/phpmailer.lang-fi.php @@ -20,7 +20,6 @@ $PHPMAILER_LANG['mailer_not_supported'] = 'postivälitintyyppiä ei tueta.'; $PHPMAILER_LANG['provide_address'] = 'Aseta vähintään yksi vastaanottajan sähköpostiosoite.'; $PHPMAILER_LANG['recipients_failed'] = 'SMTP-virhe: seuraava vastaanottaja osoite on virheellinen.'; -$PHPMAILER_LANG['encoding'] = 'Tuntematon koodaustyyppi: '; //$PHPMAILER_LANG['signing'] = 'Signing Error: '; //$PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP Connect() failed.'; //$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: '; diff --git a/web/lib/PHPMailer/language/phpmailer.lang-fr.php b/web/lib/PHPMailer/language/phpmailer.lang-fr.php index 38a7a8e7e5..0d367fcf88 100644 --- a/web/lib/PHPMailer/language/phpmailer.lang-fr.php +++ b/web/lib/PHPMailer/language/phpmailer.lang-fr.php @@ -35,4 +35,3 @@ $PHPMAILER_LANG['smtp_detail'] = 'Détails : '; $PHPMAILER_LANG['smtp_error'] = 'Erreur du serveur SMTP : '; $PHPMAILER_LANG['variable_set'] = 'Impossible d’initialiser ou de réinitialiser une variable : '; -$PHPMAILER_LANG['extension_missing'] = 'Extension manquante : '; diff --git a/web/lib/PHPMailer/language/phpmailer.lang-nb.php b/web/lib/PHPMailer/language/phpmailer.lang-nb.php index 65793ce2b9..c9621a164f 100644 --- a/web/lib/PHPMailer/language/phpmailer.lang-nb.php +++ b/web/lib/PHPMailer/language/phpmailer.lang-nb.php @@ -5,22 +5,29 @@ * @package PHPMailer */ -$PHPMAILER_LANG['authenticate'] = 'SMTP Feil: Kunne ikke autentisere.'; -$PHPMAILER_LANG['connect_host'] = 'SMTP Feil: Kunne ikke koble til SMTP tjener.'; -$PHPMAILER_LANG['data_not_accepted'] = 'SMTP Feil: Datainnhold ikke akseptert.'; -$PHPMAILER_LANG['empty_message'] = 'Meldingsinnhold mangler'; -$PHPMAILER_LANG['encoding'] = 'Ukjent koding: '; -$PHPMAILER_LANG['execute'] = 'Kunne ikke utføre: '; -$PHPMAILER_LANG['file_access'] = 'Får ikke tilgang til filen: '; -$PHPMAILER_LANG['file_open'] = 'Fil Feil: Kunne ikke åpne filen: '; -$PHPMAILER_LANG['from_failed'] = 'Følgende Frå adresse feilet: '; -$PHPMAILER_LANG['instantiate'] = 'Kunne ikke initialisere post funksjon.'; -$PHPMAILER_LANG['invalid_address'] = 'Ugyldig adresse: '; -$PHPMAILER_LANG['mailer_not_supported'] = ' sender er ikke støttet.'; -$PHPMAILER_LANG['provide_address'] = 'Du må opppgi minst en mottakeradresse.'; -$PHPMAILER_LANG['recipients_failed'] = 'SMTP Feil: Følgende mottakeradresse feilet: '; -$PHPMAILER_LANG['signing'] = 'Signering Feil: '; -$PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP connect() feilet.'; -$PHPMAILER_LANG['smtp_error'] = 'SMTP server feil: '; -$PHPMAILER_LANG['variable_set'] = 'Kan ikke skrive eller omskrive variabel: '; -$PHPMAILER_LANG['extension_missing'] = 'Utvidelse mangler: '; + $PHPMAILER_LANG['authenticate'] = 'SMTP-feil: Kunne ikke autentiseres.'; + $PHPMAILER_LANG['buggy_php'] = 'Din versjon av PHP er berørt av en feil som kan føre til ødelagte meldinger. For å løse problemet kan du bytte til SMTP, deaktivere alternativet mail.add_x_header i php.ini, bytte til MacOS eller Linux eller oppgradere PHP til versjon 7.0.17+ eller 7.1.3+.'; + $PHPMAILER_LANG['connect_host'] = 'SMTP-feil: Kunne ikke koble til SMTP-vert.'; + $PHPMAILER_LANG['data_not_accepted'] = 'SMTP-feil: data ikke akseptert.'; + $PHPMAILER_LANG['empty_message'] = 'Meldingstekst mangler'; + $PHPMAILER_LANG['encoding'] = 'Ukjent koding: '; + $PHPMAILER_LANG['execute'] = 'Kunne ikke utføres: '; + $PHPMAILER_LANG['extension_missing'] = 'Utvidelse mangler: '; + $PHPMAILER_LANG['file_access'] = 'Kunne ikke få tilgang til filen: '; + $PHPMAILER_LANG['file_open'] = 'Feil i fil: Kunne ikke åpne filen: '; + $PHPMAILER_LANG['from_failed'] = 'Følgende Fra-adresse mislyktes: '; + $PHPMAILER_LANG['instantiate'] = 'Kunne ikke instansiere e-postfunksjonen.'; + $PHPMAILER_LANG['invalid_address'] = 'Ugyldig adresse: '; + $PHPMAILER_LANG['invalid_header'] = 'Ugyldig headernavn eller verdi'; + $PHPMAILER_LANG['invalid_hostentry'] = 'Ugyldig vertsinngang: '; + $PHPMAILER_LANG['invalid_host'] = 'Ugyldig vert: '; + $PHPMAILER_LANG['mailer_not_supported'] = ' sender er ikke støttet.'; + $PHPMAILER_LANG['provide_address'] = 'Du må oppgi minst én mottaker-e-postadresse.'; + $PHPMAILER_LANG['recipients_failed'] = 'SMTP Feil: Følgende mottakeradresse feilet: '; + $PHPMAILER_LANG['signing'] = 'Signeringsfeil: '; + $PHPMAILER_LANG['smtp_code'] = 'SMTP-kode: '; + $PHPMAILER_LANG['smtp_code_ex'] = 'Ytterligere SMTP-info: '; + $PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP connect() mislyktes.'; + $PHPMAILER_LANG['smtp_detail'] = 'Detaljer: '; + $PHPMAILER_LANG['smtp_error'] = 'SMTP-serverfeil: '; + $PHPMAILER_LANG['variable_set'] = 'Kan ikke angi eller tilbakestille variabel: '; diff --git a/web/lib/PHPMailer/language/phpmailer.lang-si.php b/web/lib/PHPMailer/language/phpmailer.lang-si.php new file mode 100644 index 0000000000..dce502aa02 --- /dev/null +++ b/web/lib/PHPMailer/language/phpmailer.lang-si.php @@ -0,0 +1,34 @@ + + */ + +$PHPMAILER_LANG['authenticate'] = 'SMTP දෝෂය: සත්‍යාපනය අසාර්ථක විය.'; +$PHPMAILER_LANG['buggy_php'] = 'ඔබගේ PHP version එකෙහි පවතින දෝෂයක් නිසා email පණිවිඩ දෝෂ සහගත වීමේ හැකියාවක් ඇත. මෙය විසදීම සදහා SMTP භාවිතා කිරීම, mail.add_x_header INI setting එක අක්‍රීය කිරීම, MacOS හෝ Linux වලට මාරු වීම, හෝ ඔබගේ PHP version එක 7.0.17+ හෝ 7.1.3+ වලට අලුත් කිරීම කරගන්න.'; +$PHPMAILER_LANG['connect_host'] = 'SMTP දෝෂය: සම්බන්ධ වීමට නොහැකි විය.'; +$PHPMAILER_LANG['data_not_accepted'] = 'SMTP දෝෂය: දත්ත පිළිගනු නොලැබේ.'; +$PHPMAILER_LANG['empty_message'] = 'පණිවිඩ අන්තර්ගතය හිස්'; +$PHPMAILER_LANG['encoding'] = 'නොදන්නා කේතනය: '; +$PHPMAILER_LANG['execute'] = 'ක්‍රියාත්මක කළ නොහැකි විය: '; +$PHPMAILER_LANG['extension_missing'] = 'Extension එක නොමැත: '; +$PHPMAILER_LANG['file_access'] = 'File එකට ප්‍රවේශ විය නොහැකි විය: '; +$PHPMAILER_LANG['file_open'] = 'File දෝෂය: File එක විවෘත කළ නොහැක: '; +$PHPMAILER_LANG['from_failed'] = 'පහත From ලිපිනයන් අසාර්ථක විය: '; +$PHPMAILER_LANG['instantiate'] = 'mail function එක ක්‍රියාත්මක කළ නොහැක.'; +$PHPMAILER_LANG['invalid_address'] = 'වලංගු නොවන ලිපිනය: '; +$PHPMAILER_LANG['invalid_header'] = 'වලංගු නොවන header නාමයක් හෝ අගයක්'; +$PHPMAILER_LANG['invalid_hostentry'] = 'වලංගු නොවන hostentry එකක්: '; +$PHPMAILER_LANG['invalid_host'] = 'වලංගු නොවන host එකක්: '; +$PHPMAILER_LANG['mailer_not_supported'] = ' mailer සහාය නොදක්වයි.'; +$PHPMAILER_LANG['provide_address'] = 'ඔබ අවම වශයෙන් එක් ලබන්නෙකුගේ ඊමේල් ලිපිනයක් සැපයිය යුතුය.'; +$PHPMAILER_LANG['recipients_failed'] = 'SMTP දෝෂය: පහත ලබන්නන් අසමත් විය: '; +$PHPMAILER_LANG['signing'] = 'Sign කිරීමේ දෝෂය: '; +$PHPMAILER_LANG['smtp_code'] = 'SMTP කේතය: '; +$PHPMAILER_LANG['smtp_code_ex'] = 'අමතර SMTP තොරතුරු: '; +$PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP සම්බන්ධය අසාර්ථක විය.'; +$PHPMAILER_LANG['smtp_detail'] = 'තොරතුරු: '; +$PHPMAILER_LANG['smtp_error'] = 'SMTP දෝෂය: '; +$PHPMAILER_LANG['variable_set'] = 'Variable එක සැකසීමට හෝ නැවත සැකසීමට නොහැක: '; diff --git a/web/lib/PHPMailer/language/phpmailer.lang-zh_cn.php b/web/lib/PHPMailer/language/phpmailer.lang-zh_cn.php index 728a4994c5..03d491165b 100644 --- a/web/lib/PHPMailer/language/phpmailer.lang-zh_cn.php +++ b/web/lib/PHPMailer/language/phpmailer.lang-zh_cn.php @@ -9,11 +9,13 @@ */ $PHPMAILER_LANG['authenticate'] = 'SMTP 错误：登录失败。'; +$PHPMAILER_LANG['buggy_php'] = '您的 PHP 版本存在漏洞，可能会导致消息损坏。为修复此问题，请切换到使用 SMTP 发送，在您的 php.ini 中禁用 mail.add_x_header 选项。切换到 MacOS 或 Linux，或将您的 PHP 升级到 7.0.17+ 或 7.1.3+ 版本。'; $PHPMAILER_LANG['connect_host'] = 'SMTP 错误：无法连接到 SMTP 主机。'; $PHPMAILER_LANG['data_not_accepted'] = 'SMTP 错误：数据不被接受。'; $PHPMAILER_LANG['empty_message'] = '邮件正文为空。'; $PHPMAILER_LANG['encoding'] = '未知编码：'; $PHPMAILER_LANG['execute'] = '无法执行：'; +$PHPMAILER_LANG['extension_missing'] = '缺少扩展名：'; $PHPMAILER_LANG['file_access'] = '无法访问文件：'; $PHPMAILER_LANG['file_open'] = '文件错误：无法打开文件：'; $PHPMAILER_LANG['from_failed'] = '发送地址错误：'; @@ -22,8 +24,13 @@ $PHPMAILER_LANG['mailer_not_supported'] = '发信客户端不被支持。'; $PHPMAILER_LANG['provide_address'] = '必须提供至少一个收件人地址。'; $PHPMAILER_LANG['recipients_failed'] = 'SMTP 错误：收件人地址错误：'; -$PHPMAILER_LANG['signing'] = '登录失败：'; $PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP服务器连接失败。'; $PHPMAILER_LANG['smtp_error'] = 'SMTP服务器出错：'; $PHPMAILER_LANG['variable_set'] = '无法设置或重置变量：'; -$PHPMAILER_LANG['extension_missing'] = '丢失模块 Extension：'; +$PHPMAILER_LANG['invalid_header'] = '无效的标题名称或值'; +$PHPMAILER_LANG['invalid_hostentry'] = '无效的hostentry： '; +$PHPMAILER_LANG['invalid_host'] = '无效的主机：'; +$PHPMAILER_LANG['signing'] = '签名错误：'; +$PHPMAILER_LANG['smtp_code'] = 'SMTP代码： '; +$PHPMAILER_LANG['smtp_code_ex'] = '附加SMTP信息： '; +$PHPMAILER_LANG['smtp_detail'] = '详情:'; diff --git a/web/lib/PHPMailer/src/DSNConfigurator.php b/web/lib/PHPMailer/src/DSNConfigurator.php index ab707d2b4f..566c9618f5 100644 --- a/web/lib/PHPMailer/src/DSNConfigurator.php +++ b/web/lib/PHPMailer/src/DSNConfigurator.php @@ -80,9 +80,7 @@ private function parseDSN($dsn) $config = $this->parseUrl($dsn); if (false === $config || !isset($config['scheme']) || !isset($config['host'])) { - throw new Exception( - sprintf('Malformed DSN: "%s".', $dsn) - ); + throw new Exception('Malformed DSN'); } if (isset($config['query'])) { diff --git a/web/lib/PHPMailer/src/PHPMailer.php b/web/lib/PHPMailer/src/PHPMailer.php index a644d2cac7..7f56ea2345 100644 --- a/web/lib/PHPMailer/src/PHPMailer.php +++ b/web/lib/PHPMailer/src/PHPMailer.php @@ -750,7 +750,7 @@ class PHPMailer * * @var string */ - const VERSION = '6.8.0'; + const VERSION = '6.8.1'; /** * Error severity: message only, continue processing. @@ -795,7 +795,7 @@ class PHPMailer * The maximum line length supported by mail(). * * Background: mail() will sometimes corrupt messages - * with headers headers longer than 65 chars, see #818. + * with headers longer than 65 chars, see #818. * * @var int */ diff --git a/web/lib/PHPMailer/src/POP3.php b/web/lib/PHPMailer/src/POP3.php index d025689e80..b92a1f2488 100644 --- a/web/lib/PHPMailer/src/POP3.php +++ b/web/lib/PHPMailer/src/POP3.php @@ -46,7 +46,7 @@ class POP3 * * @var string */ - const VERSION = '6.8.0'; + const VERSION = '6.8.1'; /** * Default POP3 port number. diff --git a/web/lib/PHPMailer/src/SMTP.php b/web/lib/PHPMailer/src/SMTP.php index fc4b781a5f..2b63840304 100644 --- a/web/lib/PHPMailer/src/SMTP.php +++ b/web/lib/PHPMailer/src/SMTP.php @@ -35,7 +35,7 @@ class SMTP * * @var string */ - const VERSION = '6.8.0'; + const VERSION = '6.8.1'; /** * SMTP line break constant. @@ -704,7 +704,7 @@ public function close() * Send an SMTP DATA command. * Issues a data command and sends the msg_data to the server, * finalizing the mail transaction. $msg_data is the message - * that is to be send with the headers. Each header needs to be + * that is to be sent with the headers. Each header needs to be * on a single line followed by a with the message headers * and the message body being separated by an additional . * Implements RFC 821: DATA . @@ -732,7 +732,7 @@ public function data($msg_data) $lines = explode("\n", str_replace(["\r\n", "\r"], "\n", $msg_data)); /* To distinguish between a complete RFC822 message and a plain message body, we check if the first field - * of the first line (':' separated) does not contain a space then it _should_ be a header and we will + * of the first line (':' separated) does not contain a space then it _should_ be a header, and we will * process all lines before a blank line as headers. */