Forgot to use isset() instead of count() because I unset values in the array

[squirrelmail.git] / src / empty_trash.php

diff --git a/src/empty_trash.php b/src/empty_trash.php
index 91d88d81b62852d35325717fa5ebc7f0eafd4564..d46280142f853dbe3fbf1acea732e481517396de 100644 (file)
--- a/src/empty_trash.php
+++ b/src/empty_trash.php
@@ -7,16 +7,19 @@
     **
     **  Handles deleting messages from the trash folder without
     **  deleting subfolders.
+    **
+    **  $Id$
     **/
 
    session_start();
 
-   include("../config/config.php");
    include("../functions/strings.php");
+   include("../config/config.php");
    include("../functions/page_header.php");
    include("../functions/display_messages.php");
    include("../functions/imap.php");
-   include("../functions/array.php");
+   if (!function_exists("ary_sort"))
+      include("../functions/array.php");
 
    if (!isset($tree_php))
       include("../functions/tree.php");
@@ -25,7 +28,7 @@
 
    $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
 
-   sqimap_mailbox_list($imap_stream, $boxes);
+   sqimap_mailbox_list($imap_stream);
 
    $mailbox = $trash_folder;
    $boxes = sqimap_mailbox_list($imap_stream);
@@ -56,8 +59,8 @@
    // now lets go through the tree and delete the folders
    walkTreeInPreOrderEmptyTrash(0, $imap_stream, $foldersTree);
 
-   sqimap_mailbox_select($imap_stream, $trash_folder, $numMessages);
-   displayPageHeader($color, $mailbox);
-   messages_deleted_message($trash_folder, $sort, $startMessage, $color);
+   $location = get_location();
+   header ("Location: $location/left_main.php");
+
    sqimap_logout($imap_stream);
 ?>