X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fempty_trash.php;h=ecc1ef18a2e08cb7ea116a3054312b02e098fc2e;hb=c7ecee3abaee0ea3888aa681b798fc5557b75f90;hp=2cf16df18af4139071d31f999753e75130cb99c8;hpb=f8f9bed9bb69ef0432fbc67741f82071b6582b4d;p=squirrelmail.git diff --git a/src/empty_trash.php b/src/empty_trash.php index 2cf16df1..ecc1ef18 100644 --- a/src/empty_trash.php +++ b/src/empty_trash.php @@ -1,54 +1,53 @@ -"; - exit; - } + include("../src/load_prefs.php"); + $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); - /** GET FOLDER ARRAY OF TRASH SUBFOLDERS **/ - fputs($imapConnection, "1 list \"\" *\n"); - $str = imapReadData($imapConnection); + sqimap_mailbox_list($imap_stream, $boxes); - for ($i = 0;$i < count($str); $i++) { - $box = Chop($str[$i]); - $mailbox = findMailboxName($box); + $mailbox = $trash_folder; + $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. - if (strpos($box, $trash_folder) > 0) { - $folders[$i] = $mailbox; - } else { - $folders[$i] = "NOPE"; + /** 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; } } - - // mark them as deleted - setMessageFlag($imapConnection, 1, $numMessages, "Deleted"); - expungeBox($imapConnection, $mailbox); - - // remove subfolders - for ($i = 0; $i < count($folders); $i++) { - if (($folders[$i] == "NOPE") || ($folders[$i] == "$trash_folder")) { - } else { - $thisfolder = getFolderNameMinusINBOX($folders[$i]); - $thisfolder = "user.$username.$thisfolder"; - removeFolder($imapConnection, $thisfolder); + // 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); - selectMailbox($imapConnection, $trash_folder, $numMessages); - echo "\n"; + sqimap_mailbox_select($imap_stream, $trash_folder, $numMessages); displayPageHeader($color, $mailbox); - messages_deleted_message($trash_folder, $sort, $startMessage); - fputs($imapConnection, "1 logout"); + messages_deleted_message($trash_folder, $sort, $startMessage, $color); + sqimap_logout($imap_stream); ?>