From 1f46df486fbab558fb3e935dfed160f26e698ac0 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Fri, 24 Jan 2014 08:04:12 +0100
Subject: -- Solve merge problems (AuthnRequestHandler.java &
 mandateReferenceValueAttributeBuilder) -- Change sessionmanagement betweem
 AuthAction and TokenAction to AssertionStorage class -- add class definieten
 to HTML config element

---
 .../moa/id/configuration/config/ConfigurationProvider.java         | 7 ++-----
 id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp             | 3 ++-
 2 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'id/ConfigWebTool/src')

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/config/ConfigurationProvider.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/config/ConfigurationProvider.java
index 6b30c0cfa..e50515326 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/config/ConfigurationProvider.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/config/ConfigurationProvider.java
@@ -206,11 +206,8 @@ public class ConfigurationProvider {
 	}
 	
 	public boolean isPVP2LoginActive() {
-		if (!pvp2logininitialzied)
-			return false;
-		
-		String result = props.getProperty("general.login.pvp2.isactive", "false");
-		return Boolean.parseBoolean(result);
+					
+		return Boolean.parseBoolean(props.getProperty("general.login.pvp2.isactive", "false"));
 	}
 	
 	public boolean isPVP2LoginBusinessService() {
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
index 0341fc49b..97f0d01c2 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
@@ -415,7 +415,8 @@
 							<s:textfield name="oauth20OA.redirectUri" 
 								value="%{oauth20OA.redirectUri}" 
 								labelposition="left"
-								key="webpages.oaconfig.oauth20.redirectUri">
+								key="webpages.oaconfig.oauth20.redirectUri"
+								cssClass="textfield_long">
 							</s:textfield>
 						</div>
 					</div>
-- 
cgit v1.2.3