X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fdelete_message.php;h=97d1a4b586d8e527c09dcd14c1e26863cbd72107;hp=8a5657c86f3fd7720ac4ee130f98952ef75d5a5a;hb=353d074afac6827c90f4bb03e846c5e453d3b5b1;hpb=0b97a708e71c931153cd1ceee1495c9f4e1e209b

diff --git a/src/delete_message.php b/src/delete_message.php
index 8a5657c8..97d1a4b5 100644
--- a/src/delete_message.php
+++ b/src/delete_message.php
@@ -3,76 +3,19 @@
 /**
  * delete_message.php
  *
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
- * Licensed under the GNU GPL. For full terms see the file COPYING.
- *
  * Deletes a meesage from the IMAP server
  *
- * $Id$
+ * @copyright 1999-2018 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$
+ * @package squirrelmail
  */
 
-/* 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 = $_GET['saved_draft'];
-}
-if (isset($_GET['mail_sent'])) {
-    $mail_sent = $_GET['mail_sent'];
-}
-$sort = $_GET['sort'];
-$startMessage = $_GET['startMessage'];
-
-if(isset($_GET['where'])) {
-    $where = $_GET['where'];
-}
-if(isset($_GET['what'])) {
-    $what = $_GET['what'];
-}
-
-$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
-
-sqimap_mailbox_select($imapConnection, $mailbox);
+define('PAGE_NAME', 'delete_message');
 
-sqimap_messages_delete($imapConnection, $message, $message, $mailbox);
-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=" . urlencode($where) .
-           '&what=' . urlencode($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);
-
-?>
+/**
+ * Include the SquirrelMail initialization file.
+ */
+include('../include/init.php');
+error_box('delete_message.php script is obsolete since 1.5.1.');
+$oTemplate->display('footer.tpl');