Bugfix.

[squirrelmail.git] / src / empty_trash.php

diff --git a/src/empty_trash.php b/src/empty_trash.php
index bc554d636e71037f6b36a475387775510aeb05dd..0e845c57b6a3bf36b017248c4ed4f40decead0e5 100644 (file)
--- a/src/empty_trash.php
+++ b/src/empty_trash.php
@@ -1,55 +1,74 @@
-<?
-   include("../config/config.php");
-   include("../functions/mailbox.php");
-   include("../functions/strings.php");
-   include("../functions/page_header.php");
-   include("../functions/display_messages.php");
-   include("../functions/imap.php");
-
-   $imapConnection = loginToImapServer($username, $key, $imapServerAddress);
-
-   // 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!<BR>";
-      exit;
-   }
+<?php
+
+/**
+ * empty_trash.php
+ *
+ * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Licensed under the GNU GPL. For full terms see the file COPYING.
+ *
+ * Handles deleting messages from the trash folder without
+ * deleting subfolders.
+ *
+ * $Id$
+ */
+
+/*****************************************************************/
+/*** THIS FILE NEEDS TO HAVE ITS FORMATTING FIXED!!!           ***/
+/*** PLEASE DO SO AND REMOVE THIS COMMENT SECTION.             ***/
+/***    + Base level indent should begin at left margin, as    ***/
+/***      the require_once below looks.                        ***/
+/***    + All identation should consist of four space blocks   ***/
+/***    + Tab characters are evil.                             ***/
+/***    + all comments should use "slash-star ... star-slash"  ***/
+/***      style -- no pound characters, no slash-slash style   ***/
+/***    + FLOW CONTROL STATEMENTS (if, while, etc) SHOULD      ***/
+/***      ALWAYS USE { AND } CHARACTERS!!!                     ***/
+/***    + Please use ' instead of ", when possible. Note "     ***/
+/***      should always be used in _( ) function calls.        ***/
+/*** Thank you for your help making the SM code more readable. ***/
+/*****************************************************************/
 
+require_once('../src/validate.php');
+require_once('../functions/display_messages.php');
+require_once('../functions/imap.php');
+require_once('../functions/array.php');
+require_once('../functions/tree.php');
 
-   /** GET FOLDER ARRAY OF TRASH SUBFOLDERS **/
-   fputs($imapConnection, "1 list \"\" *\n");
-   $str = imapReadData($imapConnection);
+   $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
 
-   for ($i = 0;$i < count($str); $i++) {
-      $box = Chop($str[$i]);
-      $mailbox = findMailboxName($box);
+   sqimap_mailbox_list($imap_stream);
 
-      if (strpos($box, $trash_folder) > 0) {
-         $folders[$i] = $mailbox;
-      } else {
-         $folders[$i] = "NOPE";
+   $mailbox = $trash_folder;
+   $boxes = sqimap_mailbox_list($imap_stream);
+   global $delimiter;
+   
+   // 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;
       }
    }
-
-   // 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 . $delimiter)) == ($mailbox . $delimiter)) {
+         addChildNodeToTree($boxes[$i]["unformatted"], $boxes[$i]["unformatted-dm"], $foldersTree);
       }
    }
-   // Log out this session
-   fputs($imapConnection, "1 logout");
+   
+   // now lets go through the tree and delete the folders
+   walkTreeInPreOrderEmptyTrash(0, $imap_stream, $foldersTree);
 
-   echo "<HTML><BODY TEXT=\"#000000\" BGCOLOR=\"#FFFFFF\" LINK=\"#0000EE\" VLINK=\"#0000EE\" ALINK=\"#0000EE\">";
-   displayPageHeader($mailbox);
+   $location = get_location();
+   header ("Location: $location/left_main.php");
 
-   messages_deleted_message("INBOX", $sort, $startMessage);
+   sqimap_logout($imap_stream);
 ?>