diff options
Diffstat (limited to 'id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java')
| -rw-r--r-- | id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java index 8d20fe118..f160e3e51 100644 --- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java +++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java @@ -105,7 +105,8 @@ ServletResponseAware { else { UserDatabase userdb = ConfigurationDBRead.getUserWithID(authUser.getUserID()); - if (!userdb.isIsMailAddressVerified() && !authUser.isAdmin()) { + if (!authUser.isAdmin() && userdb.isIsMailAddressVerified() != null + && !userdb.isIsMailAddressVerified()) { log.info("Online-Applikation managemant disabled. Mail address is not verified."); addActionError(LanguageHelper.getErrorString("error.editoa.mailverification")); } @@ -162,7 +163,8 @@ ServletResponseAware { authUser = (AuthenticatedUser) authUserObj; UserDatabase userdb = ConfigurationDBRead.getUserWithID(authUser.getUserID()); - if (!userdb.isIsMailAddressVerified() && !authUser.isAdmin()) { + if (!authUser.isAdmin() && userdb.isIsMailAddressVerified() != null + && !userdb.isIsMailAddressVerified()) { log.info("Online-Applikation managemant disabled. Mail address is not verified."); addActionError(LanguageHelper.getErrorString("error.editoa.mailverification")); } @@ -316,17 +318,19 @@ ServletResponseAware { onlineapplication.setIsAdminRequired(false); - UserDatabase user = ConfigurationDBRead.getUsersWithOADBID(onlineapplication.getHjid()); - if (user != null) { + if (onlineapplication.getHjid() != null) + userdb = ConfigurationDBRead.getUsersWithOADBID(onlineapplication.getHjid()); + + if (userdb != null && !authUser.isAdmin()) { try { MailHelper.sendUserOnlineApplicationActivationMail( - user.getGivenname(), - user.getFamilyname(), - user.getInstitut(), + userdb.getGivenname(), + userdb.getFamilyname(), + userdb.getInstitut(), onlineapplication.getPublicURLPrefix(), - user.getMail()); + userdb.getMail()); } catch (ConfigurationException e) { - log.warn("Sending Mail to User " + user.getMail() + " failed", e); + log.warn("Sending Mail to User " + userdb.getMail() + " failed", e); } } |