X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Ffolders_delete.php;h=d24eb9a8f39017c24eef697495c6eeb527fbe89e;hp=e6d945effd541aecad07ee57060a692412a445ad;hb=5b8d68ca2263cc828546f629c7cd63a78783a3d0;hpb=7aaa81fcf8383ee72ee0e4fd3cb2fd8d5f9708b5

diff --git a/src/folders_delete.php b/src/folders_delete.php
index e6d945ef..d24eb9a8 100644
--- a/src/folders_delete.php
+++ b/src/folders_delete.php
@@ -1,102 +1,117 @@
 <?php
-   /**
-    **  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
-    **/
-
-   session_start();
-
-   /*
-   *  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");
-
-   
-   $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); 
-   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;
-         }
-      }
-   }
-
-
-   /** 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))) {
-         $foldersTree[0]["value"] = $mailbox;
-         $foldersTree[0]["doIHaveChildren"] = false;
-         continue;
-      }
-   }
-   // Now create the nodes for subfolders of the parent folder 
-   // You can tell that it is a subfolder by tacking the mailbox delimiter
-   //    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_no_dm . $dm)) == ($mailbox_no_dm . $dm)) {
-         addChildNodeToTree($boxes[$i]["unformatted"], $boxes[$i]["unformatted-dm"], $foldersTree);
-      }
-   }
-//   simpleWalkTreePre(0, $foldersTree);
-
-   /** Lets start removing the folders and messages **/
-   if (($move_to_trash == true) && ($can_move_to_trash == true)) { /** if they wish to move messages to the trash **/
-      walkTreeInPostOrderCreatingFoldersUnderTrash(0, $imap_stream, $foldersTree, $dm, $mailbox);
-      walkTreeInPreOrderDeleteFolders(0, $imap_stream, $foldersTree);
-   } else { /** if they do NOT wish to move messages to the trash (or cannot)**/
-      walkTreeInPreOrderDeleteFolders(0, $imap_stream, $foldersTree);
-   }
-
-   /** 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>";
-   echo _("The folder has been successfully deleted.");
-   echo "<BR><A HREF=\"webmail.php?right_frame=folders.php\" TARGET=_top>";
-   echo _("Click here");
-   echo "</A> ";
-   echo _("to continue.");
-   echo "</CENTER>"; 
-   
-   echo "</BODY></HTML>";
-   */
+
+/**
+ * folders_delete.php
+ *
+ * Copyright (c) 1999-2002 The SquirrelMail Project 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 ($mailbox == '') {
+    displayPageHeader($color, 'None');
+    echo "<html><body bgcolor=$color[4]>";
+    plain_error_message(_("You have not selected a folder to delete. Please do so.")."<BR><A HREF=\"../src/folders.php\">"._("Click here to go back")."</A>.", $color);
+    exit;
+}
+
+
+$imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+$boxes = sqimap_mailbox_list ($imap_stream);
+global $delimiter, $delete_folder;
+
+if (substr($mailbox, -1) == $delimiter)
+    $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 **/
+
+/* Courier IMAP doesn't like subfolders of Trash */
+if (strtolower($imap_server_type) == "courier") {
+    $can_move_to_trash = false;
+}
+
+/* If global options say we can't move it into Trash */
+else if(isset($delete_folder) && $delete_folder == true) {
+    $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))) {
+        $foldersTree[0]["value"] = $mailbox;
+        $foldersTree[0]["doIHaveChildren"] = false;
+        continue;
+    }
+}
+/* Now create the nodes for subfolders of the parent folder
+   You can tell that it is a subfolder by tacking the mailbox delimiter
+   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_no_dm . $delimiter)) == ($mailbox_no_dm . $delimiter)) {
+        addChildNodeToTree($boxes[$i]["unformatted"], $boxes[$i]["unformatted-dm"], $foldersTree);
+    }
+}
+/*   simpleWalkTreePre(0, $foldersTree); */
+
+/** Lets start removing the folders and messages **/
+if (($move_to_trash == true) && ($can_move_to_trash == true)) { /** if they wish to move messages to the trash **/
+    walkTreeInPostOrderCreatingFoldersUnderTrash(0, $imap_stream, $foldersTree, $mailbox);
+    walkTreeInPreOrderDeleteFolders(0, $imap_stream, $foldersTree);
+} else { /** if they do NOT wish to move messages to the trash (or cannot)**/
+    walkTreeInPreOrderDeleteFolders(0, $imap_stream, $foldersTree);
+}
+
+/** 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>";
+echo _("The folder has been successfully deleted.");
+echo "<BR><A HREF=\"webmail.php?right_frame=folders.php\" TARGET=_top>";
+echo _("Click here");
+echo "</A> ";
+echo _("to continue.");
+echo "</CENTER>";
+
+echo "</BODY></HTML>";
+*/
 ?>