|'; + $allowedTags = '
)\n?-- \n?('; + $source = preg_replace('||i', '
', $source); $source = strip_tags($source, $allowedTags); return preg_replace('/<(.*?)>/ie', "'<'.removeEvilAttributes('\\1').'>'", $source); } @@ -63,11 +175,29 @@ function removeEvilAttributes($tagSource) */ function htmlToPlainText($res) { - $res = trim(html_entity_decode(strip_tags($res, '
'))); - $res = preg_replace("@'; @@ -282,7 +427,24 @@ function displayshortcuts($first = -1) { * FORMATTING STUFF : BODY */ -function wrap($text, $_prefix="") +function autoformat($text, $part = false) +{ + global $banana; + $length = $banana->wrap; + $all = null; + if (!$part) { + $all = ', all=1'; + } + + $cmd = "echo ".escapeshellarg($text)." | perl -MText::Autoformat -e 'autoformat {left=>1, right=>$length$all };'"; + 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) { @@ -290,36 +452,117 @@ function wrap($text, $_prefix="") $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 { + if (strlen($line) > 2 * $max) { + $next = array_merge($next, autoformat($line, 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 ''.cutlink($url).''; +} + +function formatbody($_text, $format='plain', $flowed=false) { if ($format == 'html') { - $res = ''))); + $res = preg_replace("@]*>@i", "\n", $res); + if (!is_utf8($res)) { + $res = utf8_encode($res); + } return $res; } +/** Match **, // and __ to format plain text + */ +function formatPlainText($text) +{ + $formatting = Array('\*' => 'strong', + '_' => 'u', + '/' => 'em'); + foreach ($formatting as $limit=>$mark) { + $text = preg_replace('@(^|\W)' . $limit . '(\w+)' . $limit . '(\W|$)@' + ,'\1<' . $mark . '>\2\3' + , $text); + } + return $text; +} + /******************************************************************************** * RICHTEXT STUFF */ @@ -110,14 +240,14 @@ function richtextToHtml($source) */ 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) { @@ -150,6 +280,11 @@ function header_translate($hdr) { function formatDisplayHeader($_header,$_text) { global $banana; + if (function_exists('hook_formatDisplayHeader') + && $res = hook_formatDisplayHeader($_header, $_text)) { + return $res; + } + switch ($_header) { case "date": return formatDate($_text); @@ -159,7 +294,7 @@ function formatDisplayHeader($_header,$_text) { $res = ""; $groups = preg_split("/[\t ]*,[\t ]*/",$_text); foreach ($groups as $g) { - $res.="$g, "; + $res .= makeHREF(Array('group' => $g), $g) . ', '; } return substr($res,0, -2); @@ -180,20 +315,24 @@ function formatDisplayHeader($_header,$_text) { $p = $banana->spool->overview[$p]->parent; } foreach (array_reverse($par_ok) as $p) { - $rsl .= "spool->group}&artid=$p\">$ndx "; + $rsl .= makeHREF(Array('group' => $banana->spool->group, + 'artid' => $p), + $ndx) . ' '; $ndx++; } return $rsl; case "x-face": - return '
'; - - default: - if (function_exists('hook_formatDisplayHeader') - && $res = hook_formatDisplayHeader($_header, $_text)) - { - return $res; + return '
'; + + case "subject": + $link = null; + if (function_exists('hook_getSubject')) { + $link = hook_getSubject($_text); } + return formatPlainText($_text) . $link; + + default: return htmlentities($_text); } } @@ -241,38 +380,44 @@ function formatFrom($text) { return preg_replace("/\\\(\(|\))/","\\1",$result); } -function displayshortcuts($first = -1) { +function displayShortcuts($first = -1) +{ global $banana; extract($banana->state); - + $res = '
'; - $res .= '['._b_('Liste des forums').'] '; - if (is_null($group)) { - return $res.'['._b_('Abonnements').']'; + $res .= ' Profil : ' . makeHREF(Array('subscribe' => 1), _b_('Abonnements')); + if (function_exists('hook_shortcuts') && $cstm = hook_shortcuts()) { + $res .= ' . ' . $cstm; } - - $res .= "[$group] "; - - if (is_null($artid)) { - $res .= "["._b_('Nouveau message')."] "; - if (sizeof($banana->spool->overview)>$banana->tmax) { - $res .= '
'; - $n = intval(log(count($banana->spool->overview), 10))+1; - for ($ndx=1; $ndx <= sizeof($banana->spool->overview); $ndx += $banana->tmax) { - if ($first==$ndx) { - $fmt = "[%0{$n}u-%0{$n}u] "; - } else { - $fmt = "[%0{$n}u-%0{$n}u] "; + $res .= '
'; + + $res .= 'Navigation : ' + . (is_null($group) ? 'Les forums' : makeHREF(Array(), _b_('Les forums'))); + + if (!is_null($group)) { + $res .= ' > ' . makeHREF(Array('group' => $group), $group); + if (is_null($artid)) { + if (sizeof($banana->spool->overview)>$banana->tmax) { + $res .= ' > Pages
'; + $n = intval(log(count($banana->spool->overview), 10))+1; + $i = 1; + for ($ndx = 1 ; $ndx <= sizeof($banana->spool->overview) ; $ndx += $banana->tmax) { + if ($first==$ndx) { + $fmt = $i . ' '; + } else { + $fmt = makeHREF(Array('group' => $group, + 'first' => $ndx), + $i, + '%0' . $n . 'u-%0' . $n . 'u') + . ' '; + } + $i++; + $res .= sprintf($fmt, $ndx, min($ndx+$banana->tmax-1,sizeof($banana->spool->overview))); } - $res .= sprintf($fmt, $ndx, min($ndx+$banana->tmax-1,sizeof($banana->spool->overview))); } - } - } else { - $res .= "[" - ._b_('Répondre')."] "; - if ($banana->post->checkcancel()) { - $res .= "[" - ._b_('Annuler ce message')."] "; + } else { + $res .= ' > Message'; } } return $res.'
'.removeEvilTags(html_entity_decode(to_entities($_text))).'
'; + $res = '
'.html_entity_decode(to_entities(removeEvilTags($_text))).'
'; } else if ($format == 'richtext') { - $res = '
'.richtextToHtml(html_entity_decode(to_entities($_text))).'
'; - $format = 'html'; + $res = '
'.html_entity_decode(to_entities(richtextToHtml($_text))).'
'; } else { - $res = "\n\n" . to_entities(wrap($_text, ""))."\n\n"; + $res = "\n" . to_entities(wrap($_text, "", $flowed))."\n"; + $res = formatPlainText($res); } - $res = preg_replace("/(<|>|")/", " \\1 ", $res); - $res = preg_replace('/(["\[])?((https?|ftp|news):\/\/[a-z@0-9.~%$£µ&i#\-+=_\/\?]*)(["\]])?/i', "\\1\\2\\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\2\3', $res); + $res = preg_replace("/ (<|>|") /", "\\1", $res); + + if ($format == 'richtext') { + $format = 'html'; + } + } + if ($format == 'html') { - $res = preg_replace("@(
)@", "\\1
-- \\2", $res); - $res = preg_replace("@
\n?-- \n?(
--
\\2", $res); - $parts = preg_split("@(:?
)@", $res); + $res = preg_replace("@()\n?-- ?\n?(
-- \\2", $res); + $res = preg_replace("@
--
\\2", $res); + $res = preg_replace("@(
--
\\1", $res); + $parts = preg_split("@(:?|\n)>@i", $res)) { + $res = preg_replace("@(^||\n)((>[^\n]*\n)+)@ie", + "'\\1
'" + .".stripslashes(preg_replace('@(^||\n)>[ \\t\\r]*@i', '\\1', '\\2'))" + .".'
'", + $res); + } + $res = preg_replace("@-- ?\n@", "
\n-- \n", $res); $parts = preg_split("/\n-- ?\n/", $res); } @@ -327,7 +570,7 @@ function formatbody($_text, $format='plain') $sign = array_pop($parts); if ($format == 'html') { $res = join('
--
', $parts); - $sign = '
'.$sign; + $sign = '
'.$sign.'
'; } else { $res = join('\n-- \n', $parts); $sign = ''.$sign; @@ -338,4 +581,5 @@ function formatbody($_text, $format='plain') } } +// vim:set et sw=4 sts=4 ts=4 ?>