Changeset 3316 in subversion

Timestamp:

Mar 4, 2010 3:17:04 AM (3 years ago)

Author:

thomasb

Message:

Flag original messages after sending a draft (#1486203)

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• program/lib/imap.inc (modified) (1 diff)
• program/steps/mail/compose.inc (modified) (1 diff)
• program/steps/mail/sendmail.inc (modified) (1 diff)

trunk/roundcubemail/CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Flag original messages when sending a draft (#1486203)
 - Changed signature separator when top-posting (#1486330)
 - Let the admin define defaults for search modifiers (#1485897)

trunk/roundcubemail/program/lib/imap.inc

@@ -1451 +1451 @@
         $request .= "(DATE FROM TO SUBJECT REPLY-TO IN-REPLY-TO CC BCC ";
         $request .= "CONTENT-TRANSFER-ENCODING CONTENT-TYPE MESSAGE-ID ";
-        $request .= "REFERENCES DISPOSITION-NOTIFICATION-TO X-PRIORITY".$add.")])";
+        $request .= "REFERENCES DISPOSITION-NOTIFICATION-TO X-PRIORITY ";
+        $request .= "X-REPLY-UID X-FORWARD-UID".$add.")])";
 
         if (!iil_PutLine($fp, $request)) {

trunk/roundcubemail/program/steps/mail/compose.inc

@@ -159 +159 @@
     if($MESSAGE->headers->in_reply_to)
     {
-      // TODO: how to get reply_uid/forward_uid value, maybe we must set X-Reply-UID/X-Forward-UID
-      // $_SESSION['compose']['reply_uid'] = ?
-      // $_SESSION['compose']['forward_uid'] = ?
+      // 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'];
       $_SESSION['compose']['reply_msgid'] = '<'.$MESSAGE->headers->in_reply_to.'>';
     }

trunk/roundcubemail/program/steps/mail/sendmail.inc

@@ -315 +315 @@
   $headers['In-Reply-To'] = $_SESSION['compose']['reply_msgid'];
 
+// remember reply/forward UIDs in special headers
+if (!empty($_SESSION['compose']['reply_uid']) && $savedraft)
+  $headers['X-Reply-UID'] = $_SESSION['compose']['reply_uid'];
+else if (!empty($_SESSION['compose']['forward_uid']) && $savedraft)
+  $headers['X-Forward-UID'] = $_SESSION['compose']['forward_uid'];
+
 if (!empty($_SESSION['compose']['references']))
   $headers['References'] = $_SESSION['compose']['references'];