BugFixes:

 --LoginFormPreview: Header text UTF8 encoding error
 --PVP2 Login: do not show loginbutton in case of PVP2 login is not enabled

1 files changed, 22 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 3bf213290..c82746dbc 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
@@ -88,9 +88,20 @@ public class IndexAction extends ActionSupport implements ServletRequestAware,
 	
 	private String ssologouturl;
 	
+	private boolean pvp2LoginActiv = false;
+	
 	public String start() {
-				
-		return Constants.STRUTS_SUCCESS;
+		
+		try {
+			ConfigurationProvider config = ConfigurationProvider.getInstance();
+			pvp2LoginActiv = config.isPVP2LoginActive();
+			return Constants.STRUTS_SUCCESS;
+			
+		} catch (ConfigurationException e) {
+			log.warn("An internal error occurs.", e);
+			addActionError(LanguageHelper.getErrorString("error.login.internal"));
+			return Constants.STRUTS_ERROR;
+		}
 	}
 	
 	public String authenticate() {
@@ -809,4 +820,13 @@ public class IndexAction extends ActionSupport implements ServletRequestAware,
 	public void setFormID(String formID) {
 		this.formID = formID;
 	}
+
+	/**
+	 * @return the pvp2LoginActiv
+	 */
+	public boolean isPvp2LoginActiv() {
+		return pvp2LoginActiv;
+	}
+	
+	
 }