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

diff --git a/src/move_messages.php b/src/move_messages.php
index bd121451..008bf1ea 100644
--- a/src/move_messages.php
+++ b/src/move_messages.php
@@ -3,128 +3,128 @@
 /**
  * move_messages.php
  *
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Copyright (c) 1999-2004 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$
+ * @package squirrelmail
  */
 
-require_once('../src/validate.php');
-require_once('../functions/display_messages.php');
-require_once('../functions/imap.php');
+/** Path for SquirrelMail required files. */
+define('SM_PATH','../');
 
-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;
-            }
+/* SquirrelMail required files. */
+require_once(SM_PATH . 'include/validate.php');
+require_once(SM_PATH . 'functions/global.php');
+require_once(SM_PATH . 'functions/display_messages.php');
+require_once(SM_PATH . 'functions/imap.php');
+require_once(SM_PATH . 'functions/html.php');
 
-            $selectedMessages .= "selMsg[$j]=$msg[$i]";
+global $compose_new_win;
 
-            $j++;
-        }
-        $i++;
-    }
+if ( !sqgetGlobalVar('composesession', $composesession, SQ_SESSION) ) {
+    $composesession = 0;
 }
 
 function attachSelectedMessages($msg, $imapConnection) {
+    global $username, $attachment_dir, $startMessage,
+           $data_dir, $composesession, $uid_support,
+           $msgs, $show_num, $compose_messages;
 
-    global $mailbox, $username, $attachment_dir, $attachments, $identity, 
-           $data_dir, $composesession, $lastTargetMailbox, $uid_support;
-
-
-    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 (!$composesession) {
+        $composesession = 1;
+        sqsession_register($composesession,'composesession');
     } else {
-	    $composesession++;
+        $composesession++;
+        sqsession_register($composesession,'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;
-    	}
-    }
+    $hashed_attachment_dir = getHashedDir($username, $attachment_dir);
 
-    $attachments = $rem_attachments;
+    $composeMessage = new Message();
+    $rfc822_header = new Rfc822Header();
+    $composeMessage->rfc822_header = $rfc822_header;
+    $composeMessage->reply_rfc822_header = '';
 
+    foreach($msg as $id) {
+        $body_a = sqimap_run_command($imapConnection, "FETCH $id RFC822", true, $response, $readmessage, $uid_support);
 
-    $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++;	
-	
+        if ($response == 'OK') {
+
+            // fetch the subject for the message with $id from msgs.
+            // is there a more efficient way to do this?
+            foreach($msgs as $k => $vals) {
+                if($vals['ID'] == $id) {
+                    $subject = $msgs[$k]['SUBJECT'];
+                    break;
+                }
+            }
+
+            array_shift($body_a);
+            array_pop($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.'.msg',
+                 $full_localfilename);
+        }
     }
+
+    $compose_messages[$composesession] = $composeMessage;
+    sqsession_register($compose_messages,'compose_messages');
+    session_write_close();
     return $composesession;
 }
 
+
+
+/* get globals */
+sqgetGlobalVar('key',       $key,           SQ_COOKIE);
+sqgetGlobalVar('username',  $username,      SQ_SESSION);
+sqgetGlobalVar('onetimepad',$onetimepad,    SQ_SESSION);
+sqgetGlobalVar('delimiter', $delimiter,     SQ_SESSION);
+sqgetGlobalVar('base_uri',  $base_uri,      SQ_SESSION);
+
+sqgetGlobalVar('mailbox', $mailbox);
+sqgetGlobalVar('startMessage', $startMessage);
+sqgetGlobalVar('msg', $msg);
+
+sqgetGlobalVar('msgs',              $msgs,              SQ_SESSION);
+sqgetGlobalVar('composesession',    $composesession,    SQ_SESSION);
+sqgetGlobalVar('lastTargetMailbox', $lastTargetMailbox, SQ_SESSION);
+
+sqgetGlobalVar('moveButton',      $moveButton,      SQ_POST);
+sqgetGlobalVar('expungeButton',   $expungeButton,   SQ_POST);
+sqgetGlobalVar('targetMailbox',   $targetMailbox,   SQ_POST);
+sqgetGlobalVar('expungeButton',   $expungeButton,   SQ_POST);
+sqgetGlobalVar('undeleteButton',  $undeleteButton,  SQ_POST);
+sqgetGlobalVar('markRead',        $markRead,        SQ_POST);
+sqgetGlobalVar('markUnread',      $markUnread,      SQ_POST);
+sqgetGlobalVar('attache',         $attache,         SQ_POST);
+sqgetGlobalVar('location',        $location,        SQ_POST);
+sqgetGlobalVar('bypass_trash',    $bypass_trash,    SQ_POST);
+
+/* 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',0,false);
+$location = set_url_var($location,'composesession',0,false);
+$location = set_url_var($location,'session',0,false);
 
 /* remember changes to mailbox setting */
 if (!isset($lastTargetMailbox)) {
@@ -132,132 +132,114 @@ if (!isset($lastTargetMailbox)) {
 }
 if ($targetMailbox != $lastTargetMailbox) {
     $lastTargetMailbox = $targetMailbox;
-    session_register('lastTargetMailbox');
+    sqsession_register($lastTargetMailbox, 'lastTargetMailbox');
+}
+$exception = false;
+
+do_hook('move_before_move');
+
+
+/*
+    Move msg list sorting up here, as it is used several times,
+    makes it more efficient to do it in one place for the code
+*/
+$id = array();
+if (isset($msg) && is_array($msg)) {
+    foreach( $msg as $key=>$uid ) {
+        // using foreach removes the risk of infinite loops that was there //
+        $id[] = $uid;
+    }
 }
 
 // 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,false);
+        } else {
+            $location = set_url_var($location,'startMessage',1,false);
+        }
     }
-
 } 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++;
-            }
-            $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));
+    // Removes \Deleted flag from selected messages
+    if (count($id)) {
+        sqimap_toggle_flag($imapConnection, $id, '\\Deleted',false,true);
     } else {
-        displayPageHeader($color, $mailbox);
-        error_message(_("No messages were selected."), $mailbox, $sort, $startMessage, $color);
+        $exception = true;
     }
 } 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 if (isset($attache)) {
-		    break;
-                } else  {
-                    sqimap_messages_delete($imapConnection, $msg[$i], $msg[$i], $mailbox);
+    if (count($id)) {
+        $cnt = count($id);
+        if (!isset($attache)) {
+            if (isset($markRead)) {
+                sqimap_toggle_flag($imapConnection, $id, '\\Seen',true,true);
+            } else if (isset($markUnread)) {
+                sqimap_toggle_flag($imapConnection, $id, '\\Seen',false,true);
+            } else if (isset($markFlagged)) {
+                sqimap_toggle_flag($imapConnection, $id, '\\Flagged', true, true);
+            } else if (isset($markUnflagged)) {
+                sqimap_toggle_flag($imapConnection, $id, '\\Flagged', false, true);
+            } else  {
+                if (!boolean_hook_function('move_messages_button_action', NULL, 1)) {
+                    sqimap_msgs_list_delete($imapConnection, $mailbox, $id,$bypass_trash);
+                    if ($auto_expunge) {
+                        $cnt = sqimap_mailbox_expunge($imapConnection, $mailbox, true);
+                    }
                 }
-                $j++;
             }
-            $i++;
-        }
-        if ($auto_expunge) {
-            sqimap_mailbox_expunge($imapConnection, $mailbox, true);
         }
-        $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");
-	    }
+        if (isset($attache)) {
+            $composesession = attachSelectedMessages($id, $imapConnection);
+            $location = set_url_var($location, 'session', $composesession, false);
+            if ($compose_new_win) {
+                $location = set_url_var($location, 'composenew', 1, false);
+            } else {
+                $location = str_replace('search.php','compose.php',$location);
+                $location = str_replace('right_main.php','compose.php',$location);
+            }
         } else {
-            header ("Location: $location/right_main.php?sort=$sort&startMessage=$startMessage&mailbox=". urlencode($mailbox));
+            if (($startMessage+$cnt-1) >= $mbx_response['EXISTS']) {
+                if ($startMessage > $show_num) {
+                    $location = set_url_var($location,'startMessage',$startMessage-$show_num, false);
+                } else {
+                    $location = set_url_var($location,'startMessage',1, false);
+                }
+            }
         }
     } else {
-        displayPageHeader($color, $mailbox);
-        error_message(_("No messages were selected."), $mailbox, $sort, $startMessage, $color);
+        $exception = true;
     }
 } 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++;
+
+    if (count($id)) {
+        sqimap_msgs_list_move($imapConnection,$id,$targetMailbox);
+        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, false);
+            } else {
+                $location = set_url_var($location,'startMessage',1, false);
             }
-            $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));
     } else {
-        displayPageHeader($color, $mailbox);
-        error_message(_("No messages were selected."), $mailbox, $sort, $startMessage, $color);
+        $exception = true;
     }
 }
-
 // Log out this session
 sqimap_logout($imapConnection);
-
+if ($exception) {
+    displayPageHeader($color, $mailbox);
+    error_message(_("No messages were selected."), $mailbox, $sort, $startMessage, $color);
+} else {
+    header("Location: $location");
+    exit;
+}
 ?>
 </BODY></HTML>