if (isset($params['xface'])) {
$file = dirname($file) . '/xface.php';
- $get = 'face=' . $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)
+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 . '">' . $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
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 formatDisplayHeader($_header,$_text) {
global $banana;
+ if (function_exists('hook_formatDisplayHeader')
+ && $res = hook_formatDisplayHeader($_header, $_text)) {
+ return $res;
+ }
+
switch ($_header) {
case "date":
return formatDate($_text);
$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' => urlencode(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 .= '[' . makeHREF(Array(), _b_('Liste des forums')) . '] ';
- if (is_null($group)) {
- return $res.'[' . makeHREF(Array('subscribe' => 1), _b_('Abonnements')) . ']</div>';
+ $res .= '<span class="title"> Profil :</span> ' . makeHREF(Array('subscribe' => 1), _b_('Abonnements'));
+ if (function_exists('hook_shortcuts') && $cstm = hook_shortcuts()) {
+ $res .= ' . ' . $cstm;
}
-
- $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 />';
- $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 = '[' . makeHREF(Array('group' => $group,
- 'first' => $ndx),
- '%0' . $n . 'u-%0' . $n . 'u')
- . '] ';
+ $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 .= '[' . 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'))
- . '] ';
+ 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);
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";
- $formatting = Array('\*' => 'strong',
- '_' => 'u',
- '/' => 'em');
- foreach ($formatting as $limit=>$mark) {
- $res = preg_replace('@(\W)' . $limit . '(\w+)' . $limit . '(\W)@'
- ,'\1<' . $mark . '>\2</' . $mark . '>\3'
- , $res);
- }
+ $res = to_entities(wrap($_text, "", $flowed));
+ $res = formatPlainText($res);
}
if ($format != 'html') {
$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",
}
$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