X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fempty_trash.php;h=607fc3cb21301781407dd624281ae148dd07cca7;hb=0fa230016e399929e51d8e007b1509421424c7de;hp=5fefb858a3a5d07b39b28e28793bc9c0578b3239;hpb=08185f2a7631c3a12cb1ac085fec3be471b56b00;p=squirrelmail.git

diff --git a/src/empty_trash.php b/src/empty_trash.php
index 5fefb858..607fc3cb 100644
--- a/src/empty_trash.php
+++ b/src/empty_trash.php
@@ -3,7 +3,7 @@
 /**
  * empty_trash.php
  *
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Copyright (c) 1999-2003 The SquirrelMail Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
  * Handles deleting messages from the trash folder without
@@ -19,16 +19,23 @@ define('SM_PATH','../');
 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'];
+
+/* 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);
-global $delimiter;
 
 /*
  * According to RFC2060, a DELETE command should NOT remove inferiors (sub folders)
@@ -37,10 +44,11 @@ global $delimiter;
  */
 
 /** 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;
+$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;
     }
 }
@@ -50,9 +58,9 @@ for ($i = 0;$i < count($boxes);$i++) {
  *    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 . $delimiter)) == ($mailbox . $delimiter)) {
-        addChildNodeToTree($boxes[$i]["unformatted"], $boxes[$i]["unformatted-dm"], $foldersTree);
+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);
     }
 }