- // Form for deletion
- $delete_url = $base_uri . 'src/delete_message.php?mailbox=' . $urlMailbox;
- $menu_row .= '<form action="'.$delete_url.'" method="post" style="display: inline"><small>';
-
- if (!(isset($passed_ent_id) && $passed_ent_id)) {
- $menu_row .= '<input type="hidden" name="message" value="'.$passed_id.'" />';
-
- if ($where && $what) {
- $menu_row .= '<input type="hidden" name="where" value="'.$where.'" />';
- $menu_row .= '<input type="hidden" name="what" value="'.$what.'" />';
+ if ( in_array('\\deleted', $aMailbox['PERMANENTFLAGS'],true) ) {
+ // Form for deletion. Form is handled by the originating display in $where. This is right_main.php or search.php
+ $delete_url = $base_uri . "src/$where";
+ $menu_row .= '<form name="deleteMessageForm" action="'.$delete_url.'" method="post" style="display: inline">';
+
+ if (!(isset($passed_ent_id) && $passed_ent_id)) {
+ $menu_row .= addHidden('mailbox', $aMailbox['NAME']);
+ $menu_row .= addHidden('msg[0]', $passed_id);
+ $menu_row .= addHidden('startMessage', $startMessage);
+ $menu_row .= getButton('submit', 'delete', _("Delete"));
+ $menu_row .= '<input type="checkbox" name="bypass_trash" />' . _("Bypass Trash");