X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Ffolders_delete.php;h=e6d945effd541aecad07ee57060a692412a445ad;hb=7aaa81fcf8383ee72ee0e4fd3cb2fd8d5f9708b5;hp=3af351a89ae6178fb72dc38689293af5dce9d1d3;hpb=8c7dfc9960e03539b2ab145a37a3752cb8b31b4d;p=squirrelmail.git
diff --git a/src/folders_delete.php b/src/folders_delete.php
index 3af351a8..e6d945ef 100644
--- a/src/folders_delete.php
+++ b/src/folders_delete.php
@@ -1,56 +1,102 @@
-
- include("../config/config.php");
- include("../functions/strings.php");
- include("../functions/page_header.php");
- include("../functions/imap.php");
-
- $imapConnection = fsockopen($imapServerAddress, 143, &$errorNumber, &$errorString);
- if (!$imapConnection) {
- echo "Error connecting to IMAP Server.
";
- echo "$errorNumber : $errorString
";
- exit;
- }
- $serverInfo = fgets($imapConnection, 256);
+
Return";
-?>
+ /** 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 "