bugfix

[squirrelmail.git] / src / move_messages.php

diff --git a/src/move_messages.php b/src/move_messages.php
index c234a5db085e7e43722f4f46734ae8b2ce2089c2..17841ea8673ba33be12ef93256f854417deaa79b 100644 (file)
--- a/src/move_messages.php
+++ b/src/move_messages.php
@@ -15,6 +15,8 @@ require_once('../src/validate.php');
 require_once('../functions/display_messages.php');
 require_once('../functions/imap.php');
 
+global $compose_new_win;
+
 function putSelectedMessagesIntoString($msg) {
     $j = 0;
     $i = 0;
@@ -39,17 +41,107 @@ function putSelectedMessagesIntoString($msg) {
     }
 }
 
+function attachSelectedMessages($msg, $imapConnection) {
+
+    global $mailbox, $username, $attachment_dir, $attachments, $identity, $data_dir, $composesession, $lastTargetMailbox;
+
+
+    if (!isset($attachments)) {
+           $attachments = array();
+           session_register('attachments');
+    }
+
+    if (!isset($composesession) ) {
+           $composesession = 1;
+           session_register('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;
+
+
+    $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);
+                       $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++;       
+       
+    }
+    return $composesession;
+}
+
 $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);
     $location = get_location();
-    if ($where && $what) {
-        header ("Location: $location/search.php?mailbox=".urlencode($mailbox)."&amp;what=".urlencode($what)."&amp;where=".urlencode($where));
+    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&amp;startMessage=$startMessage&amp;mailbox=". urlencode($mailbox));
+        header ("Location: $location/right_main.php?sort=$sort&startMessage=$startMessage&mailbox=". urlencode($mailbox));
     }
 
 } elseif(isset($undeleteButton)) {
@@ -72,9 +164,9 @@ if(isset($expungeButton)) {
         $location = get_location();
 
         if ($where && $what)
-            header ("Location: $location/search.php?mailbox=".urlencode($mailbox)."&amp;what=".urlencode($what)."&amp;where=".urlencode($where));
+            header ("Location: $location/search.php?mailbox=".urlencode($mailbox)."&what=".urlencode($what)."&where=".urlencode($where));
         else
-            header ("Location: $location/right_main.php?sort=$sort&amp;startMessage=$startMessage&amp;mailbox=". urlencode($mailbox));
+            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);
@@ -94,7 +186,9 @@ if(isset($expungeButton)) {
                     sqimap_messages_flag($imapConnection, $msg[$i], $msg[$i], "Seen");
                 } else if (isset($markUnread)) {
                     sqimap_messages_remove_flag($imapConnection, $msg[$i], $msg[$i], "Seen");
-                } else {
+                } else if (isset($attache)) {
+                   break;
+                } else  {
                     sqimap_messages_delete($imapConnection, $msg[$i], $msg[$i], $mailbox);
                 }
                 $j++;
@@ -106,9 +200,25 @@ if(isset($expungeButton)) {
         }
         $location = get_location();
         if (isset($where) && isset($what)) {
-            header ("Location: $location/search.php?mailbox=".urlencode($mailbox)."&amp;what=".urlencode($what)."&amp;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') {
+               header ("Location: $location/right_main.php?sort=$sort&startMessage=$startMessage&mailbox=". urlencode($mailbox)."&composenew=1&session=$composesession&attachedmessages=true");
+           } else {
+               header ("Location: $location/compose.php?startMessage=$startMessage&mailbox=". urlencode($mailbox)."&session=$composesession&attachedmessages=true");
+           }
         } else {
-            header ("Location: $location/right_main.php?sort=$sort&amp;startMessage=$startMessage&amp;mailbox=". urlencode($mailbox));
+            header ("Location: $location/right_main.php?sort=$sort&startMessage=$startMessage&mailbox=". urlencode($mailbox));
         }
     } else {
         displayPageHeader($color, $mailbox);
@@ -136,9 +246,9 @@ if(isset($expungeButton)) {
 
         $location = get_location();
         if (isset($where) && isset($what))
-            header ("Location: $location/search.php?mailbox=".urlencode($mailbox)."&amp;what=".urlencode($what)."&amp;where=".urlencode($where));
+            header ("Location: $location/search.php?mailbox=".urlencode($mailbox)."&what=".urlencode($what)."&where=".urlencode($where));
         else
-            header ("Location: $location/right_main.php?sort=$sort&amp;startMessage=$startMessage&amp;mailbox=". urlencode($mailbox));
+            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);