diff --git a/src/main/java/no/nibio/vips/logic/controller/session/UserBean.java b/src/main/java/no/nibio/vips/logic/controller/session/UserBean.java index a35d00bc6f2f2ba236f611019ff7b172875dab30..2697e8763091efa29302ba70f3d3fd3494df106f 100755 --- a/src/main/java/no/nibio/vips/logic/controller/session/UserBean.java +++ b/src/main/java/no/nibio/vips/logic/controller/session/UserBean.java @@ -642,20 +642,20 @@ public class UserBean { */ public void informAdminOfConfirmedEmail(VipsLogicUser confirmUser, ResourceBundle i18nBundle, String serverName ) { List<VipsLogicUser> organizationAdmins = this.findOrganizationUsersByRole(confirmUser.getOrganizationId(), Globals.ROLE_ORGANIZATION_ADMINISTRATOR); + String subject = i18nBundle.getString("informAdminOfConfirmedEmailSubject"); + String body = MessageFormat.format(i18nBundle.getString("informAdminOfConfirmedEmailBody"), + confirmUser.getLastName(), + confirmUser.getApprovalApplication(), + Globals.PROTOCOL + "://" + serverName + "/user?action=viewUser&userId=" + confirmUser.getUserId(), + Globals.PROTOCOL + "://" + serverName + "/user?action=approveUser&userId=" + confirmUser.getUserId() + ); + + //System.out.println(body); + // Send email + String smtpServer = System.getProperty("no.nibio.vips.logic.SMTP_SERVER"); + SimpleMailSender mailSender = new SimpleMailSender(smtpServer); for(VipsLogicUser organizationAdmin: organizationAdmins) { - String subject = i18nBundle.getString("informAdminOfConfirmedEmailSubject"); - String body = MessageFormat.format(i18nBundle.getString("informAdminOfConfirmedEmailBody"), - confirmUser.getLastName(), - confirmUser.getApprovalApplication(), - Globals.PROTOCOL + "://" + serverName + "/user?action=viewUser&userId=" + confirmUser.getUserId(), - Globals.PROTOCOL + "://" + serverName + "/user?action=approveUser&userId=" + confirmUser.getUserId() - ); - - //System.out.println(body); - // Send email - String smtpServer = System.getProperty("no.nibio.vips.logic.SMTP_SERVER"); - SimpleMailSender mailSender = new SimpleMailSender(smtpServer); mailSender.sendMail("noreply@" + serverName, organizationAdmin.getEmail(), subject, body); } }