X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fmove_messages.php;h=74320bf3874683c69a2ac4137c968ba94d2201b6;hp=3281867be4f4a5c0cb13e239a8cc6612c11d9474;hb=65c3ec94c897fb098598f3843e371020deb2226b;hpb=1195c34026fc65eb8e0ca7a337fe4b406764dee8

diff --git a/src/move_messages.php b/src/move_messages.php
index 3281867b..74320bf3 100644
--- a/src/move_messages.php
+++ b/src/move_messages.php
@@ -1,109 +1,151 @@
 <?php
-   /**
-    **  move_messages.php
-    **
-    **  Copyright (c) 1999-2000 The SquirrelMail development team
-    **  Licensed under the GNU GPL. For full terms see the file COPYING.
-    **
-    **  Enables message moving between folders on the IMAP server.
-    **/
-
-   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]) {
+
+/**
+ * move_messages.php
+ *
+ * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Licensed under the GNU GPL. For full terms see the file COPYING.
+ *
+ * Enables message moving between folders on the IMAP server.
+ *
+ * $Id$
+ */
+
+require_once('../src/validate.php');
+require_once('../functions/display_messages.php');
+require_once('../functions/imap.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 .= "&";
+            $selectedMessages .= "&";
             else
-               $firstLoop = false;
+            $firstLoop = false;
 
             $selectedMessages .= "selMsg[$j]=$msg[$i]";
-            
+
             $j++;
-         }
-         $i++;
-      }
-   }
-
-   $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
-   sqimap_mailbox_select($imapConnection, $mailbox);
-
-   // 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)) {
+        }
+        $i++;
+    }
+}
+
+$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+sqimap_mailbox_select($imapConnection, $mailbox);
+
+// expunge-on-demand if user isn't using move_to_trash or auto_expunge
+if(isset($expungeButton)) {
+    sqimap_mailbox_expunge($imapConnection, $mailbox, true);
+    $location = get_location();
+    if ($where && $what) {
+        header ("Location: $location/search.php?mailbox=".urlencode($mailbox)."&what=".urlencode($what)."&where=".urlencode($where));
+    } else {
+        header ("Location: $location/right_main.php?sort=$sort&startMessage=$startMessage&mailbox=". urlencode($mailbox));
+    }
+
+} elseif(isset($undeleteButton)) {
+    // undelete messages if user isn't using move_to_trash or auto_expunge
+
+    if (is_array($msg) == 1) {
+        // Removes \Deleted flag from selected messages
+        $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++;
+            sqimap_messages_remove_flag ($imapConnection, $msg[$i], $msg[$i], "Deleted");
+            $j++;
             }
             $i++;
-         }
-         if ($auto_expunge) {
-            sqimap_mailbox_expunge($imapConnection, $mailbox);
-         }
-         $location = get_location();
-         header ("Location: $location/right_main.php?sort=$sort&startMessage=$startMessage&mailbox=". urlencode($mailbox));
-      } 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++;
+        }
+        $location = get_location();
+
+        if ($where && $what)
+            header ("Location: $location/search.php?mailbox=".urlencode($mailbox)."&what=".urlencode($what)."&where=".urlencode($where));
+        else
+            header ("Location: $location/right_main.php?sort=$sort&startMessage=$startMessage&mailbox=". urlencode($mailbox));
+    } else {
+        displayPageHeader($color, $mailbox);
+        error_message(_("No messages were selected."), $mailbox, $sort, $startMessage, $color);
+    }
+} elseif (!isset($moveButton)) {
+    // If the delete button was pressed, the moveButton variable will not be set.
+    if (is_array($msg) == 1) {
+        // Marks the selected messages as '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 (isset($msg[$i])) {
+                if (isset($markRead)) {
+                    sqimap_messages_flag($imapConnection, $msg[$i], $msg[$i], "Seen");
+                } else if (isset($markUnread)) {
+                    sqimap_messages_remove_flag($imapConnection, $msg[$i], $msg[$i], "Seen");
+                } else {
+                    sqimap_messages_delete($imapConnection, $msg[$i], $msg[$i], $mailbox);
+                }
+                $j++;
             }
             $i++;
-         }
-         if ($auto_expunge == true)
-            sqimap_mailbox_expunge($imapConnection, $mailbox);
-
-         $location = get_location();
-         header ("Location: $location/right_main.php?sort=$sort&startMessage=$startMessage&mailbox=". urlencode($mailbox));
-      } else {
-         displayPageHeader($color, $mailbox);
-         error_message(_("No messages were selected."), $mailbox, $sort, $startMessage, $color);
-      }
-   }
-
-   // Log out this session
-   sqimap_logout($imapConnection);
+        }
+        if ($auto_expunge) {
+            sqimap_mailbox_expunge($imapConnection, $mailbox, true);
+        }
+        $location = get_location();
+        if (isset($where) && isset($what)) {
+            header ("Location: $location/search.php?mailbox=".urlencode($mailbox)."&what=".urlencode($what)."&where=".urlencode($where));
+        } else {
+            header ("Location: $location/right_main.php?sort=$sort&startMessage=$startMessage&mailbox=". urlencode($mailbox));
+        }
+    } 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 (isset($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, true);
+
+        $location = get_location();
+        if (isset($where) && isset($what))
+            header ("Location: $location/search.php?mailbox=".urlencode($mailbox)."&what=".urlencode($what)."&where=".urlencode($where));
+        else
+            header ("Location: $location/right_main.php?sort=$sort&startMessage=$startMessage&mailbox=". urlencode($mailbox));
+    } else {
+        displayPageHeader($color, $mailbox);
+        error_message(_("No messages were selected."), $mailbox, $sort, $startMessage, $color);
+    }
+}
+
+// Log out this session
+sqimap_logout($imapConnection);
 
 ?>
 </BODY></HTML>