fixes for changed attachment handling
[squirrelmail.git] / src / move_messages.php
index 782b5c59ad296eefde14e00659eefb122fde6bf9..027fbc0cee232e01234e647a29190ca11029481c 100644 (file)
 require_once('../src/validate.php');
 require_once('../functions/display_messages.php');
 require_once('../functions/imap.php');
-
+require_once('../functions/html.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.
@@ -32,9 +31,7 @@ function putSelectedMessagesIntoString($msg) {
             } else {
                 $firstLoop = false;
             }
-
             $selectedMessages .= "selMsg[$j]=$msg[$i]";
-
             $j++;
         }
         $i++;
@@ -42,99 +39,103 @@ 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,
+          $msgs, $startMessage, $show_num, $thread_sort_messages,
+          $allow_server_sort;
 
     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;
 
+    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);
     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();
+           $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, '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++;           
+           $j++;
        }
        $i++;   
-       
     }
+    setPref($data_dir, $username, 'attachments', serialize($attachments));
     return $composesession;
 }
 
 $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
 sqimap_mailbox_select($imapConnection, $mailbox);
 
+$location = set_url_var($location,'composenew');
+$location = set_url_var($location,'composesession');
+$location = set_url_var($location,'session');
+
+
+/* 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));
-    }
-
+    header("Location: $location");
 } elseif(isset($undeleteButton)) {
     // undelete messages if user isn't using move_to_trash or auto_expunge
 
@@ -142,22 +143,16 @@ if(isset($expungeButton)) {
         // 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", true);
+                $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));
+       header ("Location: $location"); 
     } else {
         displayPageHeader($color, $mailbox);
         error_message(_("No messages were selected."), $mailbox, $sort, $startMessage, $color);
@@ -168,15 +163,14 @@ if(isset($expungeButton)) {
         // 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");
+                    sqimap_messages_flag($imapConnection, $msg[$i], $msg[$i], "Seen", true);
                 } else if (isset($markUnread)) {
-                    sqimap_messages_remove_flag($imapConnection, $msg[$i], $msg[$i], "Seen");
+                    sqimap_messages_remove_flag($imapConnection, $msg[$i], $msg[$i], "Seen", true);
                 } else if (isset($attache)) {
                    break;
                 } else  {
@@ -189,19 +183,18 @@ if(isset($expungeButton)) {
         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));
-       } elseif(isset($attache)) {
+        if (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");
+           if ($compose_new_win) {
+               header ("Location: $location&composenew=1&session=$composesession");
            } else {
-               header ("Location: $location/compose.php?startMessage=$startMessage&mailbox=". urlencode($mailbox)."&session=$composesession&attachedmessages=true");
+               $location = str_replace('search.php','compose.php',$location);
+               $location = str_replace('right_main.php','compose.php',$location);
+               header ("Location: $location&session=$composesession");
            }
-        } else {
-            header ("Location: $location/right_main.php?sort=$sort&startMessage=$startMessage&mailbox=". urlencode($mailbox));
-        }
+       } else {                
+            header ("Location: $location");
+        } 
     } else {
         displayPageHeader($color, $mailbox);
         error_message(_("No messages were selected."), $mailbox, $sort, $startMessage, $color);
@@ -211,32 +204,26 @@ if(isset($expungeButton)) {
     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");
+                sqimap_messages_flag($imapConnection, $msg[$i], $msg[$i], "Deleted", true);
                 $j++;
             }
             $i++;
         }
-        if ($auto_expunge == true)
+        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
-            header ("Location: $location/right_main.php?sort=$sort&startMessage=$startMessage&mailbox=". urlencode($mailbox));
+       }
+       header ("Location: $location"); 
     } else {
         displayPageHeader($color, $mailbox);
         error_message(_("No messages were selected."), $mailbox, $sort, $startMessage, $color);
     }
 }
-
 // Log out this session
 sqimap_logout($imapConnection);