X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Ffolders_delete.php;h=e7d879db70bcb3d6bf0e3c7fa2b65ccade14d0b8;hb=e2ab93e54b0576afcc455883e256862fa939c79c;hp=1e76b406134604247f208093c17fcec36ec5c060;hpb=2c1dc6525ed4a642bbcdbd58bb312091baee7ccb;p=squirrelmail.git

diff --git a/src/folders_delete.php b/src/folders_delete.php
index 1e76b406..e7d879db 100644
--- a/src/folders_delete.php
+++ b/src/folders_delete.php
@@ -7,6 +7,8 @@
     **
     **  Deltes folders from the IMAP server. 
     **  Called from the folders.php
+    **
+    **  $Id$
     **/
 
    session_start();
@@ -16,10 +18,10 @@
    *     $mailbox - selected mailbox from the form
    */
    
-   if (!isset($config_php))
-      include("../config/config.php");
    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))
@@ -35,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); 
@@ -44,17 +45,24 @@
 
    /** lets see if we CAN move folders to the trash.. otherwise, 
     ** just delete them **/
+
+   // Courier IMAP doesn't like subfolders of Trash
    if (strtolower($imap_server_type) == "courier") {
-      // Courier IMAP doesn't like subfolders of Trash
       $can_move_to_trash = false;
-   } else {
+   } 
+
+   // If it's already a subfolder of trash, we'll have to delete it
+   else if(eregi("^".$trash_folder.".+", $mailbox)) {
+
+      $can_move_to_trash = false;
+
+   }
+
+   // Otherwise, check if trash folder exits and support sub-folders
+   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']);
          }
       }
    }