X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Ffolders_delete.php;h=c6d914d7d4b2f7b76c583140327c21801c87ff3c;hb=12719a100c59d2f34af1cb539eee1df0f2fd046c;hp=0f4ac3e98657a32a2bfdfcfef5ee88b38e41badb;hpb=b7f83b61539e8952b9b337f167870aa99eb772f8;p=squirrelmail.git
diff --git a/src/folders_delete.php b/src/folders_delete.php
index 0f4ac3e9..c6d914d7 100644
--- a/src/folders_delete.php
+++ b/src/folders_delete.php
@@ -3,7 +3,7 @@
/**
* folders_delete.php
*
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Copyright (c) 1999-2003 The SquirrelMail Project Team
* Licensed under the GNU GPL. For full terms see the file COPYING.
*
* Deletes folders from the IMAP server.
@@ -17,8 +17,8 @@ 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');
@@ -29,13 +29,11 @@ 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 == '') {
@@ -46,13 +44,13 @@ if ($mailbox == '') {
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 '
' .
@@ -62,7 +60,7 @@ if(!isset($_POST['confirmed'])) {
) .
html_tag( 'tr' ) .
html_tag( 'td', '', 'center', $color[4] ) .
- sprintf(_("Are you sure you want to delete %s?"), $mailbox).
+ sprintf(_("Are you sure you want to delete %s?"), imap_utf7_decode_local($mailbox)).
'