X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Ffolders_delete.php;h=6775f677667f786d857779b62919d732e29c2b54;hb=9de421689de8b2540b33cc6005e371307be4e30f;hp=de432553373a73e1914b4db07ae13428a005feb2;hpb=15e6162eacc97158393bc75aed3afeb7b19c24a6;p=squirrelmail.git
diff --git a/src/folders_delete.php b/src/folders_delete.php
index de432553..6775f677 100644
--- a/src/folders_delete.php
+++ b/src/folders_delete.php
@@ -12,108 +12,107 @@
* $Id$
*/
-/*****************************************************************/
-/*** THIS FILE NEEDS TO HAVE ITS FORMATTING FIXED!!! ***/
-/*** PLEASE DO SO AND REMOVE THIS COMMENT SECTION. ***/
-/*** + Base level indent should begin at left margin, as ***/
-/*** the require_once below looks. ***/
-/*** + All identation should consist of four space blocks ***/
-/*** + Tab characters are evil. ***/
-/*** + all comments should use "slash-star ... star-slash" ***/
-/*** style -- no pound characters, no slash-slash style ***/
-/*** + FLOW CONTROL STATEMENTS (if, while, etc) SHOULD ***/
-/*** ALWAYS USE { AND } CHARACTERS!!! ***/
-/*** + Please use ' instead of ", when possible. Note " ***/
-/*** should always be used in _( ) function calls. ***/
-/*** Thank you for your help making the SM code more readable. ***/
-/*****************************************************************/
require_once('../src/validate.php');
require_once('../functions/imap.php');
require_once('../functions/array.php');
require_once('../functions/tree.php');
+require_once('../functions/display_messages.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,
+/*
+* Incoming values:
+* $mailbox - selected mailbox from the form
+*/
+
+if ($mailbox == '') {
+ displayPageHeader($color, 'None');
+ echo "";
+ plain_error_message(_("You have not selected a folder to delete. Please do so.")."
"._("Click here to go back").".", $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;
- }
+/* 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)) {
+/* 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 . $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 "
";
- echo _("Folder Deleted!");
- echo "
";
- echo _("The folder has been successfully deleted.");
- echo "
";
- echo _("Click here");
- echo " ";
- echo _("to continue.");
- echo "";
-
- echo "";
- */
+ }
+ }
+}
+
+/** 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 "
";
+echo _("Folder Deleted!");
+echo "
";
+echo _("The folder has been successfully deleted.");
+echo "
";
+echo _("Click here");
+echo " ";
+echo _("to continue.");
+echo "";
+
+echo "