From e80b444be0527cf72b12aad8c02fc9c4f7863a3a Mon Sep 17 00:00:00 2001
From: nehresma <nehresma@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Mon, 14 Feb 2000 19:40:20 +0000
Subject: [PATCH] bug fixes and better error messages on emptying trash

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@213 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 functions/imap.php | 3 +++
 src/download.php   | 4 ++--
 src/left_main.php  | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/functions/imap.php b/functions/imap.php
index cec1048b..99b0192c 100644
--- a/functions/imap.php
+++ b/functions/imap.php
@@ -183,9 +183,12 @@
          echo "<FONT FACE=\"Arial,Helvetica\" COLOR=FF0000><B>ERROR</B>:  Could not delete the folder $folder.</FONT>";
          echo "<FONT FACE=\"Arial,Helvetica\" COLOR=\"$color[8]\">Probable causes:</FONT><BR>";
          echo "<FONT FACE=\"Arial,Helvetica\" COLOR=\"$color[8]\"><LI>This folder may contain subfolders.  Delete all subfolders first</LI></FONT>";
+         echo "<FONT FACE=\"Arial,Helvetica\" COLOR=\"$color[8]\"><BR><BR>The actual message returned from the server was:<BR>$message</FONT>";
+         echo "</BODY></HTML>";
          exit;
       } else if ($response == "BAD") {
          echo "<B><FONT COLOR=FF0000>ERROR</FONT><FONT COLOR=CC0000>:  Bad or malformed request.</B></FONT><BR><FONT COLOR=CC0000>&nbsp;&nbsp;<B>Server responded:</B> $message</FONT><BR><BR>";
+         echo "</BODY></HTML>";
          exit;
       }
    }
diff --git a/src/download.php b/src/download.php
index 552e88b6..6aa7a895 100644
--- a/src/download.php
+++ b/src/download.php
@@ -1,7 +1,7 @@
 <?
    include("../config/config.php");
-//   include("../functions/strings.php");
-//   include("../functions/page_header.php");
+   include("../functions/strings.php");
+   include("../functions/page_header.php");
    include("../functions/imap.php");
    include("../functions/mime.php");
    include("../functions/mailbox.php");
diff --git a/src/left_main.php b/src/left_main.php
index 8875cbdd..b29729fa 100644
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -57,7 +57,7 @@
       if (($move_to_trash == true) && (trim($real_box) == $trash_folder)) {
          $urlMailbox = urlencode($real_box);
          $line .= "<FONT FACE=\"Arial,Helvetica\" SIZE=2>";
-         $line .= "&nbsp;&nbsp;&nbsp;&nbsp;(<B><A HREF=\"empty_trash.php?numMessages=$numMessages&mailbox=$urlMailbox\" TARGET=right style=\"text-decoration:none\">empty</A></B>)";
+         $line .= "&nbsp;&nbsp;&nbsp;&nbsp;(<B><A HREF=\"empty_trash.php?numMessages=$numMessages&mailbox=$urlMailbox\" TARGET=right style=\"text-decoration:none\">empty me</A></B>)";
          $line .= "</FONT></a>\n";
       }
 
-- 
2.25.1