X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fempty_trash.php;h=0e845c57b6a3bf36b017248c4ed4f40decead0e5;hb=7980d56953a6e590191fb29ca2efd04545a2f8cb;hp=aa3eb97e967a218df70f2a2a1e2cb04addfbba97;hpb=e9f8ea4ecb40efdb6f19631f8359ebd1fbf588be;p=squirrelmail.git

diff --git a/src/empty_trash.php b/src/empty_trash.php
index aa3eb97e..0e845c57 100644
--- a/src/empty_trash.php
+++ b/src/empty_trash.php
@@ -1,35 +1,46 @@
 <?php
-   /**
-    **  empty_trash.php
-    **
-    **  Copyright (c) 1999-2000 The SquirrelMail development team
-    **  Licensed under the GNU GPL. For full terms see the file COPYING.
-    **
-    **  Handles deleting messages from the trash folder without
-    **  deleting subfolders.
-    **/
-
-   session_start();
-
-   include("../config/config.php");
-   include("../functions/strings.php");
-   include("../functions/page_header.php");
-   include("../functions/display_messages.php");
-   include("../functions/imap.php");
-   include("../functions/array.php");
-
-   if (!isset($tree_php))
-      include("../functions/tree.php");
-
-   include("../src/load_prefs.php");
+
+/**
+ * empty_trash.php
+ *
+ * Copyright (c) 1999-2002 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$
+ */
+
+/*****************************************************************/
+/*** THIS FILE NEEDS TO HAVE ITS FORMATTING FIXED!!!           ***/
+/*** PLEASE DO SO AND REMOVE THIS COMMENT SECTION.             ***/
+/***    + Base level indent should begin at left margin, as    ***/
+/***      the require_once below looks.                        ***/
+/***    + All identation should consist of four space blocks   ***/
+/***    + Tab characters are evil.                             ***/
+/***    + all comments should use "slash-star ... star-slash"  ***/
+/***      style -- no pound characters, no slash-slash style   ***/
+/***    + FLOW CONTROL STATEMENTS (if, while, etc) SHOULD      ***/
+/***      ALWAYS USE { AND } CHARACTERS!!!                     ***/
+/***    + Please use ' instead of ", when possible. Note "     ***/
+/***      should always be used in _( ) function calls.        ***/
+/*** Thank you for your help making the SM code more readable. ***/
+/*****************************************************************/
+
+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);
-   $dm = sqimap_get_delimiter($imap_stream);
+   global $delimiter;
    
    // According to RFC2060, a DELETE command should NOT remove inferiors (sub folders)
    //    so lets go through the list of subfolders and remove them before removing the
@@ -48,7 +59,7 @@
    //    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 . $dm)) == ($mailbox . $dm)) {
+      if (substr($boxes[$i]["unformatted"], 0, strlen($mailbox . $delimiter)) == ($mailbox . $delimiter)) {
          addChildNodeToTree($boxes[$i]["unformatted"], $boxes[$i]["unformatted-dm"], $foldersTree);
       }
    }