if (isset($params['xface'])) {
$file = dirname($file) . '/xface.php';
- $get = 'face=' . urlencode($params['xface']);
+ $get = 'face=' . urlencode(base64_encode($params['xface']));
} else if (count($params) != 0) {
$get = '?';
foreach ($params as $key=>$value) {
/** Format a link to be use in a link
* @ref makeLink
*/
-function makeHREF($params, $text = null, $popup = null)
+function makeHREF($params, $text = null, $popup = null, $class = null)
{
$link = makeLink($params);
if (is_null($text)) {
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 . '>' . $text . '</a>';
+ return '<a href="' . htmlentities($link) .'"' . $target . $popup . $class . '>' . $text . '</a>';
}
/** Format tree images links
$proto = empty($_SERVER['HTTPS']) ? 'http://' : 'https://';
$host = $_SERVER['HTTP_HOST'];
- $file = dirname($_SERVER['PHP_SELF']) . '/img/' . $img . '.gif';
+ $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
case "from":
return formatFrom($_text);
-
+
case "references":
$rsl = "";
$ndx = 1;
$p = $banana->spool->overview[$p]->parent;
}
foreach (array_reverse($par_ok) as $p) {
- $rsl .= makeHREF(Array('group' => $banana->spool->group), $ndx) . ' ';
+ $rsl .= makeHREF(Array('group' => $banana->spool->group,
+ 'artid' => $p),
+ $ndx) . ' ';
$ndx++;
}
return $rsl;
case "x-face":
- return '<img src="' . makeLink(Array('xface' => base64_encode(headerDecode($_text)))) .'" alt="x-face" />';
+ return '<img src="' . makeLink(Array('xface' => headerDecode($_text))) .'" alt="x-face" />';
case "subject":
$link = null;
return preg_replace("/\\\(\(|\))/","\\1",$result);
}
-function displayshortcuts($first = -1) {
+function makeTab($link, $text)
+{
+ return Array(makeHREF($link, $text),
+ $text);
+}
+
+function displayTabs()
+{
global $banana;
extract($banana->state);
-
- $res = '<div class="banana_scuts">';
- $res .= '[' . makeHREF(Array(), _b_('Liste des forums')) . '] ';
- if (is_null($group)) {
- return $res.'[' . makeHREF(Array('subscribe' => 1), _b_('Abonnements')) . ']</div>';
- }
-
- $res .= '[' . makeHREF(Array('group' => $group), $group) . '] ';
-
- if (is_null($artid)) {
- $res .= '[' . makeHREF(Array('group' => $group,
- 'action' => 'new'),
- _b_('Nouveau message'))
- . '] ';
- if (sizeof($banana->spool->overview)>$banana->tmax) {
- $res .= '<br />Page : ';
- $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')
- . ' ';
+ if (function_exists('hook_shortcuts') && $cstm = hook_shortcuts()) {
+ $res = $cstm;
+ }
+
+ $res['subscribe'] = makeTab(Array('subscribe' => 1), _b_('Abonnements'));
+ $res['forums'] = makeTab(Array(), _b_('Les forums'));
+
+ if (!is_null($group)) {
+ $res['group'] = makeTab(Array('group' => $group), $group);
+ if (is_null($artid)) {
+ if (@$action == 'new') {
+ $res['action'] = makeTab(Array('group' => $group,
+ 'action' => 'new'),
+ _b_('Nouveau Message'));
+ }
+ } else {
+ $res['message'] = makeTab(Array('group' => $group,
+ 'artid' => $artid),
+ _b_('Message'));
+ if (!is_null($action)) {
+ if ($action == 'new') {
+ $res['action'] = makeTab(Array('group' => $group,
+ 'artid' => $artid,
+ 'action' => 'new'),
+ _b_('Réponse'));
+ } elseif ($action == 'cancel') {
+ $res['action'] = makeTab(Array('group' => $group,
+ 'artid' => $artid,
+ 'action' => 'cancel'),
+ _b_('Annuler'));
}
- $i++;
- $res .= sprintf($fmt, $ndx, min($ndx+$banana->tmax-1,sizeof($banana->spool->overview)));
}
}
- } else {
- $res .= '[' . makeHREF(Array('group' => $group,
- 'artid' => $artid,
- 'action' => 'new'),
- _b_('Répondre'))
- . '] ';
- if ($banana->post && $banana->post->checkcancel()) {
- $res .= '[' . makeHREF(Array('group' => $group,
- 'artid' => $artid,
- 'action' => 'cancel'),
- _b_('Annuler ce message'))
- . '] ';
+ }
+ $ret = '<ul id="onglet">';
+ foreach ($res as $name=>$onglet) {
+ if ($name != @$page) {
+ $ret .= '<li>' . $onglet[0] . '</li>';
+ } else {
+ $ret .= '<li class="actif">' . $onglet[1] . '</li>';
+ }
+ }
+ $ret .= '</ul>';
+ return $ret;
+}
+
+function displayPages($first = -1)
+{
+ global $banana;
+ extract($banana->state);
+ $res = null;
+ if (!is_null($group) && is_null($artid)
+ && sizeof($banana->spool->overview)>$banana->tmax) {
+ $res .= '<div class="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) {
+ $res .= '<strong>' . $i . '</strong> ';
+ } else {
+ $res .= makeHREF(Array('group' => $group,
+ 'first' => $ndx),
+ $i,
+ $ndx . '-' . min($ndx+$banana->tmax-1,sizeof($banana->spool->overview)))
+ . ' ';
+ }
+ $i++;
}
+ $res .= '</div>';
}
- return $res.'</div>';
+ return $res;
}
+function makeTable($text)
+{
+ return '<table class="cadre_a_onglet" cellpadding="0" cellspacing="0" width="100%">'
+ . '<tr><td>'
+ . displayTabs()
+ . '</td></tr>'
+ . '<tr><td class="conteneur_tab">'
+ . $text
+ . '</td></tr>'
+ . '</table>';
+}
+
/********************************************************************************
* FORMATTING STUFF : BODY
*/
{
global $banana;
$length = $banana->wrap;
-
- $cmd = "echo ".escapeshellarg($text)." | perl -MText::Autoformat -e 'autoformat {left=>1, right=>$length, all=>1 };'";
+
+ $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);
} else {
$sign = '';
}
-
+
global $banana;
$url = $banana->url_regexp;
$length = $banana->wrap;
$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);
+ $format = true;
}
} else {
array_push($next, $line);
return '<a href="'.$url.'" title="'.$url.'">'.cutlink($url).'</a>';
}
+function catchMailLink($email)
+{
+ global $banana;
+ $mid = '<' . $email . '>';
+ if (isset($banana->spool->ids[$mid])) {
+ return makeHREF(Array('group' => $banana->state['group'],
+ 'artid' => $banana->spool->ids[$mid]),
+ $email);
+ } elseif (strpos($email, '$') !== false) {
+ return $email;
+ }
+ return '<a href="mailto:' . $email . '">' . $email . '</a>';
+}
+
+/** Remove quotation marks
+ */
+function replaceQuotes($text)
+{
+ return stripslashes(preg_replace("@(^|<pre>|\n)>[ \t\r]*@i", '\1', $text));
+}
+
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/>'.html_entity_decode(to_entities(richtextToHtml($_text))).'<br/>';
+ $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);
}
$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('/(["\[])?(?:mailto:|news:)?([a-z0-9.\-+_\$]+@([\-.+_]?[a-z0-9])+)(["\]])?/ie',
+ "'\\1' . catchMailLink('\\2') . '\\4'",
+ $res);
$res = preg_replace("/ (<|>|") /", "\\1", $res);
if ($format == 'richtext') {
$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>'",
+ ." . replaceQuotes('\\2')"
+ ."
. '</pre></blockquote><pre>'",
$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