added DELETE for when viewing a message

beautified some of the messages

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@63 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/functions/display_messages.php b/functions/display_messages.php
index 18314c1dbf66275c46bb310a120a607c1b98995d..4f8fd008f9310a5c65aba52a6bd1da7ac682efb0 100644 (file)
--- a/functions/display_messages.php
+++ b/functions/display_messages.php
@@ -56,9 +56,43 @@
       echo "         <FONT FACE=\"Arial,Helvetica\"><B><CENTER>Messages Deleted</CENTER></B></FONT>";
       echo "   </TD></TR><TR><TD>";
       echo "      <CENTER><FONT FACE=\"Arial,Helvetica\"><BR>The selected messages were deleted successfully.<BR>\n";
+      echo "      <BR>";
       echo "              <A HREF=\"webmail.php?right_frame=right_main.php&sort=$sort&startMessage=$startMessage&mailbox=$urlMailbox\" TARGET=_top>";
-      echo "              Click here to return to $mailbox";
-      echo "              </A>.";
+      echo "              Click here to return to $mailbox</A>.";
+      echo "      </FONT></CENTER>";
+      echo "   </TD></TR>";
+      echo "</TABLE>";
+    }
+
+    function messages_moved_message($mailbox, $sort, $startMessage) {
+      $urlMailbox = urlencode($mailbox);
+      echo "<BR>";
+      echo "<TABLE COLS=1 WIDTH=70% NOBORDER BGCOLOR=FFFFFF ALIGN=CENTER>";
+      echo "   <TR>";
+      echo "      <TD BGCOLOR=DCDCDC>";
+      echo "         <FONT FACE=\"Arial,Helvetica\"><B><CENTER>Messages Moved</CENTER></B></FONT>";
+      echo "   </TD></TR><TR><TD>";
+      echo "      <CENTER><FONT FACE=\"Arial,Helvetica\"><BR>The selected messages were moved successfully.<BR>\n";
+      echo "      <BR>";
+      echo "              <A HREF=\"webmail.php?right_frame=right_main.php&sort=$sort&startMessage=$startMessage&mailbox=$urlMailbox\" TARGET=_top>";
+      echo "              Click here to return to $mailbox</A>.";
+      echo "      </FONT></CENTER>";
+      echo "   </TD></TR>";
+      echo "</TABLE>";
+    }
+
+    function error_message($message, $mailbox, $sort, $startMessage) {
+      $urlMailbox = urlencode($mailbox);
+      echo "<BR>";
+      echo "<TABLE COLS=1 WIDTH=70% NOBORDER BGCOLOR=FFFFFF ALIGN=CENTER>";
+      echo "   <TR>";
+      echo "      <TD BGCOLOR=DCDCDC>";
+      echo "         <FONT FACE=\"Arial,Helvetica\" COLOR=CC0000><B><CENTER>ERROR</CENTER></B></FONT>";
+      echo "   </TD></TR><TR><TD>";
+      echo "      <CENTER><FONT FACE=\"Arial,Helvetica\"><BR>$message<BR>\n";
+      echo "      <BR>";
+      echo "              <A HREF=\"webmail.php?right_frame=right_main.php&sort=$sort&startMessage=$startMessage&mailbox=$urlMailbox\" TARGET=_top>";
+      echo "              Click here to return to $mailbox</A>.";
       echo "      </FONT></CENTER>";
       echo "   </TD></TR>";
       echo "</TABLE>";

diff --git a/functions/imap.php b/functions/imap.php
index 090f078e7b4c5190c1fc889024171367a8143bf2..e0feecfd189d687d8dee43620f4cb10a13c13c0f 100644 (file)
--- a/functions/imap.php
+++ b/functions/imap.php
@@ -82,4 +82,16 @@
       }
    }
 
+   function deleteMessages($imapConnection, $a, $b, $numMessages, $trash_folder, $move_to_trash, $auto_expunge, $mailbox) {
+      /** check if they would like to move it to the trash folder or not */
+      if ($move_to_trash == true) {
+         $success = copyMessages($imapConnection, $a, $b, $trash_folder);
+         if ($success == true)
+            setMessageFlag($imapConnection, $a, $b, "Deleted");
+      } else {
+         setMessageFlag($imapConnection, $a, $b, "Deleted");
+      }
+      if ($auto_expunge == true)
+         expungeBox($imapConnection, $mailbox, $numMessages);
+   }
 ?>

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index a3986057a3add636266ed364525f1e01d5daf159..6e49080e507db048b28c21d02fc0b1b12d18eac0 100644 (file)
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -192,7 +192,7 @@
       echo "<TABLE BGCOLOR=$color_lgray>\n";
       echo "   <TR>\n";
       echo "      <TD WIDTH=30% ALIGN=LEFT>\n";
-      echo "         <NOBR><FONT FACE=\"Arial,Helvetica\"><INPUT TYPE=SUBMIT NAME=\"moveButton\" VALUE=\"Move to:\"></FONT>\n";
+      echo "         <NOBR><FONT FACE=\"Arial,Helvetica\" SIZE=2><INPUT TYPE=SUBMIT NAME=\"moveButton\" VALUE=\"Move to:\">\n";
       echo "         <SELECT NAME=\"targetMailbox\">\n";
       getFolderList($imapConnection, $boxesFormatted, $boxesUnformatted);
       for ($i = 0; $i < count($boxesUnformatted); $i++) {
@@ -208,11 +208,11 @@
          if ($use_folder == true)
             echo "         <OPTION VALUE=\"$boxesUnformatted[$i]\">$boxesUnformatted[$i]\n";
       }
-      echo "         </SELECT></NOBR>\n";
+      echo "         </SELECT></NOBR></FONT>\n";
 
       echo "      </TD>\n";
       echo "      <TD WIDTH=70% ALIGN=RIGHT>\n";
-      echo "         <NOBR><FONT FACE=\"Arial,Helvetica\"><INPUT TYPE=SUBMIT VALUE=\"Delete\">&nbsp;checked messages</FONT></NOBR>\n";
+      echo "         <NOBR><FONT FACE=\"Arial,Helvetica\" SIZE=2><INPUT TYPE=SUBMIT VALUE=\"Delete\">&nbsp;checked messages</FONT></NOBR>\n";
       echo "      </TD>";
       echo "   </TR>\n";
 

diff --git a/src/left_main.php b/src/left_main.php
index 086ec0821fefb7bfd170ee3af4e0742ff76f4571..49043be1b763eb63effcdc2385edd8daf7e527bd 100644 (file)
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -37,6 +37,7 @@
    include("../config/config.php");
    include("../functions/strings.php");
    include("../functions/imap.php");
+   include("../functions/mailbox.php");
 
    // open a connection on the imap port (143)
    $imapConnection = loginToImapServer($username, $key, $imapServerAddress);
@@ -51,9 +52,10 @@
    echo "<code><FONT FACE=\"Arial,Helvetica\">\n";
    for ($i = 0;$i < count($str); $i++) {
       $mailbox = Chop($str[$i]);
+      $mailbox = findMailboxName($mailbox);
+
       // find the quote at the begining of the mailbox name.
       //    i subtract 1 from the strlen so it doesn't find the quote at the end of the mailbox name.
-      $mailbox = findMailboxName($mailbox);
       $periodCount = countCharInString($mailbox, ".");
       
       // indent the correct number of spaces.
@@ -62,7 +64,11 @@
       
       $mailboxURL = urlencode($mailbox);
       echo "<a href=\"right_main.php?sort=0&startMessage=1&mailbox=$mailboxURL\" target=\"right\" style=\"text-decoration:none\"><FONT FACE=\"Arial,Helvetica\">";
+      if ($doBold == true)
+         echo "<B>";
       echo readShortMailboxName($mailbox, ".");
+      if ($doBold == true)
+         echo "</B>";
       echo "</FONT></a><br>\n";
    }
    echo "</code></FONT>";

diff --git a/src/move_messages.php b/src/move_messages.php
index 13cfcfa69b21f4f250a66afecb4c21ed7fb9e2f1..36e966b17b1a132b68a58a68e1818b068b0080d3 100644 (file)
--- a/src/move_messages.php
+++ b/src/move_messages.php
@@ -47,20 +47,11 @@
          //    loop because we never increment j.  so check to see if msg[0] is set or not to fix this.
          while ($j < count($msg)) {
             if ($msg[$i]) {
-               /** check if they would like to move it to the trash folder or not */
-               if ($move_to_trash == true) {
-                  $success = copyMessages($imapConnection, $msg[$i], $msg[$i], $trash_folder);
-                  if ($success == true)
-                     setMessageFlag($imapConnection, $msg[$i], $msg[$i], "Deleted");
-               } else {
-                  setMessageFlag($imapConnection, $msg[$i], "Deleted");
-               }
+               deleteMessages($imapConnection, $msg[$i], $msg[$i], $numMessages, $trash_folder, $move_to_trash, $auto_expunge, $mailbox);
                $j++;
             }
             $i++;
          }
-         if ($auto_expunge == true)
-            expungeBox($imapConnection, $mailbox, $numMessages);
          messages_deleted_message($mailbox, $sort, $startMessage);
       } else {
          echo "<BR><BR><CENTER>No messages selected.</CENTER>";
@@ -86,11 +77,10 @@
          }
          if ($auto_expunge == true)
             expungeBox($imapConnection, $mailbox, $numMessages);
- 
-         echo "Messages are moved.<br>";
+
+         messages_moved_message($mailbox, $sort, $startMessage);
       } else {
-         echo "\n<BR><BR><BR>\n";
-         echo "<CENTER>No messages selected.</CENTER>\n";
+         error_message("No messages were selected.", $mailbox, $sort, $startMessage);
       }
    }
 

diff --git a/src/read_body.php b/src/read_body.php
index e8bb590bf5370b1aa2b8d913afe0bf95753716a3..84f7855795539aaddd803351fba7eb3a17406a26 100644 (file)
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -26,7 +26,10 @@
    echo "<BR>";
    echo "<TABLE COLS=1 WIDTH=95% BORDER=0 ALIGN=CENTER CELLPADDING=2>\n";
    echo "   <TR><TD BGCOLOR=DCDCDC WIDTH=100%>";
+   echo "      <FONT FACE=\"Arial,Helvetica\" SIZE=2>";
    echo "      <A HREF=\"right_main.php?sort=$sort&startMessage=$startMessage&mailbox=$urlMailbox\">Message List</A>&nbsp;&nbsp;";
+   echo "      <A HREF=\"delete_message.php?mailbox=$urlMailbox&message=$passed_id&sort=$sort&startMessage=1\">Delete</A>&nbsp;&nbsp;";
+   echo "      </FONT>";
    echo "   </TD></TR>";
    echo "   <TR><TD BGCOLOR=FFFFFF WIDTH=100%>";
    echo "   <TABLE COLS=2 WIDTH=100% BORDER=0 CELLSPACING=0 CELLPADDING=2>\n";