X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fmove_messages.php;h=51af2ce4d2efe10d4d8ac8d5d632a4cf79e2f472;hb=a8a702511db46d2a02b0baf8f5df642b87020a88;hp=a9fb476aabc4bda82783fba7ca11936ba4df6eb8;hpb=87d5f1990c1ac232c2a78f43c2f4088f430f23dd;p=squirrelmail.git

diff --git a/src/move_messages.php b/src/move_messages.php
index a9fb476a..51af2ce4 100644
--- a/src/move_messages.php
+++ b/src/move_messages.php
@@ -3,7 +3,7 @@
 /**
  * move_messages.php
  *
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Copyright (c) 1999-2003 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.
@@ -16,69 +16,35 @@ define('SM_PATH','../');
 
 /* 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');
 
 global $compose_new_win;
 
-if (isset($_SESSION['composesession'])) {
-    $composesession = $_SESSION['composesession'];
-} else {
+if ( !sqgetGlobalVar('composesession', $composesession, SQ_SESSION) ) {
     $composesession = 0;
-} 
-
-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++;
-    }
 }
 
 function attachSelectedMessages($msg, $imapConnection) {
-    global $username, $attachment_dir,  
+    global $username, $attachment_dir, $startMessage,
            $data_dir, $composesession, $uid_support,
-	   $msgs, $thread_sort_messages, $allow_server_sort, $show_num,
-	   $compose_messages;
-
+           $msgs, $show_num, $compose_messages;
 
     if (!isset($compose_messages)) {
-	    $compose_messages = array();
-            sqsession_register($compose_messages,'compose_messages');
+        $compose_messages = array();
+        sqsession_register($compose_messages,'compose_messages');
     }
 
     if (!$composesession) {
-	    $composesession = 1;
-            sqsession_register($composesession,'composesession');  	    
+        $composesession = 1;
+        sqsession_register($composesession,'composesession');
     } else {
-	    $composesession++;
-	    sqsession_register($composesession,'composesession');  	    
+        $composesession++;
+        sqsession_register($composesession,'composesession');
     }
 
-    $hashed_attachment_dir = getHashedDir($username, $attachment_dir, $composesession);
-
-    if ($thread_sort_messages || $allow_server_sort) {
-       $start_index=0;
-    } else {
-       $start_index = ($startMessage-1) * $show_num;
-    }
-
-    $i = 0;
-    $j = 0;
     $hashed_attachment_dir = getHashedDir($username, $attachment_dir);
 
     $composeMessage = new Message();
@@ -86,31 +52,36 @@ function attachSelectedMessages($msg, $imapConnection) {
     $composeMessage->rfc822_header = $rfc822_header;
     $composeMessage->reply_rfc822_header = '';
 
-    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') {
-	        $k = $i + $start_index;
-		$subject = $msgs[$k]['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, 'wb');
-        	fwrite ($fp, $body);
-        	fclose($fp);
-	        $composeMessage->initAttachment('message/rfc822',$subject.'.eml', 
-	                 $full_localfilename);
-    	    }
-	    $j++;
-	}
-	$i++;	
+    foreach($msg as $id) {
+        $body_a = sqimap_run_command($imapConnection, "FETCH $id RFC822", true, $response, $readmessage, $uid_support);
+
+        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.'.eml',
+                 $full_localfilename);
+        }
     }
+
     $compose_messages[$composesession] = $composeMessage;
     sqsession_register($compose_messages,'compose_messages');
     session_write_close();
@@ -120,65 +91,30 @@ function attachSelectedMessages($msg, $imapConnection) {
 
 
 /* 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);
 
-$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($_SESSION['msgs'])) {
-    $msgs = $_SESSION['msgs'];
-}
-
-
-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'];
-}
-
-if (isset($_POST['location'])) {
-    $location = $_POST['location'];
-}
-
-if (isset($_SESSION['composesession'])) {
-    $composesession = $_SESSION['composesession'];
-}
 /* end of get globals */
 
 $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
@@ -197,115 +133,98 @@ if ($targetMailbox != $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)) {
     $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);
-	}
+            $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", true);
-                $j++;
-            }
-            $i++;
-        }
+    // Removes \Deleted flag from selected messages
+    if (count($id)) {
+        sqimap_toggle_flag($imapConnection, $id, '\\Deleted',false,true);
     } else {
-	$exception = true;
+        $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", true);
-                } else if (isset($markUnread)) {
-                    sqimap_messages_remove_flag($imapConnection, $msg[$i], $msg[$i], "Seen", true);
-                } else if (isset($attache)) {
-		    break;
-                } else  {
-                    sqimap_messages_delete($imapConnection, $msg[$i], $msg[$i], $mailbox);
+    if (count($id)) {
+        $cnt = count($id);
+        if (!isset($attache)) {
+            $button_action = concat_hook_function('move_messages_button_action');
+            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 (!$button_action) {
+                    sqimap_msgs_list_delete($imapConnection, $mailbox, $id);
+                    if ($auto_expunge) {
+                        $cnt = sqimap_mailbox_expunge($imapConnection, $mailbox, true);
+                    }
                 }
-                $j++;
             }
-            $i++;
         }
-        if ($auto_expunge) {
-            $cnt = sqimap_mailbox_expunge($imapConnection, $mailbox, true);
-        } else {
-	    $cnt = 0;
-	}
         if (isset($attache)) {
-	    $composesession = attachSelectedMessages($msg, $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 {		
-	    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);
-	       }
-	    }
-        } 
+            $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 {
+            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 {
-    	$exception = true;
+        $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.
-	$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", true);
-                $j++;
-            }
-            $i++;
-        }
+
+    if (count($id)) {
+        sqimap_msgs_list_copy($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);
-	    }
-	}
+        } 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);
+            }
+        }
     } else {
-	$exception = true;
+        $exception = true;
     }
 }
 // Log out this session