extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-08-16 11:38:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Mail: Fix bullet & number to text conversion failed with non-ascii characters

Browse Source
This commit is contained in:
nathangray
2019-11-22 09:44:27 -07:00
parent 371aede01f
commit 83e2d70222
2 changed files with 45 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -492,7 +492,11 @@ class Html
return $html;
}
$dom = \DOMDocument::loadHTML($html, LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD | LIBXML_NOBLANKS);
$dom = new \DOMDocument('1.0','UTF-8');
$dom->loadHTML(
'<?xml encoding="UTF-8">'. Api\Translation::convert($html,false, 'utf8'),
LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD | LIBXML_NOBLANKS
);
if(!$dom)
{
// Failed to parse
@ -508,14 +512,23 @@ class Html
$list_text = "\r\n";
$item_count = 0;
$prefix = $list_type == 'ul' ? ' * ' : '. ';
foreach($list->getElementsByTagName('li') as $element)
$elements = $list->getElementsByTagName('li');
foreach($elements as $element)
{
$list_text .= ($list_type == 'ol' ? ' '. ++$item_count : '') . $prefix . $element->textContent . "\r\n";
if($element->tagName == 'li')
{
$list_text .= ($list_type == 'ol' ? ' '. ++$item_count : '') . $prefix . $element->textContent . "\r\n";
}
else
{
$list_text .= $element->nodeValue;
}
}
$list->parentNode->replaceChild($dom->createTextNode($list_text), $list);
}
}
$dom->removeChild($dom->firstChild);
return $dom->saveHTML();
}