X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=banana%2Fmessage.func.inc.php;h=37140153618347d124f41d96420e003c0a2cbd0f;hb=52d7843e9f91ee0350fbab92a924b365ea32d9cf;hp=8df5cd4dd2a61c1084f1fc8431ab84acf68ace83;hpb=3958da5df280bd8b4125ca6013c3fda9f538ae96;p=banana.git diff --git a/banana/message.func.inc.php b/banana/message.func.inc.php index 8df5cd4..3714015 100644 --- a/banana/message.func.inc.php +++ b/banana/message.func.inc.php @@ -354,7 +354,7 @@ function banana_filterCss($css) } return $css; } - + /** * @return string * @param string @@ -366,7 +366,7 @@ function banana_cleanHtml($source, $to_xhtml = false) $tidy_config = array('drop-empty-paras' => true, 'drop-proprietary-attributes' => true, 'hide-comments' => true, - 'logical-emphasis' => true, + 'logical-emphasis' => true, 'output-xhtml' => true, 'replace-color' => true, 'join-classes' => false, @@ -414,7 +414,7 @@ function banana_cleanHtml($source, $to_xhtml = false) // Use inlined style instead of old html attributes if ($to_xhtml) { $source = preg_replace('/<(\/?\w+)(.*?)(\/?>)/muise', "'<\\1' . banana_cleanStyles('\\1', '\\2') . '\\3'", $source); - } + } return preg_replace('/<(.*?)>/ie', "'<'.banana_removeEvilAttributes('\\1').'>'", $source); } @@ -489,7 +489,7 @@ function banana_htmlToPlainText($res) $res = trim(strip_tags($res, '

')); $res = preg_replace("@@si", "\n", $res); $res = banana__convertQuotes($res); - return banana_html_entity_decode($res); + return banana_html_entity_decode($res); } function banana_formatHtml(BananaMimePart $part) @@ -498,7 +498,7 @@ function banana_formatHtml(BananaMimePart $part) $text = banana_catchHtmlSignature($text); if (!Banana::$msgshow_externalimages) { $text = banana_hideExternalImages($text); - } + } $text = banana_catchPartLinks($text); return banana_cleanHtml($text, true); }