mirror
/
PHPMailer
mirror of https://github.com/PHPMailer/PHPMailer.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dkimrevision

This commit is contained in:
Marcus Bointon 2019-10-20 19:37:17 +02:00
parent 694b911c9c a0adbb2a7a
commit e4123e66b4
8 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -10,7 +10,7 @@ Build status: [![Build Status](https://travis-ci.org/PHPMailer/PHPMailer.svg)](h
## Class Features
- Probably the world's most popular code for sending email from PHP!
- Used by many open-source projects: WordPress, Drupal, 1CRM, SugarCRM, Yii, Joomla!, and many more
- Used by many open-source projects: WordPress, Drupal, 1CRM, SugarCRM, Yii, Joomla! and many more
- Integrated SMTP support - send without a local mail server
- Send emails with multiple To, CC, BCC and Reply-to addresses
- Multipart/alternative emails for mail clients that do not read HTML email

4
examples/contents.html
View File

@ -1,5 +1,5 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<!DOCTYPE html>
<html lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<title>PHPMailer Test</title>

4
examples/contentsutf8.html
View File

@ -1,5 +1,5 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<!DOCTYPE html>
<html lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>PHPMailer Test</title>

2
examples/send_file_upload.phps
View File

@ -34,7 +34,7 @@ if (array_key_exists('userfile', $_FILES)) {
}
?>
<!DOCTYPE html>
<html>
<html lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>PHPMailer Upload</title>

2
examples/send_multiple_file_upload.phps
View File

@ -33,7 +33,7 @@ if (array_key_exists('userfile', $_FILES)) {
}
?>
<!DOCTYPE html>
<html>
<html lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>PHPMailer Upload</title>

2
examples/simple_contact_form.phps
View File

@ -72,7 +72,7 @@ if (array_key_exists('to', $_POST)) {
}
} ?>
<!DOCTYPE html>
<html>
<html lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>PHPMailer Contact Form</title>

3
src/PHPMailer.php
View File

@ -3061,7 +3061,8 @@ class PHPMailer
$mime[] = sprintf('Content-Transfer-Encoding: %s%s', $encoding, static::$LE);
}
if (!empty($cid)) {
//Only set Content-IDs on inline attachments
if ($cid !== '' && $disposition === 'inline') {
$mime[] = 'Content-ID: ' . $this->encodeHeader('<' . $this->secureHeader($cid) . '>') . static::$LE;
}

11
test/PHPMailerTest.php
View File

@ -1094,7 +1094,8 @@ EOT;
$this->Mail->CharSet = 'UTF-8';
$this->Mail->Body = <<<'EOT'
<html>
<!DOCTYPE html>
<html lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>HTML email test</title>
@ -1104,13 +1105,13 @@ EOT;
<p>Russian text: Пустое тело сообщения</p>
<p>Armenian text: Հաղորդագրությունը դատարկ է</p>
<p>Czech text: Prázdné tělo zprávy</p>
Embedded Image: <img alt="phpmailer" src="cid:my-attach">
Embedded Image: <img alt="phpmailer" src="cid:bäck">
</body>
</html>
EOT;
$this->Mail->addEmbeddedImage(
realpath($this->INCLUDE_DIR . '/examples/images/phpmailer.png'),
'my-attach',
'bäck',
'phpmailer.png',
'base64',
'image/png'
@ -1304,8 +1305,8 @@ EOT;
$this->buildBody();
$this->assertTrue($this->Mail->send(), $this->Mail->ErrorInfo);
$this->Mail->clearAttachments();
$this->Mail->msgHTML('<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
$this->Mail->msgHTML('<!DOCTYPE html>
<html lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>E-Mail Inline Image Test</title>