X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Ffolders_delete.php;h=7cda7013ae9fd11ed9989aa0421b6d8821af99ce;hb=e7a988c11df2354f360c56864500091acc1d21fa;hp=8bc2ff5aa91340893f7ac99460a3d6971de108e0;hpb=7c1b84d979f4bbbcc8ce5d7423421123c4155107;p=squirrelmail.git
diff --git a/src/folders_delete.php b/src/folders_delete.php
index 8bc2ff5a..7cda7013 100644
--- a/src/folders_delete.php
+++ b/src/folders_delete.php
@@ -1,37 +1,102 @@
-
- include("../config/config.php");
- include("../functions/strings.php");
- include("../functions/page_header.php");
+";
- if ($numMessages > 0)
- $success = copyMessages($imapConnection, 1, $numMessages, $trash_folder);
- else
- $success = true;
+ $can_move_to_trash = false;
- if ($success == true)
- removeFolder($imapConnection, "user.$username.$folder");
- } else {
- removeFolder($imapConnection, "user.$username.$folder");
}
- // Log out this session
- fputs($imapConnection, "1 logout");
+ // 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']);
+ }
+ }
+ }
- echo "
Return";
-?>
+ /** 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;
+ 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 . $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 **/
+ walkTreeInPostOrderCreatingFoldersUnderTrash(0, $imap_stream, $foldersTree, $dm, $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);
+ }
+ /** Log out this session **/
+ sqimap_logout($imap_stream);
+ $location = get_location();
+ header ("Location: $location/folders.php?success=delete");
+ /*
+ echo "