X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fempty_trash.php;h=67adce7bbda10d5a635bb42fd7ad60b6c39383f7;hp=0e845c57b6a3bf36b017248c4ed4f40decead0e5;hb=319ad3c0c8da205707d50cfbd9c37e61d70cc314;hpb=15e6162eacc97158393bc75aed3afeb7b19c24a6

diff --git a/src/empty_trash.php b/src/empty_trash.php
index 0e845c57..67adce7b 100644
--- a/src/empty_trash.php
+++ b/src/empty_trash.php
@@ -3,72 +3,74 @@
 /**
  * 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$
+ * @copyright © 1999-2007 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$
+ * @package squirrelmail
+ */
+
+/** This is the empty_trash page */
+define('PAGE_NAME', 'empty_trash');
+
+/**
+ * Include the SquirrelMail initialization file.
  */
+require('../include/init.php');
+
+require(SM_PATH . 'functions/imap_general.php');
+require(SM_PATH . 'functions/imap_messages.php');
+require(SM_PATH . 'functions/tree.php');
 
-/*****************************************************************/
-/*** 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. ***/
-/*****************************************************************/
+/* get those globals */
 
-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');
+sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
 
-   $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+/* finished globals */
 
-   sqimap_mailbox_list($imap_stream);
+$imap_stream = sqimap_login($username, false, $imapServerAddress, $imapPort, 0);
+
+$mailbox = $trash_folder;
+$boxes = sqimap_mailbox_list($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 **/
+$numboxes = count($boxes);
+for ($i = 0; $i < $numboxes; $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 < $numboxes; $i++) {
+    if (substr($boxes[$i]['unformatted'], 0, strlen($mailbox . $delimiter)) == ($mailbox . $delimiter)) {
+        addChildNodeToTree($boxes[$i]['unformatted'], $boxes[$i]['unformatted-dm'], $foldersTree);
+    }
+}
 
-   $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.
+// now lets go through the tree and delete the folders
+walkTreeInPreOrderEmptyTrash(0, $imap_stream, $foldersTree);
+// update mailbox cache
+$mailboxes=sqimap_get_mailboxes($imap_stream,true,$show_only_subscribed_folders);
+sqimap_logout($imap_stream);
 
-   /** 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);
+// close session properly before redirecting
+session_write_close();
 
-   $location = get_location();
-   header ("Location: $location/left_main.php");
+$location = get_location();
+header ("Location: $location/left_main.php");
 
-   sqimap_logout($imap_stream);
-?>