X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fdelete_message.php;h=dd78d2bdb114e9e511f3b8a7af2a94ca6d51eff9;hb=3565cee1d2e1f928874ba9b338a6ecab48a6f3e9;hp=132b68c975edb7f515a8e8337e1686fcbc50d113;hpb=a2790a617beaef97a2d87e5bebc0e37a12c8c2ea;p=squirrelmail.git

diff --git a/src/delete_message.php b/src/delete_message.php
index 132b68c9..dd78d2bd 100644
--- a/src/delete_message.php
+++ b/src/delete_message.php
@@ -6,37 +6,27 @@
     **  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($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");
-
-   include("../src/load_prefs.php");
+   include("../src/validate.php");
+   include("../functions/display_messages.php");
+   include("../functions/imap.php");
 
    $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
-   sqimap_mailbox_select($imapConnection, $mailbox);
 
+   sqimap_mailbox_select($imapConnection, $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 ($where && $what)
+   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_mailbox_close($imapConnection);
    sqimap_logout($imapConnection);
 ?>