1 files changed, 71 insertions, 27 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
index 4a05f9dbd..3ee870d11 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
@@ -38,6 +38,7 @@ import at.gv.egovernment.moa.id.commons.db.dao.config.UserDatabase;
 import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException;
 import at.gv.egovernment.moa.id.configuration.Constants;
 import at.gv.egovernment.moa.id.configuration.auth.AuthenticatedUser;
+import at.gv.egovernment.moa.id.configuration.data.FormularCustomization;
 import at.gv.egovernment.moa.id.configuration.data.oa.OAGeneralConfig;
 import at.gv.egovernment.moa.id.configuration.data.oa.OAPVP2Config;
 import at.gv.egovernment.moa.id.configuration.data.oa.OASAML1Config;
@@ -46,6 +47,7 @@ import at.gv.egovernment.moa.id.configuration.data.oa.OASTORKConfig;
 import at.gv.egovernment.moa.id.configuration.exception.ConfigurationException;
 import at.gv.egovernment.moa.id.configuration.helper.LanguageHelper;
 import at.gv.egovernment.moa.id.configuration.helper.MailHelper;
+import at.gv.egovernment.moa.id.configuration.validation.FormularCustomizationValitator;
 import at.gv.egovernment.moa.id.configuration.validation.TargetValidator;
 import at.gv.egovernment.moa.id.configuration.validation.ValidationHelper;
 import at.gv.egovernment.moa.id.configuration.validation.oa.OAGeneralConfigValidation;
@@ -86,6 +88,7 @@ ServletResponseAware {
 	private OASAML1Config saml1OA = new OASAML1Config();
 	private OASSOConfig ssoOA = new OASSOConfig();
 	private OASTORKConfig storkOA;
+	private FormularCustomization formOA = new FormularCustomization();
 	
 	//STRUTS actions
 	public String inital() {
@@ -141,6 +144,7 @@ ServletResponseAware {
 		generalOA.parse(onlineapplication);
 		ssoOA.parse(onlineapplication);
 		saml1OA.parse(onlineapplication);
+		formOA.parse(onlineapplication);
 		
 		List<String> errors = pvp2OA.parse(onlineapplication);
 		
@@ -314,16 +318,18 @@ ServletResponseAware {
 		OASAML1ConfigValidation validatior_saml1 = new OASAML1ConfigValidation();
 		OASSOConfigValidation validatior_sso = new OASSOConfigValidation();
 		OASTORKConfigValidation validator_stork = new OASTORKConfigValidation();
+		FormularCustomizationValitator validator_form = new FormularCustomizationValitator();
 		
 		errors.addAll(validatior_general.validate(generalOA, authUser.isAdmin()));		
 		errors.addAll(validatior_pvp2.validate(pvp2OA));
 		errors.addAll(validatior_saml1.validate(saml1OA, generalOA));
 		errors.addAll(validatior_sso.validate(ssoOA, authUser.isAdmin()));
 		errors.addAll(validator_stork.validate(storkOA)); 
+		errors.addAll(validator_form.validate(formOA));
 		
 		//Do not allow SSO in combination with special BKUSelection features
 		if (ssoOA.isUseSSO() && 
-				( generalOA.isOnlyMandateAllowed() || !generalOA.isShowMandateLoginButton()) ) {
+				( formOA.isOnlyMandateAllowed() || !formOA.isShowMandateLoginButton()) ) {
 			log.warn("Special BKUSelection features can not be used in combination with SSO");
 			errors.add(LanguageHelper.getErrorString("validation.general.bkuselection.specialfeatures.valid"));			
 		}
@@ -757,22 +763,25 @@ ServletResponseAware {
 				bkuselectioncustom = new BKUSelectionCustomizationType();
 				templates.setBKUSelectionCustomization(bkuselectioncustom);
 			}
-				
-			if (MiscUtil.isNotEmpty(generalOA.getBkuSelectionBackGroundColor())) {
-				String value;
-				if (!generalOA.getBkuSelectionBackGroundColor().startsWith("#"))
-					value = "#" + generalOA.getBkuSelectionBackGroundColor();
-				else
-					value = generalOA.getBkuSelectionBackGroundColor();
-				
-				bkuselectioncustom.setBackGroundColor(value);
-				
-			} else {
-				bkuselectioncustom.setBackGroundColor("");
-			}
-				
-			bkuselectioncustom.setMandateLoginButton(generalOA.isShowMandateLoginButton());
-			bkuselectioncustom.setOnlyMandateLoginAllowed(generalOA.isOnlyMandateAllowed());
+					
+			bkuselectioncustom.setBackGroundColor(parseColor(formOA.getBackGroundColor()));
+			bkuselectioncustom.setFrontColor(parseColor(formOA.getFrontColor()));
+			
+			bkuselectioncustom.setHeaderBackGroundColor(parseColor(formOA.getHeader_BackGroundColor()));
+			bkuselectioncustom.setHeaderFrontColor(parseColor(formOA.getHeader_FrontColor()));
+			bkuselectioncustom.setHeaderText(formOA.getHeader_text());
+			
+			bkuselectioncustom.setButtonBackGroundColor(parseColor(formOA.getButton_BackGroundColor()));
+			bkuselectioncustom.setButtonBackGroundColorFocus(parseColor(formOA.getButton_BackGroundColorFocus()));
+			bkuselectioncustom.setButtonFontColor(parseColor(formOA.getButton_FrontColor()));
+
+			if (MiscUtil.isNotEmpty(formOA.getAppletRedirectTarget()))
+				bkuselectioncustom.setAppletRedirectTarget(formOA.getAppletRedirectTarget());
+			
+			bkuselectioncustom.setFontType(formOA.getFontType());
+			
+			bkuselectioncustom.setMandateLoginButton(formOA.isShowMandateLoginButton());
+			bkuselectioncustom.setOnlyMandateLoginAllowed(formOA.isOnlyMandateAllowed());
 			
 		}
 				
@@ -802,21 +811,28 @@ ServletResponseAware {
 			log.info("Uploaded Certificate can not be parsed", e);
 			return LanguageHelper.getErrorString("validation.pvp2.certificate.format");
 		}
-		
+				
 		OASAML1 saml1 = authoa.getOASAML1();
 		if (saml1 == null) {
 			saml1 = new OASAML1();
 			authoa.setOASAML1(saml1);
 		}
-		saml1.setProvideAUTHBlock(saml1OA.isProvideAuthBlock());
-		saml1.setProvideCertificate(saml1OA.isProvideCertificate());
-		saml1.setProvideFullMandatorData(saml1OA.isProvideFullMandateData());
-		saml1.setProvideIdentityLink(saml1OA.isProvideIdentityLink());
-		saml1.setProvideStammzahl(saml1OA.isProvideStammZahl());
-		saml1.setUseCondition(saml1OA.isUseCondition());
-		saml1.setConditionLength(BigInteger.valueOf(saml1OA.getConditionLength()));
-		//TODO: set sourceID
-		//saml1.setSourceID("");
+		
+		if (authUser.isAdmin()) {
+			saml1.setIsActive(saml1OA.isActive());
+		}
+
+		if (saml1.isIsActive()) {
+			saml1.setProvideAUTHBlock(saml1OA.isProvideAuthBlock());
+			saml1.setProvideCertificate(saml1OA.isProvideCertificate());
+			saml1.setProvideFullMandatorData(saml1OA.isProvideFullMandateData());
+			saml1.setProvideIdentityLink(saml1OA.isProvideIdentityLink());
+			saml1.setProvideStammzahl(saml1OA.isProvideStammZahl());
+			saml1.setUseCondition(saml1OA.isUseCondition());
+			saml1.setConditionLength(BigInteger.valueOf(saml1OA.getConditionLength()));
+			//TODO: set sourceID
+			//saml1.setSourceID("");
+		}
 		
 		OASSO sso = authoa.getOASSO();
 		if (sso == null) {
@@ -865,6 +881,18 @@ ServletResponseAware {
 		return null;
 	}
 	
+	private String parseColor(String color) {
+		String value = "";
+		
+		if (MiscUtil.isNotEmpty(color)) {
+			if (!color.startsWith("#"))
+				value = "#" + color;
+			else
+				value = color;
+		}
+		return value;
+	}
+	
 	private void generateUserSpecificConfigurationOptions(UserDatabase userdb) {
 		
 		if (userdb.isIsMandateUser() != null && userdb.isIsMandateUser()) {
@@ -1076,4 +1104,20 @@ ServletResponseAware {
 	public void setDeaktivededBusinessService(boolean deaktivededBusinessService) {
 		this.deaktivededBusinessService = deaktivededBusinessService;
 	}
+
+	/**
+	 * @return the formOA
+	 */
+	public FormularCustomization getFormOA() {
+		return formOA;
+	}
+
+	/**
+	 * @param formOA the formOA to set
+	 */
+	public void setFormOA(FormularCustomization formOA) {
+		this.formOA = formOA;
+	}
+	
+	
 }