X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fdelete_message.php;h=7cc08b1cf2924f7b340844f918c238d95f7493c8;hb=b5a29535845e2394c08a8bdbbe773ea26455df41;hp=fdaefc5a93fc23739c3cb4213406b25b5b759991;hpb=2a833d7253739cb67eb69aa760f7b37fe7aedd8c;p=squirrelmail.git

diff --git a/src/delete_message.php b/src/delete_message.php
index fdaefc5a..7cc08b1c 100644
--- a/src/delete_message.php
+++ b/src/delete_message.php
@@ -1,28 +1,51 @@
 <?php
-   session_start();
 
-   if (!isset($config_php))
-      include("../config/config.php");
-   if (!isset($strings_php))
-      include("../functions/strings.php");
-   if (!isset($page_header_php))
-      include("../functions/page_header.php");
-   if (!isset($display_message_php))
-      include("../functions/display_messages.php");
-   if (!isset($imap_php))
-      include("../functions/imap.php");
+/**
+ * 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$
+ */
 
-   include("../src/load_prefs.php");
+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);
+$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);
+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);
 
-   messages_deleted_message($mailbox, $sort, $startMessage, $color);
 ?>
-</BODY></HTML>