X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fempty_trash.php;h=a099d66782fca0c856efe635e59e7b823bdbb751;hb=51fa8319fff96a2272291ad58274898ba595b270;hp=0201b8b9dfefd0ab3d35acf3c472348440bf086f;hpb=6c84ba1ec45ab854c37b6f65c5b4d84ab1c7aad4;p=squirrelmail.git

diff --git a/src/empty_trash.php b/src/empty_trash.php
index 0201b8b9..a099d667 100644
--- a/src/empty_trash.php
+++ b/src/empty_trash.php
@@ -3,27 +3,23 @@
 /**
  * empty_trash.php
  *
- * Copyright (c) 1999-2005 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.
  *
+ * @copyright © 1999-2006 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
  */
 
 /**
- * Path for SquirrelMail required files.
- * @ignore
+ * Include the SquirrelMail initialization file.
  */
-define('SM_PATH','../');
+require('../include/init.php');
 
-/* SquirrelMail required files. */
-require_once(SM_PATH . 'include/validate.php');
-require_once(SM_PATH . 'functions/display_messages.php');
-require_once(SM_PATH . 'functions/imap.php');
-require_once(SM_PATH . 'functions/tree.php');
+require(SM_PATH . 'functions/imap_general.php');
+require(SM_PATH . 'functions/imap_messages.php');
+require(SM_PATH . 'functions/tree.php');
 
 /* get those globals */
 
@@ -68,9 +64,14 @@ for ($i = 0; $i < $numboxes; $i++) {
 
 // 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);
 ?>
\ No newline at end of file