1 files changed, 30 insertions, 9 deletions
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/MOAConfigValidator.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/MOAConfigValidator.java
index 95502cedb..d4e8e957d 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/MOAConfigValidator.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/MOAConfigValidator.java
@@ -28,10 +28,10 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 
 import at.gv.egovernment.moa.id.commons.validation.ValidationHelper;
@@ -39,8 +39,6 @@ import at.gv.egovernment.moa.id.configuration.Constants;
 import at.gv.egovernment.moa.id.configuration.data.GeneralMOAIDConfig;
 import at.gv.egovernment.moa.id.configuration.data.pvp2.ContactForm;
 import at.gv.egovernment.moa.id.configuration.helper.LanguageHelper;
-import at.gv.egovernment.moa.id.configuration.helper.StringHelper;
-import at.gv.egovernment.moa.id.configuration.validation.CompanyNumberValidator;
 import at.gv.egovernment.moa.util.Base64Utils;
 import at.gv.egovernment.moa.util.MiscUtil;
 
@@ -66,14 +64,29 @@ public class MOAConfigValidator {
 	
 		check = form.getPublicURLPrefix();
 		if (MiscUtil.isNotEmpty(check)) {
-			if (!ValidationHelper.validateURL(check)) {
-				log.info("Public URL Prefix is not valid");
-				errors.add(LanguageHelper.getErrorString("validation.general.publicURLprefix.valid", request));
-			}				
+			String[] publicURLPreFix = check.split(",");
+			if (form.isVirtualPublicURLPrefixEnabled()) {
+				for (String el : publicURLPreFix) {			
+					if (!ValidationHelper.validateURL(
+							StringUtils.chomp(el.trim()))) {
+						log.info("Public URL Prefix " + el + " is not valid");
+						errors.add(LanguageHelper.getErrorString("validation.general.publicURLprefix.valid", new Object[]{el}, request));
+					}
+				}
+				
+			} else {
+				if (!ValidationHelper.validateURL(
+						StringUtils.chomp(publicURLPreFix[0].trim()))) {
+					log.info("Public URL Prefix " + publicURLPreFix[0] + " is not valid");
+					errors.add(LanguageHelper.getErrorString("validation.general.publicURLprefix.valid", new Object[]{publicURLPreFix[0]}, request));
+					
+				}
+				
+			}
 		} else {
 			log.info("PublicURL Prefix is empty.");
 			errors.add(LanguageHelper.getErrorString("validation.general.publicURLprefix.empty", request));
-		}
+		}		
 		
 		check = form.getTimeoutAssertion();
 		if (MiscUtil.isNotEmpty(check)) {
@@ -401,7 +414,7 @@ public class MOAConfigValidator {
 		
 
 		
-		if (form.getFileUploadFileName() != null) {
+		if (form.getFileUploadFileName() != null && !form.getFileUploadFileName().isEmpty()) {
 			HashMap<String, byte[]> map = new HashMap<String, byte[]>();
 			for (int i=0; i<form.getFileUploadFileName().size(); i++) {
 				String filename = form.getFileUploadFileName().get(i);
@@ -426,7 +439,15 @@ public class MOAConfigValidator {
 					}
 				}
 			}
+						
 			form.setSecLayerTransformation(map);
+			
+		} else {
+			if (form.getSecLayerTransformation() == null) {			
+				log.info("AuthBlock Transformation file is empty");
+				errors.add(LanguageHelper.getErrorString("validation.general.slrequest.file.empty", request));
+				
+			}			
 		}