* add OA specific BKU selection template

* add OA specific send-assertion template
* add OA specific applet height and width configuration
* add PVP2.x reload checkbox in PVP2.x OA configuration

* add new elements to MOA-ID configuration

1 files changed, 15 insertions, 2 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/IndexAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/IndexAction.java
index a488d919d..ee9b38f74 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/IndexAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/IndexAction.java
@@ -138,7 +138,19 @@ public class IndexAction extends ActionSupport implements ServletRequestAware,
 	
 	public String authenticate() {
 		
-		String key = null;
+		ConfigurationProvider config;
+		try {
+			config = ConfigurationProvider.getInstance();
+			pvp2LoginActiv = config.isPVP2LoginActive();
+						
+		} catch (ConfigurationException e1) {
+			log.warn("An internal error occurs.", e1);
+			pvp2LoginActiv = false;
+		}
+
+		
+		
+		String key = null;		
 		
 		if (MiscUtil.isNotEmpty(username)) {
 			if (ValidationHelper.containsPotentialCSSCharacter(username, false)) {
@@ -247,7 +259,8 @@ public class IndexAction extends ActionSupport implements ServletRequestAware,
 		
 			try {
 				ConfigurationProvider config = ConfigurationProvider.getInstance();
-				
+				pvp2LoginActiv = config.isPVP2LoginActive();
+								
 				//Decode with HttpPost Binding
 				HTTPPostDecoder decode = new HTTPPostDecoder(new BasicParserPool());
 				BasicSAMLMessageContext<Response, ?, ?> messageContext = new BasicSAMLMessageContext<Response, SAMLObject, SAMLObject>();