antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 7 Projects Releases 5 Activity Actions

addPart() now takes just one part at a time, but accepts the

Browse source 
file name to use for the part as second argument.

Also, it accepts instances of helma.util.MimePart, which are used
in HTTP file uploads and teh global getURL() function.

setText() now plays together nicely with addPart(). If both
plain text and MIME parts are set for a message, the
text will be added as plain text at the beginning of the message.
This commit is contained in:
hns 2002-06-11 16:30:43 +00:00
parent e857528208
commit 89c232a6f9
1 changed files with 42 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
src/helma/scripting/fesi/extensions/ESMail.java
View file

@ -4,8 +4,17 @@
package helma.scripting.fesi.extensions; package helma.scripting.fesi.extensions;
import javax.mail.*; import javax.mail.Session;
import javax.mail.internet.*; import javax.mail.Multipart;
import javax.mail.Address;
import javax.mail.Transport;
import javax.mail.Message;
import javax.mail.internet.MimeMessage;
import javax.mail.internet.MimeUtility;
import javax.mail.internet.MimeMultipart;
import javax.mail.internet.MimeBodyPart;
import javax.mail.internet.InternetAddress;
import javax.mail.internet.AddressException;
import javax.activation.*; import javax.activation.*;
import java.io.*; import java.io.*;
import java.util.*; import java.util.*;
@ -86,21 +95,29 @@ public class ESMail extends ESObject implements Serializable {
} }
public void addPart (ESValue val[]) throws Exception { public void addPart (ESValue val[]) throws Exception {
if (val == null || val.length == 0) return; if (val == null || val.length == 0 || val.length > 2)
throw new IOException ("mail.addPart called with wrong number of arguments.");
if (multipart == null) { if (multipart == null) {
multipart = new MimeMultipart (); multipart = new MimeMultipart ();
} }
for (int i=0; i<val.length; i++) { MimeBodyPart part = new MimeBodyPart ();
MimeBodyPart part = new MimeBodyPart (); Object obj = val[0].toJavaObject ();
Object obj = val[i].toJavaObject (); if (obj instanceof String) {
if (obj instanceof String) { part.setContent (obj.toString (), "text/plain");
part.setContent (obj.toString (), "text/plain"); } else if (obj instanceof File) {
} else if (obj instanceof File) { FileDataSource source = new FileDataSource ((File) obj);
FileDataSource source = new FileDataSource ((File) obj); part.setDataHandler (new DataHandler (source));
part.setDataHandler (new DataHandler (source)); } else if (obj instanceof MimePart) {
} MimePartDataSource source = new MimePartDataSource ((MimePart) obj);
multipart.addBodyPart (part); part.setDataHandler (new DataHandler (source));
} }
// check if an explicit file name was given for this part
if (val.length == 2) try {
part.setFileName (val[1].toString());
} catch (Exception x) {
// FIXME: error setting file name ... should we ignore this or throw an exception?
}
multipart.addBodyPart (part);
} }
public void setSubject (ESValue val) throws Exception { public void setSubject (ESValue val) throws Exception {
@ -167,9 +184,18 @@ public class ESMail extends ESObject implements Serializable {
} }
public void send () throws Exception { public void send () throws Exception {
if (buffer != null) if (buffer != null) {
message.setText (buffer.toString ()); // if we also have a multipart body, add
else if (multipart != null) // plain string as first part to it.
if (multipart != null) {
MimeBodyPart part = new MimeBodyPart ();
part.setContent (buffer.toString (), "text/plain");
multipart.addBodyPart (part, 0);
message.setContent (multipart);
} else {
message.setText (buffer.toString ());
}
} else if (multipart != null)
message.setContent (multipart); message.setContent (multipart);
else else
message.setText (""); message.setText ("");