X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fdelete_message.php;h=f2791eea2e6e43e250fc4e1bce78dd9f41c22449;hb=d3b3a524c091171c117c06f1d9342b495f6a0783;hp=691c97af3bedfb762d5ecc92325c7c9262903603;hpb=6ee631f7b92f6a205e0841ac40e6b0e763a5a734;p=squirrelmail.git

diff --git a/src/delete_message.php b/src/delete_message.php
index 691c97af..f2791eea 100644
--- a/src/delete_message.php
+++ b/src/delete_message.php
@@ -1,33 +1,90 @@
 <?php
-   /**
-    **  delete_message.php
-    **
-    **  Copyright (c) 1999-2000 The SquirrelMail development team
-    **  Licensed under the GNU GPL. For full terms see the file COPYING.
-    **
-    **  Deletes a meesage from the IMAP server 
-    **
-    **  $Id$
-    **/
-
-   include("../src/validate.php");
-   include("../functions/page_header.php");
-   include("../functions/display_messages.php");
-   include("../functions/imap.php");
-   include("../src/load_prefs.php");
-
-   $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
-   sqimap_mailbox_select($imapConnection, $mailbox);
-
-   sqimap_messages_delete($imapConnection, $message, $message, $mailbox);
-   if ($auto_expunge)
-      sqimap_mailbox_expunge($imapConnection, $mailbox, true);
-
-   $location = get_location();
-   if (isset($where) && isset($what))
-      header ("Location: $location/search.php?where=".urlencode($where)."&what=".urlencode($what)."&mailbox=".urlencode($mailbox));
-   else   
-      header ("Location: $location/right_main.php?sort=$sort&startMessage=$startMessage&mailbox=".urlencode($mailbox));
-
-   sqimap_logout($imapConnection);
+
+/**
+ * delete_message.php
+ *
+ * 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
+ *
+ * @version $Id$
+ * @package squirrelmail
+ */
+
+/**
+ * Path for SquirrelMail required files.
+ * @ignore
+ */
+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');
+
+/* 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);
+
+sqgetGlobalVar('bypass_trash', $bypass_trash, SQ_FORM);
+
+/* end globals */
+
+if (sqGetGlobalVar('saved_draft', $tmp, SQ_GET)) {
+    $saved_draft = urlencode($tmp);
+}
+if (sqGetGlobalVar('mail_sent', $tmp, SQ_GET)) {
+    $mail_sent = urlencode($tmp);
+}
+if (sqGetGlobalVar('where', $tmp, SQ_FORM)) {
+    $where = urlencode($tmp);
+}
+if (sqGetGlobalVar('what', $tmp, SQ_FORM)) {
+    $what = urlencode($tmp);
+}
+if (sqGetGlobalVar('sort', $tmp, SQ_FORM)) {
+	$sort = (int) $tmp;
+}
+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,$bypass_trash);
+if ($auto_expunge) {
+    sqimap_mailbox_expunge($imapConnection, $mailbox, true);
+}
+if (!isset($saved_draft)) {
+    $saved_draft = '';
+}
+
+if (!isset($mail_sent)) {
+    $mail_sent = '';
+}
+
+$location = get_location();
+
+if (isset($where) && isset($what)) {
+    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");
+    }
+    else {
+        header("Location: $location/right_main.php?sort=$sort&startMessage=$startMessage&mailbox=" .
+               urlencode($mailbox));
+    }
+}
+
+sqimap_logout($imapConnection);
+
 ?>