X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Ffolders_delete.php;h=c6d914d7d4b2f7b76c583140327c21801c87ff3c;hb=12719a100c59d2f34af1cb539eee1df0f2fd046c;hp=93022b074d43f153803e8d3c39df85dcc35fe656;hpb=a32985a59fe460e2bf5c2e9ea2dd6004d0f66b54;p=squirrelmail.git
diff --git a/src/folders_delete.php b/src/folders_delete.php
index 93022b07..c6d914d7 100644
--- a/src/folders_delete.php
+++ b/src/folders_delete.php
@@ -3,10 +3,10 @@
/**
* 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.
*
- * Deltes folders from the IMAP server.
+ * Deletes folders from the IMAP server.
* Called from the folders.php
*
* $Id$
@@ -17,36 +17,65 @@ 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');
/*
-* Incoming values:
-* $mailbox - selected mailbox from the form
-*/
+ * Incoming values:
+ * $mailbox - selected mailbox from the form
+ */
/* 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');
- echo "";
- plain_error_message(_("You have not selected a folder to delete. Please do so.")."
"._("Click here to go back").".", $color);
+
+ 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)).
+ '
';
+
+ exit;
+}
$imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+
$boxes = sqimap_mailbox_list ($imap_stream);
+$numboxes = count($boxes);
+
global $delete_folder;
if (substr($mailbox, -1) == $delimiter)
@@ -57,50 +86,42 @@ else
/** lets see if we CAN move folders to the trash.. otherwise,
** just delete them **/
-/* Courier IMAP doesn't like subfolders of Trash */
-if (strtolower($imap_server_type) == "courier") {
- $can_move_to_trash = false;
-}
-
-/* If global options say we can't move it into Trash */
-else if(isset($delete_folder) && $delete_folder == true) {
- $can_move_to_trash = false;
-}
-
-/* If it's already a subfolder of trash, we'll have to delete it */
-else if(eregi("^".$trash_folder.".+", $mailbox)) {
-
- $can_move_to_trash = false;
-
+/* Courier IMAP doesn't like subfolders of Trash
+ * If global options say we can't move it into Trash
+ * If it's already a subfolder of trash, we'll have to delete it */
+if (strtolower($imap_server_type) == 'courier' ||
+ (isset($delete_folder) && $delete_folder) ||
+ eregi('^'.$trash_folder.'.+', $mailbox) )
+{
+ $can_move_to_trash = FALSE;
}
/* Otherwise, check if trash folder exits and support sub-folders */
else {
- for ($i = 0; $i < count($boxes); $i++) {
- if ($boxes[$i]["unformatted"] == $trash_folder) {
+ for ($i = 0; $i < $numboxes; $i++) {
+ if ($boxes[$i]['unformatted'] == $trash_folder) {
$can_move_to_trash = !in_array('noinferiors', $boxes[$i]['flags']);
}
}
}
/** First create the top node in the tree **/
-for ($i = 0;$i < count($boxes);$i++) {
- if (($boxes[$i]["unformatted-dm"] == $mailbox) && (strlen($boxes[$i]["unformatted-dm"]) == strlen($mailbox))) {
- $foldersTree[0]["value"] = $mailbox;
- $foldersTree[0]["doIHaveChildren"] = false;
+for ($i = 0; $i < $numboxes; $i++) {
+ if (($boxes[$i]['unformatted-dm'] == $mailbox) && (strlen($boxes[$i]['unformatted-dm']) == strlen($mailbox))) {
+ $foldersTree[0]['value'] = $mailbox;
+ $foldersTree[0]['doIHaveChildren'] = false;
continue;
}
}
+
/* Now create the nodes for subfolders of the parent folder
You can tell that it is a subfolder by tacking the mailbox delimiter
on the end of the $mailbox string, and compare to that. */
-$j = 0;
-for ($i = 0;$i < count($boxes);$i++) {
- if (substr($boxes[$i]["unformatted"], 0, strlen($mailbox_no_dm . $delimiter)) == ($mailbox_no_dm . $delimiter)) {
- addChildNodeToTree($boxes[$i]["unformatted"], $boxes[$i]["unformatted-dm"], $foldersTree);
+for ($i = 0; $i < $numboxes; $i++) {
+ if (substr($boxes[$i]['unformatted'], 0, strlen($mailbox_no_dm . $delimiter)) == ($mailbox_no_dm . $delimiter)) {
+ addChildNodeToTree($boxes[$i]["unformatted"], $boxes[$i]['unformatted-dm'], $foldersTree);
}
}
-/* simpleWalkTreePre(0, $foldersTree); */
/** Lets start removing the folders and messages **/
if (($move_to_trash == true) && ($can_move_to_trash == true)) { /** if they wish to move messages to the trash **/
@@ -115,17 +136,5 @@ sqimap_logout($imap_stream);
$location = get_location();
header ("Location: $location/folders.php?success=delete");
-/*
-echo "
";
-echo _("Folder Deleted!");
-echo "
";
-echo _("The folder has been successfully deleted.");
-echo "
";
-echo _("Click here");
-echo " ";
-echo _("to continue.");
-echo "";
-
-echo "";
-*/
+
?>