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 2c223bf..26cb3a5 100644 (file)
--- a/banana/banana.inc.php.in
+++ b/banana/banana.inc.php.in
@@ -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);
@@ -680,7 +676,8 @@ class Banana
             $clean = false;
             if (php_sapi_name() != 'cli') {
                 if ($group == @$_SESSION['banana_group'] && isset($_SESSION['banana_spool'])) {
-                    Banana::$spool =& $_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']);
@@ -692,7 +689,7 @@ class Banana
             if (php_sapi_name() != 'cli') {
                 $_SESSION['banana_group'] = $group;
                 if (!Banana::$profile['display']) {
-                    $_SESSION['banana_spool'] =& Banana::$spool;
+                    $_SESSION['banana_spool'] = serialize(Banana::$spool);
                     $_SESSION['banana_lastnews'] = Banana::$profile['lastnews'];
                 }
             }
@@ -706,13 +703,13 @@ class Banana
         Banana::load('message');
         if ($group == @$_SESSION['banana_group'] && $artid == @$_SESSION['banana_artid']
             && isset($_SESSION['banana_message'])) {
-            $message =& $_SESSION['banana_message'];
+            $message = unserialize($_SESSION['banana_message']);
             Banana::$msgshow_headers = $_SESSION['banana_showhdr'];
         }  else {
             $message = Banana::$protocole->getMessage($artid);
             $_SESSION['banana_group'] = $group;
             $_SESSION['banana_artid'] = $artid;
-            $_SESSION['banana_message'] =& $message;
+            $_SESSION['banana_message'] = serialize($message);
             $_SESSION['banana_showhdr'] = Banana::$msgshow_headers;
         }
         Banana::$message =& $message;
@@ -724,7 +721,7 @@ class Banana
         Banana::$spool->delId($artid);
         if ($group == $_SESSION['banana_group']) {
             if (!Banana::$profile['display']) {
-                $_SESSION['banana_spool'] =& Banana::$spool;
+                $_SESSION['banana_spool'] = serialize(Banana::$spool);
             }
             if ($artid == $_SESSION['banana_artid']) {
                 unset($_SESSION['banana_message']);