From f42160fec48c37d5f8a2aa804470a445ed2f0e4d Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Fri, 4 Jul 2014 12:15:23 +0200
Subject: [PATCH] OO-1114: write url for http and https
---
.../admin/user/bulkChange/UserBulkChangeManager.java | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/olat/admin/user/bulkChange/UserBulkChangeManager.java b/src/main/java/org/olat/admin/user/bulkChange/UserBulkChangeManager.java
index 87186658f26..1f17324854a 100644
--- a/src/main/java/org/olat/admin/user/bulkChange/UserBulkChangeManager.java
+++ b/src/main/java/org/olat/admin/user/bulkChange/UserBulkChangeManager.java
@@ -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
WebappHelper.getMailConfig("mailSupport"), //3: configured support email address
identity.getUser().getProperty(UserConstants.LASTNAME, null), //4 last name
- Settings.getSecureServerContextPathURI(), //5 url system
+ getServerURI(), //5 url system
gender //6 Mr. Mrs.
};
@@ -301,6 +301,14 @@ public class UserBulkChangeManager extends BasicManager {
translator.translate("mailtemplate.login.denied.body", args));
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) {
StringWriter evaluatedUserValue = new StringWriter();
--
GitLab