From 7c1b84d979f4bbbcc8ce5d7423421123c4155107 Mon Sep 17 00:00:00 2001
From: lkehresman <lkehresman@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Mon, 29 Nov 1999 02:14:50 +0000
Subject: [PATCH 1/1] update

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@35 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 config/config.php             | 2 +-
 functions/mailbox_display.php | 1 +
 src/folders.php               | 3 +--
 src/folders_delete.php        | 3 ---
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/config/config.php b/config/config.php
index 1761bcd3..9048b0aa 100644
--- a/config/config.php
+++ b/config/config.php
@@ -29,7 +29,7 @@ $version = "0.0.1";
  *           will get expunged, removing all messages marked "Deleted".
  */
 
-$move_to_trash = false;
+$move_to_trash = true;
 $trash_folder = "INBOX.Trash";
 $auto_expunge = true;
 
diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index 06df3ad1..d6c9a6db 100644
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -1,4 +1,5 @@
 <?
+
    /**
     **  mailbox_display.php
     **
diff --git a/src/folders.php b/src/folders.php
index b6350954..7b7ec043 100644
--- a/src/folders.php
+++ b/src/folders.php
@@ -35,13 +35,12 @@
    }
 
    /** DELETING FOLDERS **/
+
    echo "<FORM ACTION=folders_delete.php METHOD=POST>\n";
    echo "<SELECT NAME=mailbox><FONT FACE=\"Arial,Helvetica\">\n";
    for ($i = 0; $i < count($str); $i++) {
       $thisbox = Chop($str[$i]);
       $thisbox = findMailboxName($thisbox);
-      $thisbox = getFolderNameMinuxINBOX($thisbox);
-
       $use_folder = true;
       for ($p = 0; $p < count($special_folders); $p++) {
          if ($special_folders[$p] == $long_name_boxes[$i])
diff --git a/src/folders_delete.php b/src/folders_delete.php
index 4c318a40..8bc2ff5a 100644
--- a/src/folders_delete.php
+++ b/src/folders_delete.php
@@ -8,8 +8,6 @@
    $imapConnection = loginToImapServer($username, $key, $imapServerAddress);
 
    // switch to the mailbox, and get the number of messages in it.
-   echo "$mailbox<BR>";
-   exit;
    selectMailbox($imapConnection, $mailbox, $numMessages);
 
    $folder = getFolderNameMinusINBOX($mailbox);
@@ -29,7 +27,6 @@
    } else {
       removeFolder($imapConnection, "user.$username.$folder");
    }
-   echo "success";
 
    // Log out this session
    fputs($imapConnection, "1 logout");
-- 
2.25.1