X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fmove_messages.php;h=c7c159f2ed93454454c41169ede08dfc82f64f75;hb=21e18f59c03b946f6dfd5b885be3a108776718f9;hp=e757ca21a32fc34b21b17947173224e419e3ea1c;hpb=a2a30ee7f6ba1fc7457ce6b4ee553ca6e3d12757;p=squirrelmail.git

diff --git a/src/move_messages.php b/src/move_messages.php
index e757ca21..c7c159f2 100644
--- a/src/move_messages.php
+++ b/src/move_messages.php
@@ -3,7 +3,7 @@
 /**
  * move_messages.php
  *
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Copyright (c) 1999-2003 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.
@@ -22,6 +22,12 @@ require_once(SM_PATH . 'functions/html.php');
 
 global $compose_new_win;
 
+if (isset($_SESSION['composesession'])) {
+    $composesession = $_SESSION['composesession'];
+} else {
+    $composesession = 0;
+} 
+/* obsolete ?? */
 function putSelectedMessagesIntoString($msg) {
     $j = 0;
     $i = 0;
@@ -49,17 +55,17 @@ function attachSelectedMessages($msg, $imapConnection) {
 	   $msgs, $thread_sort_messages, $allow_server_sort, $show_num,
 	   $compose_messages;
 
-
     if (!isset($compose_messages)) {
 	    $compose_messages = array();
             sqsession_register($compose_messages,'compose_messages');
     }
 
-    if (!isset($composesession) ) {
+    if (!$composesession) {
 	    $composesession = 1;
             sqsession_register($composesession,'composesession');  	    
     } else {
 	    $composesession++;
+	    sqsession_register($composesession,'composesession');  	    
     }
 
     $hashed_attachment_dir = getHashedDir($username, $attachment_dir, $composesession);
@@ -105,17 +111,73 @@ function attachSelectedMessages($msg, $imapConnection) {
 	$i++;	
     }
     $compose_messages[$composesession] = $composeMessage;
-    sqsession_register($compose_messages,'compose_messages'); 
+    sqsession_register($compose_messages,'compose_messages');
+    session_write_close();
     return $composesession;
 }
 
 
+
+/* get globals */
+
+$username = $_SESSION['username'];
+$key  = $_COOKIE['key'];
+$onetimepad = $_SESSION['onetimepad'];
+$base_uri = $_SESSION['base_uri'];
+$delimiter = $_SESSION['delimiter'];
+
+sqGetGlobalVar('mailbox', $mailbox);
+sqGetGlobalVar('startMessage', $startMessage);
+sqGetGlobalVar('msg', $msg);
+
+if (isset($_POST['moveButton'])) {
+    $moveButton = $_POST['moveButton'];
+}
+
+if (isset($_SESSION['msgs'])) {
+    $msgs = $_SESSION['msgs'];
+}
+
+if (isset($_POST['expungeButton'])) {
+    $expungeButton = $_POST['expungeButton'];
+}
+if (isset($_POST['targetMailbox'])) {
+    $targetMailbox = $_POST['targetMailbox'];
+}
+if (isset($_SESSION['lastTargetMailbox'])) {
+    $lastTargetMailbox = $_SESSION['lastTargetMailbox'];
+}
+if (isset($_POST['expungeButton'])) {
+    $expungeButton = $_POST['expungeButton'];
+}
+if (isset($_POST['undeleteButton'])) {
+    $undeleteButton = $_POST['undeleteButton'];
+}
+if (isset($_POST['markRead'])) {
+    $markRead = $_POST['markRead'];
+}
+if (isset($_POST['markUnread'])) {
+    $markUnread = $_POST['markUnread'];
+}
+if (isset($_POST['attache'])) {
+    $attache = $_POST['attache'];
+}
+
+if (isset($_POST['location'])) {
+    $location = $_POST['location'];
+}
+
+if (isset($_SESSION['composesession'])) {
+    $composesession = $_SESSION['composesession'];
+}
+/* end of get globals */
+
 $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
 $mbx_response=sqimap_mailbox_select($imapConnection, $mailbox);
 
-$location = set_url_var($location,'composenew');
-$location = set_url_var($location,'composesession');
-$location = set_url_var($location,'session');
+$location = set_url_var($location,'composenew',0,false);
+$location = set_url_var($location,'composesession',0,false);
+$location = set_url_var($location,'session',0,false);
 
 /* remember changes to mailbox setting */
 if (!isset($lastTargetMailbox)) {
@@ -123,109 +185,104 @@ if (!isset($lastTargetMailbox)) {
 }
 if ($targetMailbox != $lastTargetMailbox) {
     $lastTargetMailbox = $targetMailbox;
-    session_register('lastTargetMailbox');
+    sqsession_register($lastTargetMailbox, 'lastTargetMailbox');
 }
-
+$exception = false;
 // expunge-on-demand if user isn't using move_to_trash or auto_expunge
 if(isset($expungeButton)) {
     $cnt = sqimap_mailbox_expunge($imapConnection, $mailbox, true);
     if (($startMessage+$cnt-1) >= $mbx_response['EXISTS']) {
         if ($startMessage > $show_num) {
-	    $location = set_url_var($location,'startMessage',$startMessage-$show_num);
+	    $location = set_url_var($location,'startMessage',$startMessage-$show_num,false);
 	} else {
-	    $location = set_url_var($location,'startMessage',1);
+	    $location = set_url_var($location,'startMessage',1,false);
 	}
     }
-    header("Location: $location");
 } 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;
+        $j = $i = 0;
+        $id = array();
         // 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_remove_flag ($imapConnection, $msg[$i], $msg[$i], "Deleted", true);
+	        $id[] = $msg[$i];
                 $j++;
             }
             $i++;
         }
-	header ("Location: $location"); 
+	if (count($id)) {
+            sqimap_toggle_flag($imapConnection, $id, '\\Deleted',false,true);
+        }
     } else {
-        displayPageHeader($color, $mailbox);
-        error_message(_("No messages were selected."), $mailbox, $sort, $startMessage, $color);
+	$exception = true;
     }
 } elseif (!isset($moveButton)) {
     // If the delete button was pressed, the moveButton variable will not be set.
-    if (is_array($msg) == 1) {
+    if (is_array($msg)) {
         // Marks the selected messages as 'Deleted'
-        $j = 0;
-        $i = 0;
+        $j = $i = $cnt = 0;
+	$id = array();
         // 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", true);
-                } else if (isset($markUnread)) {
-                    sqimap_messages_remove_flag($imapConnection, $msg[$i], $msg[$i], "Seen", true);
-                } else if (isset($attache)) {
-		    break;
-                } else  {
-                    sqimap_messages_delete($imapConnection, $msg[$i], $msg[$i], $mailbox);
-                }
+	        $id[] = $msg[$i];
                 $j++;
             }
             $i++;
         }
-        if ($auto_expunge) {
-            $cnt = sqimap_mailbox_expunge($imapConnection, $mailbox, true);
-        } else {
-	    $cnt = 0;
-	}
+	if (count($id) && !isset($attache)) {
+           if (isset($markRead)) {
+	      sqimap_toggle_flag($imapConnection, $id, '\\Seen',true,true);
+           } else if (isset($markUnread)) {
+	      sqimap_toggle_flag($imapConnection, $id, '\\Seen',false,true);
+           } else  {
+	      sqimap_msgs_list_delete($imapConnection, $mailbox, $id);
+              if ($auto_expunge) {
+                 $cnt = sqimap_mailbox_expunge($imapConnection, $mailbox, true);
+	      }
+           }
+        }
         if (isset($attache)) {
 	    $composesession = attachSelectedMessages($msg, $imapConnection);
+	    $location = set_url_var($location, 'session', $composesession, false);
 	    if ($compose_new_win) {
-        	header ("Location: $location&composenew=1&session=$composesession");
+	        $location = set_url_var($location, 'composenew', 1, false);
 	    } else {
 		$location = str_replace('search.php','compose.php',$location);
 		$location = str_replace('right_main.php','compose.php',$location);
-		header ("Location: $location&session=$composesession");
 	    }
 	} else {		
 	    if (($startMessage+$cnt-1) >= $mbx_response['EXISTS']) {
     	       if ($startMessage > $show_num) {
-	           $location = set_url_var($location,'startMessage',$startMessage-$show_num);
+	           $location = set_url_var($location,'startMessage',$startMessage-$show_num, false);
 	       } else {
-	  	   $location = set_url_var($location,'startMessage',1);
+	  	   $location = set_url_var($location,'startMessage',1, false);
 	       }
 	    }
-	    echo $location . ' ' .$show_num. ' '.$cnt;
-            header ("Location: $location");
         } 
     } else {
-        displayPageHeader($color, $mailbox);
-        error_message(_("No messages were selected."), $mailbox, $sort, $startMessage, $color);
+    	$exception = true;
     }
 } else {    // Move messages
     // lets check to see if they selected any messages
-    if (is_array($msg) == 1) {
-        $j = 0;
-        $i = 0;
+    if (is_array($msg)) {
+        $j = $i = 0;
+	$id = array();
         // 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.
 	$cnt = count($msg);
         while ($j < $cnt) {
             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", true);
+	        $id[] = $msg[$i];
                 $j++;
             }
             $i++;
         }
+	sqimap_msgs_list_copy($imapConnection,$id,$targetMailbox);
         if ($auto_expunge) {
             $cnt = sqimap_mailbox_expunge($imapConnection, $mailbox, true);
 	} else {
@@ -234,19 +291,23 @@ if(isset($expungeButton)) {
 	
 	if (($startMessage+$cnt-1) >= $mbx_response['EXISTS']) {
     	    if ($startMessage > $show_num) {
-		$location = set_url_var($location,'startMessage',$startMessage-$show_num);
+		$location = set_url_var($location,'startMessage',$startMessage-$show_num, false);
 	    } else {
-		$location = set_url_var($location,'startMessage',1);
+		$location = set_url_var($location,'startMessage',1, false);
 	    }
 	}
-	header ("Location: $location"); 
     } else {
-        displayPageHeader($color, $mailbox);
-        error_message(_("No messages were selected."), $mailbox, $sort, $startMessage, $color);
+	$exception = true;
     }
 }
 // Log out this session
 sqimap_logout($imapConnection);
-
+if ($exception) {
+    displayPageHeader($color, $mailbox);
+    error_message(_("No messages were selected."), $mailbox, $sort, $startMessage, $color);
+} else {
+    header("Location: $location");
+    exit;
+}
 ?>
 </BODY></HTML>