lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests 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:24:31 +02:00
parent c3f64ed36e
commit f9f7d3655d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
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 = html_entity_decode(strip_tags($strContent));
$strContentAltText = preg_replace("/<br\s*[^>]*>/"," ", $strContentAltText); $strContentAltText = preg_replace("/<br\s*[^>]*>/"," ", $strContentAltText);
$strContentAltText = html_entity_decode(strip_tags($strContent));
$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

2
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 = html_entity_decode(strip_tags($strContent));
$strContentAltText = preg_replace("/<br\s*[^>]*>/"," ", $strContentAltText); $strContentAltText = preg_replace("/<br\s*[^>]*>/"," ", $strContentAltText);
$strContentAltText = html_entity_decode(strip_tags($strContent));
$strContentAltText = rtrim(wordwrap($strContentAltText, 75, "\r\n")); $strContentAltText = rtrim(wordwrap($strContentAltText, 75, "\r\n"));
} }