fixed edit message as new

[squirrelmail.git] / src / compose.php

diff --git a/src/compose.php b/src/compose.php
index 90d6ff38cf751e3596dbe9cbd64025cf3566d8af..ce9e3c6fe8626d36cc6f1d2088b500616c35383b 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -70,10 +70,10 @@ if (!isset($composesession)) {
     session_register('composesession');
 }
 
-if (!isset($session)) {
+if (!isset($session) || (isset($newmessage) && $newmessage)) {
     $session = "$composesession" +1; 
     $composesession = $session;        
-}    
+}     
 
 if (!isset($mailbox) || $mailbox == '' || ($mailbox == 'None')) {
     $mailbox = 'INBOX';
@@ -179,7 +179,7 @@ if (isset($send)) {
             exit();
         }
         if ($compose_new_win == '1') {
-            Header("Location: compose.php?mail_sent=yes&session=$composesession");
+            Header("Location: compose.php?mail_sent=yes");
         }
         else {
             Header("Location: right_main.php?mailbox=$urlMailbox&sort=$sort".
@@ -344,6 +344,10 @@ elseif (isset($sigappend)) {
         getAttachments(0, $session);
     }
 
+    if (isset($passed_id) && $passed_id && isset($ent_num) && $ent_num) {
+        getAttachments(0, $session);
+    }
+
     newMail($session);
     showInputForm($session);
     sqimap_logout($imapConnection);
@@ -359,7 +363,7 @@ exit();
 function newMail () {
     global $forward_id, $imapConnection, $msg, $ent_num, $body_ary, $body,
            $reply_id, $send_to, $send_to_cc, $mailbox, $send_to_bcc, $editor_size,
-           $draft_id, $use_signature, $composesession, $forward_cc;
+           $draft_id, $use_signature, $composesession, $forward_cc, $passed_id;
 
     $send_to = decodeHeader($send_to, false);
     $send_to_cc = decodeHeader($send_to_cc, false);
@@ -372,8 +376,11 @@ function newMail () {
         $id = $forward_id;
     } elseif ($reply_id) {
         $id = $reply_id;
+    } elseif ($passed_id) {
+        $id = $passed_id;
     }
 
+
     if ($draft_id){
         $id = $draft_id;
         $use_signature = FALSE;
@@ -510,12 +517,14 @@ function newMail () {
 
 function getAttachments($message, $session) {
     global $mailbox, $attachments, $attachment_dir, $imapConnection,
-           $ent_num, $forward_id, $draft_id, $username;
+           $ent_num, $forward_id, $draft_id, $username, $passed_id;
 
     if (isset($draft_id)) {
         $id = $draft_id;
-    } else {
+    } else if (isset($forward_id)) {
         $id = $forward_id;
+    } else {
+        $id = $passed_id;
     }
 
     if (!$message) {