X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fdelete_message.php;h=a46f96e45b841d41a4b64e929a94ed6a1433ad7b;hb=190dc452bedb05364a6f5842142b5e484995b1ca;hp=b58f37539b278987faa13b1d2953b85771b8051a;hpb=355861846a51d35efe50848869d680fd3b4a5316;p=squirrelmail.git

diff --git a/src/delete_message.php b/src/delete_message.php
index b58f3753..a46f96e4 100644
--- a/src/delete_message.php
+++ b/src/delete_message.php
@@ -3,47 +3,18 @@
 /**
  * delete_message.php
  *
- * Copyright (c) 1999-2001 The Squirrelmail Development Team
- * Licensed under the GNU GPL. For full terms see the file COPYING.
+ * Deletes a meesage from the IMAP server
  *
- * Deletes a meesage from the IMAP server 
- *
- * $Id$
+ * @copyright © 1999-2006 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$
+ * @package squirrelmail
  */
 
-/*****************************************************************/
-/*** 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. ***/
-/*****************************************************************/
-
-require_once('../src/validate.php');
-require_once('../functions/display_messages.php');
-require_once('../functions/imap.php');
-
-   $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);
-?>
+/**
+ * Include the SquirrelMail initialization file.
+ */
+include('../include/init.php');
+error_box('delete_message.php script is obsolete since 1.5.1.');
+$oTemplate->display('footer.tpl');
+?>
\ No newline at end of file