holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use monospace fontstyle for plaintext edit; preserve whitespace (horizontal AND vertical) if mail is plaintext (not containing any html)

Browse Source
This commit is contained in:
Klaus Leithoff 2013-02-22 10:58:39 +00:00
parent 98120c44b3
commit a09ef26c5c
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1019,6 +1019,14 @@ class translation
*/ */
static function convertHTMLToText($_html,$displayCharset=false,$stripcrl=false,$stripalltags=true) static function convertHTMLToText($_html,$displayCharset=false,$stripcrl=false,$stripalltags=true)
{ {
// assume input isHTML, but test the input anyway, because,
// if it is not, we may not want to strip whitespace
$isHTML = true;
if (strlen(strip_tags($_html)) == strlen($_html))
{
$isHTML = false;
// return $_html; // maybe we should not proceed at all
}
if ($displayCharset === false) $displayCharset = self::$system_charset; if ($displayCharset === false) $displayCharset = self::$system_charset;
//error_log(__METHOD__.$_html); //error_log(__METHOD__.$_html);
#print '<hr>'; #print '<hr>';
@ -1123,7 +1131,7 @@ class translation
$_html = preg_replace('~<a[^>]+href=\"([^"]+)\"[^>]*>(.*)</a>~si','[$2 -> $1]',$_html); $_html = preg_replace('~<a[^>]+href=\"([^"]+)\"[^>]*>(.*)</a>~si','[$2 -> $1]',$_html);
// reducing double \r\n to single ones, dont mess with pre sections // reducing double \r\n to single ones, dont mess with pre sections
if ($stripcrl === true ) if ($stripcrl === true && $isHTML)
{ {
if (stripos($_html,'<pre>')!==false) if (stripos($_html,'<pre>')!==false)
{ {
@ -1161,18 +1169,14 @@ class translation
$_html = preg_replace('~<[^>^@]+>~s','',$_html); $_html = preg_replace('~<[^>^@]+>~s','',$_html);
//$_html = strip_tags($_html, '<a>'); //$_html = strip_tags($_html, '<a>');
} }
// reducing spaces // reducing spaces (not for input that was plain text from the beginning)
$_html = preg_replace('~ +~s',' ',$_html); if ($isHTML) $_html = preg_replace('~ +~s',' ',$_html);
// 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);
// restoring ampersands // restoring ampersands
$_html = str_replace('#amper#sand#','&',$_html); $_html = str_replace('#amper#sand#','&',$_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);
//self::replaceEmailAdresses($_html); //self::replaceEmailAdresses($_html);
#error_log($text);
$pos = strpos($_html, 'blockquote'); $pos = strpos($_html, 'blockquote');
//error_log("convert HTML2Text: $_html"); //error_log("convert HTML2Text: $_html");
if($pos === false) { if($pos === false) {