Merge branch 'ap' into moa2_0_tlenz_bs_3

Conflicts:
	id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/STORKConfig.java
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AuthenticationRequest.java

2 files changed, 50 insertions, 0 deletions

diff --git a/id/ConfigWebTool/src/main/webapp/js/common.js b/id/ConfigWebTool/src/main/webapp/js/common.js
index 98f7bdacb..5fbbdafd1 100644
--- a/id/ConfigWebTool/src/main/webapp/js/common.js
+++ b/id/ConfigWebTool/src/main/webapp/js/common.js
@@ -51,6 +51,17 @@ function oaStork() {
 		$('#stork_block').css('display', "none");
 	}
 }
+function oaVIDP() {
+	if ($('#oa_vidp_area').css('display') == "block") {
+		$('#oa_vidp_area').css('display', "none");
+		$('#button_vidp_show').css('display', "block");
+		$('#button_vidp_hidden').css('display', "none");
+	} else {
+		$('#oa_vidp_area').css('display', "block");
+		$('#button_vidp_show').css('display', "none");
+		$('#button_vidp_hidden').css('display', "block");
+	}
+}
 function oaSAML1() {
 	if ($('#oa_saml1_area').css('display') == "block") {
 		$('#oa_saml1_area').css('display', "none");
@@ -229,4 +240,13 @@ function newStorkAttribute() {
 	clone.innerHTML = clone.innerHTML.replace(/name="storkconfig.attributes\[\d/g, 'name="storkconfig.attributes[' + nextindex);
 	clone.innerHTML = clone.innerHTML.replace(/(.*" value=").*?(".*)/g, '$1$2');
 	target.parentNode.appendChild(clone);
+}
+function newAp() {
+	var target = $(document.getElementById("stork_aplist").getElementsByTagName("tr")).last()[0];
+	var clone = target.cloneNode(true);
+	var lastindex = parseInt(clone.innerHTML.match(/name="storkOA.attributeProviderPlugins\[(\d)/)[1]);
+	var nextindex = lastindex + 1;
+	clone.innerHTML = clone.innerHTML.replace(/name="storkOA.attributeProviderPlugins\[\d/g, 'name="storkOA.attributeProviderPlugins[' + nextindex);
+	clone.innerHTML = clone.innerHTML.replace(/(.*" value=").*?(".*)/g, '$1$2');
+	target.parentNode.appendChild(clone);
 }
\ No newline at end of file
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
index e182fd805..7887d9d62 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
@@ -384,6 +384,13 @@
 								<button type="button" class="oa_buttons" onclick="oaSAML1();" id="button_saml1_hidden">
 									<%=LanguageHelper.getGUIString("webpages.oaconfig.menu.saml1.hidden", request) %>
 								</button>
+								
+								<button  type="button" class="oa_buttons" onclick="oaVIDP();" id="button_vidp_show">
+									<%=LanguageHelper.getGUIString("webpages.oaconfig.menu.vidp.show", request) %>
+								</button>
+								<button type="button" style="display:none" class="oa_buttons" onclick="oaVIDP();" id="button_vidp_hidden">
+									<%=LanguageHelper.getGUIString("webpages.oaconfig.menu.vidp.hidden", request) %>
+								</button>
 							</s:if>
 							
 							<button type="button" class="oa_buttons" onclick="oaPVP2();" id="button_pvp2_show">
@@ -496,6 +503,29 @@
 								cssClass="textfield_long">
 							</s:textfield>
 						</div>
+						
+											
+						<div id="oa_vidp_area" class="oa_protocol_area">
+							<h4><%=LanguageHelper.getGUIString("webpages.oaconfig.stork.header", request) %></h4>
+	
+							<p><s:checkbox name="storkOA.vidpEnabled" 
+								value="%{storkOA.vidpEnabled}"
+								labelposition="left"
+								key="webpages.oaconfig.vidp.enabled"
+								cssClass="checkbox"
+								id="OAuseVidp" /></p>
+							<h5><%=LanguageHelper.getGUIString("webpages.oaconfig.vidp.ap.list", request) %></h5>
+							<table id="stork_aplist">
+								<tr><th>AP Plugin</th><th>URL</th>
+								<s:iterator value="storkOA.attributeProviderPlugins" status="stat">
+								  <tr><td><s:select name="storkOA.attributeProviderPlugins[%{#stat.index}].plugin" value="%{plugin}" list="%{storkOA.availableAttributeProviderPlugins}"/></td>
+								      <td><s:textfield name="storkOA.attributeProviderPlugins[%{#stat.index}].url" value="%{url}" cssClass="textfield"/></td>
+								      <td><input type="button" value="<%=LanguageHelper.getGUIString("webpages.oaconfig.vidp.ap.remove", request) %>" onclick='this.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode);'/></td></tr>
+								</s:iterator>
+							</table>
+							<input type="button" value="<%=LanguageHelper.getGUIString("webpages.oaconfig.vidp.ap.new", request) %>" onclick='newAp();' />
+								
+						</div>
 					</div>