X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fempty_trash.php;h=604b860753e5f1b93b39bd8f762d17dfa619f544;hp=d46280142f853dbe3fbf1acea732e481517396de;hb=fdf58ef92a0b69f93bd08e22be831aa8172bfe62;hpb=b954b6faf740d280dc9067fad0b15966afa282fe

diff --git a/src/empty_trash.php b/src/empty_trash.php
index d4628014..604b8607 100644
--- a/src/empty_trash.php
+++ b/src/empty_trash.php
@@ -1,66 +1,74 @@
 <?php
-   /**
-    **  empty_trash.php
-    **
-    **  Copyright (c) 1999-2000 The SquirrelMail development team
-    **  Licensed under the GNU GPL. For full terms see the file COPYING.
-    **
-    **  Handles deleting messages from the trash folder without
-    **  deleting subfolders.
-    **
-    **  $Id$
-    **/
 
-   session_start();
+/**
+ * empty_trash.php
+ *
+ * Handles deleting messages from the trash folder without
+ * deleting subfolders.
+ *
+ * @copyright &copy; 1999-2007 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$
+ * @package squirrelmail
+ */
 
-   include("../functions/strings.php");
-   include("../config/config.php");
-   include("../functions/page_header.php");
-   include("../functions/display_messages.php");
-   include("../functions/imap.php");
-   if (!function_exists("ary_sort"))
-      include("../functions/array.php");
+/**
+ * Include the SquirrelMail initialization file.
+ */
+require('../include/init.php');
 
-   if (!isset($tree_php))
-      include("../functions/tree.php");
+require(SM_PATH . 'functions/imap_general.php');
+require(SM_PATH . 'functions/imap_messages.php');
+require(SM_PATH . 'functions/tree.php');
 
-   include("../src/load_prefs.php");
+/* get those globals */
 
-   $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
 
-   sqimap_mailbox_list($imap_stream);
+/* finished globals */
 
-   $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.
+$imap_stream = sqimap_login($username, false, $imapServerAddress, $imapPort, 0);
 
-   /** 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);
+$mailbox = $trash_folder;
+$boxes = sqimap_mailbox_list($imap_stream);
 
-   $location = get_location();
-   header ("Location: $location/left_main.php");
+/*
+ * 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);
+    }
+}
+
+// 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);
+
+// close session properly before redirecting
+session_write_close();
+
+$location = get_location();
+header ("Location: $location/left_main.php");
 
-   sqimap_logout($imap_stream);
 ?>