X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=banana%2Fmisc.inc.php;h=5a76e82bdd62f5402143e90b1169d8d64f997ea5;hb=a205f5e35af586f946d887040a4f3c82f7777323;hp=926cac1e5a5410d74a093ce512c1ff6a9fc7f664;hpb=4ccaaeb747a77c626cfa5868470039d6f909c3d1;p=banana.git diff --git a/banana/misc.inc.php b/banana/misc.inc.php index 926cac1..5a76e82 100644 --- a/banana/misc.inc.php +++ b/banana/misc.inc.php @@ -48,6 +48,7 @@ function redirectInBanana($params) * - 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 */ @@ -61,7 +62,10 @@ function makeLink($params) $host = $_SERVER['HTTP_HOST']; $file = $_SERVER['PHP_SELF']; - if (count($params) != 0) { + 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) { @@ -79,17 +83,23 @@ function makeLink($params) /** 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 '' . $text . ''; + return '' . $text . ''; } /** Format tree images links @@ -102,7 +112,7 @@ function makeHREF($params, $text = null) function makeImg($img, $alt, $height = null, $width = null) { if (function_exists('hook_makeImg') - && $res = hook_makeImg($img, $alt, $width)) { + && $res = hook_makeImg($img, $alt, $height, $width)) { return $res; } @@ -115,12 +125,22 @@ function makeImg($img, $alt, $height = null, $width = null) $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 '' . $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 @@ -163,6 +183,21 @@ function htmlToPlainText($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 */ @@ -245,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); @@ -275,20 +315,24 @@ function formatDisplayHeader($_header,$_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 'x-face'; - - default: - if (function_exists('hook_formatDisplayHeader') - && $res = hook_formatDisplayHeader($_header, $_text)) - { - return $res; + return 'x-face'; + + case "subject": + $link = null; + if (function_exists('hook_getSubject')) { + $link = hook_getSubject($_text); } + return formatPlainText($_text) . $link; + + default: return htmlentities($_text); } } @@ -336,50 +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 .= '[' . makeHREF(Array(), _b_('Liste des forums')) . '] '; - if (is_null($group)) { - return $res.'[' . makeHREF(Array('subscribe' => 1), _b_('Abonnements')) . ']
'; + $res .= ' Profil : ' . 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 .= '
'; - $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 .= '
'; + + $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 .= '[' . 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')) - . '] '; + } else { + $res .= ' > Message'; } } return $res.''; @@ -389,12 +427,16 @@ function displayshortcuts($first = -1) { * 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); @@ -422,7 +464,8 @@ function wrap($text, $_prefix="", $_force=false) $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) { @@ -446,8 +489,12 @@ function wrap($text, $_prefix="", $_force=false) } } } 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); @@ -485,13 +532,8 @@ function formatbody($_text, $format='plain', $flowed=false) } else if ($format == 'richtext') { $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('@' . $limit . '([^\s]+)' . $limit . '@', "<$mark>\\1", $res); - } + $res = "\n" . to_entities(wrap($_text, "", $flowed))."\n"; + $res = formatPlainText($res); } if ($format != 'html') {