extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-25 16:18:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Do not touch email addresses when creating a plaintext message

Browse Source
This commit is contained in:
Hadi Nategh 2018-12-20 16:57:46 +01:00
parent 4e59184d00
commit 490d79f774
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/src/Mail/Html.php
View File

@ -225,9 +225,10 @@ class Html
* @param string $displayCharset : charset to use; should be a valid charset
* @param bool $stripcrl : flag to indicate for the removal of all crlf \r\n
* @param bool $stripalltags : flag to indicate wether or not to strip $_html from all remaining tags
* @param bool $noRepEmailAddr = false, if true email addresses will be intact
* @return text $_html : the modified text.
*/
static function convertHTMLToText($_html,$displayCharset=false,$stripcrl=false,$stripalltags=true)
static function convertHTMLToText($_html,$displayCharset=false,$stripcrl=false,$stripalltags=true,$noRepEmailAddr = false)
{
// assume input isHTML, but test the input anyway, because,
// if it is not, we may not want to strip whitespace
@ -348,7 +349,7 @@ class Html
$_html = preg_replace('~</t(d|h)>\s*<t(d|h)[^>]*>~si',' - ',$_html);
$_html = preg_replace('~<img[^>]+>~s','',$_html);
// replace emailaddresses eclosed in <> (eg.: <me@you.de>) with the emailaddress only (e.g: me@you.de)
self::replaceEmailAdresses($_html);
if (!$noRepEmailAddr) self::replaceEmailAdresses($_html);
//convert hrefs to description -> URL
//$_html = preg_replace('~<a[^>]+href=\"([^"]+)\"[^>]*>(.*)</a>~si','[$2 -> $1]',$_html);
$_html = preg_replace_callback('~<a[^>]+href=\"([^"]+)\"[^>]*>(.*?)</a>~si','self::transform_url2text',$_html);

2
mail/inc/class.mail_compose.inc.php
View File

@ -2542,7 +2542,7 @@ class mail_compose
$_mailObject->setOpenPgpBody($_formData['body']);
break;
default:
$body = $this->convertHTMLToText($_formData['body'],false);
$body = $this->convertHTMLToText($_formData['body'],false, false, true, true);
if ($attachment_links) $body .= $attachment_links;