Changeset 998 in subversion

Timestamp:

Feb 2, 2008 3:30:01 PM (5 years ago)

Author:

thomasb

Message:

Also respect receipt and priority settings when re-opening a draft message

Location:

trunk/roundcubemail

Files:

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

trunk/roundcubemail/CHANGELOG

@@ -1 +1 @@
 CHANGELOG RoundCube Webmail
 ---------------------------
+
+2008/02/02 (thomasb)
+----------
+- Always update $CONFIG with user prefs (#1484729)
+- Don't ask for MDN confirmations on drafted messages (#1484691)
+- 
 
 2008/01/31 (robin)

trunk/roundcubemail/program/lib/imap.inc

@@ -127 +127 @@
         var $internaldate;
         var $references;
+        var $priority;
         var $mdn_to;
         var $mdn_sent = false;
@@ -1516 +1517 @@
     $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)])\r\n";
+    $request .= "REFERENCES DISPOSITION-NOTIFICATION-TO X-PRIORITY)])\r\n";
 
         if (!fputs($fp, $request)) {
@@ -1625 +1626 @@
                                         case 'message-id':
                                                 $result[$id]->messageID = $string;
+                                                break;
+                                        case 'x-priority':
+                                                if (preg_match('/^(\d+)/', $string, $matches))
+                                                        $result[$id]->priority = intval($matches[1]);
                                                 break;
                                 } // end switch ()

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

@@ -737 +737 @@
 function rcmail_priority_selector($attrib)
 {
+  global $MESSAGE;
+  
   list($form_start, $form_end) = get_form_tags($attrib);
   unset($attrib['form']);
@@ -750 +752 @@
                  array(5, 4, 0, 2, 1));
                  
-  $sel = isset($_POST['_priority']) ? $_POST['_priority'] : 0;
+  $sel = isset($_POST['_priority']) ? $_POST['_priority'] : intval($MESSAGE['headers']->priority);
 
   $out = $form_start ? "$form_start\n" : '';
@@ -762 +764 @@
 function rcmail_receipt_checkbox($attrib)
 {
+  global $MESSAGE;
+  
   list($form_start, $form_end) = get_form_tags($attrib);
   unset($attrib['form']);
@@ -773 +777 @@
 
   $out = $form_start ? "$form_start\n" : '';
-  $out .= $checkbox->show(0);
+  $out .= $checkbox->show($MESSAGE['headers']->mdn_to ? 1 : 0);
   $out .= $form_end ? "\n$form_end" : '';