fix wrong placeholder in default GUI templates

2 files changed, 7 insertions, 7 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java
index 73d682c21..a97486097 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java
@@ -554,8 +554,7 @@ public class AuthenticationManager extends MOAIDAuthConstants {
 		        context.put("redirectURLs", sloReqList);
 		        context.put("timeoutURL", timeOutURL);
 		        context.put("timeout", SLOTIMEOUT);
-		        context.put(SSOManager.CONTEXTPATH, authURL);
-		        ssoManager.printSingleLogOutInfo(context, httpResp);
+		        ssoManager.printSingleLogOutInfo(context, httpResp, authURL);
 				
 								
 			} else {
@@ -575,7 +574,7 @@ public class AuthenticationManager extends MOAIDAuthConstants {
 			        else
 			        	context.put("errorMsg", 
 			        			MOAIDMessageProvider.getInstance().getMessage("slo.01", null));
-			        ssoManager.printSingleLogOutInfo(context, httpResp);
+			        ssoManager.printSingleLogOutInfo(context, httpResp, authURL);
 										
 				}
 									
@@ -593,7 +592,7 @@ public class AuthenticationManager extends MOAIDAuthConstants {
 		        VelocityContext context = new VelocityContext();
 	        	context.put("errorMsg", 
 	        			MOAIDMessageProvider.getInstance().getMessage("slo.01", null));
-		        ssoManager.printSingleLogOutInfo(context, httpResp);
+		        ssoManager.printSingleLogOutInfo(context, httpResp, authURL);
 									
 			}
 			
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/SSOManager.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/SSOManager.java
index 856410d7b..3b7c99d5a 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/SSOManager.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/SSOManager.java
@@ -64,7 +64,7 @@ import at.gv.egovernment.moa.util.MiscUtil;
 public class SSOManager {	
 	private static final String HTMLTEMPLATESDIR = "htmlTemplates/";
 	private static final String HTMLTEMPLATEFULL = "slo_template.html";
-	public static String CONTEXTPATH = "#CONTEXTPATH#";
+	public static String CONTEXTPATH = "contextPath";
 	
 	private static final String SSOCOOKIE = "MOA_ID_SSO";
 	private static final String SSOINTERFEDERATION = "MOA_INTERFEDERATION_SSO";
@@ -313,9 +313,10 @@ public class SSOManager {
 		
 	}
 	
-	public void printSingleLogOutInfo(VelocityContext context, HttpServletResponse httpResp) throws MOAIDException {		
+	public void printSingleLogOutInfo(VelocityContext context, HttpServletResponse httpResp, String authURL) throws MOAIDException {		
 		try {			
 			Logger.trace("Initialize VelocityEngine...");
+			context.put(CONTEXTPATH, authURL);
 			
 			InputStream is = null;
 			String pathLocation = null;
@@ -362,7 +363,7 @@ public class SSOManager {
 		BufferedReader reader = new BufferedReader(new InputStreamReader(is ));
 		
 		//set default elements to velocity context
-		context.put("contextpath", authConfig.getPublicURLPrefix());
+		//context.put(CONTEXTPATH, authConfig.getPublicURLPrefix());
 		
 		StringWriter writer = new StringWriter();			
 		//velocityEngine.evaluate(context, writer, "SLO_Template", reader);