mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-24 17:32:48 +00:00
Heinous merge from HEAD. Seems to basically work. Be on guard however.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4137 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -109,6 +109,11 @@ public class MailActionExecuter extends ActionExecuterAbstractBase
|
||||
*/
|
||||
private ServiceRegistry serviceRegistry;
|
||||
|
||||
/**
|
||||
* Mail header encoding scheme
|
||||
*/
|
||||
private String headerEncoding = null;
|
||||
|
||||
/**
|
||||
* @param javaMailSender the java mail sender
|
||||
*/
|
||||
@@ -164,6 +169,14 @@ public class MailActionExecuter extends ActionExecuterAbstractBase
|
||||
{
|
||||
this.nodeService = nodeService;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param headerEncoding The mail header encoding to set.
|
||||
*/
|
||||
public void setHeaderEncoding(String headerEncoding)
|
||||
{
|
||||
this.headerEncoding = headerEncoding;
|
||||
}
|
||||
|
||||
/**
|
||||
* Execute the rule action
|
||||
@@ -180,6 +193,12 @@ public class MailActionExecuter extends ActionExecuterAbstractBase
|
||||
{
|
||||
MimeMessageHelper message = new MimeMessageHelper(mimeMessage);
|
||||
|
||||
// set header encoding if one has been supplied
|
||||
if (headerEncoding != null && headerEncoding.length() != 0)
|
||||
{
|
||||
mimeMessage.setHeader("Content-Transfer-Encoding", headerEncoding);
|
||||
}
|
||||
|
||||
// set recipient
|
||||
String to = (String)ruleAction.getParameterValue(PARAM_TO);
|
||||
if (to != null && to.length() != 0)
|
||||
|
Reference in New Issue
Block a user