X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Ffolders_delete.php;h=6775f677667f786d857779b62919d732e29c2b54;hb=8e54a58ba05c72b8265b168df336ca048b571bed;hp=430bb00be7a11f90092eddc6ffcdd5dbf5215829;hpb=f8f9bed9bb69ef0432fbc67741f82071b6582b4d;p=squirrelmail.git
diff --git a/src/folders_delete.php b/src/folders_delete.php
index 430bb00b..6775f677 100644
--- a/src/folders_delete.php
+++ b/src/folders_delete.php
@@ -1,51 +1,118 @@
- 0)
- $success = copyMessages($imapConnection, 1, $numMessages, "$trash_folder.$folder");
- else
- $success = true;
-
- if ($success == true)
- removeFolder($imapConnection, "$boxesUnformatted[$i]");
- }
- }
- } else { /** if they do NOT wish to move messages to the trash **/
- for ($i = 0; $i < count($boxesUnformatted); $i++) {
- if (substr($boxesUnformatted[$i], 0, strlen($mailbox)) == $mailbox) {
- removeFolder($imapConnection, "$boxesUnformatted[$i]");
- }
- }
- }
-
- /** Log out this session **/
- fputs($imapConnection, "1 logout");
-
- echo "\n";
- echo "
Return";
- echo "";
-?>
+";
+ plain_error_message(_("You have not selected a folder to delete. Please do so.")."
"._("Click here to go back").".", $color);
+ exit;
+}
+
+
+$imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+$boxes = sqimap_mailbox_list ($imap_stream);
+global $delimiter, $delete_folder;
+
+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 **/
+/* 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;
+
+}
+
+/* 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))) {
+ $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);
+ }
+}
+/* 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, $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 "
";
+echo _("Folder Deleted!");
+echo "
";
+echo _("The folder has been successfully deleted.");
+echo "
";
+echo _("Click here");
+echo " ";
+echo _("to continue.");
+echo "";
+
+echo "