X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=banana%2Fmisc.inc.php;h=7a782c4dcf8f8f8cfba14a976ed3be3e556a2f4d;hb=261210bc9c416cca0d9b79ab215526d4c93b098a;hp=9b568d82a767292992d5f3a8d095c91025814814;hpb=940ae667f3ed96e2e3eed46a741421c5ea04440e;p=banana.git
diff --git a/banana/misc.inc.php b/banana/misc.inc.php
index 9b568d8..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
@@ -42,7 +137,8 @@ function textFormat_translate($format)
*/
function removeEvilTags($source)
{
- $allowedTags = '
)\n?-- ?\n?(
'; + $allowedTags = '
)\n?-- \n?(
'; + $source = preg_replace('||i', '
', $source); $source = strip_tags($source, $allowedTags); return preg_replace('/<(.*?)>/ie', "'<'.removeEvilAttributes('\\1').'>'", $source); } @@ -63,8 +159,8 @@ function removeEvilAttributes($tagSource) */ function htmlToPlainText($res) { - $res = trim(html_entity_decode(strip_tags($res, '
'))); - $res = preg_replace("@
]>@i", "\n", $res); + $res = trim(html_entity_decode(strip_tags($res, ''; } - $res .= "[$group] "; + $res .= '[' . makeHREF(Array('group' => $group), $group) . '] '; if (is_null($artid)) { - $res .= "["._b_('Nouveau message')."] "; + $res .= '[' . makeHREF(Array('group' => $group, + 'action' => 'new'), + _b_('Nouveau message')) + . '] '; if (sizeof($banana->spool->overview)>$banana->tmax) { $res .= ''))); + $res = preg_replace("@?(br|p|div)[^>]*>@i", "\n", $res); if (!is_utf8($res)) { $res = utf8_encode($res); } @@ -113,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) { @@ -162,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); @@ -183,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') @@ -249,15 +345,18 @@ function displayshortcuts($first = -1) { extract($banana->state); $res = '
'; - $res .= '['._b_('Liste des forums').'] '; + $res .= '[' . makeHREF(Array(), _b_('Liste des forums')) . '] '; if (is_null($group)) { - return $res.'['._b_('Abonnements').']'; + return $res.'[' . makeHREF(Array('subscribe' => 1), _b_('Abonnements')) . ']
'; $n = intval(log(count($banana->spool->overview), 10))+1; @@ -265,17 +364,26 @@ function displayshortcuts($first = -1) { if ($first==$ndx) { $fmt = "[%0{$n}u-%0{$n}u] "; } else { - $fmt = "[%0{$n}u-%0{$n}u] "; + $fmt = '[' . makeHREF(Array('group' => $group, + 'first' => $ndx), + '%0' . $n . 'u-%0' . $n . 'u') + . '] '; } $res .= sprintf($fmt, $ndx, min($ndx+$banana->tmax-1,sizeof($banana->spool->overview))); } } } else { - $res .= "[" - ._b_('Répondre')."] "; + $res .= '[' . makeHREF(Array('group' => $group, + 'artid' => $artid, + 'action' => 'new'), + _b_('Répondre')) + . '] '; if ($banana->post && $banana->post->checkcancel()) { - $res .= "[" - ._b_('Annuler ce message')."] "; + $res .= '[' . makeHREF(Array('group' => $group, + 'artid' => $artid, + 'action' => 'cancel'), + _b_('Annuler ce message')) + . '] '; } } return $res.''; @@ -285,7 +393,20 @@ function displayshortcuts($first = -1) { * FORMATTING STUFF : BODY */ -function wrap($text, $_prefix="") +function autoformat($text) +{ + global $banana; + $length = $banana->wrap; + + $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); + } + return $result; +} + +function wrap($text, $_prefix="", $_force=false) { $parts = preg_split("/\n-- ?\n/", $text); if (count($parts) >1) { @@ -293,36 +414,117 @@ function wrap($text, $_prefix="") $text = join("\n-- \n", $parts); } else { $sign = ''; - $text = $text; } global $banana; + $url = $banana->url_regexp; $length = $banana->wrap; - $cmd = "echo ".escapeshellarg($text)." | perl -MText::Autoformat -e 'autoformat {left=>1, right=>$length, all=>1 };'"; - exec($cmd, $result); + $max = $length + ($length/10); + $splits = split("\n", $text); + $result = array(); + $next = array(); + $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 (strlen($matches[1]) != 0) { + array_push($next, rtrim($matches[1])); + if (strlen($matches[1]) > $max) { + $format = true; + } + } + + if ($format) { + $result = array_merge($result, autoformat(join("\n", $next))); + } else { + $result = array_merge($result, $next); + } + $format = false; + $next = array(); + array_push($result, $matches[2]); + + if (strlen($matches[6]) != 0) { + array_push($next, ltrim($matches[6])); + if (strlen($matches[6]) > $max) { + $format = true; + } + } + } else { + $format = true; + array_push($next, $line); + } + } else { + array_push($next, $line); + } + } + if ($format) { + $result = array_merge($result, autoformat(join("\n", $next))); + } else { + $result = array_merge($result, $next); + } return $_prefix.join("\n$_prefix", $result).($_prefix ? '' : $sign); } -function formatbody($_text, $format='plain') +function cutlink($link) +{ + global $banana; + + if (strlen($link) > $banana->wrap) { + $link = substr($link, 0, $banana->wrap - 3)."..."; + } + return $link; +} + +function cleanurl($url) +{ + $url = str_replace('@', '%40', $url); + return ''.cutlink($url).''; +} + +function formatbody($_text, $format='plain', $flowed=false) { if ($format == 'html') { - $res = '
'.removeEvilTags($_text).'
'; + $res = '
'.html_entity_decode(to_entities(removeEvilTags($_text))).'
'; } else if ($format == 'richtext') { - $res = '
'.richtextToHtml($_text).'
'; - $format = 'html'; + $res = '
'.html_entity_decode(to_entities(richtextToHtml($_text))).'
'; } else { - $res = "\n\n" . to_entities(wrap($_text, ""))."\n\n"; + $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$mark>", $res); + } } - $res = preg_replace("/(<|>|")/", " \\1 ", $res); - $res = preg_replace('/(["\[])?((https?|ftp|news):\/\/[a-z@0-9.~%$£µ&i#\-+=_\/\?]*)(["\]])?/i', "\\1\\2\\4", $res); - $res = preg_replace("/ (<|>|") /", "\\1", $res); + if ($format != 'html') { + global $banana; + $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\2\3', $res); + $res = preg_replace("/ (<|>|") /", "\\1", $res); + + if ($format == 'richtext') { + $format = 'html'; + } + } + if ($format == 'html') { - $res = preg_replace("@(]*>|
)@", "\\1
-- \\2", $res); - $res = preg_replace("@
\n?-- \n?(]*>)@", "
--
\\2", $res); - $parts = preg_split("@(:?]*>\n?-- \n?
|
]*>\n?-- \n?
)@", $res); + $res = preg_replace("@(]*>|
]*>)@", "\\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 { + while (preg_match("@(^||\n)>@i", $res)) { + $res = preg_replace("@(^||\n)((>[^\n]*\n)+)@ie", + "'\\1'" + .".stripslashes(preg_replace('@(^||\n)>[ \\t\\r]*@i', '\\1', '\\2'))" + .".''", + $res); + } + $res = preg_replace("@-- ?\n@", "\n-- \n", $res); $parts = preg_split("/\n-- ?\n/", $res); } @@ -330,7 +532,7 @@ function formatbody($_text, $format='plain') $sign = array_pop($parts); if ($format == 'html') { $res = join('
--
', $parts); - $sign = '
'.$sign; + $sign = '
'.$sign.'
'; } else { $res = join('\n-- \n', $parts); $sign = ''.$sign; @@ -341,4 +543,5 @@ function formatbody($_text, $format='plain') } } +// vim:set et sw=4 sts=4 ts=4 ?>