Skip to content
Snippets Groups Projects
Commit f42160fe authored by srosse's avatar srosse
Browse files

OO-1114: write url for http and https

parent 133b9593
No related branches found
No related tags found
No related merge requests found
...@@ -291,7 +291,7 @@ public class UserBulkChangeManager extends BasicManager { ...@@ -291,7 +291,7 @@ public class UserBulkChangeManager extends BasicManager {
UserManager.getInstance().getUserDisplayName(identity.getUser()),// 2: Name (first and last name) of user who changed the password UserManager.getInstance().getUserDisplayName(identity.getUser()),// 2: Name (first and last name) of user who changed the password
WebappHelper.getMailConfig("mailSupport"), //3: configured support email address WebappHelper.getMailConfig("mailSupport"), //3: configured support email address
identity.getUser().getProperty(UserConstants.LASTNAME, null), //4 last name identity.getUser().getProperty(UserConstants.LASTNAME, null), //4 last name
Settings.getSecureServerContextPathURI(), //5 url system getServerURI(), //5 url system
gender //6 Mr. Mrs. gender //6 Mr. Mrs.
}; };
...@@ -301,6 +301,14 @@ public class UserBulkChangeManager extends BasicManager { ...@@ -301,6 +301,14 @@ public class UserBulkChangeManager extends BasicManager {
translator.translate("mailtemplate.login.denied.body", args)); translator.translate("mailtemplate.login.denied.body", args));
CoreSpringFactory.getImpl(MailManager.class).sendExternMessage(bundle, null); CoreSpringFactory.getImpl(MailManager.class).sendExternMessage(bundle, null);
} }
private String getServerURI() {
String uri = Settings.getSecureServerContextPathURI();
if(StringHelper.containsNonWhitespace(uri)) {
return uri;
}
return Settings.getInsecureServerContextPathURI();
}
public String evaluateValueWithUserContext(String valToEval, Context vcContext) { public String evaluateValueWithUserContext(String valToEval, Context vcContext) {
StringWriter evaluatedUserValue = new StringWriter(); StringWriter evaluatedUserValue = new StringWriter();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment