}
}
+/** Redirect to the page with the given parameter
+ * @ref makeLink
+ */
+function redirectInBanana($params)
+{
+ header('Location: ' . makeLink($params));
+}
+
+/** Make a link using the given parameters
+ * @param ARRAY params, the parameters with
+ * key => value
+ * Known key are:
+ * - group = group name
+ * - artid/first = article id the the group
+ * - subscribe = to show the subscription page
+ * - action = action to do (new, cancel, view)
+ * - part = to show the given MIME part of the article
+ * - pj = to get the given attachment
+ * - xface = to make a link to an xface
+ *
+ * Can be overloaded by defining a hook_makeLink function
+ */
+function makeLink($params)
+{
+ if (function_exists('hook_makeLink')
+ && $res = hook_makeLink($params)) {
+ return $res;
+ }
+ $proto = empty($_SERVER['HTTPS']) ? 'http://' : 'https://';
+ $host = $_SERVER['HTTP_HOST'];
+ $file = $_SERVER['PHP_SELF'];
+
+ if (isset($params['xface'])) {
+ $file = dirname($file) . '/xface.php';
+ $get = 'face=' . urlencode(base64_encode($params['xface']));
+ } else if (count($params) != 0) {
+ $get = '?';
+ foreach ($params as $key=>$value) {
+ if (strlen($get) != 1) {
+ $get .= '&';
+ }
+ $get .= $key . '=' . $value;
+ }
+ } else {
+ $get = '';
+ }
+
+ return $proto . $host . $file . $get;
+}
+
+/** Format a link to be use in a link
+ * @ref makeLink
+ */
+function makeHREF($params, $text = null, $popup = null, $class = null)
+{
+ $link = makeLink($params);
+ if (is_null($text)) {
+ $text = $link;
+ }
+ if (!is_null($popup)) {
+ $popup = ' title="' . $popup . '"';
+ }
+ if (!is_null($class)) {
+ $class = ' class="' . $class . '"';
+ }
+ $target = null;
+ if (isset($params['action']) && $params['action'] == 'view') {
+ $target = ' target="_blank"';
+ }
+ return '<a href="' . htmlentities($link) .'"' . $target . $popup . $class . '>' . $text . '</a>';
+}
+
+/** Format tree images links
+ * @param img STRING Image name (without extension)
+ * @param alt STRING alternative string
+ * @param width INT to force width of the image (null if not defined)
+ *
+ * This function can be overloaded by defining hook_makeImg()
+ */
+function makeImg($img, $alt, $height = null, $width = null)
+{
+ if (function_exists('hook_makeImg')
+ && $res = hook_makeImg($img, $alt, $height, $width)) {
+ return $res;
+ }
+
+ if (!is_null($width)) {
+ $width = ' width="' . $width . '"';
+ }
+ if (!is_null($height)) {
+ $height = ' height="' . $height . '"';
+ }
+
+ $proto = empty($_SERVER['HTTPS']) ? 'http://' : 'https://';
+ $host = $_SERVER['HTTP_HOST'];
+ $file = dirname($_SERVER['PHP_SELF']) . '/img/' . $img;
+ $url = $proto . $host . $file;
+
+ return '<img src="' . $url . '"' . $height . $width . ' alt="' . $alt . '" />';
+}
+
+/** Make a link using an image
+ */
+function makeImgLink($params, $img, $alt, $height = null, $width = null, $class = null)
+{
+ return makeHREF($params,
+ makeImg($img, ' [' . $alt . ']', $height, $width),
+ $alt,
+ $class);
+}
+
/********************************************************************************
* HTML STUFF
* Taken from php.net
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</' . $mark . '>\3'
+ , $text);
+ }
+ return $text;
+}
+
/********************************************************************************
* RICHTEXT 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) {
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);
$res = "";
$groups = preg_split("/[\t ]*,[\t ]*/",$_text);
foreach ($groups as $g) {
- $res.="<a href='?group=$g'>$g</a>, ";
+ $res .= makeHREF(Array('group' => $g), $g) . ', ';
}
return substr($res,0, -2);
$p = $banana->spool->overview[$p]->parent;
}
foreach (array_reverse($par_ok) as $p) {
- $rsl .= "<a href=\"?group={$banana->spool->group}&artid=$p\">$ndx</a> ";
+ $rsl .= makeHREF(Array('group' => $banana->spool->group,
+ 'artid' => $p),
+ $ndx) . ' ';
$ndx++;
}
return $rsl;
case "x-face":
- return '<img src="xface.php?face='.base64_encode($_text).'" alt="x-face" />';
-
- default:
- if (function_exists('hook_formatDisplayHeader')
- && $res = hook_formatDisplayHeader($_header, $_text))
- {
- return $res;
+ return '<img src="' . makeLink(Array('xface' => headerDecode($_text))) .'" alt="x-face" />';
+
+ case "subject":
+ $link = null;
+ if (function_exists('hook_getSubject')) {
+ $link = hook_getSubject($_text);
}
+ return formatPlainText($_text) . $link;
+
+ default:
return htmlentities($_text);
}
}
return preg_replace("/\\\(\(|\))/","\\1",$result);
}
-function displayshortcuts($first = -1) {
+function displayShortcuts($first = -1)
+{
global $banana;
extract($banana->state);
-
+
$res = '<div class="banana_scuts">';
- $res .= '[<a href="?">'._b_('Liste des forums').'</a>] ';
- if (is_null($group)) {
- return $res.'[<a href="?subscribe=1">'._b_('Abonnements').'</a>]</div>';
+ $res .= '<span class="title"> Profil :</span> ' . makeHREF(Array('subscribe' => 1), _b_('Abonnements'));
+ if (function_exists('hook_shortcuts') && $cstm = hook_shortcuts()) {
+ $res .= ' . ' . $cstm;
}
-
- $res .= "[<a href=\"?group=$group\">$group</a>] ";
-
- if (is_null($artid)) {
- $res .= "[<a href=\"?group=$group&action=new\">"._b_('Nouveau message')."</a>] ";
- if (sizeof($banana->spool->overview)>$banana->tmax) {
- $res .= '<br />';
- $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 = "[<a href=\"?group=$group&first=$ndx\">%0{$n}u-%0{$n}u</a>] ";
+ $res .= '<br />';
+
+ $res .= '<span class="title">Navigation :</span> '
+ . (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<br />';
+ $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 .= "[<a href=\"?group=$group&artid=$artid&action=new\">"
- ._b_('Répondre')."</a>] ";
- if ($banana->post && $banana->post->checkcancel()) {
- $res .= "[<a href=\"?group=$group&artid=$artid&action=cancel\">"
- ._b_('Annuler ce message')."</a>] ";
+ if (!is_null($action)) {
+ if ($action == 'new') {
+ $res .= ' > Nouveau Message';
+ }
+ }
+ } else {
+ if (!is_null($action)) {
+ $res .= ' > ' . makeHREF(Array('group' => $group,
+ 'artid' => $artid),
+ 'Message')
+ . ' > ';
+ if ($action == 'new') {
+ $res .= 'Répondre';
+ } elseif ($action == 'cancel') {
+ $res .= 'Annuler';
+ }
+ } else {
+ $res .= ' > Message';
+ }
}
}
return $res.'</div>';
* FORMATTING STUFF : BODY
*/
-function autoformat($text)
+function autoformat($text, $part = false)
{
global $banana;
$length = $banana->wrap;
-
- $cmd = "echo ".escapeshellarg($text)." | perl -MText::Autoformat -e 'autoformat {left=>1, right=>$length, all=>1 };'";
+ $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);
$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 (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) {
}
}
} else {
- $format = true;
- array_push($next, $line);
+ if (strlen($line) > 2 * $max) {
+ $next = array_merge($next, autoformat($line, true));
+ } else {
+ $format = true;
+ array_push($next, $line);
+ }
}
} else {
array_push($next, $line);
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/>'.html_entity_decode(to_entities(removeEvilTags($_text))).'<br/>';
+ $res = html_entity_decode(to_entities(removeEvilTags($_text)));
} else if ($format == 'richtext') {
- $res = '<br/>'.createlinks(html_entity_decode(to_entities(richtextToHtml($_text)))).'<br/>';
- $format = 'html';
+ $res = html_entity_decode(to_entities(richtextToHtml($_text)));
} else {
- $res = "\n\n" . to_entities(wrap($_text, "", $flowed))."\n\n";
+ $res = to_entities(wrap($_text, "", $flowed));
+ $res = formatPlainText($res);
}
- global $banana;
- $url = $banana->url_regexp;
- $res = preg_replace("/(<|>|")/", " \\1 ", $res);
- $res = preg_replace("!$url!ie", "'\\1<a href=\"\\2\" title=\"\\2\">'.cutlink('\\2').'</a>\\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 != '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);
+ $sign = '<hr style="width: 100%; margin: 1em 0em; " />';
} 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);
+ .".stripslashes(preg_replace('@(^|<pre>|\n)>[ \\t\\r]*@i', '\\1', '\\2'))"
+ .".'</pre></blockquote><pre>'",
+ $res);
}
- $res = preg_replace("@<pre>-- ?\n@", "<pre>\n-- \n", $res);
+
$res = preg_replace("@<pre>-- ?\n@", "<pre>\n-- \n", $res);
$parts = preg_split("/\n-- ?\n/", $res);
+ $sign = '</pre><hr style="width: 100%; margin: 1em 0em; " /><pre>';
}
- if (count($parts) > 1) {
- $sign = array_pop($parts);
- if ($format == 'html') {
- $res = join('<br/>-- <br/>', $parts);
- $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;
- }
- return $res.$sign;
- } else {
- return $res;
- }
+ return join($sign, $parts);
}
+// vim:set et sw=4 sts=4 ts=4
?>
projects / banana.git / blobdiff