I18n fixes

[squirrelmail.git] / src / delete_message.php

diff --git a/src/delete_message.php b/src/delete_message.php
index f8400834709fea80a8a96bff141605363b4d8f9c..f2791eea2e6e43e250fc4e1bce78dd9f41c22449 100644 (file)
--- a/src/delete_message.php
+++ b/src/delete_message.php
@@ -3,16 +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. */
@@ -25,36 +28,37 @@ sqgetGlobalVar('username', $username, SQ_SESSION);
 sqgetGlobalVar('key', $key, SQ_COOKIE);
 sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION);
 
-sqgetGlobalVar('message', $message, SQ_GET);
+sqgetGlobalVar('message', $message, SQ_FORM);
 sqgetGlobalVar('mailbox', $mailbox, SQ_GET);
+
+sqgetGlobalVar('bypass_trash', $bypass_trash, SQ_FORM);
+
 /* end globals */
 
-if (isset($_GET['saved_draft'])) {
-    $saved_draft = urlencode($_GET['saved_draft']);
+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);
 }