From f42de0d01bb3e88fdd40acd2ad78ea71596f0c59 Mon Sep 17 00:00:00 2001 From: Marcus Bointon Date: Tue, 18 Apr 2017 17:47:32 +0200 Subject: [PATCH 1/5] Add issue_template --- issue_template.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 issue_template.md diff --git a/issue_template.md b/issue_template.md new file mode 100644 index 00000000..44350317 --- /dev/null +++ b/issue_template.md @@ -0,0 +1,14 @@ +Please check these things before submitting your issue: + +- [] Make sure you're using the latest version of PHPMailer +- [] Check that your problem is not dealt with in [the troubleshooting guide](https://github.com/PHPMailer/PHPMailer/wiki/Troubleshooting) +- [] Include sufficient code to reproduce your problem +- [] If you're having an SMTP issue, include the debug output generated with `SMTPDebug = 2` set +- [] If you're having problems connecting to gmail or GoDaddy, check the troubleshooting guide +- [] If you have a question about how to use PHPMailer (rather than reporting a bug in it), [tag a question on Stack Overflow with phpmailer](http://stackoverflow.com/questions/tagged/phpmailer), but **search first**! + +# Problem description + +# Code to reproduce + +# Debug output From 4f6255858f58d0889ee7f43668932e36906c1253 Mon Sep 17 00:00:00 2001 From: Fabio Beneditto Date: Sun, 7 May 2017 14:32:26 -0300 Subject: [PATCH 2/5] Update pt_BR translation (#1038) Adjust on strings: correct sender (remetente, not rementente) --- language/phpmailer.lang-pt_br.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/language/phpmailer.lang-pt_br.php b/language/phpmailer.lang-pt_br.php index fecbbe34..4ec10f77 100644 --- a/language/phpmailer.lang-pt_br.php +++ b/language/phpmailer.lang-pt_br.php @@ -5,6 +5,7 @@ * @author Paulo Henrique Garcia * @author Lucas Guimarães * @author Phelipe Alves + * @author Fabio Beneditto */ $PHPMAILER_LANG['authenticate'] = 'Erro de SMTP: Não foi possível autenticar.'; @@ -15,7 +16,7 @@ $PHPMAILER_LANG['encoding'] = 'Codificação desconhecida: '; $PHPMAILER_LANG['execute'] = 'Não foi possível executar: '; $PHPMAILER_LANG['file_access'] = 'Não foi possível acessar o arquivo: '; $PHPMAILER_LANG['file_open'] = 'Erro de Arquivo: Não foi possível abrir o arquivo: '; -$PHPMAILER_LANG['from_failed'] = 'Os seguintes remententes falharam: '; +$PHPMAILER_LANG['from_failed'] = 'Os seguintes remetentes falharam: '; $PHPMAILER_LANG['instantiate'] = 'Não foi possível instanciar a função mail.'; $PHPMAILER_LANG['invalid_address'] = 'Endereço de e-mail inválido: '; $PHPMAILER_LANG['mailer_not_supported'] = ' mailer não é suportado.'; From a3b4f6b2815fd5e5142cbb006a36cb69a86525b7 Mon Sep 17 00:00:00 2001 From: Kirill Voronov <32kiros32@gmail.com> Date: Thu, 11 May 2017 02:22:50 +0300 Subject: [PATCH 3/5] add specific chars for matching of ipv6 addresses (#1040) when validating servers in the `Host` property. --- class.phpmailer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/class.phpmailer.php b/class.phpmailer.php index 52c0e52d..9c18c740 100644 --- a/class.phpmailer.php +++ b/class.phpmailer.php @@ -1622,7 +1622,7 @@ class PHPMailer foreach ($hosts as $hostentry) { $hostinfo = array(); - if (!preg_match('/^((ssl|tls):\/\/)*([a-zA-Z0-9\.-]*):?([0-9]*)$/', trim($hostentry), $hostinfo)) { + if (!preg_match('/^((ssl|tls):\/\/)*([a-zA-Z0-9:\[\]\.-]*):?([0-9]*)$/', trim($hostentry), $hostinfo)) { // Not a valid host entry continue; } From afb13026111515c1d36fed168708f261992ab9ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= Date: Thu, 11 May 2017 02:25:01 +0300 Subject: [PATCH 4/5] composer: indicate ctype ext being used (#937) --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index f3611470..a0ac2964 100644 --- a/composer.json +++ b/composer.json @@ -20,6 +20,7 @@ } ], "require": { + "ext-ctype": "*", "php": ">=5.0.0" }, "require-dev": { From 7280a55d58df4cb11a0e8b7feb0b079d474622a6 Mon Sep 17 00:00:00 2001 From: lewa Date: Thu, 11 May 2017 02:27:15 +0300 Subject: [PATCH 5/5] low-level SMTP error handling from 6.0 branch (#1012) (#1041) --- class.smtp.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/class.smtp.php b/class.smtp.php index 010a7aa6..9c4e34e6 100644 --- a/class.smtp.php +++ b/class.smtp.php @@ -989,7 +989,10 @@ class SMTP public function client_send($data) { $this->edebug("CLIENT -> SERVER: $data", self::DEBUG_CLIENT); - return fwrite($this->smtp_conn, $data); + set_error_handler(array($this, 'errorHandler')); + $result = fwrite($this->smtp_conn, $data); + restore_error_handler(); + return $result; } /**