fsf changes, meant to be rebased on upstream
[squirrelmail.git] / src / read_body.php
index aeff2e7..9e8bb97 100644 (file)
@@ -8,7 +8,7 @@
  *
  * @copyright 1999-2022 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
- * @version $Id$
+ * @version $Id: read_body.php 14845 2020-01-07 08:09:34Z pdontthink $
  * @package squirrelmail
  */
 
@@ -653,6 +653,8 @@ function formatMenubar($aMailbox, $passed_id, $passed_ent_id, $message,
             $oTemplate->assign('move_delete_form_action', $base_uri.'src/read_body.php');
         $oTemplate->assign('delete_form_extra', addHidden('mailbox', $aMailbox['NAME'])."\n" .
                                                 addHidden('msg[0]', $passed_id)."\n" .
+                                                // only need when $return_to_message_list_after_move is off
+                                                addHidden('passed_id', ($next >= 0 ? $next : $prev))."\n" .
                                                 addHidden('startMessage', $startMessage)."\n" );
         if (!(isset($passed_ent_id) && $passed_ent_id)) {
             $oTemplate->assign('can_be_moved', true);
@@ -941,6 +943,13 @@ if ( sqgetGlobalVar('delete_id', $delete_id, SQ_GET) ) {
 }
 
 /**
+ * or delete button... why is handleMessageListForm (per above) conditional anway?
+ */
+if ( sqgetGlobalVar('delete', $ignore, SQ_POST) ) {
+    $sError = handleMessageListForm($imapConnection,$aMailbox);
+}
+
+/**
  * or move button... why is handleMessageListForm (per above) conditional anway?
  */
 if ( sqgetGlobalVar('moveButton', $ignore, SQ_POST) ) {