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:18:22 +02:00
parent da16805b00
commit c3f64ed36e
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1061,7 +1061,9 @@ class CMailFile
$strContentAltText = ''; $strContentAltText = '';
if ($this->msgishtml) if ($this->msgishtml)
{ {
// Similar code to forge a text from html is also in CMailFile.class.php
$strContentAltText = html_entity_decode(strip_tags($strContent)); $strContentAltText = html_entity_decode(strip_tags($strContent));
$strContentAltText = preg_replace("/<br\s*[^>]*>/"," ", $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

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

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

2
htdocs/langs/en_US/other.lang
View File

@ -218,7 +218,7 @@ FileIsTooBig=Files is too big
PleaseBePatient=Please be patient... PleaseBePatient=Please be patient...
NewPassword=New password NewPassword=New password
ResetPassword=Reset password ResetPassword=Reset password
RequestToResetPasswordReceived=A request to change your password has been received RequestToResetPasswordReceived=A request to change your password has been received.
NewKeyIs=This is your new keys to login NewKeyIs=This is your new keys to login
NewKeyWillBe=Your new key to login to software will be NewKeyWillBe=Your new key to login to software will be
ClickHereToGoTo=Click here to go to %s ClickHereToGoTo=Click here to go to %s