extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-22 13:20:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

if we deal with text, we do not need to tidy any html, if we use tidy, we use show-body-only set to auto, and we switch to output-html

Browse Source
This commit is contained in:
Klaus Leithoff 2012-02-06 13:57:41 +00:00
parent 9873161e0a
commit 7e3c94794e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
felamimail/inc/class.felamimail_bo.inc.php
View File

@ -1430,7 +1430,7 @@ class felamimail_bo
if (extension_loaded('tidy'))
{
$tidy = new tidy();
$cleaned = $tidy->repairString($_html, array('clean'=>true,'output-xhtml'=>true,'join-classes'=>true,'join-styles'=>true,'show-body-only'=>false,'word-2000'=>true,'wrap'=>0),'utf8');
$cleaned = $tidy->repairString($_html, array('clean'=>true,'output-html'=>true,'join-classes'=>true,'join-styles'=>true,'show-body-only'=>"auto",'word-2000'=>true,'wrap'=>0),'utf8');
// Found errors. Strip it all so there's some output
if($tidy->getStatus() == 2)
{
@ -4393,7 +4393,7 @@ class felamimail_bo
$newBody = html::purify($newBody);
//error_log(__METHOD__.__LINE__.' after purify:'.$newBody);
if ($preserveHTML==false) $newBody = $bofelamimail->convertHTMLToText($newBody,true);
$bofelamimail->getCleanHTML($newBody); // new Body passed by reference
$bofelamimail->getCleanHTML($newBody,false,$preserveHTML); // new Body passed by reference
//error_log(__METHOD__.__LINE__.' after getClean:'.$newBody);
$message .= $newBody;
continue;