Make moving folders into Trash optional

[squirrelmail.git] / src / folders_delete.php

diff --git a/src/folders_delete.php b/src/folders_delete.php
index 4ae96f809e27711ac90dd66de11f27c6590981e7..40c2ca2feb976d13e0f95e05f676abfc812c649b 100644 (file)
--- a/src/folders_delete.php
+++ b/src/folders_delete.php
@@ -25,7 +25,7 @@ require_once('../functions/tree.php');
 
 $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
 $boxes = sqimap_mailbox_list ($imap_stream);
-global $delimiter;
+global $delimiter, $delete_folder;
 
 if (substr($mailbox, -1) == $delimiter)
     $mailbox_no_dm = substr($mailbox, 0, strlen($mailbox) - 1);
@@ -40,6 +40,11 @@ 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)) {