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

preserving ampersands while converting html to text; improving linebreak behavior; switching off WordWrapn (by setting it to 0) in phpmailer, as we handle our linebreaking on our own

Browse Source
This commit is contained in:
Klaus Leithoff 2010-09-09 10:19:23 +00:00
parent 8241be4091
commit 5153a61a63
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1143,7 +1143,7 @@ class translation
); );
$Replace = array ('', $Replace = array ('',
'"', '"',
'+', '#amper#sand#',
'<', '<',
'>', '>',
' ', ' ',
@ -1221,29 +1221,25 @@ class translation
// we dont reduce whitespace at the start or the end of the line, since its used for structuring the document // we dont reduce whitespace at the start or the end of the line, since its used for structuring the document
#$_html = preg_replace('~^\s+~m','',$_html); #$_html = preg_replace('~^\s+~m','',$_html);
#$_html = preg_replace('~\s+$~m','',$_html); #$_html = preg_replace('~\s+$~m','',$_html);
// restoring the preserved blockquote // restoring ampersands
//$_html = str_replace('#blockquote#type#cite#','<blockquote type="cite">',$_html); $_html = str_replace('#amper#sand#','&',$_html);
$_html = html_entity_decode($_html, ENT_COMPAT, $displayCharset); $_html = html_entity_decode($_html, ENT_COMPAT, $displayCharset);
//self::replaceEmailAdresses($_html); //self::replaceEmailAdresses($_html);
#error_log($text); #error_log($text);
$pos = strpos($_html, 'blockquote'); $pos = strpos($_html, 'blockquote');
#error_log("convert HTML2Text"); //error_log("convert HTML2Text: $_html");
if($pos === false) { if($pos === false) {
return $_html; return $_html;
} else { } else {
$indent = 0; $indent = 0;
$indentString = ''; $indentString = '';
//$quoteParts = preg_split('/<blockquote type="cite">/', $_html, -1, PREG_SPLIT_OFFSET_CAPTURE);
$quoteParts = preg_split('/#blockquote#type#cite#/', $_html, -1, PREG_SPLIT_OFFSET_CAPTURE); $quoteParts = preg_split('/#blockquote#type#cite#/', $_html, -1, PREG_SPLIT_OFFSET_CAPTURE);
foreach($quoteParts as $quotePart) { foreach($quoteParts as $quotePart) {
if($quotePart[1] > 0) { if($quotePart[1] > 0) {
$indent++; $indent++;
$indentString .= '>'; $indentString .= '>';
} }
//$quoteParts2 = preg_split('/<\/blockquote>/', $quotePart[0], -1, PREG_SPLIT_OFFSET_CAPTURE);
$quoteParts2 = preg_split('/#blockquote#end#cite#/', $quotePart[0], -1, PREG_SPLIT_OFFSET_CAPTURE); $quoteParts2 = preg_split('/#blockquote#end#cite#/', $quotePart[0], -1, PREG_SPLIT_OFFSET_CAPTURE);
foreach($quoteParts2 as $quotePart2) { foreach($quoteParts2 as $quotePart2) {
@ -1255,9 +1251,10 @@ class translation
$quoteParts3 = explode("\r\n", $quotePart2[0]); $quoteParts3 = explode("\r\n", $quotePart2[0]);
foreach($quoteParts3 as $quotePart3) { foreach($quoteParts3 as $quotePart3) {
//error_log(__METHOD__.__LINE__.'Line:'.$quotePart3);
$allowedLength = 76-strlen("\r\n$indentString"); $allowedLength = 76-strlen("\r\n$indentString");
// only break lines, if not already indented // only break lines, if not already indented
if ($quotePart3[0] != $indentString) if (substr($quotePart3,0,strlen($indentString)) != $indentString)
{ {
if (strlen($quotePart3) > $allowedLength) { if (strlen($quotePart3) > $allowedLength) {
$s=explode(" ", $quotePart3); $s=explode(" ", $quotePart3);
@ -1268,11 +1265,13 @@ class translation
// only break long words within the wordboundaries, // only break long words within the wordboundaries,
// but it may destroy links, so we check for href and dont do it if we find it // but it may destroy links, so we check for href and dont do it if we find it
if($cnt > $allowedLength && stripos($v,'href=')===false) { if($cnt > $allowedLength && stripos($v,'href=')===false) {
//error_log(__METHOD__.__LINE__.'LongWordFound:'.$v);
$v=wordwrap($v, $allowedLength, "\r\n$indentString", true); $v=wordwrap($v, $allowedLength, "\r\n$indentString", true);
} }
// the rest should be broken at the start of the new word that exceeds the limit // the rest should be broken at the start of the new word that exceeds the limit
if ($linecnt+$cnt > $allowedLength) { if ($linecnt+$cnt > $allowedLength) {
$v="\r\n$indentString$v"; $v="\r\n$indentString$v";
//error_log(__METHOD__.__LINE__.'breaking here:'.$v);
$linecnt = 0; $linecnt = 0;
} else { } else {
$linecnt += $cnt; $linecnt += $cnt;
@ -1281,6 +1280,7 @@ class translation
} }
} }
} }
//error_log(__METHOD__.__LINE__.'partString to return:'.$indentString . $quotePart3);
$asciiTextBuff[] = $indentString . $quotePart3 ; $asciiTextBuff[] = $indentString . $quotePart3 ;
} }
} }