fixed a NPE
This commit is contained in:
parent
90effab182
commit
d750fc7180
|
@ -42,12 +42,12 @@ public class MailDispatcher {
|
||||||
}
|
}
|
||||||
|
|
||||||
public void configure(final SystemConfiguration conf) {
|
public void configure(final SystemConfiguration conf) {
|
||||||
this.enabled = conf.getSmtpEnabled();
|
enabled = conf.getSmtpEnabled();
|
||||||
this.fromMail = conf.getSmtpFromMail();
|
fromMail = conf.getSmtpFromMail();
|
||||||
this.fromName = conf.getSmtpFromName();
|
fromName = conf.getSmtpFromName();
|
||||||
this.toMailAdmin = conf.getSmtpToMailAdmin();
|
toMailAdmin = conf.getSmtpToMailAdmin();
|
||||||
this.newUserMessage = conf.getSmtpNewUserMessage();
|
newUserMessage = conf.getSmtpNewUserMessage();
|
||||||
this.updateUserMessage = conf.getSmtpUpdateUserMessage();
|
updateUserMessage = conf.getSmtpUpdateUserMessage();
|
||||||
|
|
||||||
if (StringUtils.isNotBlank(conf.getSmtpHost())) {
|
if (StringUtils.isNotBlank(conf.getSmtpHost())) {
|
||||||
emailFactory.setSmtpHost(conf.getSmtpHost());
|
emailFactory.setSmtpHost(conf.getSmtpHost());
|
||||||
|
@ -70,7 +70,7 @@ public class MailDispatcher {
|
||||||
|
|
||||||
public void sendRequestRegistrationMail(final UserView user) {
|
public void sendRequestRegistrationMail(final UserView user) {
|
||||||
if (StringUtils.isNotBlank(newUserMessage)) {
|
if (StringUtils.isNotBlank(newUserMessage)) {
|
||||||
final String message = prepareMessage(this.newUserMessage, user);
|
final String message = prepareMessage(newUserMessage, user);
|
||||||
|
|
||||||
for (final String to : StringUtils.split(toMailAdmin, ",")) {
|
for (final String to : StringUtils.split(toMailAdmin, ",")) {
|
||||||
sendMail("OpenOrgs: new registration request", message, to.trim());
|
sendMail("OpenOrgs: new registration request", message, to.trim());
|
||||||
|
@ -82,7 +82,7 @@ public class MailDispatcher {
|
||||||
|
|
||||||
public void sendUpdatedUserMail(final UserView user) {
|
public void sendUpdatedUserMail(final UserView user) {
|
||||||
if (StringUtils.isNotBlank(updateUserMessage)) {
|
if (StringUtils.isNotBlank(updateUserMessage)) {
|
||||||
final String message = prepareMessage(this.updateUserMessage, user);
|
final String message = prepareMessage(updateUserMessage, user);
|
||||||
sendMail("OpenOrgs: user updated", message, user.getEmail());
|
sendMail("OpenOrgs: user updated", message, user.getEmail());
|
||||||
} else {
|
} else {
|
||||||
log.warn("Template is empty (updateUserMessage)");
|
log.warn("Template is empty (updateUserMessage)");
|
||||||
|
@ -92,13 +92,13 @@ public class MailDispatcher {
|
||||||
private String prepareMessage(final String template, final UserView user) {
|
private String prepareMessage(final String template, final UserView user) {
|
||||||
final String countries = user.getRole().equals(UserRole.ADMIN.toString()) ? "All" : StringUtils.join(user.getCountries(), ", ");
|
final String countries = user.getRole().equals(UserRole.ADMIN.toString()) ? "All" : StringUtils.join(user.getCountries(), ", ");
|
||||||
|
|
||||||
return template.replaceAll(":email:", user.getEmail())
|
return template.replaceAll(":email:", "" + user.getEmail())
|
||||||
.replaceAll(":fullname:", user.getFullname())
|
.replaceAll(":fullname:", "" + user.getFullname())
|
||||||
.replaceAll(":organization:", user.getOrganization())
|
.replaceAll(":organization:", "" + user.getOrganization())
|
||||||
.replaceAll(":refperson:", user.getReferencePerson())
|
.replaceAll(":refperson:", "" + user.getReferencePerson())
|
||||||
.replaceAll(":reqmessage:", user.getRequestMessage())
|
.replaceAll(":reqmessage:", "" + user.getRequestMessage())
|
||||||
.replaceAll(":role:", user.getRole())
|
.replaceAll(":role:", "" + user.getRole())
|
||||||
.replaceAll(":countries:", countries);
|
.replaceAll(":countries:", countries);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue