X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fdelete_message.php;h=f485b387b581bd922c73b02073f4792e24a3cf00;hb=a48fbf9b8db674a9bf4361d6f8c64e402cb6445a;hp=db693cdc7444a97868ad016c1a3c59f2a4e638f1;hpb=a3cb3d5fe740f69089667295f7faae051abe04a8;p=squirrelmail.git diff --git a/src/delete_message.php b/src/delete_message.php index db693cdc..f485b387 100644 --- a/src/delete_message.php +++ b/src/delete_message.php @@ -1,4 +1,16 @@ -\n"; - - $imapConnection = sqimap_login($username, $key, $imapServerAddress, 0); + $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); sqimap_mailbox_select($imapConnection, $mailbox); - displayPageHeader($color, $mailbox); - sqimap_messages_delete($imapConnection, $message, $message, $mailbox); - messages_deleted_message($mailbox, $sort, $startMessage, $color); + if ($auto_expunge) + sqimap_mailbox_expunge($imapConnection, $mailbox); + + $location = get_location(); + if ($where && $what) + header ("Location: $location/search.php?where=".urlencode($where)."&what=".urlencode($what)."&mailbox=".urlencode($mailbox)); + else + header ("Location: $location/right_main.php?sort=$sort&startMessage=$startMessage&mailbox=".urlencode($mailbox)); + + sqimap_logout($imapConnection); ?> -