From 0198792e5c2a37446cdf37a94893ae1a3c3b744c Mon Sep 17 00:00:00 2001 From: Klaus Leithoff Date: Thu, 26 Mar 2009 13:55:33 +0000 Subject: [PATCH] small improvements regarding the display of an HTML message (font-size and color in tds, handling of certain HTML special-chars (only occurring as non UTF-8)) --- felamimail/inc/class.bofelamimail.inc.php | 1 + felamimail/inc/class.uidisplay.inc.php | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/felamimail/inc/class.bofelamimail.inc.php b/felamimail/inc/class.bofelamimail.inc.php index de60c24dbd..0f5cc859ad 100644 --- a/felamimail/inc/class.bofelamimail.inc.php +++ b/felamimail/inc/class.bofelamimail.inc.php @@ -782,6 +782,7 @@ $kses->AddProtocol('cid'); // since check protocoll is called for every value associated to an attribute we have to add color and background-color to the valid protocolls $kses->AddProtocol('color'); + $kses->AddProtocol('font-size'); $kses->AddProtocol('background-color'); #$kses->AddHTML('html', array( # 'xmlns' => array(), diff --git a/felamimail/inc/class.uidisplay.inc.php b/felamimail/inc/class.uidisplay.inc.php index 436a4ded73..3ba498218f 100644 --- a/felamimail/inc/class.uidisplay.inc.php +++ b/felamimail/inc/class.uidisplay.inc.php @@ -964,6 +964,20 @@ if(!empty($body)) { $body .= '
'; } + // some characterreplacements, as they fail to translate + $sar = array( + '@(\x84|\x93|\x94)@', + '@(\x96|\x97)@', + '@(\x91|\x92)@', + '@(\x85)@', + ); + $rar = array( + '"', + '-', + '\'', + '...', + ); + if($singleBodyPart['mimeType'] == 'text/html' && strtoupper($singleBodyPart['charSet']) != 'UTF-8') $singleBodyPart['body'] = preg_replace($sar,$rar,$singleBodyPart['body']); #_debug_array($singleBodyPart['charSet']); $singleBodyPart['body'] = $this->botranslation->convert( $singleBodyPart['body'],