1 files changed, 48 insertions, 13 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/LoginFormBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/LoginFormBuilder.java
index 5f100d5fe..9ba11bebd 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/LoginFormBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/LoginFormBuilder.java
@@ -1,17 +1,26 @@
 package at.gv.egovernment.moa.id.auth.builder;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.InputStream;
 import java.io.StringWriter;
+import java.net.URI;
 
 import org.apache.commons.io.IOUtils;
 
 import at.gv.egovernment.moa.id.auth.servlet.GenerateIFrameTemplateServlet;
 import at.gv.egovernment.moa.id.config.OAParameter;
+import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider;
 import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
 import at.gv.egovernment.moa.id.protocols.saml1.SAML1Protocol;
 import at.gv.egovernment.moa.logging.Logger;
 
 public class LoginFormBuilder {
+
+	private static final String HTMLTEMPLATESDIR = "htmlTemplates/";
+	private static final String HTMLTEMPLATEFULL = "loginFormFull.html";
+	private static final String HTMLTEMPLATEIFRAME = "loginFormIFrame.html";
 	
 	private static String AUTH_URL = "#AUTH_URL#";
 	private static String MODUL = "#MODUL#";
@@ -24,16 +33,41 @@ public class LoginFormBuilder {
 	
 	private static String SERVLET = CONTEXTPATH+"/GenerateIframeTemplate";
 	
-	private static String template;
-
-	private static String getTemplate() {
+	private static String getTemplate(boolean isIFrame) {
 
-		if (template == null) {
+			String template = null; 
+		
 			try {
-				String classpathLocation = "resources/templates/loginForm.html";
-				InputStream input = Thread.currentThread()
-						.getContextClassLoader()
-						.getResourceAsStream(classpathLocation);
+				String pathLocation;
+				
+				InputStream input;
+				
+				String rootconfigdir = AuthConfigurationProvider.getInstance().getRootConfigFileDir();
+			
+				if (isIFrame)
+					pathLocation = rootconfigdir + HTMLTEMPLATESDIR + HTMLTEMPLATEIFRAME;
+				else
+					pathLocation = rootconfigdir + HTMLTEMPLATESDIR + HTMLTEMPLATEFULL;
+				
+				try {
+					File file = new File(new URI(pathLocation));
+					input = new  FileInputStream(file);
+					
+				} catch (FileNotFoundException e)  {
+					
+					Logger.warn("No LoginFormTempaltes found. Use Generic Templates from package.");
+					
+					if (isIFrame)
+						pathLocation = "resources/templates/" + HTMLTEMPLATEIFRAME;
+					else
+						pathLocation = "resources/templates/" + HTMLTEMPLATEFULL;
+					
+					input = Thread.currentThread()
+							.getContextClassLoader()
+							.getResourceAsStream(pathLocation);
+					
+				}
+			
 				StringWriter writer = new StringWriter();
 				IOUtils.copy(input, writer);
 				template = writer.toString();
@@ -41,16 +75,17 @@ public class LoginFormBuilder {
 				template = template.replace(BKU_ONLINE, OAAuthParameter.ONLINEBKU);
 				template = template.replace(BKU_HANDY, OAAuthParameter.HANDYBKU);
 				template = template.replace(BKU_LOCAL, OAAuthParameter.LOCALBKU);
+				
+				input.close();
+				
 			} catch (Exception e) {
 				Logger.error("Failed to read template", e);
 			}
-		}
-		
-		return template;
+			return template;
 	}
 
-	public static String buildLoginForm(String modul, String action, String oaname, String contextpath) {
-		String value = getTemplate();
+	public static String buildLoginForm(String modul, String action, String oaname, String contextpath, boolean isIFrame) {
+		String value = getTemplate(isIFrame);
 		
 		if(value != null) {
 			if(modul == null) {