X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fempty_trash.php;h=486b15e6d96883a1e00fb09f364a47e411b32a69;hp=d67d7514bfbc23e4495585a2256b0e2b868fc762;hb=e0495695509e5d8a0d9a37df24539483678d9e3c;hpb=0a1d5f3a4aeb3f44c5af035b2f9a29bd53f573ad diff --git a/src/empty_trash.php b/src/empty_trash.php index d67d7514..486b15e6 100644 --- a/src/empty_trash.php +++ b/src/empty_trash.php @@ -1,47 +1,59 @@ -\n"; - + $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. - // BUG??? - what if a subfolder has a subfolder?? need to start at lowest level - // and work up. - - for ($i = 0; $i < count($boxes); $i++) { -// if (($boxes[$i]["UNFORMATTED"] == $mailbox) || -// (substr($boxes[$i]["UNFORMATTED"], 0, strlen($mailbox . $dm)) == $mailbox . $dm)) { - if (($boxes[$i]["UNFORMATTED"] != $mailbox) && (substr($boxes[$i]["UNFORMATTED"], 0, strlen($mailbox . $dm)) == $mailbox . $dm)) { - removeFolder($imapConnection, $boxes[$i]["UNFORMATTED"]); - echo "removing " . $boxes[$i]["UNFORMATTED"] . "
"; + /** 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 lets remove the top level trash folder - removeFolder($imapConnection, $mailbox); + // 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); + } + } + + // 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); ?>