X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Ffolders_delete.php;h=a301f70ba9578161d9be6aceda4033bc61493635;hb=45c4e0f2653ed11aa2d417923e043440e1d33d77;hp=0a3eef3eed9a247291822b67520668beb3883a5f;hpb=2a833d7253739cb67eb69aa760f7b37fe7aedd8c;p=squirrelmail.git

diff --git a/src/folders_delete.php b/src/folders_delete.php
index 0a3eef3e..a301f70b 100644
--- a/src/folders_delete.php
+++ b/src/folders_delete.php
@@ -1,51 +1,59 @@
 <?php
-   session_start();
+   /**
+    **  folders_delete.php
+    **
+    **  Copyright (c) 1999-2000 The SquirrelMail development team
+    **  Licensed under the GNU GPL. For full terms see the file COPYING.
+    **
+    **  Deltes folders from the IMAP server. 
+    **  Called from the folders.php
+    **
+    **  $Id$
+    **/
+
+   require_once('../src/validate.php');
+   require_once('../functions/imap.php');
+   require_once('../functions/array.php');
+   require_once('../functions/tree.php');
 
    /*
    *  Incoming values:
    *     $mailbox - selected mailbox from the form
    */
    
-   if (!isset($config_php))
-      include("../config/config.php");
-   if (!isset($strings_php))
-      include("../functions/strings.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");
-
-   displayPageHeader($color, "None");  
-
-   
    $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
    $boxes = sqimap_mailbox_list ($imap_stream);
    $dm = sqimap_get_delimiter($imap_stream);
-   $mailbox = stripslashes($mailbox);
    
    if (substr($mailbox, -1) == $dm)
       $mailbox_no_dm = substr($mailbox, 0, strlen($mailbox) - 1); 
    else
       $mailbox_no_dm = $mailbox;
 
-   /** lets see if we CAN move folders to the trash.. otherwise, just delete them **/
-   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;
+   /** 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") {
+      $can_move_to_trash = false;
+   } 
+
+   // 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 = !in_array('noinferiors', $boxes[$i]['flags']);
          }
       }
    }
 
-
    /** First create the top node in the tree **/
    for ($i = 0;$i < count($boxes);$i++) {
       if (($boxes[$i]["unformatted-dm"] == $mailbox) && (strlen($boxes[$i]["unformatted-dm"]) == strlen($mailbox))) {
@@ -76,6 +84,9 @@
    /** Log out this session **/
    sqimap_logout($imap_stream);
 
+   $location = get_location();
+   header ("Location: $location/folders.php?success=delete");
+   /*
    echo "<BR><BR><BR><CENTER><B>";
    echo _("Folder Deleted!");
    echo "</B><BR><BR>";
@@ -87,4 +98,5 @@
    echo "</CENTER>"; 
    
    echo "</BODY></HTML>";
-?>
+   */
+?>
\ No newline at end of file