uid support?

[squirrelmail.git] / src / move_messages.php

diff --git a/src/move_messages.php b/src/move_messages.php
index 6e8495d0885f817a38b6b1290f6f6585a60a3eb9..bd121451773fa75c7a7e6dcd3b628b74a4dffdb8 100644 (file)
--- a/src/move_messages.php
+++ b/src/move_messages.php
@@ -43,33 +43,34 @@ function putSelectedMessagesIntoString($msg) {
 
 function attachSelectedMessages($msg, $imapConnection) {
 
-    global $mailbox, $username, $attachment_dir, $attachments, $identity, $data_dir, $composesession;
+    global $mailbox, $username, $attachment_dir, $attachments, $identity, 
+           $data_dir, $composesession, $lastTargetMailbox, $uid_support;
 
 
     if (!isset($attachments)) {
-       $attachments = array();
-       session_register('attachments');
+           $attachments = array();
+           session_register('attachments');
     }
 
-    if (!isset($composesession)) {
-       $composesession = 1;
-       session_register('$composesession');
+    if (!isset($composesession) ) {
+           $composesession = 1;
+           session_register('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) {
+       if ($info['session'] == $composesession) {
            $attached_file = "$hashed_attachment_dir/$info[localfilename]";
            if (file_exists($attached_file)) {
-               unlink($attached_file);
+                   unlink($attached_file);
            }
-       } else {
-           $rem_attachments[] = $info;
-       }
+       } else {
+           $rem_attachments[] = $info;
+       }
     }
 
     $attachments = $rem_attachments;
@@ -77,45 +78,46 @@ function attachSelectedMessages($msg, $imapConnection) {
 
     $i = 0;
     $j = 0;
-    
+    $hashed_attachment_dir = getHashedDir($username, $attachment_dir);
     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') {
+                   // get subject so we can set the remotefilename
+                       $read = sqimap_run_command ($imapConnection, "FETCH $id BODY.PEEK[HEADER.FIELDS (Subject)]", true, $response, $readmessage, $uid_support);
+                       $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);
+                       $body .= "\r\n";
+                       
+                       $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();
            }
-           $j++;           
-       }
-       $i++;   
+            $j++;          
+           }
+           $i++;       
        
     }
     return $composesession;
@@ -124,6 +126,15 @@ function attachSelectedMessages($msg, $imapConnection) {
 $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
 sqimap_mailbox_select($imapConnection, $mailbox);
 
+/* 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);
@@ -190,7 +201,16 @@ if(isset($expungeButton)) {
         }
         $location = get_location();
         if (isset($where) && isset($what)) {
-            header ("Location: $location/search.php?mailbox=".urlencode($mailbox)."&what=".urlencode($what)."&where=".urlencode($where));
+           if (isset($attache)) {
+               $composesession = attachSelectedMessages($msg, $imapConnection);
+               if ($compose_new_win == '1') {
+                   header ("Location: $location/search.php?mailbox=".urlencode($mailbox)."&what=".urlencode($what)."&where=".urlencode($where)."&composenew=1&session=$composesession&attachedmessages=true");
+               } else {
+                   header ("Location: $location/compose.php?startMessage=$startMessage&mailbox=". urlencode($mailbox)."&session=$composesession&attachedmessages=true".$wherewhat);
+               }
+           } else {            
+               header ("Location: $location/search.php?mailbox=".urlencode($mailbox)."&what=".urlencode($what)."&where=".urlencode($where));
+           }
        } elseif(isset($attache)) {
            $composesession = attachSelectedMessages($msg, $imapConnection);
            if ($compose_new_win == '1') {