X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Ffolders_delete.php;h=4ae96f809e27711ac90dd66de11f27c6590981e7;hb=90de175589bcd8ea2b4d338c8b7eedb456a81da2;hp=e7d879db70bcb3d6bf0e3c7fa2b65ccade14d0b8;hpb=e54e0b894a77678b16ff712f6b69f782ac9c2916;p=squirrelmail.git

diff --git a/src/folders_delete.php b/src/folders_delete.php
index e7d879db..4ae96f80 100644
--- a/src/folders_delete.php
+++ b/src/folders_delete.php
@@ -1,115 +1,104 @@
 <?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
-    **
-    **  $Id$
-    **/
-
-   session_start();
-
-   /*
-   *  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);
-   
-   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, 
+
+/**
+ * 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
+*/
+
+$imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+$boxes = sqimap_mailbox_list ($imap_stream);
+global $delimiter;
+
+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;
-   } 
+// 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)) {
+// 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;
+    $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) {
+// 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 . $dm)) == ($mailbox_no_dm . $dm)) {
-         addChildNodeToTree($boxes[$i]["unformatted"], $boxes[$i]["unformatted-dm"], $foldersTree);
-      }
-   }
+        }
+    }
+}
+
+/** 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, $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>";
-   */
+/** 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>";
+*/
 ?>