More rg=0

[squirrelmail.git] / src / delete_message.php

diff --git a/src/delete_message.php b/src/delete_message.php
index 966fc54838c6651300d7553a3bc5f37a501ec1cc..8a5657c86f3fd7720ac4ee130f98952ef75d5a5a 100644 (file)
--- a/src/delete_message.php
+++ b/src/delete_message.php
@@ -11,9 +11,36 @@
  * $Id$
  */
 
-require_once('../src/validate.php');
-require_once('../functions/display_messages.php');
-require_once('../functions/imap.php');
+/* Path for SquirrelMail required files. */
+define('SM_PATH','../');
+
+/* SquirrelMail required files. */
+require_once(SM_PATH . 'include/validate.php');
+require_once(SM_PATH . 'functions/display_messages.php');
+require_once(SM_PATH . 'functions/imap.php');
+
+$key = $_COOKIE['key'];
+$username = $_SESSION['username'];
+$onetimepad = $_SESSION['onetimepad'];
+
+$message = $_GET['message'];
+$mailbox = $_GET['mailbox'];
+
+if (isset($_GET['saved_draft'])) {
+    $saved_draft = $_GET['saved_draft'];
+}
+if (isset($_GET['mail_sent'])) {
+    $mail_sent = $_GET['mail_sent'];
+}
+$sort = $_GET['sort'];
+$startMessage = $_GET['startMessage'];
+
+if(isset($_GET['where'])) {
+    $where = $_GET['where'];
+}
+if(isset($_GET['what'])) {
+    $what = $_GET['what'];
+}
 
 $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
 
@@ -32,18 +59,20 @@ if (!isset($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 ($compose_new_win == '1') {
+    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));
+        header("Location: $location/right_main.php?sort=$sort&startMessage=$startMessage&mailbox=" .
+               urlencode($mailbox));
     }
 }
 
 sqimap_logout($imapConnection);
+
 ?>