X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fempty_trash.php;h=18d89d94ec35777a19a41b29967ac010280b8955;hb=4d14fc0079d1e51cacdbafeb2573ea8b5c83291a;hp=f6baf0db982eef4f0200b96b63cfdd7cfc24add2;hpb=2aa12d5e029f04fa8c778ec1d3487418d0c3b62d;p=squirrelmail.git diff --git a/src/empty_trash.php b/src/empty_trash.php index f6baf0db..18d89d94 100644 --- a/src/empty_trash.php +++ b/src/empty_trash.php @@ -1,30 +1,62 @@ -"; - exit; - } +$imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); - // mark them as deleted - setMessageFlag($imapConnection, 1, $numMessages, "Deleted"); - expungeBox($imapConnection, $mailbox); +sqimap_mailbox_list($imap_stream); - // Log out this session - fputs($imapConnection, "1 logout"); +$mailbox = $trash_folder; +$boxes = sqimap_mailbox_list($imap_stream); +global $delimiter; - echo ""; - displayPageHeader($mailbox); +/* + * 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. + */ - messages_deleted_message($mailbox, $sort, $startMessage); +/** 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 . $delimiter)) == ($mailbox . $delimiter)) { + addChildNodeToTree($boxes[$i]["unformatted"], $boxes[$i]["unformatted-dm"], $foldersTree); + } +} + +// now lets go through the tree and delete the folders +walkTreeInPreOrderEmptyTrash(0, $imap_stream, $foldersTree); + +$location = get_location(); +header ("Location: $location/left_main.php"); + +sqimap_logout($imap_stream); ?>