X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fdelete_message.php;h=7cc08b1cf2924f7b340844f918c238d95f7493c8;hb=fb745cc7d13d3cf5142d9c36dbd7539041599508;hp=5518624b613ef24e1a2e15bdc644491b974c1079;hpb=d068c0ec5447e8f373ebd536b08ed902c00de0f5;p=squirrelmail.git diff --git a/src/delete_message.php b/src/delete_message.php index 5518624b..7cc08b1c 100644 --- a/src/delete_message.php +++ b/src/delete_message.php @@ -1,25 +1,51 @@ -\n"; +require_once('../src/validate.php'); +require_once('../functions/display_messages.php'); +require_once('../functions/imap.php'); - $imapConnection = sqimap_login($username, $key, $imapServerAddress, 0); - sqimap_mailbox_select($imapConnection, $mailbox); +$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); - displayPageHeader($color, $mailbox); +sqimap_mailbox_select($imapConnection, $mailbox); + +sqimap_messages_delete($imapConnection, $message, $message, $mailbox); +if ($auto_expunge) { + sqimap_mailbox_expunge($imapConnection, $mailbox, true); +} +if (!isset($saved_draft)) { + $saved_draft = ''; +} + +if (!isset($mail_sent)) { + $mail_sent = ''; +} + +$location = get_location(); + +if (isset($where) && isset($what)) { + header("Location: $location/search.php?where=" . urlencode($where) . + '&what=' . urlencode($what) . '&mailbox=' . urlencode($mailbox)); +} else { + if (!empty($saved_draft) || !empty($mail_sent)) { + header("Location: $location/compose.php?mail_sent=$mail_sent&saved_draft=$saved_draft"); + } + else { + header("Location: $location/right_main.php?sort=$sort&startMessage=$startMessage&mailbox=" . + urlencode($mailbox)); + } +} + +sqimap_logout($imapConnection); - sqimap_message_delete($imapConnection, $message, $message, $mailbox); - messages_deleted_message($mailbox, $sort, $startMessage, $color); ?> -