dead code + css

[banana.git] / include / misc.inc.php

diff --git a/include/misc.inc.php b/include/misc.inc.php
index 767d739..bdac4fa 100644 (file)
--- a/include/misc.inc.php
+++ b/include/misc.inc.php
@@ -13,13 +13,6 @@
 
 function _b_($str) { return utf8_decode(dgettext('banana', utf8_encode($str))); }
 
-function checkcancel($_headers) {
-    if (function_exists('hook_checkcancel')) {
-        return hook_checkcancel($_headers);
-    }
-    return ($_headers['from'] == $_SESSION['name']." <".$_SESSION['mail'].">");
-}
-
 /********************************************************************************
  *  HEADER STUFF
  */
@@ -46,8 +39,9 @@ function header_translate($hdr) {
         case 'references':      return _b_('Références');
         case 'x-face':          return _b_('Image');
         default:
-            if (function_exists('hook_header_translate')) {
-                return hook_header_translate($hdr);
+            if (function_exists('hook_headerTranslate')
+                    && $res = hook_headerTranslate($hdr)) {
+                return $res;
             }
             return $hdr;
     }
@@ -64,7 +58,7 @@ function formatDisplayHeader($_header,$_text) {
             $res = "";
             $groups = preg_split("/[\t ]*,[\t ]*/",$_text);
             foreach ($groups as $g) {
-                $res.="<a href='thread.php?group=$g'>$g</a>, ";
+                $res.="<a href='?group=$g'>$g</a>, ";
             }
             return substr($res,0, -2);
 
@@ -78,13 +72,14 @@ function formatDisplayHeader($_header,$_text) {
             $text    = preg_split("/[ \t]/",strtr($text,$banana->spool->ids));
             $parents = preg_grep("/^\d+$/",$text);
             $p       = array_pop($parents);
+            $par_ok  = Array();
             
             while ($p) {
-                $valid_parents[]=$p;
+                $par_ok[]=$p;
                 $p = $banana->spool->overview[$p]->parent;
             }
-            foreach (array_reverse($valid_parents) as $p) {
-                $rsl .= "<a href=\"article.php?group={$banana->spool->group}&amp;id=$p\">$ndx</a> ";
+            foreach (array_reverse($par_ok) as $p) {
+                $rsl .= "<a href=\"?group={$banana->spool->group}&amp;artid=$p\">$ndx</a> ";
                 $ndx++;
             }
             return $rsl;
@@ -93,8 +88,10 @@ function formatDisplayHeader($_header,$_text) {
             return '<img src="xface.php?face='.base64_encode($_text).'"  alt="x-face" />';
         
         default:
-            if (function_exists('hook_formatDisplayHeader')) {
-                return hook_formatDisplayHeader($_header, $_text);
+            if (function_exists('hook_formatDisplayHeader')
+                    && $res = hook_formatDisplayHeader($_header, $_text))
+            {
+                return $res;
             }
             return htmlentities($_text);
     }
@@ -117,7 +114,7 @@ function fancyDate($stamp) {
     } elseif ($today == 1 + $dday) {
         $format = _b_('hier')." %H:%M";
     } elseif ($today < 7 + $dday) {
-        $format = '%A %H:%M';
+        $format = '%a %H:%M';
     } else {
         $format = '%a %e %b';
     }
@@ -143,6 +140,47 @@ function formatFrom($text) {
     return preg_replace("/\\\(\(|\))/","\\1",$result);
 }
 
+function displayshortcuts($first = -1) {
+    global $banana;
+    extract($banana->state);
+
+    $res  = '<div class="banana_scuts">';
+    $res .= '[<a href="?">'._b_('Liste des forums').'</a>] ';
+    if (is_null($group)) {
+        return $res.'</div>';
+    }
+   
+    $res .= "[<a href=\"?group=$group\">$group</a>] ";
+
+    if (is_null($artid)) {
+        $res .= "[<a href=\"?group=$group&amp;action=new\">"._b_('Nouveau message')."</a>] ";
+        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 = "[<a href=\"?group=$group&amp;first=$ndx\">%0{$n}u-%0{$n}u</a>] ";
+                }
+                $res .= sprintf($fmt, $ndx, min($ndx+$banana->tmax-1,sizeof($banana->spool->overview)));
+            }
+        }
+    } else {
+        $res .= "[<a href=\"?group=$group&amp;artid=$artid&amp;action=new\">"
+            ._b_('Répondre')."</a>] ";
+        if ($banana->post->checkcancel()) {
+            $res .= "[<a href=\"?group=$group&amp;artid=$artid&amp;action=cancel\">"
+                ._b_('Annuler ce message')."</a>] ";
+        }
+    }
+    return $res.'</div>';
+}
+
+/********************************************************************************
+ *  FORMATTING STUFF : BODY
+ */
+
 function wrap($text, $_prefix="")
 {
     $parts = preg_split("/\n-- ?\n/", $text);