*** empty log message ***

[squirrelmail.git] / src / folders_delete.php

diff --git a/src/folders_delete.php b/src/folders_delete.php
index d49be2d31abaaa839112e2a3eeca34a83faac41c..7cda7013ae9fd11ed9989aa0421b6d8821af99ce 100644 (file)
--- a/src/folders_delete.php
+++ b/src/folders_delete.php
@@ -11,29 +11,16 @@
     **  $Id$
     **/
 
-   session_start();
+   include('../src/validate.php');
+   include("../functions/imap.php");
+   include("../functions/array.php");
+   include("../functions/tree.php");
 
    /*
    *  Incoming values:
    *     $mailbox - selected mailbox from the form
    */
    
-   if (!isset($strings_php))
-      include("../functions/strings.php");
-   if (!isset($config_php))
-      include("../config/config.php");
-   if (!isset($page_header_php))
-      include("../functions/page_header.php");
-   if (!isset($imap_php))
-      include("../functions/imap.php");
-   if (!isset($array_php))
-      include("../functions/array.php");
-   if (!isset($tree_php))
-      include("../functions/tree.php");
-
-   include("../src/load_prefs.php");
-
-   
    $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
    $boxes = sqimap_mailbox_list ($imap_stream);
    $dm = sqimap_get_delimiter($imap_stream);
@@ -62,11 +49,7 @@
    else {
       for ($i = 0; $i < count($boxes); $i++) {
          if ($boxes[$i]["unformatted"] == $trash_folder) {
-            $can_move_to_trash = true;
-            for ($j = 0; $j < count($boxes[$i]["flags"]); $j++) {
-               if (strtolower($boxes[$i]["flags"][$j]) == "noinferiors")
-                 $can_move_to_trash = false;
-            }
+            $can_move_to_trash = !in_array('noinferiors', $boxes[$i]['flags']);
          }
       }
    }