From 7bfbf0b8c030606959f02d67f4f8ba7b091028c5 Mon Sep 17 00:00:00 2001 From: Peter Hormanns Date: Fri, 6 Mar 2020 19:46:48 +0100 Subject: [PATCH] fix external address password reset --- .../de/jalin/ldapadmin/web/ResetPasswordServlet.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/de/jalin/ldapadmin/web/ResetPasswordServlet.java b/src/main/java/de/jalin/ldapadmin/web/ResetPasswordServlet.java index fdd8f20..07d8668 100644 --- a/src/main/java/de/jalin/ldapadmin/web/ResetPasswordServlet.java +++ b/src/main/java/de/jalin/ldapadmin/web/ResetPasswordServlet.java @@ -128,7 +128,10 @@ public class ResetPasswordServlet extends AbstractLDAPServlet { for (User usr : allUsers) { if (usr.getEmailInternal() != null && usr.getEmailInternal().equalsIgnoreCase(loginOrEMail)) { login = usr.getLogin(); - email = usr.getEmailInternal(); + email = usr.getEmailExternal(); + if (email == null || email.isEmpty()) { + email = usr.getEmailInternal(); + } salutation = usr.getFirstname() + " " + usr.getLastname(); } } @@ -136,7 +139,10 @@ public class ResetPasswordServlet extends AbstractLDAPServlet { final User usr = usrDAO.read("uid=" + loginOrEMail + ",ou=users,"); if (usr != null) { login = usr.getLogin(); - email = usr.getEmailInternal(); + email = usr.getEmailExternal(); + if (email == null || email.isEmpty()) { + email = usr.getEmailInternal(); + } salutation = usr.getFirstname() + " " + usr.getLastname(); } }