extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-08 00:54:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

attempt to improve html2text conversion

Browse Source
This commit is contained in:
Klaus Leithoff 2016-02-02 12:57:21 +00:00
parent e29aed662e
commit cf54b25ca2
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
phpgwapi/inc/class.translation.inc.php
View File

@ -1394,6 +1394,10 @@ class translation
11 => '/<blockquote>/', 11 => '/<blockquote>/',
12 => '~</blockquote>~si', 12 => '~</blockquote>~si',
13 => '~<blockquote[^>]*>~si', 13 => '~<blockquote[^>]*>~si',
14 => '/<=([1234567890])/',
15 => '/>=([1234567890])/',
16 => '/<([1234567890])/',
17 => '/>([1234567890])/',
); );
$Replace = array ( $Replace = array (
0 => "\r\n", 0 => "\r\n",
@ -1410,6 +1414,10 @@ class translation
11 => '#blockquote#type#cite#', 11 => '#blockquote#type#cite#',
12 => '#blockquote#end#cite#', 12 => '#blockquote#end#cite#',
13 => '#blockquote#type#cite#', 13 => '#blockquote#type#cite#',
14 => '#lowerorequal#than#$1',
15 => '#greaterorequal#than#$1',
16 => '#lower#than#$1',
17 => '#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);
@ -1463,6 +1471,11 @@ class translation
if ($isHTML) $_html = preg_replace('~ +~s',' ',$_html); if ($isHTML) $_html = preg_replace('~ +~s',' ',$_html);
// restoring ampersands // restoring ampersands
$_html = str_replace('#amper#sand#','&',$_html); $_html = str_replace('#amper#sand#','&',$_html);
// restoring lower|greater[or equal] than
$_html = str_replace('#lowerorequal#than#','<=',$_html);
$_html = str_replace('#greaterorequal#than#','>=',$_html);
$_html = str_replace('#lower#than#','<',$_html);
$_html = str_replace('#greater#than#','>',$_html);
//error_log(__METHOD__.__LINE__.' Charset:'.$displayCharset.' -> '.$_html); //error_log(__METHOD__.__LINE__.' Charset:'.$displayCharset.' -> '.$_html);
$_html = html_entity_decode($_html, ENT_COMPAT, $displayCharset); $_html = html_entity_decode($_html, ENT_COMPAT, $displayCharset);
//error_log(__METHOD__.__LINE__.' Charset:'.$displayCharset.' After html_entity_decode: -> '.$_html); //error_log(__METHOD__.__LINE__.' Charset:'.$displayCharset.' After html_entity_decode: -> '.$_html);