X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Ffolders_delete.php;h=1a96fc26f817f47a49cf6ba4989ca8c4d548cf88;hp=0f4ac3e98657a32a2bfdfcfef5ee88b38e41badb;hb=eb548244cf42565bbad450f308b760d3b6c2fc94;hpb=b7f83b61539e8952b9b337f167870aa99eb772f8
diff --git a/src/folders_delete.php b/src/folders_delete.php
index 0f4ac3e9..1a96fc26 100644
--- a/src/folders_delete.php
+++ b/src/folders_delete.php
@@ -3,25 +3,30 @@
/**
* folders_delete.php
*
- * Copyright (c) 1999-2002 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 folders from the IMAP server.
* Called from the folders.php
*
- * $Id$
+ * @version $Id$
+ * @package squirrelmail
*/
-/* Path for SquirrelMail required files. */
+/**
+ * Path for SquirrelMail required files.
+ * @ignore
+ */
define('SM_PATH','../');
/* SquirrelMail required files. */
require_once(SM_PATH . 'include/validate.php');
+require_once(SM_PATH . 'functions/global.php');
require_once(SM_PATH . 'functions/imap.php');
-require_once(SM_PATH . 'functions/array.php');
require_once(SM_PATH . 'functions/tree.php');
require_once(SM_PATH . 'functions/display_messages.php');
require_once(SM_PATH . 'functions/html.php');
+require_once(SM_PATH . 'functions/forms.php');
/*
* Incoming values:
@@ -29,46 +34,43 @@ require_once(SM_PATH . 'functions/html.php');
*/
/* globals */
-$username = $_SESSION['username'];
-$key = $_COOKIE['key'];
-$delimiter = $_SESSION['delimiter'];
-$onetimepad = $_SESSION['onetimepad'];
-
-$mailbox = $_POST['mailbox'];
-
+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);
+ '
'._("Click here to go back").'.', $color);
exit;
}
-if (isset($_POST['backingout'])) {
+if ( sqgetGlobalVar('backingout', $tmp, SQ_POST) ) {
$location = get_location();
header ("Location: $location/folders.php");
exit;
}
-if(!isset($_POST['confirmed'])) {
+if( !sqgetGlobalVar('confirmed', $tmp, SQ_POST) ) {
displayPageHeader($color, 'None');
- echo '
' .
+ 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?"), $mailbox).
- '
\n". + addHidden('mailbox', $mailbox). + addSubmit(_("Yes"), 'confirmed'). + addSubmit(_("No"), 'backingout'). + '