Changeset ed54070 in github

Timestamp:

Nov 29, 2007 9:17:32 AM (5 years ago)

Author:

thomascube <thomas@…>

Branches:

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

Children:

f20cf0f

Parents:

1107480

Message:

Track message disposition notification flag and headers

Location:

program

Files:

• include/rcube_imap.inc (modified) (2 diffs)
• lib/imap.inc (modified) (6 diffs)
• steps/mail/show.inc (modified) (1 diff)

program/include/rcube_imap.inc

@@ -940 +940 @@
    * Check if the given message ID is part of the current search set
    *
-   * @return True on match or if no search request is stored
+   * @return boolean True on match or if no search request is stored
    */
   function in_searchset($msgid)
@@ -1291 +1291 @@
    *
    * @param mixed  Message UIDs as array or as comma-separated string
-   * @param string Flag to set: SEEN, UNDELETED, DELETED, RECENT, ANSWERED, DRAFT
+   * @param string Flag to set: SEEN, UNDELETED, DELETED, RECENT, ANSWERED, DRAFT, MDNSENT
    * @return boolean True on success, False on failure
    */

program/lib/imap.inc

@@ -97 +97 @@
         var $size;
         var $encoding;
+        var $charset;
         var $ctype;
         var $flags;
         var $timestamp;
         var $f;
-        var $seen;
-        var $deleted;
-        var $recent;
-        var $answered;
-        var $junk;
         var $internaldate;
-        var $is_reply;
+        var $references;
+        var $mdn_to;
+        var $mdn_sent = false;
+        var $is_reply = false;
+        var $seen = false;
+        var $deleted = false;
+        var $recent = false;
+        var $answered = false;
+        var $junk = false;
 }
 
@@ -1241 +1245 @@
         $key="fh".($c++);
         $prefix=$uidfetch?" UID":"";
-        $request=$key.$prefix." FETCH $message_set (BODY.PEEK[HEADER.FIELDS (DATE FROM TO SUBJECT REPLY-TO IN-REPLY-TO CC BCC CONTENT-TRANSFER-ENCODING CONTENT-TYPE MESSAGE-ID REFERENCES)])\r\n";
+        $request=$key.$prefix." FETCH $message_set (BODY.PEEK[HEADER.FIELDS (DATE FROM TO SUBJECT REPLY-TO IN-REPLY-TO CC BCC CONTENT-TRANSFER-ENCODING CONTENT-TYPE MESSAGE-ID REFERENCES DISPOSITION-NOTIFICATION-TO)])\r\n";
 
         if (!fputs($fp, $request)) return false;
@@ -1308 +1312 @@
                         $result[$id]->in_reply_to = ereg_replace("[\n<>]",'', $headers['in-reply-to']);
                         $result[$id]->references = $headers["references"];
+                        $result[$id]->mdn_to = $headers["disposition-notification-to"];
                         
                         list($result[$id]->ctype, $ctype_add) = explode(";", $headers["content-type"]);
@@ -1370 +1375 @@
                                         //echo "<!-- ID: $id FLAGS: ".implode(",", $flags_a)." //-->\n";
                                         
-                                        $result[$id]->seen = false;
-                                        $result[$id]->recent = false;
-                                        $result[$id]->deleted = false;
-                                        $result[$id]->answered = false;
                                         if (is_array($flags_a)){
                                                 reset($flags_a);
@@ -1381 +1382 @@
                                                         else if (strcasecmp($val, "Recent")==0) $result[$id]->recent = true;
                                                         else if (strcasecmp($val, "Answered")==0) $result[$id]->answered = true;
+                                                        else if (strcasecmp($val, "\$MDNSent")==0) $result[$id]->mdn_sent = true;
                                                 }
-                                                $result[$id]->flags=$flags_str;
+                                                $result[$id]->flags = $flags_a;
                                         }
                         
@@ -1511 +1513 @@
         $fp = $conn->fp;
         $flags=array(
-                    "SEEN"=>"\\Seen",
-                    "DELETED"=>"\\Deleted",
-                    "RECENT"=>"\\Recent",
-                    "ANSWERED"=>"\\Answered",
-                    "DRAFT"=>"\\Draft",
-                                        "FLAGGED"=>"\\Flagged"
-                   );
+    "SEEN"=>"\\Seen",
+    "DELETED"=>"\\Deleted",
+    "RECENT"=>"\\Recent",
+    "ANSWERED"=>"\\Answered",
+    "DRAFT"=>"\\Draft",
+    "FLAGGED"=>"\\Flagged",
+    "MDNSENT"=>"\$MDNSent"
+  );
         $flag=strtoupper($flag);
         $flag=$flags[$flag];

program/steps/mail/show.inc

@@ -73 +73 @@
   $OUTPUT->set_env('uid', $MESSAGE['UID']);
   $OUTPUT->set_env('safemode', intval($_GET['_safe']));
+  
+  // check for unset disposition notification
+  if ($MESSAGE['headers']->mdn_to && !$MESSAGE['headers']->mdn_sent)
+    $OUTPUT->set_env('mdn_request', true);
 
   $next = $prev = -1;