X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fdelete_message.php;h=09c2fef64e30faaac62ee09b30ec143c63707436;hb=b268e66b4b96c4e2b8b44eae8161e7557b6eaf7c;hp=fc281fdd479130b13158b9b9bf8cbe2fea101e6f;hpb=9b761dbdd92259ef09affe9b8f8b62362d0d7bb2;p=squirrelmail.git

diff --git a/src/delete_message.php b/src/delete_message.php
index fc281fdd..09c2fef6 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
@@ -19,12 +19,14 @@ 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'];
+/* get globals */
+sqgetGlobalVar('username', $username, SQ_SESSION);
+sqgetGlobalVar('key', $key, SQ_COOKIE);
+sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION);
 
-$message = $_GET['message'];
-$mailbox = $_GET['mailbox'];
+sqgetGlobalVar('message', $message, SQ_GET);
+sqgetGlobalVar('mailbox', $mailbox, SQ_GET);
+/* end globals */
 
 if (isset($_GET['saved_draft'])) {
     $saved_draft = urlencode($_GET['saved_draft']);
@@ -32,8 +34,13 @@ if (isset($_GET['saved_draft'])) {
 if (isset($_GET['mail_sent'])) {
     $mail_sent = urlencode($_GET['mail_sent']);
 }
-$sort = (int) $_GET['sort'];
-$startMessage = (int) $_GET['startMessage'];
+if (isset($_GET['sort'])) {
+	$sort = (int) $_GET['sort'];
+}
+
+if (isset($_GET['startMessage'])) {
+	$startMessage = (int) $_GET['startMessage'];
+}
 
 if(isset($_GET['where'])) {
     $where = urlencode($_GET['where']);