Small bug fix

[squirrelmail.git] / src / delete_message.php

diff --git a/src/delete_message.php b/src/delete_message.php
index 6078920d093c7f7e26d1cdbe72d6245b21705f09..b876be57b764fa33df18fc348dc9ad646e07104a 100644 (file)
--- a/src/delete_message.php
+++ b/src/delete_message.php
@@ -3,15 +3,19 @@
 /**
  * delete_message.php
  *
- * Copyright (c) 1999-2003 The SquirrelMail Project Team
+ * Copyright (c) 1999-2004 The SquirrelMail Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
  * Deletes a meesage from the IMAP server
  *
- * $Id$
+ * @version $Id$
+ * @package squirrelmail
  */
 
-/* Path for SquirrelMail required files. */
+/**
+ * Path for SquirrelMail required files.
+ * @ignore
+ */
 define('SM_PATH','../');
 
 /* SquirrelMail required files. */
@@ -19,39 +23,42 @@ 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);
+
+sqgetGlobalVar('message', $message, SQ_FORM);
+sqgetGlobalVar('mailbox', $mailbox, SQ_GET);
 
-$message = $_GET['message'];
-$mailbox = $_GET['mailbox'];
+sqgetGlobalVar('bypass_trash', $bypass_trash, SQ_FORM);
 
-if (isset($_GET['saved_draft'])) {
-    $saved_draft = urlencode($_GET['saved_draft']);
+/* end globals */
+
+if (sqGetGlobalVar('saved_draft', $tmp, SQ_GET)) {
+    $saved_draft = urlencode($tmp);
 }
-if (isset($_GET['mail_sent'])) {
-    $mail_sent = urlencode($_GET['mail_sent']);
+if (sqGetGlobalVar('mail_sent', $tmp, SQ_GET)) {
+    $mail_sent = urlencode($tmp);
 }
-if (isset($_GET['sort'])) {
-       $sort = (int) $_GET['sort'];
+if (sqGetGlobalVar('where', $tmp, SQ_FORM)) {
+    $where = urlencode($tmp);
 }
-
-if (isset($_GET['startMessage'])) {
-       $startMessage = (int) $_GET['startMessage'];
+if (sqGetGlobalVar('what', $tmp, SQ_FORM)) {
+    $what = urlencode($tmp);
 }
-
-if(isset($_GET['where'])) {
-    $where = urlencode($_GET['where']);
+if (sqGetGlobalVar('sort', $tmp, SQ_FORM)) {
+    $sort = (int) $tmp;
 }
-if(isset($_GET['what'])) {
-    $what = urlencode($_GET['what']);
+if (sqGetGlobalVar('startMessage', $tmp, SQ_FORM)) {
+    $startMessage = (int) $tmp;
 }
 
 $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
 
 sqimap_mailbox_select($imapConnection, $mailbox);
 
-sqimap_messages_delete($imapConnection, $message, $message, $mailbox);
+sqimap_messages_delete($imapConnection, $message, $message, $mailbox,$bypass_trash);
 if ($auto_expunge) {
     sqimap_mailbox_expunge($imapConnection, $mailbox, true);
 }
@@ -80,4 +87,4 @@ if (isset($where) && isset($what)) {
 
 sqimap_logout($imapConnection);
 
-?>
+?>
\ No newline at end of file