X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fdelete_message.php;h=6078920d093c7f7e26d1cdbe72d6245b21705f09;hb=a11df61b949068712242d77e2c18311c93e63979;hp=7cc08b1cf2924f7b340844f918c238d95f7493c8;hpb=732fd5a4019e68399281fd42dd19d679ea4afb8f;p=squirrelmail.git

diff --git a/src/delete_message.php b/src/delete_message.php
index 7cc08b1c..6078920d 100644
--- a/src/delete_message.php
+++ b/src/delete_message.php
@@ -3,7 +3,7 @@
 /**
  * delete_message.php
  *
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Copyright (c) 1999-2003 The SquirrelMail Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
  * Deletes a meesage from the IMAP server
@@ -11,9 +11,41 @@
  * $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 = urlencode($_GET['saved_draft']);
+}
+if (isset($_GET['mail_sent'])) {
+    $mail_sent = urlencode($_GET['mail_sent']);
+}
+if (isset($_GET['sort'])) {
+	$sort = (int) $_GET['sort'];
+}
+
+if (isset($_GET['startMessage'])) {
+	$startMessage = (int) $_GET['startMessage'];
+}
+
+if(isset($_GET['where'])) {
+    $where = urlencode($_GET['where']);
+}
+if(isset($_GET['what'])) {
+    $what = urlencode($_GET['what']);
+}
 
 $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
 
@@ -34,8 +66,8 @@ 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));
+    header("Location: $location/search.php?where=" . $where .
+           '&what=' . $what . '&mailbox=' . urlencode($mailbox));
 } else {
     if (!empty($saved_draft) || !empty($mail_sent)) {
           header("Location: $location/compose.php?mail_sent=$mail_sent&saved_draft=$saved_draft");