lotsa stuff works

darcs-hash:20040610172447-5007d-71183c18efd594f96233f7695ff908e60193da9d.gz

diff --git a/src/org/ibex/mail/Message.java b/src/org/ibex/mail/Message.java
index 477d88c..690285c 100644 (file)
--- a/src/org/ibex/mail/Message.java
+++ b/src/org/ibex/mail/Message.java
@@ -51,7 +51,6 @@ public class Message extends JSReflection {
         w.write(allHeaders);
         w.write("X-IbexMail-EnvelopeFrom: " + envelopeFrom + "\r\n");
         w.write("X-IbexMail-EnvelopeTo: "); for(int i=0; i<envelopeTo.length; i++) w.write(envelopeTo[i] + " "); w.write("\r\n");
-        w.write("\r\n");
         w.write(body);
         w.flush();
     }
@@ -99,6 +98,7 @@ public class Message extends JSReflection {
         try {
             this.arrival = new Date();
             this.headers = new CaseInsensitiveHash();
+            Vec envelopeToHeader = new Vec();
             String key = null;
             StringBuffer all = new StringBuffer();
             Date date = null;
@@ -123,14 +123,20 @@ public class Message extends JSReflection {
                 if (key.startsWith("Resent-")) {
                     if (key.startsWith("Resent-From")) resent.addElement(new Hashtable());
                     ((Hashtable)resent.lastElement()).put(key.substring(7), val);
-                } else if (key.startsWith("Return-Path:")) {
+                } else if (key.startsWith("Return-Path")) {
                     rs.pushback(s); traces.addElement(new Trace(rs));
+                } else if (key.equals("X-org.ibex.mail.headers.envelopeFrom")) {
+                    if (envelopeFrom == null) envelopeFrom = new Address(val);
+                } else if (key.equals("X-org.ibex.mail.headers.envelopeTo")) {
+                    if (envelopeTo == null) envelopeToHeader.addElement(new Address(val));
                 } else {
                     // just append it to the previous one; valid for Comments/Keywords
                     if (headers.get(key) != null) val = headers.get(key) + " " + val;
                     ((CaseInsensitiveHash)headers).add(key, val);
                 }            
             }
+            if (envelopeTo == null) envelopeTo = new Address[envelopeToHeader.size()];
+            envelopeToHeader.copyInto(envelopeTo);
 
             // FIXME what if all are null?
             this.to           = headers.get("To") == null   ? envelopeTo[0] : new Address((String)headers.get("To"));
@@ -138,7 +144,7 @@ public class Message extends JSReflection {
             this.envelopeFrom = envelopeFrom == null        ? this.from                 : envelopeFrom;
             this.envelopeTo   = envelopeTo == null          ? new Address[] { this.to } : envelopeTo;
 
-            this.date      = (Date)headers.get("Date");
+            this.date      = new Date(); // FIXME (Date)headers.get("Date");
             this.replyto   = headers.get("Reply-To") == null ? null : new Address((String)headers.get("Reply-To"));
             this.subject   = (String)headers.get("Subject");
             this.messageid = (String)headers.get("Message-Id");

diff --git a/src/org/ibex/mail/protocol/IMAP.java b/src/org/ibex/mail/protocol/IMAP.java
index bb7fc67..d98572e 100644 (file)
--- a/src/org/ibex/mail/protocol/IMAP.java
+++ b/src/org/ibex/mail/protocol/IMAP.java
@@ -160,7 +160,8 @@ public class IMAP extends MessageProtocol {
             Token[] tl = null;
             int start = -1, end = -1;
             boolean peek = false, fast = false, all = false, full = false;
-            if (t.type == Token.LIST) tl = t.l();
+            if (t == null) { tl = new Token[] { new Token("BODY", false) }; }
+            else if (t.type == Token.LIST) tl = t.l();
             else if (t.atom().equals("FULL")) full = true;
             else if (t.atom().equals("ALL")) all = true;
             else if (t.atom().equals("FAST")) fast = true;