X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Ffolders_delete.php;h=140d1400f8befea3acbffb9adea3302e1b6ffa69;hp=8ea828c5cf41dbcd49d1677bcedbfdf5e6d04a47;hb=dfec863ee306edcf23b897453bc19262002343d0;hpb=e146912692c921160f93dcb6da97dc6246bf95d2
diff --git a/src/folders_delete.php b/src/folders_delete.php
index 8ea828c5..140d1400 100644
--- a/src/folders_delete.php
+++ b/src/folders_delete.php
@@ -1,49 +1,59 @@
-";
- echo "\n";
- displayPageHeader($color, "None");
-
-
$imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
$boxes = sqimap_mailbox_list ($imap_stream);
- $dm = sqimap_get_delimiter($imap_stream);
- if (substr($mailbox, -1) == $dm)
+ 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 **/
- for ($i = 0; $i < count($boxes); $i++) {
- if ($boxes[$i]["unformatted"] == $trash_folder) {
- $can_move_to_trash = true;
- for ($j = 0; $j < count($boxes[$i]["flags"]); $j++) {
- if (strtolower($boxes[$i]["flags"][$j]) == "noinferiors")
- $can_move_to_trash = false;
+ /** 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 it's already a subfolder of trash, we'll have to delete it
+ else if(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) {
+ $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))) {
@@ -57,7 +67,7 @@
// 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 . $dm)) == ($mailbox_no_dm . $dm)) {
+ if (substr($boxes[$i]["unformatted"], 0, strlen($mailbox_no_dm . $delimiter)) == ($mailbox_no_dm . $delimiter)) {
addChildNodeToTree($boxes[$i]["unformatted"], $boxes[$i]["unformatted-dm"], $foldersTree);
}
}
@@ -65,7 +75,7 @@
/** 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 **/
- walkTreeInPostOrderCreatingFoldersUnderTrash(0, $imap_stream, $foldersTree, $dm, $mailbox);
+ walkTreeInPostOrderCreatingFoldersUnderTrash(0, $imap_stream, $foldersTree, $mailbox);
walkTreeInPreOrderDeleteFolders(0, $imap_stream, $foldersTree);
} else { /** if they do NOT wish to move messages to the trash (or cannot)**/
walkTreeInPreOrderDeleteFolders(0, $imap_stream, $foldersTree);
@@ -74,6 +84,9 @@
/** Log out this session **/
sqimap_logout($imap_stream);
+ $location = get_location();
+ header ("Location: $location/folders.php?success=delete");
+ /*
echo "
";
echo _("Folder Deleted!");
echo "
";
@@ -85,4 +98,5 @@
echo "";
echo "