From f78f34d24e8c50d41eec95a5e46ca0a9f449af38 Mon Sep 17 00:00:00 2001
From: x2000habouzit <x2000habouzit>
Date: Mon, 3 Jan 2005 11:30:54 +0000
Subject: [PATCH] exit format.inc.php

---
 include/misc.inc.php     | 50 ++++++++++++++++++++++++++++++++++++++++++
 install.d/format.inc.php | 56 ------------------------------------------------
 2 files changed, 50 insertions(+), 56 deletions(-)
 delete mode 100644 install.d/format.inc.php

diff --git a/include/misc.inc.php b/include/misc.inc.php
index 4171988..88bb39e 100644
--- a/include/misc.inc.php
+++ b/include/misc.inc.php
@@ -137,6 +137,56 @@ function formatFrom($text) {
     return preg_replace("/\\\(\(|\))/","\\1",$result);
 }
 
+function displayshortcuts($first = -1) {
+    global $banana, $css;
+    $sname = basename($_SERVER['SCRIPT_NAME']);
+
+    echo "<div class=\"{$css['bananashortcuts']}\">";
+
+    if (function_exists('hook_displayshortcuts')) {
+        hook_displayshortcuts($sname, $first);
+    } else {
+        echo '[<a href="disconnect.php">'._b_('Déconnexion').'</a>] ';
+    }
+
+    switch ($sname) {
+        case 'thread.php' :
+            echo '[<a href="index.php">'._b_('Liste des forums').'</a>] ';
+            echo "[<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) {
+                        echo "[$ndx-".min($ndx+$banana->tmax-1,sizeof($banana->spool->overview))."] ";
+                    } else {
+                        echo "[<a href=\"?group={$banana->spool->group}&amp;first="
+                            ."$ndx\">$ndx-".min($ndx+$banana->tmax-1,sizeof($banana->spool->overview))
+                            ."</a>] ";
+                    }
+                }
+            }
+            break;
+        case 'article.php' :
+            echo '[<a href="index.php">'._b_('Liste des forums').'</a>] ';
+            echo "[<a href=\"thread.php?group={$banana->spool->group}\">{$banana->spool->group}</a>] ";
+            echo "[<a href=\"post.php?group={$banana->spool->group}&amp;id={$banana->post->id}&amp;type=followup\">"
+                ._b_('Répondre')."</a>] ";
+            if ($banana->post->checkcancel()) {
+                echo "[<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' :
+            echo '[<a href="index.php">'._b_('Liste des forums').'</a>] ';
+            echo "[<a href=\"thread.php?group={$banana->spool->group}\">{$banana->spool->group}</a>]";
+            break;
+    }
+    echo '</div>';
+}
+
+/********************************************************************************
+ *  FORMATTING STUFF : BODY
+ */
+
 function wrap($text, $_prefix="")
 {
     $parts = preg_split("/\n-- ?\n/", $text);
diff --git a/install.d/format.inc.php b/install.d/format.inc.php
deleted file mode 100644
index 064b7ad..0000000
--- a/install.d/format.inc.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-/********************************************************************************
-* install.d/format.inc.php : HTML output subroutines
-* --------------------------
-*
-* This file is part of the banana distribution
-* Copyright: See COPYING files that comes with this distribution
-********************************************************************************/
-
-
-/** contextual links 
- * @return STRING HTML output
- */
-function displayshortcuts($first = -1) {
-    global $banana;
-    $sname = basename($_SERVER['SCRIPT_NAME']);
-
-    echo '<div class="shortcuts">';
-    echo '[<a href="disconnect.php">'._b_('Déconnexion').'</a>] ';
-
-    switch ($sname) {
-        case 'thread.php' :
-            echo '[<a href="index.php">'._b_('Liste des forums').'</a>] ';
-            echo "[<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) {
-                        echo "[$ndx-".min($ndx+$banana->tmax-1,sizeof($banana->spool->overview))."] ";
-                    } else {
-                        echo "[<a href=\"".$_SERVER['PHP_SELF']."?group={$banana->spool->group}&amp;first="
-                            ."$ndx\">$ndx-".min($ndx+$banana->tmax-1,sizeof($banana->spool->overview))
-                            ."</a>] ";
-                    }
-                }
-            }
-            break;
-        case 'article.php' :
-            echo '[<a href="index.php">'._b_('Liste des forums').'</a>] ';
-            echo "[<a href=\"thread.php?group={$banana->spool->group}\">{$banana->spool->group}</a>] ";
-            echo "[<a href=\"post.php?group={$banana->spool->group}&amp;id={$banana->post->id}&amp;type=followup\">"
-                ._b_('Répondre')."</a>] ";
-            if ($banana->post->checkcancel()) {
-                echo "[<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' :
-            echo '[<a href="index.php">'._b_('Liste des forums').'</a>] ';
-            echo "[<a href=\"thread.php?group={$banana->spool->group}\">{$banana->spool->group}</a>]";
-            break;
-    }
-    echo '</div>';
-}
-
-?>
-
-- 
2.1.4