total overhaul; were using MIME and MIME.Part now

[org.ibex.mail.git] / src / org / ibex / mail / target / Script.java

diff --git a/src/org/ibex/mail/target/Script.java b/src/org/ibex/mail/target/Script.java
index f5e7840..42b878b 100644 (file)
--- a/src/org/ibex/mail/target/Script.java
+++ b/src/org/ibex/mail/target/Script.java
@@ -124,7 +124,8 @@ public class Script extends Target {
                         if (key.equals("body")) body = val;
                         else headers.append(key + ": " + val + "\r\n");
                     }
-                    Message message = new Message(null, null, new org.ibex.io.Stream(headers.toString() + "\r\n" + body));
+                    Message message = new Message(new org.ibex.io.Stream(headers.toString() + "\r\n" + body),
+                                                  new Message.Envelope(null, null, new Date()));
                     //org.ibex.mail.protocol.SMTP.Outgoing.accept(message);
                     boolean ok = org.ibex.mail.protocol.SMTP.Outgoing.attempt(message);
                     if (!ok) throw new JSExn("SMTP server rejected message");
@@ -133,9 +134,10 @@ public class Script extends Target {
                 if (name.equals("mail.forward")) { return new Target() {
                         public void accept(Message m) throws MailException {
                             try {
-                                Message m2 = new Message(m.envelopeFrom,
-                                                         new Address(a.toString()),
-                                                         new org.ibex.io.Stream(m.toString()));
+                                Message m2 = new Message(new org.ibex.io.Stream(m.toString()),
+                                                         new Message.Envelope(m.envelope.from,
+                                                                              new Address(a.toString()),
+                                                                              new Date()));
                                 org.ibex.mail.protocol.SMTP.Outgoing.accept(m2);
                             } catch (Exception e) {
                                 throw new MailException(e.toString());