fixed delimiter presence when not connected to imap server

[squirrelmail.git] / src / empty_trash.php

diff --git a/src/empty_trash.php b/src/empty_trash.php
index 42023fe056a185d23940ee8f9b8c8dbee63ada63..279af75eaac657ce58fdcb86035153e5f5b4f3ac 100644 (file)
--- a/src/empty_trash.php
+++ b/src/empty_trash.php
@@ -11,24 +11,15 @@
     **  $Id$
     **/
 
-   session_start();
-
-   include("../config/config.php");
-   include("../functions/strings.php");
-   include("../functions/page_header.php");
-   include("../functions/display_messages.php");
-   include("../functions/imap.php");
-   if (!function_exists("ary_sort"))
-      include("../functions/array.php");
-
-   if (!isset($tree_php))
-      include("../functions/tree.php");
-
-   include("../src/load_prefs.php");
+   require_once('../src/validate.php');
+   require_once('../functions/display_messages.php');
+   require_once('../functions/imap.php');
+   require_once('../functions/array.php');
+   require_once('../functions/tree.php');
 
    $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);
@@ -63,4 +54,4 @@
    header ("Location: $location/left_main.php");
 
    sqimap_logout($imap_stream);
-?>
+?>
\ No newline at end of file