X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fempty_trash.php;h=b0318f409a5b548c2b266ebf269eaee521a372a0;hb=4764a7ff9361fd551c0c38b82a5e3332c27eb1e8;hp=7f3896303b1c0142003b6d90ca887e8eb5148659;hpb=625c8b787b79d07a1e53ba05213f66451d73651e;p=squirrelmail.git

diff --git a/src/empty_trash.php b/src/empty_trash.php
index 7f389630..b0318f40 100644
--- a/src/empty_trash.php
+++ b/src/empty_trash.php
@@ -3,16 +3,17 @@
 /**
  * empty_trash.php
  *
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Copyright (c) 1999-2004 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$
+ * @package squirrelmail
  */
 
-/* Path for SquirrelMail required files. */
+/** Path for SquirrelMail required files. */
 define('SM_PATH','../');
 
 /* SquirrelMail required files. */
@@ -23,17 +24,15 @@ 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);