From 19cbabff11dd919e40eaef5e8eb50d4e35c7421f Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Fri, 8 Apr 2016 09:53:57 +0200
Subject: fix typo in redirectTarget parameter

---
 .../gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilder.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilder.java b/id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilder.java
index 18495381e..ef81af94b 100644
--- a/id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilder.java
+++ b/id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilder.java
@@ -174,7 +174,7 @@ public class GetIdentityLinkFormBuilder extends Builder {
 		htmlForm = replaceTag(htmlForm, COLOR_TAG, FormBuildUtils.getDefaultMap().get(FormBuildUtils.PARAM_MAIN_BACKGROUNDCOLOR), false, ALL);
     	
    	//set redirect target
-   	if (oaParam != null && MiscUtil.isNotEmpty(oaParam.getConfigurationValue(oaParam.getConfigurationValue(MOAIDConfigurationConstants.SERVICE_AUTH_TEMPLATES_CUSTOMIZATION_APPLETREDIRECTTARGET))))
+   	if (oaParam != null && MiscUtil.isNotEmpty(oaParam.getConfigurationValue(MOAIDConfigurationConstants.SERVICE_AUTH_TEMPLATES_CUSTOMIZATION_APPLETREDIRECTTARGET)))
    		htmlForm = replaceTag(htmlForm, REDIRECTTARGETTAG, 
    				oaParam.getConfigurationValue(MOAIDConfigurationConstants.SERVICE_AUTH_TEMPLATES_CUSTOMIZATION_APPLETREDIRECTTARGET), false, ALL);
    	else
-- 
cgit v1.2.3


From 9231c84c9a509ba75b3e92a286941cc0792982f6 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Fri, 8 Apr 2016 09:54:25 +0200
Subject: fix configurationTool BKU-selection preview problem

---
 .../configuration/struts/action/BasicOAAction.java | 34 +++++++++++++++-------
 .../htmlTemplates/loginFormFull.html               |  4 +--
 2 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/BasicOAAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/BasicOAAction.java
index c80bc1925..5bc17f1ee 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/BasicOAAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/BasicOAAction.java
@@ -29,6 +29,8 @@ import java.io.FileInputStream;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.StringWriter;
+import java.io.UnsupportedEncodingException;
+import java.net.URI;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Iterator;
@@ -84,7 +86,7 @@ public class BasicOAAction extends BasicAction {
     private boolean newOA;
     private boolean isMetaDataRefreshRequired = false;
     
-    private InputStream stream;
+    private InputStream stream = null;
     
     /**
 	 * 
@@ -587,8 +589,8 @@ public class BasicOAAction extends BasicAction {
                 ConfigurationProvider config = ConfigurationProvider.getInstance();
                 String templateURL = config.getConfigRootDir() + ConfigurationProvider.HTMLTEMPLATE_DIR
                         + ConfigurationProvider.HTMLTEMPLATE_FILE;
-
-                File file = new File(templateURL);
+                
+                File file = new File(new URI(templateURL));
                 input = new FileInputStream(file);
 
                 String contextpath = config.getMOAIDInstanceURL();
@@ -656,6 +658,15 @@ public class BasicOAAction extends BasicAction {
 
         }
 
+        if (stream == null && MiscUtil.isNotEmpty(preview)) {
+			try {
+				stream = new ByteArrayInputStream(preview.getBytes("UTF-8"));
+				
+			} catch (UnsupportedEncodingException e) {
+				e.printStackTrace();
+				
+			}
+        }
         
 
         return Constants.STRUTS_SUCCESS;
@@ -699,12 +710,13 @@ public class BasicOAAction extends BasicAction {
     public void setPvp2OA(OAPVP2Config pvp2oa) {
     	formList.put(pvp2oa.getName(), pvp2oa);
     }
-    
-    /**
-     * @return the stream
-     */
-    public InputStream getStream() {
-        return stream;
-    }
-    
+
+	/**
+	 * @return the stream
+	 */
+	public InputStream getStream() {
+		return stream;
+	}
+
+
 }
diff --git a/id/server/data/deploy/conf/moa-id-configuration/htmlTemplates/loginFormFull.html b/id/server/data/deploy/conf/moa-id-configuration/htmlTemplates/loginFormFull.html
index 02b86472b..6c70b57b3 100644
--- a/id/server/data/deploy/conf/moa-id-configuration/htmlTemplates/loginFormFull.html
+++ b/id/server/data/deploy/conf/moa-id-configuration/htmlTemplates/loginFormFull.html
@@ -37,13 +37,13 @@
 						</div>
 						<div id="bkuselectionarea">
 							<div id="bkukarte">
-								<img id="bkuimage" class="bkuimage" src="$contextPath/img/online-bku.png"
+								<img id="bkuimage" class="bkuimage" src="$contextPath/img/karte.png"
 									alt="OnlineBKU" /> <input name="bkuButtonOnline" type="button"
 									onClick="bkuOnlineClicked();" tabindex="2" role="button"
 									value="Karte" />
 							</div>
 							<div id="bkuhandy">
-								<img class="bkuimage" src="$contextPath/img/mobile-bku.png"
+								<img class="bkuimage" src="$contextPath/img/handysign.png"
 									alt="HandyBKU" /> <input name="bkuButtonHandy" type="button"
 									onClick="bkuHandyClicked();" tabindex="3" role="button"
 									value="HANDY" />
-- 
cgit v1.2.3


From 007475a7d2df25efa5c958a859fa0dc4c923c687 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Fri, 8 Apr 2016 09:57:35 +0200
Subject: fix typo in sendAssertionFormFull backup template

---
 .../src/main/resources/templates/sendAssertionFormFull.html             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/id/server/moa-id-frontend-resources/src/main/resources/templates/sendAssertionFormFull.html b/id/server/moa-id-frontend-resources/src/main/resources/templates/sendAssertionFormFull.html
index a9f0c4238..7ae4b3f92 100644
--- a/id/server/moa-id-frontend-resources/src/main/resources/templates/sendAssertionFormFull.html
+++ b/id/server/moa-id-frontend-resources/src/main/resources/templates/sendAssertionFormFull.html
@@ -3,7 +3,7 @@
 <head>
 	<meta content="text/html; charset=utf-8" http-equiv="Content-Type">
     <!-- MOA-ID 2.x BKUSelection Layout CSS -->               
-    <link rel="stylesheet" href="$contextPath/css/buildCSS?pendingid=#ID#" />
+    <link rel="stylesheet" href="$contextPath/css/buildCSS?pendingid=$pendingReqID" />
     
     <title>Anmeldung an Online-Applikation</title>   
 </head>
-- 
cgit v1.2.3