X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fempty_trash.php;h=aa3eb97e967a218df70f2a2a1e2cb04addfbba97;hb=c95df3808257297105d60595ab869357359a89e7;hp=dab7f4e1e24ed2b549e15fe0cd9f6a304f796026;hpb=6520d9e641db67984863613d9dd12addc85fa842;p=squirrelmail.git diff --git a/src/empty_trash.php b/src/empty_trash.php index dab7f4e1..aa3eb97e 100644 --- a/src/empty_trash.php +++ b/src/empty_trash.php @@ -1,39 +1,63 @@ -\n"; - echo "DEBUG - mailbox is : $mailbox
\n"; - 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); ?>