X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Ffolders_delete.php;h=58e6fe2c89a2544b129298facdebd911a6c439f3;hp=c03fa852a6a1d34d1c7c4609ab2ba3063ca6d1d5;hb=1e12d1ffb4f54350932a17397d38917db21d64df;hpb=355861846a51d35efe50848869d680fd3b4a5316
diff --git a/src/folders_delete.php b/src/folders_delete.php
index c03fa852..58e6fe2c 100644
--- a/src/folders_delete.php
+++ b/src/folders_delete.php
@@ -3,117 +3,137 @@
/**
* folders_delete.php
*
- * Copyright (c) 1999-2001 The Squirrelmail Development Team
+ * Copyright (c) 1999-2003 The SquirrelMail Project Team
* Licensed under the GNU GPL. For full terms see the file COPYING.
*
- * Deltes folders from the IMAP server.
+ * Deletes folders from the IMAP server.
* Called from the folders.php
*
* $Id$
*/
-/*****************************************************************/
-/*** THIS FILE NEEDS TO HAVE ITS FORMATTING FIXED!!! ***/
-/*** PLEASE DO SO AND REMOVE THIS COMMENT SECTION. ***/
-/*** + Base level indent should begin at left margin, as ***/
-/*** the require_once below looks. ***/
-/*** + All identation should consist of four space blocks ***/
-/*** + Tab characters are evil. ***/
-/*** + all comments should use "slash-star ... star-slash" ***/
-/*** style -- no pound characters, no slash-slash style ***/
-/*** + FLOW CONTROL STATEMENTS (if, while, etc) SHOULD ***/
-/*** ALWAYS USE { AND } CHARACTERS!!! ***/
-/*** + Please use ' instead of ", when possible. Note " ***/
-/*** should always be used in _( ) function calls. ***/
-/*** Thank you for your help making the SM code more readable. ***/
-/*****************************************************************/
-
-require_once('../src/validate.php');
-require_once('../functions/imap.php');
-require_once('../functions/array.php');
-require_once('../functions/tree.php');
-
- /*
- * Incoming values:
- * $mailbox - selected mailbox from the form
- */
-
- $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
- $boxes = sqimap_mailbox_list ($imap_stream);
- global $delimiter;
-
- if (substr($mailbox, -1) == $delimiter)
- $mailbox_no_dm = substr($mailbox, 0, strlen($mailbox) - 1);
- else
- $mailbox_no_dm = $mailbox;
-
- /** lets see if we CAN move folders to the trash.. otherwise,
- ** just delete them **/
+/* Path for SquirrelMail required files. */
+define('SM_PATH','../');
+
+/* SquirrelMail required files. */
+require_once(SM_PATH . 'include/validate.php');
+require_once(SM_PATH . 'functions/imap.php');
+require_once(SM_PATH . 'functions/tree.php');
+require_once(SM_PATH . 'functions/display_messages.php');
+require_once(SM_PATH . 'functions/html.php');
+
+/*
+ * Incoming values:
+ * $mailbox - selected mailbox from the form
+ */
+
+/* globals */
+sqgetGlobalVar('key', $key, SQ_COOKIE);
+sqgetGlobalVar('username', $username, SQ_SESSION);
+sqgetGlobalVar('onetimepad',$onetimepad, SQ_SESSION);
+sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
+sqgetGlobalVar('mailbox', $mailbox, SQ_POST);
+/* end globals */
+
+if ($mailbox == '') {
+ displayPageHeader($color, 'None');
+
+ plain_error_message(_("You have not selected a folder to delete. Please do so.").
+ '
'._("Click here to go back").'.', $color);
+ exit;
+}
+
+if ( sqgetGlobalVar('backingout', $tmp, SQ_POST) ) {
+ $location = get_location();
+ header ("Location: $location/folders.php");
+ exit;
+}
+
+if( !sqgetGlobalVar('confirmed', $tmp, SQ_POST) ) {
+ displayPageHeader($color, 'None');
+
+ echo '
' .
+ html_tag( 'table', '', 'center', '', 'width="95%" border="0"' ) .
+ html_tag( 'tr',
+ html_tag( 'td', '' . _("Delete Folder") . '', 'center', $color[0] )
+ ) .
+ html_tag( 'tr' ) .
+ html_tag( 'td', '', 'center', $color[4] ) .
+ sprintf(_("Are you sure you want to delete %s?"), imap_utf7_decode_local($mailbox)).
+ '