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

diff --git a/src/move_messages.php b/src/move_messages.php
index 6e8495d0..e757ca21 100644
--- a/src/move_messages.php
+++ b/src/move_messages.php
@@ -11,9 +11,14 @@
  * $Id$
  */
 
-require_once('../src/validate.php');
-require_once('../functions/display_messages.php');
-require_once('../functions/imap.php');
+/* Path for SquirrelMail required files. */
+define('SM_PATH','../');
+
+/* SquirrelMail required files. */
+require_once(SM_PATH . 'include/validate.php');
+require_once(SM_PATH . 'functions/display_messages.php');
+require_once(SM_PATH . 'functions/imap.php');
+require_once(SM_PATH . 'functions/html.php');
 
 global $compose_new_win;
 
@@ -21,7 +26,6 @@ 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.
@@ -32,9 +36,7 @@ function putSelectedMessagesIntoString($msg) {
             } else {
                 $firstLoop = false;
             }
-
             $selectedMessages .= "selMsg[$j]=$msg[$i]";
-
             $j++;
         }
         $i++;
@@ -42,121 +44,115 @@ function putSelectedMessagesIntoString($msg) {
 }
 
 function attachSelectedMessages($msg, $imapConnection) {
-
-    global $mailbox, $username, $attachment_dir, $attachments, $identity, $data_dir, $composesession;
+    global $username, $attachment_dir,  
+           $data_dir, $composesession, $uid_support,
+	   $msgs, $thread_sort_messages, $allow_server_sort, $show_num,
+	   $compose_messages;
 
 
-    if (!isset($attachments)) {
-	$attachments = array();
-	session_register('attachments');
+    if (!isset($compose_messages)) {
+	    $compose_messages = array();
+            sqsession_register($compose_messages,'compose_messages');
     }
 
-    if (!isset($composesession)) {
-	$composesession = 1;
-	session_register('$composesession');
+    if (!isset($composesession) ) {
+	    $composesession = 1;
+            sqsession_register($composesession,'composesession');  	    
     } else {
-	$composesession++;
+	    $composesession++;
     }
 
-    $hashed_attachment_dir = getHashedDir($username, $attachment_dir,$composesession);
+    $hashed_attachment_dir = getHashedDir($username, $attachment_dir, $composesession);
 
-    $rem_attachments = array();
-    foreach ($attachments as $info) {
-	if ($info['session'] == $composesession) {
-    	    $attached_file = "$hashed_attachment_dir/$info[localfilename]";
-    	    if (file_exists($attached_file)) {
-        	unlink($attached_file);
-    	    }
-	} else {
-	    $rem_attachments[] = $info;
-	}
+    if ($thread_sort_messages || $allow_server_sort) {
+       $start_index=0;
+    } else {
+       $start_index = ($startMessage-1) * $show_num;
     }
 
-    $attachments = $rem_attachments;
-
-
     $i = 0;
     $j = 0;
-    
+    $hashed_attachment_dir = getHashedDir($username, $attachment_dir);
+
+    $composeMessage = new Message();
+    $rfc822_header = new Rfc822Header();
+    $composeMessage->rfc822_header = $rfc822_header;
+    $composeMessage->reply_rfc822_header = '';
+
     while ($j < count($msg)) {
         if (isset($msg[$i])) {
-	    $id = $msg[$i];
-	    $body_a = sqimap_run_command($imapConnection, "FETCH $id RFC822",true, $response, $readmessage);
-	    if ($response = 'OK') {
-		// get subject so we can set the remotefilename
-    		$read = sqimap_run_command ($imapConnection, "FETCH $id BODY.PEEK[HEADER.FIELDS (Subject)]", true, $response, $readmessage);
-    		$subject = substr($read[1], strpos($read[1], ' '));
-		$subject = trim($subject);
-
-		if (isset($subject) && $subject != '') {
-		    $subject = htmlentities($subject);
-		} else {
-		    $subject = _("<No subject>");
-		    $subject = htmlentities($subject);
-		}
-
-		array_shift($body_a);
-		$body = implode('', $body_a);
-		
-		$localfilename = GenerateRandomString(32, 'FILE', 7);
-		$full_localfilename = "$hashed_attachment_dir/$localfilename";
-	    
-		$fp = fopen( $full_localfilename, 'w');
-		fwrite ($fp, $body);
-		fclose($fp);
-
-		$newAttachment = array();
-		$newAttachment['localfilename'] = $localfilename;
-		$newAttachment['type'] = "message/rfc822";
-	    	$newAttachment['remotefilename'] = "$subject".".eml";
-	    	$newAttachment['session'] = $composesession;
-		$attachments[] = $newAttachment;
-		flush();
+    	    $id = $msg[$i];
+    	    $body_a = sqimap_run_command($imapConnection, "FETCH $id RFC822",true, $response, $readmessage, $uid_support);
+    	    if ($response = 'OK') {
+	        $k = $i + $start_index;
+		$subject = $msgs[$k]['SUBJECT'];
+    
+        	array_shift($body_a);
+        	$body = implode('', $body_a);
+        	$body .= "\r\n";
+        		
+        	$localfilename = GenerateRandomString(32, 'FILE', 7);
+        	$full_localfilename = "$hashed_attachment_dir/$localfilename";
+        	
+        	$fp = fopen( $full_localfilename, 'wb');
+        	fwrite ($fp, $body);
+        	fclose($fp);
+	        $composeMessage->initAttachment('message/rfc822',$subject.'.eml', 
+	                 $full_localfilename);
     	    }
-    	    $j++;	    
+	    $j++;
 	}
 	$i++;	
-	
     }
+    $compose_messages[$composesession] = $composeMessage;
+    sqsession_register($compose_messages,'compose_messages'); 
     return $composesession;
 }
 
+
 $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
-sqimap_mailbox_select($imapConnection, $mailbox);
+$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');
+
+/* remember changes to mailbox setting */
+if (!isset($lastTargetMailbox)) {
+    $lastTargetMailbox = 'INBOX';
+}
+if ($targetMailbox != $lastTargetMailbox) {
+    $lastTargetMailbox = $targetMailbox;
+    session_register('lastTargetMailbox');
+}
 
 // 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 (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));
+    $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);
+	} else {
+	    $location = set_url_var($location,'startMessage',1);
+	}
     }
-
+    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;
-
         // 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");
-            $j++;
+                sqimap_messages_remove_flag ($imapConnection, $msg[$i], $msg[$i], "Deleted", true);
+                $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));
+	header ("Location: $location"); 
     } else {
         displayPageHeader($color, $mailbox);
         error_message(_("No messages were selected."), $mailbox, $sort, $startMessage, $color);
@@ -167,15 +163,14 @@ if(isset($expungeButton)) {
         // 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");
+                    sqimap_messages_flag($imapConnection, $msg[$i], $msg[$i], "Seen", true);
                 } else if (isset($markUnread)) {
-                    sqimap_messages_remove_flag($imapConnection, $msg[$i], $msg[$i], "Seen");
+                    sqimap_messages_remove_flag($imapConnection, $msg[$i], $msg[$i], "Seen", true);
                 } else if (isset($attache)) {
 		    break;
                 } else  {
@@ -186,21 +181,30 @@ if(isset($expungeButton)) {
             $i++;
         }
         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));
-	} elseif(isset($attache)) {
+            $cnt = sqimap_mailbox_expunge($imapConnection, $mailbox, true);
+        } else {
+	    $cnt = 0;
+	}
+        if (isset($attache)) {
 	    $composesession = attachSelectedMessages($msg, $imapConnection);
-	    if ($compose_new_win == '1') {
-        	header ("Location: $location/right_main.php?sort=$sort&startMessage=$startMessage&mailbox=". urlencode($mailbox)."&composenew=1&session=$composesession&attachedmessages=true");
+	    if ($compose_new_win) {
+        	header ("Location: $location&composenew=1&session=$composesession");
 	    } else {
-		header ("Location: $location/compose.php?startMessage=$startMessage&mailbox=". urlencode($mailbox)."&session=$composesession&attachedmessages=true");
+		$location = str_replace('search.php','compose.php',$location);
+		$location = str_replace('right_main.php','compose.php',$location);
+		header ("Location: $location&session=$composesession");
 	    }
-        } else {
-            header ("Location: $location/right_main.php?sort=$sort&startMessage=$startMessage&mailbox=". urlencode($mailbox));
-        }
+	} else {		
+	    if (($startMessage+$cnt-1) >= $mbx_response['EXISTS']) {
+    	       if ($startMessage > $show_num) {
+	           $location = set_url_var($location,'startMessage',$startMessage-$show_num);
+	       } else {
+	  	   $location = set_url_var($location,'startMessage',1);
+	       }
+	    }
+	    echo $location . ' ' .$show_num. ' '.$cnt;
+            header ("Location: $location");
+        } 
     } else {
         displayPageHeader($color, $mailbox);
         error_message(_("No messages were selected."), $mailbox, $sort, $startMessage, $color);
@@ -210,32 +214,37 @@ if(isset($expungeButton)) {
     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)) {
+	$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");
+                sqimap_messages_flag($imapConnection, $msg[$i], $msg[$i], "Deleted", true);
                 $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));
+        if ($auto_expunge) {
+            $cnt = sqimap_mailbox_expunge($imapConnection, $mailbox, true);
+	} else {
+	    $cnt = 0;
+	}
+	
+	if (($startMessage+$cnt-1) >= $mbx_response['EXISTS']) {
+    	    if ($startMessage > $show_num) {
+		$location = set_url_var($location,'startMessage',$startMessage-$show_num);
+	    } else {
+		$location = set_url_var($location,'startMessage',1);
+	    }
+	}
+	header ("Location: $location"); 
     } else {
         displayPageHeader($color, $mailbox);
         error_message(_("No messages were selected."), $mailbox, $sort, $startMessage, $color);
     }
 }
-
 // Log out this session
 sqimap_logout($imapConnection);