From: x2003bruneau <x2003bruneau@9869982d-c50d-0410-be91-f2a2ec7c7c7b>
Date: Sun, 23 Jul 2006 15:41:59 +0000 (+0000)
Subject: First index to show must be a linear index and not a message number
X-Git-Tag: 1.8~173
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=55336123892d166ad156911be4a65ffe25b6bac5;p=banana.git

First index to show must be a linear index and not a message number

git-svn-id: svn+ssh://murphy/home/svn/banana/trunk@124 9869982d-c50d-0410-be91-f2a2ec7c7c7b
---

diff --git a/banana/banana.inc.php.in b/banana/banana.inc.php.in
index 25ac4c5..bbec034 100644
--- a/banana/banana.inc.php.in
+++ b/banana/banana.inc.php.in
@@ -316,10 +316,14 @@ class Banana
              . "\n"
              . "Message canceled with Banana";
         if ($this->nntp->post($msg)) {
+            $ndx = $this->spool->getndx($artid) - 1;
+            if ($ndx > 50) {
+                $ndx = 0;
+            }
             $this->spool->delid($id);
             $this->nntp->quit();
             redirectInBanana(Array('group' => $group,
-                                   'first' => $id));
+                                   'first' => $ndx));
         } else {
             return '<p class="error">'._b_('Impossible d\'annuler le message').'</p>';
         }
@@ -475,7 +479,10 @@ class Banana
         if ($this->nntp->post($msg)) {
             $dir = Array('group' => $group);
             if ($artid != -1) {
-                $dir['first'] = $artid;
+                $ndx = $this->spool->getndx($artid);
+                if ($ndx > 50) {
+                    $dir['first'] = $ndx;
+                }
             }
             redirectInBanana($dir);
         } else {