From 74e00c4d803a4da3e21c345445aac3b95db19243 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Dec 2016 01:04:17 +0100
Subject: [PATCH] More comment and hidden option to solve problems when sending
emails.
---
htdocs/core/class/CMailFile.class.php | 7 +++++--
htdocs/core/class/smtps.class.php | 4 +++-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index ba4eb1ad017..a7c9b0a0e56 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -143,6 +143,8 @@ class CMailFile
$this->msgishtml = $msgishtml;
}
+ if (! empty($conf->global->MAIN_MAIL_FORCE_CONTENT_TYPE_TO_HTML)) $this->msgishtml=1; // To force to send everything with content type html.
+
// Detect images
if ($this->msgishtml)
{
@@ -822,8 +824,9 @@ class CMailFile
$strContent = preg_replace("/\r\n/si", "\n", $strContent);
}
- //$strContent = rtrim(chunk_split($strContent)); // Function chunck_split seems bugged
- $strContent = rtrim(wordwrap($strContent));
+ // Make RFC2045 Compliant, split lines
+ //$strContent = rtrim(chunk_split($strContent)); // Function chunck_split seems ko if not used on a base64 content
+ $strContent = rtrim(wordwrap($strContent)); // TODO Using this method creates unexpected line break on text/plain content.
if ($this->msgishtml)
{
diff --git a/htdocs/core/class/smtps.class.php b/htdocs/core/class/smtps.class.php
index 6731b46fe0f..91efd218de1 100644
--- a/htdocs/core/class/smtps.class.php
+++ b/htdocs/core/class/smtps.class.php
@@ -1188,7 +1188,9 @@ class SMTPs
// Make RFC821 Compliant, replace bare linefeeds
$strContent = preg_replace("/(?<!\r)\n/si", "\r\n", $strContent);
- $strContent = rtrim(wordwrap($strContent, 75, "\r\n"));
+ // Make RFC2045 Compliant
+ //$strContent = rtrim(chunk_split($strContent)); // Function chunck_split seems ko if not used on a base64 content
+ $strContent = rtrim(wordwrap($strContent, 75, "\r\n")); // TODO Using this method creates unexpected line break on text/plain content.
$this->_msgContent[$strType] = array();
--
GitLab