package org.ibex.mail;
import org.ibex.js.*;
import org.ibex.io.*;
+import org.ibex.io.Fountain;
import org.ibex.util.*;
import org.ibex.mail.filter.*;
import org.ibex.mail.target.*;
if (envelopeTo == null) envelopeTo = to;
if (envelopeFrom == null) envelopeFrom = from;
Message message =
- Message.newMessage(new org.ibex.io.Fountain.StringFountain(headers.toString() + "\r\n" + body),
+ Message.newMessage(Fountain.Util.concat(Fountain.Util.create(headers.toString()),
+ Fountain.Util.create("\r\n"),
+ Fountain.Util.create(body)),
envelopeFrom,
envelopeTo
);
if (attempt) {
org.ibex.mail.SMTP.Outgoing.attempt(message);
} else {
- org.ibex.mail.SMTP.Outgoing.accept(message);
+ org.ibex.mail.SMTP.Outgoing.enqueue(message);
}
ok = true;
} catch (Exception ex) {
public void accept(Message m) throws MailException {
try {
Message m2 = m.bounce(JSU.toString(a));
- org.ibex.mail.SMTP.Outgoing.accept(m2);
+ org.ibex.mail.SMTP.Outgoing.enqueue(m2);
Log.error(this, "BOUNCING! " + m2.summary());
} catch (Exception e) {
Log.warn(this, e);
}
if (name.equals("mail.forward2") || name.equals("forward2")) {
try {
- Message m2 = Message.newMessage(new org.ibex.io.Fountain.StringFountain(m.toString()),
+ Message m2 = Message.newMessage(m,
m.envelopeFrom,
new Address(JSU.toString(a)));
- org.ibex.mail.SMTP.Outgoing.accept(m2);
+ org.ibex.mail.SMTP.Outgoing.enqueue(m2);
} catch (Exception e) {
Log.warn(this, e);
throw new JSExn(e.toString());