* Forgot to catch an 'if' so I could get proper indentation

[squirrelmail.git] / src / folders_delete.php

diff --git a/src/folders_delete.php b/src/folders_delete.php
index f2b245d66fb6c9cff81c3b8d5d29bc6f0595202b..e7d879db70bcb3d6bf0e3c7fa2b65ccade14d0b8 100644 (file)
--- a/src/folders_delete.php
+++ b/src/folders_delete.php
@@ -37,7 +37,6 @@
    $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
    $boxes = sqimap_mailbox_list ($imap_stream);
    $dm = sqimap_get_delimiter($imap_stream);
-   $mailbox = sqStripSlashes($mailbox);
    
    if (substr($mailbox, -1) == $dm)
       $mailbox_no_dm = substr($mailbox, 0, strlen($mailbox) - 1); 
@@ -63,11 +62,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']);
          }
       }
    }