X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fempty_trash.php;h=279af75eaac657ce58fdcb86035153e5f5b4f3ac;hb=56b52934be8ce6632aec987b6530036dccdd71d7;hp=60d1386fffb151f70bf47998ffcec462d9f245fb;hpb=87d0dfb59bd4f72a02737a0a23bfc121dd473f06;p=squirrelmail.git diff --git a/src/empty_trash.php b/src/empty_trash.php index 60d1386f..279af75e 100644 --- a/src/empty_trash.php +++ b/src/empty_trash.php @@ -1,38 +1,57 @@ -\n"; - 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"]); - } + $boxes = sqimap_mailbox_list($imap_stream); + $dm = sqimap_get_delimiter($imap_stream); + + // According to RFC2060, a DELETE command should NOT remove inferiors (sub folders) + // so lets go through the list of subfolders and remove them before removing the + // parent. + + /** 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))) { + $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 . $dm)) == ($mailbox . $dm)) { + addChildNodeToTree($boxes[$i]["unformatted"], $boxes[$i]["unformatted-dm"], $foldersTree); } - fputs($imapConnection, "1 LIST \"$mailbox\" *\n"); - $data = imapReadData($imapConnection , "1", false, $response, $message); } + + // now lets go through the tree and delete the folders + walkTreeInPreOrderEmptyTrash(0, $imap_stream, $foldersTree); - createFolder($imapConnection, "$trash_folder", ""); + $location = get_location(); + header ("Location: $location/left_main.php"); - selectMailbox($imapConnection, $trash_folder, $numMessages); - echo "\n"; - displayPageHeader($color, $mailbox); - messages_deleted_message($trash_folder, $sort, $startMessage, $color); - fputs($imapConnection, "1 logout"); -?> + sqimap_logout($imap_stream); +?> \ No newline at end of file