Remove dead code.

[banana.git] / banana / banana.inc.php.in

diff --git a/banana/banana.inc.php.in b/banana/banana.inc.php.in
index 2b43207..26cb3a5 100644 (file)
--- a/banana/banana.inc.php.in
+++ b/banana/banana.inc.php.in
@@ -46,7 +46,7 @@ class Banana
 
 ### Message display ###
     static public $msgshow_headers   = array('from', 'newsgroups', 'followup-to', 'to', 'cc', 'reply-to',
-                                       'organization', 'date', 'references', 'in-reply-to');
+                                             'organization', 'date');
     static public $msgshow_mimeparts = array('multipart/report', 'multipart/mixed',
                                              'text/html', 'text/plain', 'text/enriched', 'text', 'message');
     static public $msgshow_xface     = true;
@@ -574,16 +574,12 @@ class Banana
         }
         if (isset($_POST['cancel'])) {
             $this->loadSpool($group);
-            $ndx = Banana::$spool->getNdX($id) - 1;
             if (!Banana::$protocole->cancel($msg)) {
                 return _b_('Une erreur s\'est produite lors de l\'annulation du message :') . '<br />'
                        . Banana::$protocole->lastError();
             }
-            if ($ndx < 50) {
-                 $ndx = 0;
-            }
             $this->removeMessage($group, $artid);
-            Banana::$page->redirect(Array('group' => $group, 'first' => $ndx));
+            Banana::$page->redirect(Array('group' => $group));
         }
 
         Banana::$page->assign_by_ref('message', $msg);
@@ -681,6 +677,7 @@ class Banana
             if (php_sapi_name() != 'cli') {
                 if ($group == @$_SESSION['banana_group'] && isset($_SESSION['banana_spool'])) {
                     Banana::$spool = unserialize($_SESSION['banana_spool']);
+                    unset($_SESSION['banana_spool']);
                     $clean = @(Banana::$profile['lastnews'] != $_SESSION['banana_lastnews']);
                 } else {
                     unset($_SESSION['banana_message']);
@@ -736,7 +733,7 @@ class Banana
         return true;
     }
 
-    static private function load($file)
+    static public function load($file)
     {
         $file = strtolower($file) . '.inc.php';
         if (!@include_once dirname(__FILE__) . "/$file") {