moving of messages between folders is finished. also did a bit of

rearranging how deleting works, and the way the html shows the (now 2)
buttons.

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

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index 98a4ce0b1d5ede09ba7b07f5b8e398f5cc134496..1dfd4e417b9c0baeceb8d1d758bc8e43f0077619 100644 (file)
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -187,11 +187,34 @@
 
       /** The delete and move options */
       echo "<TR><TD BGCOLOR=$color_lgray>";
+      echo "\n\n\n<TABLE BGCOLOR=$color_lgray><TR><TD>";
       echo "<FORM name=messageList method=post action=\"move_messages.php?msg=$msg&mailbox=$urlMailbox&sort=$sort&startMessage=$startMessage\">";
-      echo "<SELECT NAME=move_or_delete><OPTION>Delete selected messages<OPTION>Move selected messages</SELECT>";
-      echo "<NOBR><INPUT TYPE=SUBMIT VALUE=\"Go\">";
+      echo "<NOBR>\n";
+      echo "<INPUT TYPE=SUBMIT VALUE=\"Delete\">\n";
+      echo "checked mail";
+      echo "</NOBR></TD><TD ALIGN=\"right\"><NOBR>";
+      echo "<INPUT TYPE=SUBMIT NAME=\"moveButton\" VALUE=\"Move messages to:\">\n";
+      echo "<SELECT NAME=\"targetMailbox\">\n";
+      getFolderList($imapConnection, $boxesFormatted, $boxesUnformatted);
+      for ($i = 0; $i < count($boxesUnformatted); $i++) {
+         $use_folder = true;
+         for ($p = 0; $p < count($special_folders); $p++) {
+            // don't allow moving messages to any special folder EXCEPT for INBOX.
+            if (($boxesUnformatted[$i] == $special_folders[$p]) && ($boxesUnformatted[$i] != "INBOX")) {
+               $use_folder = false;
+            } else if (substr($boxesUnformatted[$i], 0, strlen($trash_folder)) == $trash_folder) {
+               $use_folder = false;
+            }
+         }
+         if ($use_folder == true)
+            echo "<OPTION VALUE=\"$boxesUnformatted[$i]\">$boxesUnformatted[$i]\n";
+      }
+      echo "</SELECT>\n";
       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>";
+      else
+         echo "</NOBR>\n";
+      echo "</TD></TR></TABLE>\n\n\n";
       echo "</TD></TR>";
 
       echo "<TR><TD BGCOLOR=$color_lgray>";

diff --git a/src/login.php b/src/login.php
index cff8c3f98388570dd2daceb84ef49f4de18b75a8..9814a3a26e6d46f97c8e8695c13c988b8555f065 100644 (file)
--- a/src/login.php
+++ b/src/login.php
@@ -15,7 +15,7 @@
 <?
    include("../config/config.php");
 
-   echo "<FORM ACTION=webmail.php METHOD=POST NAME=f>\n";
+   echo "<FORM ACTION=webmail.php METHOD=\"POST\" NAME=f>\n";
    echo "<CENTER><IMG SRC=\"$org_logo\"</CENTER>\n";
    echo "<CENTER><FONT FACE=\"Arial,Helvetica\" SIZE=-2>SquirrelMail version $version<BR>By Nathan and Luke Ehresman<BR></FONT><CENTER>\n";
    echo "<TABLE COLS=1 WIDTH=350>\n";

diff --git a/src/move_messages.php b/src/move_messages.php
index 80e48ac7974bfe10d9a914d0b54e3b1b0034d267..13cfcfa69b21f4f250a66afecb4c21ed7fb9e2f1 100644 (file)
--- a/src/move_messages.php
+++ b/src/move_messages.php
@@ -7,54 +7,90 @@
    include("../functions/display_messages.php");
    include("../functions/imap.php");
 
-   $imapConnection = loginToImapServer($username, $key, $imapServerAddress);
-
-   // switch to the mailbox, and get the number of messages in it.
-   selectMailbox($imapConnection, $mailbox, $numMessages, $imapServerAddress);
-
-   if (strtolower($move_or_delete) == "delete selected messages") {
-      // Marks the selected messages ad 'Deleted'
+   function putSelectedMessagesIntoString($msg) {
       $j = 0;
       $i = 0;
+      $firstLoop = true;
       
       // If they have selected nothing msg is size one still, but will be an infinite
       //    loop because we never increment j.  so check to see if msg[0] is set or not to fix this.
       while (($j < count($msg)) && ($msg[0])) {
          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");
-            }
+            if ($firstLoop != true)
+               $selectedMessages .= "&";
+            else
+               $firstLoop = false;
+
+            $selectedMessages .= "selMsg[$j]=$msg[$i]";
+            
             $j++;
          }
          $i++;
       }
-      if ($auto_expunge == true)
-         expungeBox($imapConnection, $mailbox, $numMessages);
+   }
+   
+   
+   $imapConnection = loginToImapServer($username, $key, $imapServerAddress);
+
+   // switch to the mailbox, and get the number of messages in it.
+   selectMailbox($imapConnection, $mailbox, $numMessages, $imapServerAddress);
+
+   // If the delete button was pressed, the moveButton variable will not be set.
+   if (!$moveButton) {
       displayPageHeader($mailbox);
-      messages_deleted_message($mailbox, $sort, $startMessage);
-   } else {
-      $j = 0;
-      $i = 0;
+      if (is_array($msg) == 1) {
+         // Marks the selected messages ad 'Deleted'
+         $j = 0;
+         $i = 0;
       
-      // If they have selected nothing msg is size one still, but will be an infinite
-      //    loop because we never increment j.  so check to see if msg[0] is set or not to fix this.
-      while (($j < count($msg)) && ($msg[0])) {
-         if ($msg[$i]) {
-            $success = copyMessages($imapConnection, $msg[$i], $msg[$i], $trash_folder);
-            if ($success == true) {
-               setMessageFlag($imapConnection, $msg[$i], $msg[$i], "Deleted");
-               displayPageHeader($mailbox);
+         // If they have selected nothing msg is size one still, but will be an infinite
+         //    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");
+               }
+               $j++;
             }
-            if ($auto_expunge == true)
-               expungeBox($imapConnection, $mailbox, $numMessages);
-            $j++;
+            $i++;
          }
-         $i++;
+         if ($auto_expunge == true)
+            expungeBox($imapConnection, $mailbox, $numMessages);
+         messages_deleted_message($mailbox, $sort, $startMessage);
+      } else {
+         echo "<BR><BR><CENTER>No messages selected.</CENTER>";
+      }
+   } else {    // Move messages
+      displayPageHeader($mailbox);
+      // lets check to see if they selected any messages
+      if (is_array($msg) == 1) {
+         $j = 0;
+         $i = 0;
+ 
+         // If they have selected nothing msg is size one still, but will be an infinite
+         //    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 */
+               $success = copyMessages($imapConnection, $msg[$i], $msg[$i], $targetMailbox);
+               if ($success == true)
+                  setMessageFlag($imapConnection, $msg[$i], $msg[$i], "Deleted");
+               $j++;
+            }
+            $i++;
+         }
+         if ($auto_expunge == true)
+            expungeBox($imapConnection, $mailbox, $numMessages);
+ 
+         echo "Messages are moved.<br>";
+      } else {
+         echo "\n<BR><BR><BR>\n";
+         echo "<CENTER>No messages selected.</CENTER>\n";
       }
    }