mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-10-21 16:46:11 +02:00
Code Issues Releases Wiki Activity

Auto-detecting of mime type for emails and switched to HtmlFormatter for emails by default, fixes #577

Browse Source
This commit is contained in:
Jordi Boggiano
2016-05-26 22:41:26 +01:00
parent af7c0a7bda
commit 8a45ed75cc
7 changed files with 47 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Monolog/Handler/NativeMailerHandler.php
View File

@@ -56,7 +56,7 @@ class NativeMailerHandler extends MailHandler
* The Content-type for the message
* @var string
*/
protected $contentType = 'text/plain';
protected $contentType;
/**
* The encoding for the message
@@ -117,10 +117,15 @@ class NativeMailerHandler extends MailHandler
*/
protected function send($content, array $records)
{
$content = wordwrap($content, $this->maxColumnWidth);
$contentType = $this->getContentType() ?: ($this->isHtmlBody($content) ? 'text/html' : 'text/plain');
if ($contentType !== 'text/html') {
$content = wordwrap($content, $this->maxColumnWidth);
}
$headers = ltrim(implode("\r\n", $this->headers) . "\r\n", "\r\n");
$headers .= 'Content-type: ' . $this->getContentType() . '; charset=' . $this->getEncoding() . "\r\n";
if ($this->getContentType() == 'text/html' && false === strpos($headers, 'MIME-Version:')) {
$headers .= 'Content-type: ' . $contentType . '; charset=' . $this->getEncoding() . "\r\n";
if ($contentType === 'text/html' && false === strpos($headers, 'MIME-Version:')) {
$headers .= 'MIME-Version: 1.0' . "\r\n";
}