diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2016-01-18 17:34:23 +0100 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2016-01-18 17:34:23 +0100 |
| commit | 871e8fefefdd935bc99db467d43f4ec61dba251d (patch) | |
| tree | 04f6c37e1d38067ba83e2620941bb391918bebe3 /id/ConfigWebTool | |
| parent | 5de5a970cacf9cfe5e55f9581902b00f4378b577 (diff) | |
| download | moa-id-spss-871e8fefefdd935bc99db467d43f4ec61dba251d.tar.gz moa-id-spss-871e8fefefdd935bc99db467d43f4ec61dba251d.tar.bz2 moa-id-spss-871e8fefefdd935bc99db467d43f4ec61dba251d.zip | |
add virtual IDP enabled flag to configuration
Diffstat (limited to 'id/ConfigWebTool')
2 files changed, 20 insertions, 5 deletions
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java index b4a0f9a77..3871fe6e1 100644 --- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java +++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java @@ -267,7 +267,11 @@ public class EditGeneralConfigAction extends BasicAction { StringUtils.chomp(pubURLPrefix.trim())); } - + + dbauthgeneral.setVirtualPublicURLPrefixEnabled( + moaconfig.isVirtualPublicURLPrefixEnabled()); + + // if (MiscUtil.isNotEmpty(moaconfig.getAlternativeSourceID())) // dbauthgeneral.setAlternativeSourceID(moaconfig.getAlternativeSourceID()); // else { 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 b640e8621..dac25ad60 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 @@ -68,12 +68,23 @@ public class MOAConfigValidator { check = form.getPublicURLPrefix(); if (MiscUtil.isNotEmpty(check)) { String[] publicURLPreFix = check.split(","); - for (String el : publicURLPreFix) { + 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(el.trim()))) { - log.info("Public URL Prefix " + el + " is not valid"); - errors.add(LanguageHelper.getErrorString("validation.general.publicURLprefix.valid", new Object[]{el}, request)); + 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."); |