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

explizitly handle span element on convertHTMLToText

Browse Source
This commit is contained in:
leithoff 2016-05-27 12:29:18 +02:00
parent 371c24ec75
commit 97b30f3167
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -314,15 +314,16 @@ class Html
6 => '~<br[^>]*>~si', 6 => '~<br[^>]*>~si',
7 => '~<p[^>]*>\r*\n*~si', 7 => '~<p[^>]*>\r*\n*~si',
8 => '~<div[^>]*>\r*\n*~si', 8 => '~<div[^>]*>\r*\n*~si',
9 => '~<hr[^>]*>\r*\n*~si', 9 => '~<span[^>]*>\r*\n*~si',
10 => '/<blockquote type="cite">/', 10 => '~<hr[^>]*>\r*\n*~si',
11 => '/<blockquote>/', 11 => '/<blockquote type="cite">/',
12 => '~</blockquote>~si', 12 => '/<blockquote>/',
13 => '~<blockquote[^>]*>~si', 13 => '~</blockquote>~si',
14 => '/<=([1234567890])/', 14 => '~<blockquote[^>]*>~si',
15 => '/>=([1234567890])/', 15 => '/<=([1234567890])/',
16 => '/<([1234567890])/', 16 => '/>=([1234567890])/',
17 => '/>([1234567890])/', 17 => '/<([1234567890])/',
18 => '/>([1234567890])/',
); );
$Replace = array ( $Replace = array (
0 => "\r\n", 0 => "\r\n",
@ -334,15 +335,16 @@ class Html
6 => "\r\n", 6 => "\r\n",
7 => "\r\n", 7 => "\r\n",
8 => "\r\n", 8 => "\r\n",
9 => "\r\n__________________________________________________\r\n", 9 => "",
10 => '#blockquote#type#cite#', 10 => "\r\n__________________________________________________\r\n",
11 => '#blockquote#type#cite#', 11 => '#blockquote#type#cite#',
12 => '#blockquote#end#cite#', 12 => '#blockquote#type#cite#',
13 => '#blockquote#type#cite#', 13 => '#blockquote#end#cite#',
14 => '#lowerorequal#than#$1', 14 => '#blockquote#type#cite#',
15 => '#greaterorequal#than#$1', 15 => '#lowerorequal#than#$1',
16 => '#lower#than#$1', 16 => '#greaterorequal#than#$1',
17 => '#greater#than#$1', 17 => '#lower#than#$1',
18 => '#greater#than#$1',
); );
$_html = preg_replace($tags,$Replace,$_html); $_html = preg_replace($tags,$Replace,$_html);
$_html = preg_replace('~</t(d|h)>\s*<t(d|h)[^>]*>~si',' - ',$_html); $_html = preg_replace('~</t(d|h)>\s*<t(d|h)[^>]*>~si',' - ',$_html);