*/
function removeEvilTags($source)
{
- $allowedTags = '<h1><b><i><a><ul><li><pre><hr><blockquote><img><br><font><p><small><big><sup><sub><code>';
+ $allowedTags = '<h1><b><i><a><ul><li><pre><hr><blockquote><img><br><font><p><small><big><sup><sub><code><em>';
+ $source = preg_replace('|</div>|i', '<br />', $source);
$source = strip_tags($source, $allowedTags);
return preg_replace('/<(.*?)>/ie', "'<'.removeEvilAttributes('\\1').'>'", $source);
}
*/
function htmlToPlainText($res)
{
- $res = trim(html_entity_decode(strip_tags($res, '<br>')));
- $res = preg_replace("@<br[^>]>@i", "\n", $res);
+ $res = trim(html_entity_decode(strip_tags($res, '<div><br><p>')));
+ $res = preg_replace("@</?(br|p|div)[^>]*>@i", "\n", $res);
+ if (!is_utf8($res)) {
+ $res = utf8_encode($res);
+ }
return $res;
}
}
} else {
$res .= "[<a href=\"?group=$group&artid=$artid&action=new\">"
- ._b_('Répondre')."</a>] ";
- if ($banana->post->checkcancel()) {
+ ._b_('Répondre')."</a>] ";
+ if ($banana->post && $banana->post->checkcancel()) {
$res .= "[<a href=\"?group=$group&artid=$artid&action=cancel\">"
- ._b_('Annuler ce message')."</a>] ";
+ ._b_('Annuler ce message')."</a>] ";
}
}
return $res.'</div>';
* FORMATTING STUFF : BODY
*/
-function wrap($text, $_prefix="")
+function wrap($text, $_prefix="", $_force=false)
{
$parts = preg_split("/\n-- ?\n/", $text);
if (count($parts) >1) {
$text = join("\n-- \n", $parts);
} else {
$sign = '';
- $text = $text;
}
global $banana;
+ $url = $banana->url_regexp;
$length = $banana->wrap;
- $cmd = "echo ".escapeshellarg($text)." | perl -MText::Autoformat -e 'autoformat {left=>1, right=>$length, all=>1 };'";
- exec($cmd, $result);
+ $max = $length + ($length/10);
+ $splits = split("\n", $text);
+ $ret = -1;
+ foreach ($splits as $line) {
+ if ($_force || strlen($line) > $max) {
+ if (!preg_match("!^\\s*$url\\s*$!i", $line)) {
+ $cmd = "echo ".escapeshellarg($text)." | perl -MText::Autoformat -e 'autoformat {left=>1, right=>$length, all=>1 };'";
+ exec($cmd, $result, $ret);
+ break;
+ }
+ }
+ }
+ if ($ret != 0) {
+ $result = $splits;
+ }
return $_prefix.join("\n$_prefix", $result).($_prefix ? '' : $sign);
}
-function formatbody($_text, $format='plain')
+function cutlink($link)
+{
+ global $banana;
+
+ if (strlen($link) > $banana->wrap) {
+ $link = substr($link, 0, $banana->wrap - 3)."...";
+ }
+ return $link;
+}
+
+function formatbody($_text, $format='plain', $flowed=false)
{
if ($format == 'html') {
- $res = '<br/>'.removeEvilTags(html_entity_decode(to_entities($_text))).'<br/>';
+ $res = '<br/>'.html_entity_decode(to_entities(removeEvilTags($_text))).'<br/>';
} else if ($format == 'richtext') {
- $res = '<br/>'.richtextToHtml(html_entity_decode(to_entities($_text))).'<br/>';
+ $res = '<br/>'.createlinks(html_entity_decode(to_entities(richtextToHtml($_text)))).'<br/>';
$format = 'html';
} else {
- $res = "\n\n" . to_entities(wrap($_text, ""))."\n\n";
+ $res = "\n\n" . to_entities(wrap($_text, "", $flowed))."\n\n";
}
- $res = preg_replace("/(<|>|")/", " \\1 ", $res);
- $res = preg_replace('/(["\[])?((https?|ftp|news):\/\/[a-z@0-9.~%$£µ&i#\-+=_\/\?]*)(["\]])?/i', "\\1<a href=\"\\2\">\\2</a>\\4", $res);
- $res = preg_replace("/ (<|>|") /", "\\1", $res);
+ global $banana;
+ $url = $banana->url_regexp;
+ $res = preg_replace("/(<|>|")/", " \\1 ", $_text);
+ $res = preg_replace("!$url!ie", "'\\1<a href=\"\\2\" title=\"\\2\">'.cutlink('\\2').'</a>\\3'", $res);
+ $res = preg_replace("/ (<|>|") /", "\\1", $res);
+
if ($format == 'html') {
- $res = preg_replace("@(</p>)\n?-- \n?(<p[^>]*>|<br>)@", "\\1<br>-- \\2", $res);
- $res = preg_replace("@<br>\n?-- \n?(<p[^>]*>)@", "<br>-- <br>\\2", $res);
- $parts = preg_split("@(:?<p[^>]*>\n?-- \n?</p>|<br[^>]*>\n?-- \n?<br>)@", $res);
+ $res = preg_replace("@(</p>)\n?-- \n?(<p[^>]*>|<br[^>]*>)@", "\\1<br/>-- \\2", $res);
+ $res = preg_replace("@<br[^>]*>\n?-- \n?(<p[^>]*>)@", "<br/>-- <br/>\\2", $res);
+ $parts = preg_split("@(:?<p[^>]*>\n?-- \n?</p>|<br[^>]*>\n?-- \n?<br[^>]*>)@", $res);
} else {
+ for ($i = 1 ; preg_match("@(^|<pre>|\n)>@i", $res) ; $i++) {
+ $res = preg_replace("@(^|<pre>|\n)((>[^\n]*\n)+)@ie",
+ "'\\1</pre><blockquote class=\'level$i\'><pre>'"
+ .".stripslashes(preg_replace('@(^|<pre>|\n)>[ \\t\\r]*@i', '\\1', '\\2'))"
+ .".'</pre></blockquote><pre>'",
+ $res);
+ }
+ $res = preg_replace("@<pre>-- ?\n@", "<pre>\n-- \n", $res);
$parts = preg_split("/\n-- ?\n/", $res);
}
$sign = array_pop($parts);
if ($format == 'html') {
$res = join('<br/>-- <br/>', $parts);
- $sign = '<hr style="width: 100%; margin: 1em 0em; " />'.$sign;
+ $sign = '<hr style="width: 100%; margin: 1em 0em; " />'.$sign.'<br/>';
} else {
$res = join('\n-- \n', $parts);
$sign = '</pre><hr style="width: 100%; margin: 1em 0em; " /><pre>'.$sign;