8,6 → 8,7 |
import pt.estgp.estgweb.services.expceptions.ServiceException; |
import pt.estgp.estgweb.utils.ConfigProperties; |
import pt.estgp.estgweb.utils.Email; |
import pt.estgp.estgweb.utils.EmailPersonalizedCertificated; |
import pt.estgp.estgweb.web.utils.DatesUtils; |
import pt.utl.ist.berserk.logic.serviceManager.IService; |
|
49,8 → 50,14 |
} |
return serverEmails[serverEmailPos]; |
} |
|
|
public void sendEmail(Email email) throws ServiceException |
{ |
sendEmail(email,null,null); |
} |
public void sendEmail(Email email,String url,String nome) throws ServiceException |
{ |
if(Globals.TEST_ENVIRONEMENT && !email.isSystemAssumingTestEmail()) |
{ |
String warn = "System in TEST Environement - will not send EMAIL"; |
114,17 → 121,37 |
if(Email.validEmail(recipient)) |
{ |
valid=true; |
message.addRecipient(email.getType(),new InternetAddress(recipient)); |
message.addRecipient(Message.RecipientType.TO,new InternetAddress(recipient)); |
logger.info("Adding recipient (" + email.getType().toString() + ") to transport:"+recipient); |
} |
} |
|
if(email.getRecipientsCC() != null) |
{ |
for (String recipient : email.getRecipientsCC()) |
{ |
if(Email.validEmail(recipient)) |
{ |
//valid=true; |
message.addRecipient(Message.RecipientType.CC,new InternetAddress(recipient)); |
logger.info("Adding recipient CC (" + email.getType().toString() + ") to transport:"+recipient); |
} |
} |
} |
if(valid) |
{ |
|
String fullMessage = getEmailTextMessage(email); |
|
if(url != null && nome != null) |
{ |
logger.info("Requesting certificated Email, will replace fields in template"); |
fullMessage = fullMessage.replaceAll("@USER_NOME@",nome); |
fullMessage = fullMessage.replaceAll("@URL@",url); |
} |
|
|
|
logger.info("FROM:" + email.getFrom() + " but using: " + sendFromAddress); |
//if(email.getFromName() != null) |
try { |
309,7 → 336,8 |
// # 0 : From |
// # 1 : Subject |
// # 2 : Text |
// # 2 : FromEmail Adultered in message |
// # 3 : FromEmail Adultered in message |
// # 4 : URL todo with certificate |
List<String> arguments = new ArrayList<String>(); |
arguments.add(from); |
arguments.add(subject); |
342,13 → 370,56 |
logger.info(rec); |
logger.info("arguments end"); |
fromEmail = fromEmail == null ? user.getEmail() : fromEmail; |
Email email = new Email(subject ,recipients,fromEmail,template,arguments,Message.RecipientType.BCC); |
Email email = new Email(subject ,recipients,fromEmail,template,arguments,Message.RecipientType.TO); |
email.setFromName(from + " (PAE-IPP)"); |
return email; |
} |
|
public EmailPersonalizedCertificated getMessageEmailAdulteredFromEmailIppCertificated( |
String fromEmail, String from, String subject,String text, User user, |
List<Long> userIds, |
String url |
) |
{ |
// # 0 : From |
// # 1 : Subject |
// # 2 : Text |
// # 3 : FromEmail Adultered in message |
// # 4 : URL todo with certificate |
List<String> arguments = new ArrayList<String>(); |
arguments.add(from); |
arguments.add(subject); |
arguments.add(text); |
arguments.add(fromEmail); |
|
String template; |
|
template = Globals.EMAIL_MESSAGE_IPP_TEMPLATE_PT_CERTIFICATED; |
|
|
logger.info("Preparing batch work for Personalized Emails Certificated"); |
logger.info("subject: " + subject); |
if(fromEmail == null) |
logger.info("user: " + user.getEmail()); |
else |
logger.info("user altered to: " + fromEmail); |
logger.info("template: " + template); |
logger.info("arguments:"); |
for(String arg: arguments) |
logger.info(arg); |
logger.info("userIds:" + userIds); |
logger.info("arguments end"); |
fromEmail = fromEmail == null ? user.getEmail() : fromEmail; |
EmailPersonalizedCertificated email = new EmailPersonalizedCertificated(subject ,fromEmail,template,arguments, |
url, |
userIds); |
email.setFromName(from + " (PAE-IPP)"); |
|
return email; |
} |
|
|
|
public Email getMessageEmailOld(String from, String subject,String text, LangEnum langEnum, String target, List<User> users, User user) |
{ |
// # 0 : From |