X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Ffolders_delete.php;h=7cbea84f3b12ba48c5bd1643fae16a958042b92d;hb=e7db48afbf9565737173583af6962520d2491acc;hp=b38a4d7445fb63fb0ce2683edf0a2dff2df4238d;hpb=aff57ea55796bf1f66d7ab9b374d3e7ca5cd11bb;p=squirrelmail.git
diff --git a/src/folders_delete.php b/src/folders_delete.php
index b38a4d74..7cbea84f 100644
--- a/src/folders_delete.php
+++ b/src/folders_delete.php
@@ -1,93 +1,104 @@
-";
- echo "\n";
- displayPageHeader($color, "None");
+ /*
+ * Incoming values:
+ * $mailbox - selected mailbox from the form
+ */
+
+ $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+ $boxes = sqimap_mailbox_list ($imap_stream);
+ $dm = sqimap_get_delimiter($imap_stream);
- $imapConnection = loginToImapServer($username, $key, $imapServerAddress, 0);
- getFolderList($imapConnection, $boxes);
+ if (substr($mailbox, -1) == $dm)
+ $mailbox_no_dm = substr($mailbox, 0, strlen($mailbox) - 1);
+ else
+ $mailbox_no_dm = $mailbox;
- $dm = findMailboxDelimeter($imapConnection);
- /** lets see if we CAN move folders to the trash.. otherwise, just delete them **/
- for ($i = 0; $i < count($boxes[$i]["UNFORMATTED"]); $i++) {
- if ($boxes[$i]["UNFORMATTED"] == $trash_folder)
- $tmp_trash_folder = $boxes[$i]["RAW"];
- }
+ /** 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;
- $tmpflags = getMailboxFlags($imapConnection, $tmp_trash_folder);
- $can_move_to_trash = true;
- for ($i = 0; $i < count($tmpflags); $i++) {
- if (strtolower($tmpflags[$i]) == "noinferiors")
- $can_move_to_trash = false;
}
- /** 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 **/
- /** Creates the subfolders under $trash_folder **/
+ // Otherwise, check if trash folder exits and support sub-folders
+ else {
for ($i = 0; $i < count($boxes); $i++) {
- if (($boxes[$i]["UNFORMATTED"] == $mailbox) ||
- (substr($boxes[$i]["UNFORMATTED"], 0, strlen($mailbox . $dm)) == $mailbox . $dm)) {
- $folderWithoutINBOX = getFolderNameMinusINBOX($boxes[$i]["UNFORMATTED"], $dm);
- $flags = getMailboxFlags($imapConnection, $boxes[$i]["RAW"]);
- for ($b = 0; $b < count($flags); $b++) {
- $type = $flags[$b];
- }
- createFolder($imapConnection, "$trash_folder" . $dm . "$folderWithoutINBOX", $type);
+ if ($boxes[$i]["unformatted"] == $trash_folder) {
+ $can_move_to_trash = !in_array('noinferiors', $boxes[$i]['flags']);
}
}
- for ($i = 0; $i < count($boxes); $i++) {
- if (($boxes[$i]["UNFORMATTED"] == $mailbox) ||
- (substr($boxes[$i]["UNFORMATTED"], 0, strlen($mailbox . $dm)) == $mailbox . $dm)) {
- selectMailbox($imapConnection, $boxes[$i]["UNFORMATTED"], $numMessages);
- $folder = getFolderNameMinusINBOX($boxes[$i]["UNFORMATTED"]);
-
- if ($numMessages > 0)
- $success = copyMessages($imapConnection, 1, $numMessages, "$trash_folder" . $dm . "$folder");
- else
- $success = true;
+ }
- if ($success == true)
- removeFolder($imapConnection, $boxes[$i]["UNFORMATTED"]);
- }
+ /** 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;
}
- } else { /** if they do NOT wish to move messages to the trash (or cannot)**/
- fputs($imapConnection, "1 LIST \"$mailbox\" *\n");
- $data = imapReadData($imapConnection , "1", false, $response, $message);
- while (substr($data[0], strpos($data[0], " ")+1, 4) == "LIST") {
- for ($i = 0; $i < count($boxes); $i++) {
- if (($boxes[$i]["UNFORMATTED"] == $mailbox) ||
- (substr($boxes[$i]["UNFORMATTED"], 0, strlen($mailbox . $dm)) == $mailbox . $dm)) {
- removeFolder($imapConnection, $boxes[$i]["UNFORMATTED"]);
- }
- }
- fputs($imapConnection, "1 LIST \"$mailbox\" *\n");
- $data = imapReadData($imapConnection , "1", false, $response, $message);
+ }
+ // 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 **/
- fputs($imapConnection, "1 logout");
+ sqimap_logout($imap_stream);
- echo "";
+ $location = get_location();
+ header ("Location: $location/folders.php?success=delete");
+ /*
echo "
";
echo _("Folder Deleted!");
echo "
";
echo _("The folder has been successfully deleted.");
- echo "
";
+ echo "
";
echo _("Click here");
- echo " ";
+ echo " ";
echo _("to continue.");
- echo "";
+ echo "";
echo "