mirror/PHPMailer
0
0
Fork 0
mirror of https://github.com/PHPMailer/PHPMailer.git synced 2024-09-20 10:02:14 +02:00
Code

Standards

Browse Source
This commit is contained in:
Marcus Bointon 2019-04-25 18:25:53 +02:00
parent 7cfef991e5
commit 0dc4706dc7
No known key found for this signature in database
GPG Key ID: DE31CD6EB646AA24
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/PHPMailer.php
View File

@ -1015,10 +1015,12 @@ class PHPMailer
$pos = strrpos($address, '@');
if (false === $pos) {
// At-sign is missing.
$error_message = sprintf('%s (%s): %s',
$error_message = sprintf(
'%s (%s): %s',
$this->lang('invalid_address'),
$kind,
$address);
$address
);
$this->setError($error_message);
$this->edebug($error_message);
if ($this->exceptions) {
@ -2945,14 +2947,18 @@ class PHPMailer
}
if (!empty($cid)) {
$mime[] = sprintf('Content-ID: <%s>%s', $cid, static::$LE);
$mime[] = sprintf(
'Content-ID: <%s>%s',
$this->encodeHeader($this->secureHeader($cid)),
static::$LE
);
}
// If a filename contains any of these chars, it should be quoted,
// but not otherwise: RFC2183 & RFC2045 5.1
// Fixes a warning in IETF's msglint MIME checker
// Allow for bypassing the Content-Disposition header totally
if (!(empty($disposition))) {
if (!empty($disposition)) {
$encoded_name = $this->encodeHeader($this->secureHeader($name));
if (preg_match('/[ \(\)<>@,;:\\"\/\[\]\?=]/', $encoded_name)) {
$mime[] = sprintf(