X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fdelete_message.php;h=ba73607edbbe4aaec85bb7183bcbb13d60502698;hb=715225af1f3ef09897a7c1db61acdeb0ba842455;hp=f490f4cf782b2bd8b63d37f1c3efeb07c0e2be4d;hpb=f8f9bed9bb69ef0432fbc67741f82071b6582b4d;p=squirrelmail.git diff --git a/src/delete_message.php b/src/delete_message.php index f490f4cf..ba73607e 100644 --- a/src/delete_message.php +++ b/src/delete_message.php @@ -1,19 +1,49 @@ -\n"; +/** + * delete_message.php + * + * Copyright (c) 1999-2002 The SquirrelMail Project Team + * Licensed under the GNU GPL. For full terms see the file COPYING. + * + * Deletes a meesage from the IMAP server + * + * $Id$ + */ - $imapConnection = loginToImapServer($username, $key, $imapServerAddress); - selectMailbox($imapConnection, $mailbox, $numMessages, $imapServerAddress); +/*****************************************************************/ +/*** THIS FILE NEEDS TO HAVE ITS FORMATTING FIXED!!! ***/ +/*** PLEASE DO SO AND REMOVE THIS COMMENT SECTION. ***/ +/*** + Base level indent should begin at left margin, as ***/ +/*** the require_once below looks. ***/ +/*** + All identation should consist of four space blocks ***/ +/*** + Tab characters are evil. ***/ +/*** + all comments should use "slash-star ... star-slash" ***/ +/*** style -- no pound characters, no slash-slash style ***/ +/*** + FLOW CONTROL STATEMENTS (if, while, etc) SHOULD ***/ +/*** ALWAYS USE { AND } CHARACTERS!!! ***/ +/*** + Please use ' instead of ", when possible. Note " ***/ +/*** should always be used in _( ) function calls. ***/ +/*** Thank you for your help making the SM code more readable. ***/ +/*****************************************************************/ - displayPageHeader($color, $mailbox); +require_once('../src/validate.php'); +require_once('../functions/display_messages.php'); +require_once('../functions/imap.php'); - deleteMessages($imapConnection, $message, $message, $numMessages, $trash_folder, $move_to_trash, $auto_expunge, $mailbox); - messages_deleted_message($mailbox, $sort, $startMessage); + $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); + + sqimap_mailbox_select($imapConnection, $mailbox); + + sqimap_messages_delete($imapConnection, $message, $message, $mailbox); + if ($auto_expunge) + sqimap_mailbox_expunge($imapConnection, $mailbox, true); + + $location = get_location(); + if (isset($where) && isset($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); ?> - \ No newline at end of file