X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fempty_trash.php;h=b34af88cd656199bc4d94d6d4efe57e31f7fb10a;hb=76e034f5084c4b72e243c249a030773bd03e586a;hp=607fc3cb21301781407dd624281ae148dd07cca7;hpb=76911253eb850bacde3d86c8cb7b4af072e67ebe;p=squirrelmail.git

diff --git a/src/empty_trash.php b/src/empty_trash.php
index 607fc3cb..b34af88c 100644
--- a/src/empty_trash.php
+++ b/src/empty_trash.php
@@ -10,9 +10,10 @@
  * 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);