X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fdelete_message.php;h=69b46bce3e5327c4d4ae19ad8020c95d55cf10f4;hp=3f2813973b1f66837ca302505a4a21fbfcc0b9b6;hb=ce39317491517268fe421d95b7329bbe80a2fe8d;hpb=1809bad8f78a708bd2df0c535a29b94ae21a24d1

diff --git a/src/delete_message.php b/src/delete_message.php
index 3f281397..69b46bce 100644
--- a/src/delete_message.php
+++ b/src/delete_message.php
@@ -6,34 +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");
+   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_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_logout($imapConnection);
+?>
\ No newline at end of file