Changeset bc404ff in github for program/steps/mail/compose.inc

Timestamp:

Mar 11, 2010 5:44:43 PM (3 years ago)

Author:

thomascube <thomas@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

7244b45

Parents:

56505a1

Message:

Save draft information in one header; finally fixes #1486203

File:

• program/steps/mail/compose.inc (modified) (1 diff)

program/steps/mail/compose.inc

@@ -152 +152 @@
     if (!empty($_SESSION['compose']['param']['all']))
       $MESSAGE->reply_all = 1;
-      
+
     $OUTPUT->set_env('compose_mode', 'reply');
   }
   else if ($compose_mode == RCUBE_COMPOSE_DRAFT)
   {
-    if($MESSAGE->headers->in_reply_to)
+    if ($MESSAGE->headers->others['x-draft-info'])
     {
       // get reply_uid/forward_uid to flag the original message when sending
-      $_SESSION['compose']['reply_uid'] = $MESSAGE->headers->others['x-reply-uid'];
-      $_SESSION['compose']['forward_uid'] = $MESSAGE->headers->others['x-forward-uid'];
+      $info = rcmail_draftinfo_decode($MESSAGE->headers->others['x-draft-info']);
+
+      if ($info['type'] == 'reply')
+        $_SESSION['compose']['reply_uid'] = $info['uid'];
+      else if ($info['type'] == 'forward')
+        $_SESSION['compose']['forward_uid'] = $info['uid'];
+
+      $_SESSION['compose']['mailbox'] = $info['folder'];
+    }
+    
+    if ($MESSAGE->headers->in_reply_to)
       $_SESSION['compose']['reply_msgid'] = '<'.$MESSAGE->headers->in_reply_to.'>';
-    }
+
     $_SESSION['compose']['references']  = $MESSAGE->headers->references;
   }