Adds the "Move or Delete" drop-down box

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

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index b9d8c23c64dc33822623575f4c28e31413a336a0..dafac53576bb563f199ac0307dc55d7b502e32c0 100644 (file)
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -169,10 +169,11 @@
       }
       echo "</TD></TR>\n";
 
-      /** The "DELETE" button */
+      /** The delete and move options */
       echo "<TR><TD BGCOLOR=DCDCDC>";
       echo "<FORM name=messageList method=post action=\"move_messages.php?mailbox=$urlMailbox&sort=$sort&startMessage=$startMessage\">";
-      echo "<NOBR><INPUT TYPE=SUBMIT VALUE=\"Delete Selected\">";
+      echo "<SELECT NAME=move_or_delete><OPTION>Delete selected messages<OPTION>Move selected messages</SELECT>";
+      echo "<NOBR><INPUT TYPE=SUBMIT VALUE=\"Go\">";
       if (($move_to_trash == true) && ($mailbox == $trash_folder))
          echo "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<A HREF=\"empty_trash.php?numMessages=$numMessages&mailbox=$urlMailbox\">Empty Trash</A></NOBR>";
       echo "</TD></TR>";
@@ -220,16 +221,9 @@
             $t++;
          }
       }
-      echo "</TABLE>";
+      echo "</FORM></TABLE>";
 
-      /** The "DELETE" button */
-      echo "<TR><TD BGCOLOR=DCDCDC>";
-      echo "<INPUT TYPE=SUBMIT VALUE=\"Delete Selected\">";
-      if (($move_to_trash == true) && ($mailbox == $trash_folder))
-         echo "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<A HREF=\"empty_trash.php\">Empty Trash</A></NOBR>";
-      echo "</TD></TR>";
-
-      echo "</FORM></TABLE>\n";
+      echo "</TABLE>\n";
       echo "</TD></TR>\n";
 
       echo "<TR BGCOLOR=FFFFFF><TD>";