removed an unnecessary select from delete_message (fixes bug#418631)

[squirrelmail.git] / src / delete_message.php

diff --git a/src/delete_message.php b/src/delete_message.php
index 966578e0f9ee123c7e9a417664b8f13ffa213089..1f267c6ada0652cfc4ad40463ab0f388de399951 100644 (file)
--- a/src/delete_message.php
+++ b/src/delete_message.php
@@ -10,30 +10,18 @@
     **  $Id$
     **/
 
-   session_start();
-
-   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))
-      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_messages_delete($imapConnection, $message, $message, $mailbox);
    if ($auto_expunge)
       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));