Including plugins integrated into 1.5.1 core.

[squirrelmail.git] / src / empty_trash.php

diff --git a/src/empty_trash.php b/src/empty_trash.php
index 6289fea80394e2999d25d2d98615b0ccdc6027d8..ceaac877173192dc35ffce5b8997bb5852e57dd9 100644 (file)
--- a/src/empty_trash.php
+++ b/src/empty_trash.php
@@ -3,38 +3,38 @@
 /**
  * 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-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. */
+/**
+ * Path for SquirrelMail required files.
+ * @ignore
+ */
 define('SM_PATH','../');
 
 /* 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/array.php');
 require_once(SM_PATH . 'functions/tree.php');
 
 /* get those globals */
 
-$key = $_COOKIE['key'];
-$username = $_SESSION['username'];
-$onetimepad = $_SESSION['onetimepad'];
-$delimiter = $_SESSION['delimiter'];
+sqgetGlobalVar('username', $username, SQ_SESSION);
+sqgetGlobalVar('key', $key, SQ_COOKIE);
+sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
+sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION);
 
 /* finished globals */
 
 $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
 
-sqimap_mailbox_list($imap_stream);
-
 $mailbox = $trash_folder;
 $boxes = sqimap_mailbox_list($imap_stream);
 
@@ -67,9 +67,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