* Taken from php.net
*/
- /**
+/**
* @return string
* @param string
* @desc Strip forbidden tags and delegate tag-source check to removeEvilAttributes()
*/
function removeEvilTags($source)
{
- $allowedTags = '<h1><b><i><a><ul><li><pre><hr><blockquote><img><br><font><p>';
+ $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);
}
return stripslashes(preg_replace("/$stripAttrib/i", '', $tagSource));
}
+/** Convert html to plain text
+ */
+function htmlToPlainText($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;
+}
+
+/********************************************************************************
+ * RICHTEXT STUFF
+ */
+
+/** Convert richtext to html
+ */
+function richtextToHtml($source)
+{
+ $tags = Array('bold' => 'b',
+ 'italic' => 'i',
+ 'smaller' => 'small',
+ 'bigger' => 'big',
+ 'underline' => 'u',
+ 'subscript' => 'sub',
+ 'superscript' => 'sup',
+ 'excerpt' => 'blockquote',
+ 'paragraph' => 'p',
+ 'nl' => 'br'
+ );
+
+ // clean unsupported tags
+ $protectedTags = '<signature><lt><comment><'.join('><', array_keys($tags)).'>';
+ $source = strip_tags($source, $protectedTags);
+
+ // convert richtext tags to html
+ foreach (array_keys($tags) as $tag) {
+ $source = preg_replace('@(</?)'.$tag.'([^>]*>)@i', '\1'.$tags[$tag].'\2', $source);
+ }
+
+ // some special cases
+ $source = preg_replace('@<signature>@i', '<br>-- <br>', $source);
+ $source = preg_replace('@</signature>@i', '', $source);
+ $source = preg_replace('@<lt>@i', '<', $source);
+ $source = preg_replace('@<comment[^>]*>((?:[^<]|<(?!/comment>))*)</comment>@i', '<!-- \1 -->', $source);
+ return removeEvilAttributes($source);
+}
+
/********************************************************************************
* HEADER STUFF
*/
function _headerdecode($charset, $c, $str) {
- $s = ($c == 'Q') ? quoted_printable_decode($str) : base64_decode($str);
+ $s = ($c == 'Q' || $c == 'q') ? quoted_printable_decode($str) : base64_decode($str);
$s = iconv($charset, 'iso-8859-15', $s);
return str_replace('_', ' ', $s);
}
function headerDecode($value) {
- $val = preg_replace('/(=\?[^?]*\?[BQ]\?[^?]*\?=) (=\?[^?]*\?[BQ]\?[^?]*\?=)/', '\1\2', $value);
- return preg_replace('/=\?([^?]*)\?([BQ])\?([^?]*)\?=/e', '_headerdecode("\1", "\2", "\3")', $val);
+ $val = preg_replace('/(=\?[^?]*\?[BQbq]\?[^?]*\?=) (=\?[^?]*\?[BQbq]\?[^?]*\?=)/', '\1\2', $value);
+ return preg_replace('/=\?([^?]*)\?([BQbq])\?([^?]*)\?=/e', '_headerdecode("\1", "\2", "\3")', $val);
}
function headerEncode($value, $trim = 0) {
return $rsl;
case "x-face":
- return '<img src="xface.php?face='.base64_encode($_text).'" alt="x-face" />';
+ return '<img src="xface.php?face='.urlencode(base64_encode($_text)).'" alt="x-face" />';
default:
if (function_exists('hook_formatDisplayHeader')
}
} 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 autoformat($text)
+{
+ global $banana;
+ $length = $banana->wrap;
+
+ $cmd = "echo ".escapeshellarg($text)." | perl -MText::Autoformat -e 'autoformat {left=>1, right=>$length, all=>1 };'";
+ exec($cmd, $result, $ret);
+ if ($ret != 0) {
+ $result = split("\n", $text);
+ }
+ return $result;
+}
+
+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);
+ $result = array();
+ $next = array();
+ $format = false;
+ foreach ($splits as $line) {
+ if ($_force || strlen($line) > $max) {
+ if (preg_match("!^(.*)($url)(.*)!i", $line, $matches) && strlen($matches[2]) > $length && strlen($matches) < 900) {
+ if (strlen($matches[1]) != 0) {
+ array_push($next, rtrim($matches[1]));
+ if (strlen($matches[1]) > $max) {
+ $format = true;
+ }
+ }
+
+ if ($format) {
+ $result = array_merge($result, autoformat(join("\n", $next)));
+ } else {
+ $result = array_merge($result, $next);
+ }
+ $format = false;
+ $next = array();
+ array_push($result, $matches[2]);
+
+ if (strlen($matches[6]) != 0) {
+ array_push($next, ltrim($matches[6]));
+ if (strlen($matches[6]) > $max) {
+ $format = true;
+ }
+ }
+ } else {
+ $format = true;
+ array_push($next, $line);
+ }
+ } else {
+ array_push($next, $line);
+ }
+ }
+ if ($format) {
+ $result = array_merge($result, autoformat(join("\n", $next)));
+ } else {
+ $result = array_merge($result, $next);
+ }
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 cleanurl($url)
+{
+ $url = str_replace('@', '%40', $url);
+ return '<a href="'.$url.'" title="'.$url.'">'.cutlink($url).'</a>';
+}
+
+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/>'.html_entity_decode(to_entities(richtextToHtml($_text))).'<br/>';
} 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);
+ if ($format != 'html') {
+ global $banana;
+ $url = $banana->url_regexp;
+ $res = preg_replace("/(<|>|")/", " \\1 ", $res);
+ $res = preg_replace("!$url!ie", "'\\1'.cleanurl('\\2').'\\3'", $res);
+ $res = preg_replace('/(["\[])?(?:mailto:)?([a-z0-9.\-+_]+@[a-z0-9.\-+_]+)(["\]])?/i', '\1<a href="mailto:\2">\2</a>\3', $res);
+ $res = preg_replace("/ (<|>|") /", "\\1", $res);
+
+ if ($format == 'richtext') {
+ $format = 'html';
+ }
+ }
+
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);
+ $res = preg_replace("@(<pre[^>]*>)\n?-- ?\n@", "<br/>-- <br/>\\1", $res);
+ $parts = preg_split("@(:?<p[^>]*>\n?-- ?\n?</p>|<br[^>]*>\n?-- ?\n?<br[^>]*>)@", $res);
} else {
+ while (preg_match("@(^|<pre>|\n)>@i", $res)) {
+ $res = preg_replace("@(^|<pre>|\n)((>[^\n]*\n)+)@ie",
+ "'\\1</pre><blockquote><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;
projects / banana.git / blobdiff