Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-05 17:18:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

FIX better text content for multipart email

Browse Source
This commit is contained in:
Laurent Destailleur
2018-06-18 23:26:21 +02:00
parent f9f7d3655d
commit 5d5083199f
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/class/CMailFile.class.php
View File

@@ -1062,8 +1062,8 @@ class CMailFile
if ($this->msgishtml) if ($this->msgishtml)
{ {
// Similar code to forge a text from html is also in CMailFile.class.php // Similar code to forge a text from html is also in CMailFile.class.php
$strContentAltText = preg_replace("/<br\s*[^>]*>/"," ", $strContentAltText); $strContentAltText = preg_replace("/<br\s*[^>]*>/"," ", $strContent);
$strContentAltText = html_entity_decode(strip_tags($strContent)); $strContentAltText = html_entity_decode(strip_tags($strContentAltText));
$strContentAltText = rtrim(wordwrap($strContentAltText, 75, empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA)?"\r\n":"\n")); $strContentAltText = rtrim(wordwrap($strContentAltText, 75, empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA)?"\r\n":"\n"));
// Check if html header already in message, if not complete the message // Check if html header already in message, if not complete the message

4
htdocs/core/class/smtps.class.php
View File

@@ -1361,8 +1361,8 @@ class SMTPs
if ($strType == 'html') if ($strType == 'html')
{ {
// Similar code to forge a text from html is also in CMailFile.class.php // Similar code to forge a text from html is also in CMailFile.class.php
$strContentAltText = preg_replace("/<br\s*[^>]*>/"," ", $strContentAltText); $strContentAltText = preg_replace("/<br\s*[^>]*>/"," ", $strContent);
$strContentAltText = html_entity_decode(strip_tags($strContent)); $strContentAltText = html_entity_decode(strip_tags($strContentAltText));
$strContentAltText = rtrim(wordwrap($strContentAltText, 75, "\r\n")); $strContentAltText = rtrim(wordwrap($strContentAltText, 75, "\r\n"));
} }