X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Ffolders_delete.php;h=a301f70ba9578161d9be6aceda4033bc61493635;hb=0fe622fddabb599b799d8fa7d65d8f423e11a3bd;hp=c79b24d61682e4f70e5064aa990723250fe8edff;hpb=97dd6a624bf63447bba316785396f88265d7a081;p=squirrelmail.git
diff --git a/src/folders_delete.php b/src/folders_delete.php
index c79b24d6..a301f70b 100644
--- a/src/folders_delete.php
+++ b/src/folders_delete.php
@@ -1,48 +1,62 @@
-";
- echo "\n";
- displayPageHeader($color, "None");
+ // Courier IMAP doesn't like subfolders of Trash
+ if (strtolower($imap_server_type) == "courier") {
+ $can_move_to_trash = false;
+ }
-
- $imap_stream = sqimap_login($username, $key, $imapServerAddress, 0);
- $boxes = sqimap_mailbox_list ($imap_stream);
- $dm = sqimap_get_delimiter($imap_stream);
+ // 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;
+
+ }
- /** 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;
+ // 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"] == $mailbox) && (strlen($boxes[$i]["unformatted"]) == strlen($mailbox))) {
+ if (($boxes[$i]["unformatted-dm"] == $mailbox) && (strlen($boxes[$i]["unformatted-dm"]) == strlen($mailbox))) {
$foldersTree[0]["value"] = $mailbox;
$foldersTree[0]["doIHaveChildren"] = false;
continue;
@@ -53,10 +67,11 @@
// 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 . $dm)) == ($mailbox . $dm)) {
- addChildNodeToTree($boxes[$i]["unformatted"], $foldersTree);
+ if (substr($boxes[$i]["unformatted"], 0, strlen($mailbox_no_dm . $dm)) == ($mailbox_no_dm . $dm)) {
+ 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 **/
@@ -69,7 +84,9 @@
/** Log out this session **/
sqimap_logout($imap_stream);
- echo "";
+ $location = get_location();
+ header ("Location: $location/folders.php?success=delete");
+ /*
echo "
";
echo _("Folder Deleted!");
echo "
";
@@ -78,7 +95,8 @@
echo _("Click here");
echo " ";
echo _("to continue.");
- echo "";
+ echo "";
echo "