X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fmove_messages.php;h=d43c3b107d959d40f9ab5024319df6cfd3e113d5;hb=24fc49052db9408811aadf5b2e2740371553ace2;hp=684e63c5bb00bd1976a27c5dcb2e083795ce388a;hpb=8c33aaf78bc674d7900fe8181d081d7888e0b8a8;p=squirrelmail.git

diff --git a/src/move_messages.php b/src/move_messages.php
index 684e63c5..d43c3b10 100644
--- a/src/move_messages.php
+++ b/src/move_messages.php
@@ -11,10 +11,15 @@
  * $Id$
  */
 
-require_once('../src/validate.php');
-require_once('../functions/display_messages.php');
-require_once('../functions/imap.php');
-require_once('../functions/html.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;
 
 function putSelectedMessagesIntoString($msg) {
@@ -39,39 +44,26 @@ function putSelectedMessagesIntoString($msg) {
 }
 
 function attachSelectedMessages($msg, $imapConnection) {
-    global $mailbox, $username, $attachment_dir, $attachments, $identity, 
-           $data_dir, $composesession, $lastTargetMailbox, $uid_support,
-	   $msgs, $startMessage, $show_num, $thread_sort_messages,
-	   $allow_server_sort;
-
-    if (!isset($attachments)) {
-	    $attachments = array();
-	    session_register('attachments');
+    global $username, $attachment_dir,  
+           $data_dir, $composesession, $uid_support,
+	   $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) ) {
 	    $composesession = 1;
-	    session_register('composesession');
+            sqsession_register($composesession,'composesession');  	    
     } else {
 	    $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;
-    	}
-    }
-
-    $attachments = $rem_attachments;
-
     if ($thread_sort_messages || $allow_server_sort) {
        $start_index=0;
     } else {
@@ -81,6 +73,12 @@ function attachSelectedMessages($msg, $imapConnection) {
     $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];
@@ -96,49 +94,102 @@ function attachSelectedMessages($msg, $imapConnection) {
         	$localfilename = GenerateRandomString(32, 'FILE', 7);
         	$full_localfilename = "$hashed_attachment_dir/$localfilename";
         	
-        	$fp = fopen( $full_localfilename, 'w');
+        	$fp = fopen( $full_localfilename, 'wb');
         	fwrite ($fp, $body);
         	fclose($fp);
-    		$newAttachment = array();
-        	$newAttachment['localfilename'] = $localfilename;
-        	$newAttachment['type'] = "message/rfc822";
-            	$newAttachment['remotefilename'] = $subject.'.eml';
-            	$newAttachment['session'] = $composesession;
-        	$attachments[] = $newAttachment;
-        	flush();
+	        $composeMessage->initAttachment('message/rfc822',$subject.'.eml', 
+	                 $full_localfilename);
     	    }
 	    $j++;
 	}
 	$i++;	
     }
-    setPref($data_dir, $username, 'attachments', serialize($attachments));
+    $compose_messages[$composesession] = $composeMessage;
+    sqsession_register($compose_messages,'compose_messages'); 
     return $composesession;
 }
 
+
+
+/* get globals */
+
+$username = $_SESSION['username'];
+$key  = $_COOKIE['key'];
+$onetimepad = $_SESSION['onetimepad'];
+$base_uri = $_SESSION['base_uri'];
+$delimiter = $_SESSION['delimiter'];
+
+if (isset($_GET['mailbox'])) {
+    $mailbox = $_GET['mailbox'];
+}
+if (isset($_GET['startMessage'])) {
+    $startMessage = $_GET['startMessage'];
+}
+if (isset($_POST['moveButton'])) {
+    $moveButton = $_POST['moveButton'];
+}
+if (isset($_POST['msg'])) {
+    $msg = $_POST['msg'];
+}
+elseif (isset($_GET['msg'])) {
+    $msg = $_GET['msg'];
+}
+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'];
+}
+
+/* end of get globals */
+
 $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');
+    sqsession_register($lastTargetMailbox, 'lastTargetMailbox');
 }
 
 // expunge-on-demand if user isn't using move_to_trash or auto_expunge
 if(isset($expungeButton)) {
-    sqimap_mailbox_expunge($imapConnection, $mailbox, true);
+    $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;
@@ -147,7 +198,7 @@ if(isset($expungeButton)) {
         //    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");
+                sqimap_messages_remove_flag ($imapConnection, $msg[$i], $msg[$i], "Deleted", true);
                 $j++;
             }
             $i++;
@@ -168,9 +219,9 @@ if(isset($expungeButton)) {
         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  {
@@ -181,8 +232,10 @@ if(isset($expungeButton)) {
             $i++;
         }
         if ($auto_expunge) {
-            sqimap_mailbox_expunge($imapConnection, $mailbox, true);
-        }
+            $cnt = sqimap_mailbox_expunge($imapConnection, $mailbox, true);
+        } else {
+	    $cnt = 0;
+	}
         if (isset($attache)) {
 	    $composesession = attachSelectedMessages($msg, $imapConnection);
 	    if ($compose_new_win) {
@@ -193,6 +246,13 @@ if(isset($expungeButton)) {
 		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);
+	       } else {
+	  	   $location = set_url_var($location,'startMessage',1);
+	       }
+	    }
             header ("Location: $location");
         } 
     } else {
@@ -206,17 +266,28 @@ if(isset($expungeButton)) {
         $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) {
-            sqimap_mailbox_expunge($imapConnection, $mailbox, true);
+            $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 {