X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fmove_messages.php;h=b208e39e7312c8ca53f76b5392bd4745f0c0bb30;hp=0dc83b96f9b96bf7dc10b51a88fa3a318e04311a;hb=2a833d7253739cb67eb69aa760f7b37fe7aedd8c;hpb=2aa12d5e029f04fa8c778ec1d3487418d0c3b62d

diff --git a/src/move_messages.php b/src/move_messages.php
index 0dc83b96..b208e39e 100644
--- a/src/move_messages.php
+++ b/src/move_messages.php
@@ -1,42 +1,108 @@
-<?
-   include("../config/config.php");
-   include("../functions/mailbox.php");
-   include("../functions/strings.php");
-   include("../functions/page_header.php");
-   include("../functions/display_messages.php");
-
-   $imapConnection = loginToImapServer($username, $key);
-
-   // switch to the mailbox, and get the number of messages in it.
-   selectMailbox($imapConnection, $mailbox, $numMessages, $imapServerAddress);
-
-   // Marks the selected messages ad 'Deleted'
-   $j = 0;
-   $i = 0;
-
-   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");
+<?php
+   session_start();
+
+   if (!isset($config_php))
+      include("../config/config.php");
+   if (!isset($strings_php))
+      include("../functions/strings.php");
+   if (!isset($page_header_php))
+      include("../functions/page_header.php");
+   if (!isset($display_messages_php))
+      include("../functions/display_messages.php");
+   if (!isset($imap_php))
+      include("../functions/imap.php");
+
+   include("../src/load_prefs.php");
+
+   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]) {
+            if ($firstLoop != true)
+               $selectedMessages .= "&";
+            else
+               $firstLoop = false;
+
+            $selectedMessages .= "selMsg[$j]=$msg[$i]";
+            
+            $j++;
          }
-         $j++;
+         $i++;
       }
-      $i++;
    }
 
-   if ($auto_expunge == true)
-      expungeBox($imapConnection, $mailbox, $numMessages);
+   $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+   sqimap_mailbox_select($imapConnection, $mailbox);
 
-   // Log out this session
-   fputs($imapConnection, "1 logout");
+   // If the delete button was pressed, the moveButton variable will not be set.
+   if (!$moveButton) {
+      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)) {
+            if ($msg[$i]) {
+               sqimap_messages_delete($imapConnection, $msg[$i], $msg[$i], $mailbox);
+               $j++;
+            }
+            $i++;
+         }
+         if ($auto_expunge) {
+            sqimap_mailbox_expunge($imapConnection, $mailbox);
+         }
+         if ($auto_forward) {   
+            header ("Location: right_main.php");
+         } else {
+            displayPageHeader($color, $mailbox);
+            messages_deleted_message($mailbox, $sort, $startMessage, $color);
+         }
+      } else {
+         displayPageHeader($color, $mailbox);
+         error_message(_("No messages were selected."), $mailbox, $sort, $startMessage, $color);
+      }
+   } else {    // Move messages
+      // 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 */
+               sqimap_messages_copy($imapConnection, $msg[$i], $msg[$i], $targetMailbox);
+               sqimap_messages_flag($imapConnection, $msg[$i], $msg[$i], "Deleted");
+               $j++;
+            }
+            $i++;
+         }
+         if ($auto_expunge == true)
+            sqimap_mailbox_expunge($imapConnection, $mailbox);
 
-   echo "<HTML><BODY TEXT=\"#000000\" BGCOLOR=\"#FFFFFF\" LINK=\"#0000EE\" VLINK=\"#0000EE\" ALINK=\"#0000EE\">";
-   displayPageHeader($mailbox);
+         if ($auto_forward) {   
+            header ("Location: right_main.php");
+         } else {
+            displayPageHeader($color, $mailbox);
+            messages_moved_message($mailbox, $sort, $startMessage, $color);
+         }
+      } else {
+         displayPageHeader($color, $mailbox);
+         error_message(_("No messages were selected."), $mailbox, $sort, $startMessage, $color);
+      }
+   }
+
+   // Log out this session
+   sqimap_logout($imapConnection);
 
-   messages_deleted_message($mailbox, $sort, $startMessage);
 ?>
+</BODY></HTML>