Changeset e4867ea in github

Timestamp:

Nov 6, 2007 1:24:25 PM (6 years ago)

Author:

thomascube <thomas@…>

Branches:

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

Children:

a9cc52b

Parents:

ff0566b

Message:

Fix bugs #1484555, #1484646 and #1484639

Files:

• CHANGELOG (modified) (1 diff)
• program/include/session.inc (modified) (1 diff)
• program/lib/imap.inc (modified) (2 diffs)
• program/steps/mail/compose.inc (modified) (1 diff)
• program/steps/mail/search.inc (modified) (1 diff)

CHANGELOG

@@ -2 +2 @@
 ---------------------------
 
+2007/11/06 (thomasb)
+----------
+- Switch to/from when searcing in Sent folder (#1484555)
+- Correctly read the References header (#1484646)
+- Unset old cookie in before sending a new value (#1484639)
+
 2007/10/22 (tomekp)
+----------
 - update ru, eo localizations
 

program/include/session.inc

@@ -174 +174 @@
   session_id($random);
   $cookie = session_get_cookie_params();
+  setcookie(session_name(), "", time() -3600);
   setcookie(session_name(), $random, $cookie['lifetime'], $cookie['path']);
 

program/lib/imap.inc

@@ -1241 +1241 @@
         $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 REFERENCE)])\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)])\r\n";
 
         if (!fputs($fp, $request)) return false;
@@ -1296 +1296 @@
                         $result[$id]->ctype = str_replace("\n", " ", $headers["content-type"]);
                         $result[$id]->in_reply_to = ereg_replace("[\n<>]",'', $headers['in-reply-to']);
-                        $result[$id]->reference = $headers["reference"];
+                        $result[$id]->references = $headers["references"];
                         
                         list($result[$id]->ctype, $ctype_add) = explode(";", $headers["content-type"]);

program/steps/mail/compose.inc

@@ -87 +87 @@
     $_SESSION['compose']['reply_uid'] = $msg_uid;
     $_SESSION['compose']['reply_msgid'] = $MESSAGE['headers']->messageID;
-    $_SESSION['compose']['references']  = $MESSAGE['headers']->reference;
-    $_SESSION['compose']['references'] .= !empty($MESSAGE['headers']->reference) ? ' ' : '';
-    $_SESSION['compose']['references'] .= $MESSAGE['headers']->messageID;
+    $_SESSION['compose']['references']  = trim($MESSAGE['headers']->references . " " . $MESSAGE['headers']->messageID);
 
     if (!empty($_GET['_all']))

program/steps/mail/search.inc

@@ -65 +65 @@
 else
 {
-  $subject = array("HEADER SUBJECT", "HEADER FROM");
+  $from = ($mbox == $CONFIG['sent_mbox'] || $mbox == $CONFIG['drafts_mbox']) ? "TO" : "FROM";
+  $subject = array("HEADER SUBJECT", "HEADER $from");
   $search = trim($str);
 }