midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-2104 restrict sending EMails to one single to address

This commit is contained in:
Carlos Ruiz 2014-07-28 14:52:09 +02:00
parent 7d028de0a3
commit bbd6556f45
2 changed files with 45 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
org.adempiere.base/src/org/compiere/model/MSysConfig.java
View File

@ -42,9 +42,9 @@ public class MSysConfig extends X_AD_SysConfig
/** /**
* *
*/ */
private static final long serialVersionUID = -4635791167798916808L; private static final long serialVersionUID = 8682693142401650434L;
public static final String ADDRESS_SAVE_REQUEST_RESPONSE_LOG = "ADDRESS_SAVE_REQUEST_RESPONSE_LOG"; public static final String ADDRESS_SAVE_REQUEST_RESPONSE_LOG = "ADDRESS_SAVE_REQUEST_RESPONSE_LOG";
public static final String ADDRESS_VALIDATION = "ADDRESS_VALIDATION"; public static final String ADDRESS_VALIDATION = "ADDRESS_VALIDATION";
public static final String ALERT_SEND_ATTACHMENT_AS_XLS = "ALERT_SEND_ATTACHMENT_AS_XLS"; public static final String ALERT_SEND_ATTACHMENT_AS_XLS = "ALERT_SEND_ATTACHMENT_AS_XLS";
public static final String ALLOW_APPLY_PAYMENT_TO_CREDITMEMO = "ALLOW_APPLY_PAYMENT_TO_CREDITMEMO"; public static final String ALLOW_APPLY_PAYMENT_TO_CREDITMEMO = "ALLOW_APPLY_PAYMENT_TO_CREDITMEMO";
@ -79,6 +79,7 @@ public class MSysConfig extends X_AD_SysConfig
public static final String LOCATION_MAX_CITY_ROWS = "LOCATION_MAX_CITY_ROWS"; public static final String LOCATION_MAX_CITY_ROWS = "LOCATION_MAX_CITY_ROWS";
public static final String LOGIN_HELP_URL = "LOGIN_HELP_URL"; public static final String LOGIN_HELP_URL = "LOGIN_HELP_URL";
public static final String LOGIN_SHOW_RESETPASSWORD = "LOGIN_SHOW_RESETPASSWORD"; public static final String LOGIN_SHOW_RESETPASSWORD = "LOGIN_SHOW_RESETPASSWORD";
public static final String MAIL_DONT_SEND_TO_ADDRESS = "MAIL_DONT_SEND_TO_ADDRESS";
public static final String MAIL_SEND_BCC_TO_ADDRESS = "MAIL_SEND_BCC_TO_ADDRESS"; public static final String MAIL_SEND_BCC_TO_ADDRESS = "MAIL_SEND_BCC_TO_ADDRESS";
public static final String MAIL_SEND_BCC_TO_FROM = "MAIL_SEND_BCC_TO_FROM"; public static final String MAIL_SEND_BCC_TO_FROM = "MAIL_SEND_BCC_TO_FROM";
public static final String MAIL_SEND_CREDENTIALS = "MAIL_SEND_CREDENTIALS"; public static final String MAIL_SEND_CREDENTIALS = "MAIL_SEND_CREDENTIALS";

54
org.adempiere.base/src/org/compiere/util/EMail.java
View File

@ -155,7 +155,7 @@ public final class EMail implements Serializable
setSmtpHost(smtpHost); setSmtpHost(smtpHost);
setFrom(from); setFrom(from);
String bccAddressForAllMails = MSysConfig.getValue(MSysConfig.MAIL_SEND_BCC_TO_ADDRESS, Env.getAD_Client_ID(Env.getCtx())); String bccAddressForAllMails = MSysConfig.getValue(MSysConfig.MAIL_SEND_BCC_TO_ADDRESS, Env.getAD_Client_ID(Env.getCtx()));
if (bccAddressForAllMails != null && bccAddressForAllMails.length() > 0) if (! Util.isEmpty(bccAddressForAllMails, true))
addBcc(bccAddressForAllMails); addBcc(bccAddressForAllMails);
addTo(to); addTo(to);
m_ctx = ctx; m_ctx = ctx;
@ -291,17 +291,37 @@ public final class EMail implements Serializable
m_msg = new SMTPMessage(session); m_msg = new SMTPMessage(session);
// Addresses // Addresses
m_msg.setFrom(m_from); m_msg.setFrom(m_from);
InternetAddress[] rec = getTos();
if (rec.length == 1) // IDEMPIERE-2104 - intended for test or dev systems to not send undesired emails
m_msg.setRecipient (Message.RecipientType.TO, rec[0]); boolean isDontSendToAddress = MSysConfig.getBooleanValue(MSysConfig.MAIL_DONT_SEND_TO_ADDRESS, false, Env.getAD_Client_ID(Env.getCtx()));
else
m_msg.setRecipients (Message.RecipientType.TO, rec); if (! isDontSendToAddress) {
rec = getCcs(); InternetAddress[] rec = getTos();
if (rec != null && rec.length > 0) if (rec.length == 1)
m_msg.setRecipients (Message.RecipientType.CC, rec); m_msg.setRecipient (Message.RecipientType.TO, rec[0]);
rec = getBccs(); else
if (rec != null && rec.length > 0) m_msg.setRecipients (Message.RecipientType.TO, rec);
m_msg.setRecipients (Message.RecipientType.BCC, rec); rec = getCcs();
if (rec != null && rec.length > 0)
m_msg.setRecipients (Message.RecipientType.CC, rec);
rec = getBccs();
if (rec != null && rec.length > 0)
m_msg.setRecipients (Message.RecipientType.BCC, rec);
} else {
String bccAddressForAllMails = MSysConfig.getValue(MSysConfig.MAIL_SEND_BCC_TO_ADDRESS, Env.getAD_Client_ID(Env.getCtx()));
if (! Util.isEmpty(bccAddressForAllMails, true)) {
m_msg.setRecipient (Message.RecipientType.TO, new InternetAddress(bccAddressForAllMails, true));
}
InternetAddress[] rec = getTos();
if (rec != null && rec.length > 0)
m_msg.setHeader("OriginalTo", getCommaSeparatedString(rec));
rec = getCcs();
if (rec != null && rec.length > 0)
m_msg.setHeader("OriginalCC", getCommaSeparatedString(rec));
rec = getBccs();
if (rec != null && rec.length > 0)
m_msg.setHeader("OriginalBCC", getCommaSeparatedString(rec));
}
if (m_replyTo != null) if (m_replyTo != null)
m_msg.setReplyTo(new Address[] {m_replyTo}); m_msg.setReplyTo(new Address[] {m_replyTo});
// //
@ -436,6 +456,16 @@ public final class EMail implements Serializable
return m_sentMsg; return m_sentMsg;
} // send } // send
private String getCommaSeparatedString(InternetAddress[] recs) {
StringBuilder retValue = new StringBuilder();
for (InternetAddress rec : recs) {
if (retValue.length() > 0)
retValue.append(",");
retValue.append(rec.getAddress());
}
return retValue.toString();
}
/** /**
* Get Send Result Msg * Get Send Result Msg
* @return msg * @return msg