X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=banana%2Fmisc.inc.php;h=7a782c4dcf8f8f8cfba14a976ed3be3e556a2f4d;hb=261210bc9c416cca0d9b79ab215526d4c93b098a;hp=f8df8709168cc9fe047e0d758ee8ae95ab49a44f;hpb=76032c26b695305820448a33acd03e73cc502b41;p=banana.git diff --git a/banana/misc.inc.php b/banana/misc.inc.php index f8df870..7a782c4 100644 --- a/banana/misc.inc.php +++ b/banana/misc.inc.php @@ -30,6 +30,101 @@ function textFormat_translate($format) } } +/** 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=' . $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) +{ + $link = makeLink($params); + if (is_null($text)) { + $text = $link; + } + $target = null; + if (isset($params['action']) && $params['action'] == 'view') { + $target = ' target="_blank"'; + } + return '' . $text . ''; +} + +/** 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 . '.gif'; + $url = $proto . $host . $file; + + return ''; +} + /******************************************************************************** * HTML STUFF * Taken from php.net @@ -114,14 +209,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) { @@ -163,7 +258,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); @@ -184,13 +279,13 @@ 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), $ndx) . ' '; $ndx++; } return $rsl; case "x-face": - return ''; + return ''; default: if (function_exists('hook_formatDisplayHeader') @@ -250,15 +345,18 @@ function displayshortcuts($first = -1) { extract($banana->state); $res = '
]*>|
]*>)@", "\\1
-- \\2", $res);
- $res = preg_replace("@
]*>\n?-- \n?(
]*>)@", "
--
\\2", $res);
- $parts = preg_split("@(:?
]*>\n?-- \n?
|]*>|
]*>)@", "\\1
-- \\2", $res);
+ $res = preg_replace("@
]*>\n?-- ?\n?(
]*>)@", "
--
\\2", $res);
+ $res = preg_replace("@(
]*>)\n?-- ?\n@", "
--
\\1", $res); + $parts = preg_split("@(:?]*>\n?-- ?\n?
|
]*>\n?-- ?\n?
]*>)@", $res); } else { - for ($i = 1 ; preg_match("@(^||\n)>@i", $res) ; $i++) { + while (preg_match("@(^||\n)>@i", $res)) { $res = preg_replace("@(^||\n)((>[^\n]*\n)+)@ie", - "'\\1'" - .".stripslashes(preg_replace('@(^||\n)>[ \\t\\r]*@i', '\\1', '\\2'))" - .".''", - $res); + "'\\1'" + .".stripslashes(preg_replace('@(^||\n)>[ \\t\\r]*@i', '\\1', '\\2'))" + .".''", + $res); } - $res = preg_replace("@-- ?\n@", "\n-- \n", $res); + $res = preg_replace("@-- ?\n@", "\n-- \n", $res); $parts = preg_split("/\n-- ?\n/", $res); } @@ -350,4 +543,5 @@ function formatbody($_text, $format='plain') } } +// vim:set et sw=4 sts=4 ts=4 ?>