dead code + css

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

diff --git a/include/misc.inc.php b/include/misc.inc.php
index 1d85354..bdac4fa 100644 (file)
--- a/include/misc.inc.php
+++ b/include/misc.inc.php
@@ -11,15 +11,6 @@
  *  MISC
  */
 
-function mtime() 
-{ 
-    global $time;
-    list($usec, $sec) = explode(" ", microtime()); 
-    $time[] = ((float)$usec + (float)$sec); 
-} 
-
-mtime();
-
 function _b_($str) { return utf8_decode(dgettext('banana', utf8_encode($str))); }
 
 /********************************************************************************
@@ -48,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;
     }
@@ -66,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);
 
@@ -87,7 +79,7 @@ function formatDisplayHeader($_header,$_text) {
                 $p = $banana->spool->overview[$p]->parent;
             }
             foreach (array_reverse($par_ok) as $p) {
-                $rsl .= "<a href=\"article.php?group={$banana->spool->group}&amp;id=$p\">$ndx</a> ";
+                $rsl .= "<a href=\"?group={$banana->spool->group}&amp;artid=$p\">$ndx</a> ";
                 $ndx++;
             }
             return $rsl;
@@ -96,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);
     }
@@ -148,48 +142,39 @@ function formatFrom($text) {
 
 function displayshortcuts($first = -1) {
     global $banana;
-    $sname = basename($_SERVER['SCRIPT_NAME']);
+    extract($banana->state);
 
-    $res = '<div class="banana_scuts">';
-
-    if (function_exists('hook_displayshortcuts')) {
-        $res .= hook_displayshortcuts($sname, $first);
+    $res  = '<div class="banana_scuts">';
+    $res .= '[<a href="?">'._b_('Liste des forums').'</a>] ';
+    if (is_null($group)) {
+        return $res.'</div>';
     }
-
-    switch ($sname) {
-        case 'thread.php' :
-            $res .= '[<a href="index.php">'._b_('Liste des forums').'</a>] ';
-            $res .= "[<a href=\"post.php?group={$banana->spool->group}\">"._b_('Nouveau message')."</a>] ";
-            if (sizeof($banana->spool->overview)>$banana->tmax) {
-                for ($ndx=1; $ndx<=sizeof($banana->spool->overview); $ndx += $banana->tmax) {
-                    if ($first==$ndx) {
-                        $res .= "[$ndx-".min($ndx+$banana->tmax-1,sizeof($banana->spool->overview))."] ";
-                    } else {
-                        $res .= "[<a href=\"?group={$banana->spool->group}&amp;first="
-                            ."$ndx\">$ndx-".min($ndx+$banana->tmax-1,sizeof($banana->spool->overview))
-                            ."</a>] ";
-                    }
+   
+    $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)));
             }
-            break;
-        case 'article.php' :
-            $res .= '[<a href="index.php">'._b_('Liste des forums').'</a>] ';
-            $res .= "[<a href=\"thread.php?group={$banana->spool->group}\">{$banana->spool->group}</a>] ";
-            $res .= "[<a href=\"post.php?group={$banana->spool->group}&amp;id={$banana->post->id}&amp;type=followup\">"
-                ._b_('Répondre')."</a>] ";
-            if ($banana->post->checkcancel()) {
-                $res .= "[<a href=\"article.php?group={$banana->spool->group}&amp;id={$banana->post->id}&amp;type=cancel\">"
-                    ._b_('Annuler ce message')."</a>] ";
-            }
-            break;
-        case 'post.php' :
-            $res .= '[<a href="index.php">'._b_('Liste des forums').'</a>] ';
-            $res .= "[<a href=\"thread.php?group={$banana->spool->group}\">{$banana->spool->group}</a>]";
-            break;
+        }
+    } 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>] ";
+        }
     }
-    $res .= '</div>';
-
-    return $res;
+    return $res.'</div>';
 }
 
 /********************************************************************************