prepared for SC-selection new

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@537 d688527b-c9ab-4aba-bd8d-4036d912da1d

2 files changed, 10 insertions, 8 deletions

diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilder.java b/id.server/src/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilder.java
index 69dfd1d3f..9baa71612 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilder.java
+++ b/id.server/src/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilder.java
@@ -26,6 +26,8 @@ public class GetIdentityLinkFormBuilder extends Builder {
   private static final String CERTINFO_XMLREQUEST_TAG = "<CertInfoXMLRequest>";
   /** special tag in the HTML template to be substituted for the certificate info data URL */
   private static final String CERTINFO_DATAURL_TAG = "<CertInfoDataURL>";
+  /** private static int all contains the representation to replace all tags*/
+  private static final int ALL = -1;
 
   /** default HTML template */
   private static final String DEFAULT_HTML_TEMPLATE = 
@@ -83,12 +85,12 @@ public class GetIdentityLinkFormBuilder extends Builder {
       
   	String htmlForm = htmlTemplate == null ? DEFAULT_HTML_TEMPLATE : htmlTemplate;
 //    String bku = bkuURL == null ? DEFAULT_BKU : bkuURL;
-    htmlForm = replaceTag(htmlForm, BKU_TAG, bkuURL);
-    htmlForm = replaceTag(htmlForm, XMLREQUEST_TAG, encodeParameter(xmlRequest));
-    htmlForm = replaceTag(htmlForm, DATAURL_TAG, dataURL);
-//    htmlForm = replaceTag(htmlForm, BKU_TAG, bkuURL);
-    htmlForm = replaceTag(htmlForm, CERTINFO_XMLREQUEST_TAG, encodeParameter(certInfoXMLRequest));
-    htmlForm = replaceTag(htmlForm, CERTINFO_DATAURL_TAG, certInfoDataURL);
+    htmlForm = replaceTag(htmlForm, BKU_TAG, bkuURL, ALL);
+    htmlForm = replaceTag(htmlForm, XMLREQUEST_TAG, encodeParameter(xmlRequest), ALL);
+    htmlForm = replaceTag(htmlForm, DATAURL_TAG, dataURL, ALL);
+//new:wird oben mitreplaced    htmlForm = replaceTag(htmlForm, BKU_TAG, bkuURL);
+    htmlForm = replaceTag(htmlForm, CERTINFO_XMLREQUEST_TAG, encodeParameter(certInfoXMLRequest), ALL);
+    htmlForm = replaceTag(htmlForm, CERTINFO_DATAURL_TAG, certInfoDataURL, ALL);
   	return htmlForm;
   }
   /**
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/builder/SelectBKUFormBuilder.java b/id.server/src/at/gv/egovernment/moa/id/auth/builder/SelectBKUFormBuilder.java
index b1553efc9..72ecb53af 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/builder/SelectBKUFormBuilder.java
+++ b/id.server/src/at/gv/egovernment/moa/id/auth/builder/SelectBKUFormBuilder.java
@@ -55,8 +55,8 @@ public class SelectBKUFormBuilder extends Builder {
     throws BuildException {
     
     String htmlForm = htmlTemplate == null ? DEFAULT_HTML_TEMPLATE : htmlTemplate;
-    htmlForm = replaceTag(htmlForm, ACTION_TAG, startAuthenticationURL);
-    htmlForm = replaceTag(htmlForm, SELECT_TAG, bkuSelectTag);
+    htmlForm = replaceTag(htmlForm, ACTION_TAG, startAuthenticationURL, 1);
+    htmlForm = replaceTag(htmlForm, SELECT_TAG, bkuSelectTag, 1);
     return htmlForm;
   }