X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=banana%2Fmisc.inc.php;h=5a76e82bdd62f5402143e90b1169d8d64f997ea5;hb=a205f5e35af586f946d887040a4f3c82f7777323;hp=7e7a5479bda876d238eeea374505b21c9c2b7357;hpb=9c192e03df3b73f697c2ab36347b1e302eff85d8;p=banana.git
diff --git a/banana/misc.inc.php b/banana/misc.inc.php
index 7e7a547..5a76e82 100644
--- a/banana/misc.inc.php
+++ b/banana/misc.inc.php
@@ -30,6 +30,117 @@ 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=' . 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 '' . $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;
+ $url = $proto . $host . $file;
+
+ return '';
+}
+
+/** 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
@@ -72,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' . $mark . '>\3'
+ , $text);
+ }
+ return $text;
+}
+
/********************************************************************************
* RICHTEXT STUFF
*/
@@ -154,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);
@@ -163,7 +294,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,20 +315,24 @@ 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,
+ 'artid' => $p),
+ $ndx) . ' ';
$ndx++;
}
return $rsl;
case "x-face":
- return '
';
-
- default:
- if (function_exists('hook_formatDisplayHeader')
- && $res = hook_formatDisplayHeader($_header, $_text))
- {
- return $res;
+ return '
';
+
+ case "subject":
+ $link = null;
+ if (function_exists('hook_getSubject')) {
+ $link = hook_getSubject($_text);
}
+ return formatPlainText($_text) . $link;
+
+ default:
return htmlentities($_text);
}
}
@@ -245,38 +380,44 @@ function formatFrom($text) {
return preg_replace("/\\\(\(|\))/","\\1",$result);
}
-function displayshortcuts($first = -1) {
+function displayShortcuts($first = -1)
+{
global $banana;
extract($banana->state);
-
+
$res = '
|\n)>@i", $res)) { $res = preg_replace("@(^||\n)((>[^\n]*\n)+)@ie", "'\\1'" - .".stripslashes(preg_replace('@(^||\n)>[ \\t\\r]*@i', '\\1', '\\2'))" - .".''", - $res); + .".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); } @@ -430,4 +581,5 @@ function formatbody($_text, $format='plain', $flowed=false) } } +// vim:set et sw=4 sts=4 ts=4 ?>