X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fempty_trash.php;h=4a18b8bac87aed0612221ce005db2f7fa7ecba5c;hb=e452ce9b159ee616915c2ca809a6da3f97b2c60b;hp=ee460ba4e0b37d93aeaf46246b9c0a22960e90eb;hpb=7a783442fed4fec7b484043c3a17e26054a1a0cb;p=squirrelmail.git
diff --git a/src/empty_trash.php b/src/empty_trash.php
index ee460ba4..4a18b8ba 100644
--- a/src/empty_trash.php
+++ b/src/empty_trash.php
@@ -1,44 +1,54 @@
-";
- echo "$errorNumber : $errorString
";
- exit;
- }
- $serverInfo = fgets($imapConnection, 256);
+ if (!isset($tree_php))
+ include("../functions/tree.php");
- // login
- fputs($imapConnection, "1 login $username $key\n");
- $read = fgets($imapConnection, 1024);
+ include("../src/load_prefs.php");
- if (strpos($read, "NO")) {
- error_username_password_incorrect();
- exit;
- }
+ $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
- // switch to the mailbox, and get the number of messages in it.
- selectMailbox($imapConnection, $mailbox, $numMessages);
-
- if ($mailbox != $trash_folder) {
- echo "ERROR -- I'm not in the trash folder!
";
- exit;
- }
+ sqimap_mailbox_list($imap_stream, $boxes);
- // mark them as deleted
- setMessageFlag($imapConnection, 1, $numMessages, "Deleted");
- expungeBox($imapConnection, $mailbox);
+ $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.
- // Log out this session
- fputs($imapConnection, "1 logout");
-
- echo "";
- displayPageHeader($mailbox);
-
- messages_deleted_message($mailbox, $sort, $startMessage);
-?>
\ No newline at end of file
+ /** 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);
+ }
+ }
+
+ // now lets go through the tree and delete the folders
+ walkTreeInPreOrderEmptyTrash(0, $imap_stream, $foldersTree);
+
+ sqimap_mailbox_select($imap_stream, $trash_folder, $numMessages);
+ echo "\n";
+ displayPageHeader($color, $mailbox);
+ messages_deleted_message($trash_folder, $sort, $startMessage, $color);
+ sqimap_logout($imap_stream);
+?>