X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fmove_messages.php;h=bd121451773fa75c7a7e6dcd3b628b74a4dffdb8;hp=06707724e2decc8fe4dcf631cd7a3940999b7db0;hb=5b8d68ca2263cc828546f629c7cd63a78783a3d0;hpb=37faa781f9b8050e179020558fb79c4716118f5e

diff --git a/src/move_messages.php b/src/move_messages.php
index 06707724..bd121451 100644
--- a/src/move_messages.php
+++ b/src/move_messages.php
@@ -1,148 +1,263 @@
 <?php
-   /**
-    **  move_messages.php
-    **
-    **  Copyright (c) 1999-2000 The SquirrelMail development team
-    **  Licensed under the GNU GPL. For full terms see the file COPYING.
-    **
-    **  Enables message moving between folders on the IMAP server.
-    **
-    **  $Id$
-    **/
-
-   require_once('../src/validate.php');
-   require_once('../functions/display_messages.php');
-   require_once('../functions/imap.php');
-
-   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.
-      while (($j < count($msg)) && ($msg[0])) {
-         if ($msg[$i]) {
-            if ($firstLoop != true)
-               $selectedMessages .= "&";
-            else
-               $firstLoop = false;
+
+/**
+ * move_messages.php
+ *
+ * Copyright (c) 1999-2002 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.
+ *
+ * $Id$
+ */
+
+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;
+    $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.
+    while (($j < count($msg)) && ($msg[0])) {
+        if ($msg[$i]) {
+            if ($firstLoop != true) {
+                $selectedMessages .= "&amp;";
+            } else {
+                $firstLoop = false;
+            }
 
             $selectedMessages .= "selMsg[$j]=$msg[$i]";
-            
+
             $j++;
-         }
-         $i++;
-      }
-   }
-
-   $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
-   sqimap_mailbox_select($imapConnection, $mailbox);
-
-   // 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)."&what=".urlencode($what)."&where=".urlencode($where));
-     else   
-       header ("Location: $location/right_main.php?sort=$sort&startMessage=$startMessage&mailbox=". urlencode($mailbox));
-   }
-   // undelete messages if user isn't using move_to_trash or auto_expunge
-   elseif(isset($undeleteButton)) {
-      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)) {
+        }
+        $i++;
+    }
+}
+
+function attachSelectedMessages($msg, $imapConnection) {
+
+    global $mailbox, $username, $attachment_dir, $attachments, $identity, 
+           $data_dir, $composesession, $lastTargetMailbox, $uid_support;
+
+
+    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, $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++;	
+	
+    }
+    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 (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));
+    }
+
+} 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");
+            $j++;
             }
             $i++;
-         }
-         $location = get_location();
+        }
+        $location = get_location();
 
-         if ($where && $what)
+        if ($where && $what)
             header ("Location: $location/search.php?mailbox=".urlencode($mailbox)."&what=".urlencode($what)."&where=".urlencode($where));
-         else   
+        else
             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);
-      }
-   }
-   // If the delete button was pressed, the moveButton variable will not be set.
-   elseif (!isset($moveButton)) {
-      if (is_array($msg) == 1) {
-         // 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)) {
+    } else {
+        displayPageHeader($color, $mailbox);
+        error_message(_("No messages were selected."), $mailbox, $sort, $startMessage, $color);
+    }
+} elseif (!isset($moveButton)) {
+    // If the delete button was pressed, the moveButton variable will not be set.
+    if (is_array($msg) == 1) {
+        // 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");
-               } else if (isset($markUnread)) {
-                   sqimap_messages_remove_flag($imapConnection, $msg[$i], $msg[$i], "Seen");
-               } else {
-                  sqimap_messages_delete($imapConnection, $msg[$i], $msg[$i], $mailbox);
-               }
-               $j++;
+                if (isset($markRead)) {
+                    sqimap_messages_flag($imapConnection, $msg[$i], $msg[$i], "Seen");
+                } else if (isset($markUnread)) {
+                    sqimap_messages_remove_flag($imapConnection, $msg[$i], $msg[$i], "Seen");
+                } else if (isset($attache)) {
+		    break;
+                } else  {
+                    sqimap_messages_delete($imapConnection, $msg[$i], $msg[$i], $mailbox);
+                }
+                $j++;
             }
             $i++;
-         }
-         if ($auto_expunge) {
+        }
+        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));
-         else   
+        }
+        $location = get_location();
+        if (isset($where) && isset($what)) {
+	    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&startMessage=$startMessage&mailbox=". urlencode($mailbox));
-      } else {
-         displayPageHeader($color, $mailbox);
-         error_message(_("No messages were selected."), $mailbox, $sort, $startMessage, $color);
-      }
-   } else {    // Move messages
-      // lets check to see if they selected any messages
-      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)) {
+        }
+    } else {
+        displayPageHeader($color, $mailbox);
+        error_message(_("No messages were selected."), $mailbox, $sort, $startMessage, $color);
+    }
+} else {    // Move messages
+    // lets check to see if they selected any messages
+    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)) {
             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");
-               $j++;
+                /** 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");
+                $j++;
             }
             $i++;
-         }
-         if ($auto_expunge == true)
+        }
+        if ($auto_expunge == true)
             sqimap_mailbox_expunge($imapConnection, $mailbox, true);
 
-         $location = get_location();
-         if (isset($where) && isset($what))
+        $location = get_location();
+        if (isset($where) && isset($what))
             header ("Location: $location/search.php?mailbox=".urlencode($mailbox)."&what=".urlencode($what)."&where=".urlencode($where));
-         else   
+        else
             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);
-      }
-   }
-
-   // Log out this session
-   sqimap_logout($imapConnection);
+    } else {
+        displayPageHeader($color, $mailbox);
+        error_message(_("No messages were selected."), $mailbox, $sort, $startMessage, $color);
+    }
+}
+
+// Log out this session
+sqimap_logout($imapConnection);
 
 ?>
 </BODY></HTML>