Beautified top of message list a bit

[squirrelmail.git] / src / move_messages.php

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";
       }
    }