Getting ready for 1.2.0 release.
[squirrelmail.git] / src / delete_message.php
index b6232f74aefaee29a10d98340f40afc0d878a65e..ba73607edbbe4aaec85bb7183bcbb13d60502698 100644 (file)
@@ -1,18 +1,49 @@
-<HTML><BODY TEXT="#000000" BGCOLOR="#FFFFFF" LINK="#0000EE" VLINK="#0000EE" ALINK="#0000EE">
-<?
-   include("../config/config.php");
-   include("../functions/mailbox.php");
-   include("../functions/strings.php");
-   include("../functions/page_header.php");
-   include("../functions/display_messages.php");
-   include("../functions/imap.php");
+<?php
 
-   $imapConnection = loginToImapServer($username, $key, $imapServerAddress);
-   selectMailbox($imapConnection, $mailbox, $numMessages, $imapServerAddress);
+/**
+ * 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$
+ */
 
-   displayPageHeader($mailbox);
+/*****************************************************************/
+/*** 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. ***/
+/*****************************************************************/
 
-   deleteMessages($imapConnection, $message, $message, $numMessages, $trash_folder, $move_to_trash, $auto_expunge, $mailbox);
-   messages_deleted_message($mailbox, $sort, $startMessage);
+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);
 ?>
-</BODY></HTML>
\ No newline at end of file