* Added code to show text/html messages (immediately after text/plain and

[squirrelmail.git] / src / delete_message.php
diff --git a/src/delete_message.php b/src/delete_message.php

index 9c013ff141b8d7716d2fad02c909f9eef72d9f96..05e488993ba4752c4c62580cdeb7252b03b05ff4 100644 (file)
--- a/src/delete_message.php
+++ b/src/delete_message.php
@@ -1,10 +1,21 @@
  <?php
+   /**
+    **  delete_message.php
+    **
+    **  Copyright (c) 1999-2000 The SquirrelMail development team
+    **  Licensed under the GNU GPL. For full terms see the file COPYING.
+    **
+    **  Deletes a meesage from the IMAP server 
+    **
+    **  $Id$
+    **/
+
     session_start();
  
-   if (!isset($config_php))
-      include("../config/config.php");
     if (!isset($strings_php))
        include("../functions/strings.php");
+   if (!isset($config_php))
+      include("../config/config.php");
     if (!isset($page_header_php))
        include("../functions/page_header.php");
     if (!isset($display_message_php))
@@ -14,17 +25,18 @@
  
     include("../src/load_prefs.php");
  
-   echo "<HTML><BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\n";
-
     $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
     sqimap_mailbox_select($imapConnection, $mailbox);
  
-   displayPageHeader($color, $mailbox);
-
     sqimap_messages_delete($imapConnection, $message, $message, $mailbox);
     if ($auto_expunge)
-      sqimap_mailbox_expunge($imapConnection, $mailbox);
+      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));
  
-   messages_deleted_message($mailbox, $sort, $startMessage, $color);
+   sqimap_logout($imapConnection);
  ?>
-</BODY></HTML>