From 04faf7f452a82be4e756a8fe8837233c71b2d0ac Mon Sep 17 00:00:00 2001 From: stekkel Date: Wed, 23 Oct 2002 13:48:10 +0000 Subject: [PATCH] disable if we are in an opened message/rfc822 attachment git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@3948 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- plugins/delete_move_next/setup.php | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/plugins/delete_move_next/setup.php b/plugins/delete_move_next/setup.php index 13b81159..48c9d080 100644 --- a/plugins/delete_move_next/setup.php +++ b/plugins/delete_move_next/setup.php @@ -156,11 +156,13 @@ function delete_move_next_read($currloc) { $color, $where, $what, $currentArrayIndex, $passed_id, $mailbox, $sort, $startMessage, $delete_id, $move_id, $imapConnection, $auto_expunge, $move_to_trash, $mbx_response, - $uid_support; + $uid_support, $passed_ent_id; $urlMailbox = urlencode($mailbox); - if (!(($where && $what) || ($currentArrayIndex == -1))) { + if (!isset($passed_ent_id)) $passed_ent_id = 0; + + if (!(($where && $what) || ($currentArrayIndex == -1)) && !$passed_ent_id) { $next = findNextMessage($passed_id); $prev = findPreviousMessage($mbx_response['EXISTS'], $passed_id); $prev_if_del = $prev; @@ -181,16 +183,6 @@ function delete_move_next_read($currloc) { ''. ""; -// if ($prev > 0) { -// echo "" . _("Previous") . " | \n"; -// } else { -// echo _("Previous") . " | "; -// } -// if ($next > 0) { -// echo "" . _("Next") . " | \n"; -// } else { -// echo _("Next") . " | "; -// } if ($prev > 0){ echo "" . _("Delete & Prev") . "" . " | \n"; } @@ -207,14 +199,14 @@ function delete_move_next_read($currloc) { if ($next_if_del < 0) { $next_if_del = $prev_if_del; } - if (($delete_move_next_formATtop == 'on') && ($currloc == 'top')){ + if (($delete_move_next_formATtop == 'on') && ($currloc == 'top')) { if ($next_if_del > 0) { delete_move_next_moveNextForm($next_if_del); } else { delete_move_next_moveRightMainForm(); } } - if (($delete_move_next_formATbottom != 'off') && ($currloc == 'bottom')){ + if (($delete_move_next_formATbottom != 'off') && ($currloc == 'bottom')) { if ($next_if_del > 0) { delete_move_next_moveNextForm($next_if_del); } else { -- 2.25.1