X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fdelete_message.php;h=4918d98e66292dba3959983389506f04cae319d6;hp=1304aca9ed2608e07a643ff56d6698cb6165f712;hb=c91b2e3b5b2b35ab39b7c44bc866318b7341f7a1;hpb=98a9cc036b3aa09a5798963754e011c4bdfaf4fc

diff --git a/src/delete_message.php b/src/delete_message.php
index 1304aca9..4918d98e 100644
--- a/src/delete_message.php
+++ b/src/delete_message.php
@@ -3,85 +3,19 @@
 /**
  * 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
  *
- * $Id$
+ * @copyright © 1999-2007 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');
-
-/* 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);
+define('PAGE_NAME', 'delete_message');
 
-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);
-
-?>
+/**
+ * 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');