X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fmove_messages.php;h=c5f4c837d9bc53913160a24f89604c368755d9df;hb=8061a3fb7663a4e8edf2f415e5547fc81bcdbcb6;hp=8b6a5f543e6d829e4dc15b24480ae77f7754c8f6;hpb=a2790a617beaef97a2d87e5bebc0e37a12c8c2ea;p=squirrelmail.git

diff --git a/src/move_messages.php b/src/move_messages.php
index 8b6a5f54..c5f4c837 100644
--- a/src/move_messages.php
+++ b/src/move_messages.php
@@ -6,22 +6,13 @@
     **  Licensed under the GNU GPL. For full terms see the file COPYING.
     **
     **  Enables message moving between folders on the IMAP server.
+    **
+    **  $Id$
     **/
 
-   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");
+   include('../src/validate.php');
+   include("../functions/display_messages.php");
+   include("../functions/imap.php");
 
    function putSelectedMessagesIntoString($msg) {
       $j = 0;
@@ -49,10 +40,19 @@
    $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) {
+   // 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));
+   }
+   // undelete messages if user isn't using move_to_trash or auto_expunge
+   elseif(isset($undeleteButton)) {
       if (is_array($msg) == 1) {
-         // Marks the selected messages ad 'Deleted'
+         // Removes \Deleted flag from selected messages
          $j = 0;
          $i = 0;
       
@@ -60,16 +60,43 @@
          //    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_remove_flag ($imapConnection, $msg[$i], $msg[$i], "Deleted");
+               $j++;
+            }
+            $i++;
+         }
+         $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);
+      }
+   }
+   // If the delete button was pressed, the moveButton variable will not be set.
+   elseif (!isset($moveButton)) {
+      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])) {
                sqimap_messages_delete($imapConnection, $msg[$i], $msg[$i], $mailbox);
                $j++;
             }
             $i++;
          }
          if ($auto_expunge) {
-            sqimap_mailbox_expunge($imapConnection, $mailbox);
+            sqimap_mailbox_expunge($imapConnection, $mailbox, true);
          }
          $location = get_location();
-         if ($where && $what)
+         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));
@@ -86,7 +113,7 @@
          // 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]) {
+            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");
@@ -95,10 +122,10 @@
             $i++;
          }
          if ($auto_expunge == true)
-            sqimap_mailbox_expunge($imapConnection, $mailbox);
+            sqimap_mailbox_expunge($imapConnection, $mailbox, true);
 
          $location = get_location();
-         if ($where && $what)
+         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));
@@ -109,7 +136,6 @@
    }
 
    // Log out this session
-   sqimap_mailbox_close($imapConnection);
    sqimap_logout($imapConnection);
 
 ?>