Browse Source

bug fixes and better error messages on emptying trash

nehresma 25 years ago
parent
commit
a55373bd55
3 changed files with 6 additions and 3 deletions
  1. 3 0
      functions/imap.php
  2. 2 2
      src/download.php
  3. 1 1
      src/left_main.php

+ 3 - 0
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=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]\">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]\"><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;
          exit;
       } else if ($response == "BAD") {
       } 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 "<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;
          exit;
       }
       }
    }
    }

+ 2 - 2
src/download.php

@@ -1,7 +1,7 @@
 <?
 <?
    include("../config/config.php");
    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/imap.php");
    include("../functions/mime.php");
    include("../functions/mime.php");
    include("../functions/mailbox.php");
    include("../functions/mailbox.php");

+ 1 - 1
src/left_main.php

@@ -57,7 +57,7 @@
       if (($move_to_trash == true) && (trim($real_box) == $trash_folder)) {
       if (($move_to_trash == true) && (trim($real_box) == $trash_folder)) {
          $urlMailbox = urlencode($real_box);
          $urlMailbox = urlencode($real_box);
          $line .= "<FONT FACE=\"Arial,Helvetica\" SIZE=2>";
          $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";
          $line .= "</FONT></a>\n";
       }
       }