From b2c1ca665aaaa3246671ef2ec933e29b8ff87b25 Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Fri, 4 Jul 2014 16:09:36 +0200
Subject: made country code readonly

---
 .../struts/action/EditGeneralConfigAction.java     | 15 ++++++++--
 .../validation/moaconfig/StorkConfigValidator.java | 34 ++++++++++++----------
 2 files changed, 31 insertions(+), 18 deletions(-)

(limited to 'id/ConfigWebTool/src/main/java')

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 ec261335d..ef0672e99 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
@@ -512,9 +512,20 @@ public class EditGeneralConfigAction extends BasicAction {
 				else
 					stork.setAttributes((List<StorkAttribute>) (new ArrayList<StorkAttribute>()));
 				
-				if (storkconfig.getCpepslist() != null)
+				if (storkconfig.getCpepslist() != null) {
+
+					// make CountryCode "readonly"
+					for(CPEPS newone : storkconfig.getCpepslist()) {
+						for(CPEPS current : stork.getCPEPS()) {
+							if(current.getHjid().equals(newone.getHjid())) {
+								newone.setCountryCode(current.getCountryCode());
+								break;
+							}
+						}
+					}
+
 					stork.setCPEPS(storkconfig.getCpepslist());
-				
+				}
 				else
 					stork.setCPEPS((List<CPEPS>) (new ArrayList<CPEPS>()));
 				
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/StorkConfigValidator.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/StorkConfigValidator.java
index 4a5676fd6..5ec3af519 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/StorkConfigValidator.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/StorkConfigValidator.java
@@ -32,27 +32,29 @@ public class StorkConfigValidator {
 				if(null == current)
 					continue;
 				
-				// check country code
-				String check = current.getCountryCode();
-				if (MiscUtil.isNotEmpty(check)) {
-					if (ValidationHelper.containsPotentialCSSCharacter(check, false)) {
-						log.warn("CPEPS config countrycode contains potentail XSS characters: " + check);
-						errors.add(LanguageHelper.getErrorString("validation.stork.cpeps.cc",
-								new Object[] {ValidationHelper.getPotentialCSSCharacter(false)}, request ));
-					}
-					if(!check.toLowerCase().matches("^[a-z][a-z]$")) {
-							log.warn("CPEPS config countrycode does not comply to ISO 3166-2 : " + check);
+				if(null == current.getHjid()) {
+					// check country code
+					String check = current.getCountryCode();
+					if (MiscUtil.isNotEmpty(check)) {
+						if (ValidationHelper.containsPotentialCSSCharacter(check, false)) {
+							log.warn("CPEPS config countrycode contains potentail XSS characters: " + check);
 							errors.add(LanguageHelper.getErrorString("validation.stork.cpeps.cc",
-									new Object[] {check}, request ));
+									new Object[] {ValidationHelper.getPotentialCSSCharacter(false)}, request ));
+						}
+						if(!check.toLowerCase().matches("^[a-z][a-z]$")) {
+								log.warn("CPEPS config countrycode does not comply to ISO 3166-2 : " + check);
+								errors.add(LanguageHelper.getErrorString("validation.stork.cpeps.cc",
+										new Object[] {check}, request ));
+						}
+					} else {
+						log.warn("CPEPS config countrycode is empty : " + check);
+						errors.add(LanguageHelper.getErrorString("validation.stork.cpeps.empty",
+								new Object[] {check}, request ));
 					}
-				} else {
-					log.warn("CPEPS config countrycode is empty : " + check);
-					errors.add(LanguageHelper.getErrorString("validation.stork.cpeps.empty",
-							new Object[] {check}, request ));
 				}
 	
 				// check url
-				check = current.getURL();
+				String check = current.getURL();
 				if (MiscUtil.isNotEmpty(check)) {
 					if (!ValidationHelper.validateURL(check)) {
 						log.info("CPEPS config URL is invalid : " + check);
-- 
cgit v1.2.3