update PVP2 contact information

6 files changed, 58 insertions, 10 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/pvp2/ContactForm.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/pvp2/ContactForm.java
index a2d6d8775..01615a056 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/pvp2/ContactForm.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/pvp2/ContactForm.java
@@ -43,8 +43,17 @@ public class ContactForm {
 	public ContactForm(Contact dbcont) {
 		this.surname = dbcont.getSurName();
 		this.givenname = dbcont.getGivenName();
-		this.mail =dbcont.getMail();
-		this.phone = dbcont.getPhone();
+		
+		if (dbcont.getMail() != null) {
+			this.mail = new ArrayList<String>();
+			this.mail.addAll(dbcont.getMail());
+		}
+
+		if (dbcont.getPhone() != null) {
+			this.phone = new ArrayList<String>();
+			this.phone.addAll(dbcont.getPhone());
+		}
+		
 		this.company = dbcont.getCompany();
 		this.type = dbcont.getType();
 	}
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 c9e834662..5df12a7a5 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
@@ -341,8 +341,13 @@ public class EditGeneralConfigAction extends ActionSupport
 			pvp2cont = new ArrayList<Contact>();
 			pvp2.setContact(pvp2cont);
 		}
-		Contact cont = new Contact();
-		pvp2cont.add(cont);
+		
+		if (pvp2cont.size() == 0) {
+			Contact cont = new Contact();
+			pvp2cont.add(cont);
+		}
+		
+		Contact cont = pvp2cont.get(0);		
 		if (MiscUtil.isNotEmpty(moaconfig.getPvp2Contact().getCompany()))
 			cont.setCompany(moaconfig.getPvp2Contact().getCompany());
 		
@@ -354,7 +359,7 @@ public class EditGeneralConfigAction extends ActionSupport
 			cont.setMail(Arrays.asList(moaconfig.getPvp2Contact().getMail()));
 		if (MiscUtil.isNotEmpty(moaconfig.getPvp2Contact().getPhone()))
 			cont.setPhone(Arrays.asList(moaconfig.getPvp2Contact().getPhone()));
-			
+		
 		if (MiscUtil.isNotEmpty(moaconfig.getPvp2Contact().getSurname()))
 			cont.setSurName(moaconfig.getPvp2Contact().getSurname());
 		if (MiscUtil.isNotEmpty(moaconfig.getPvp2Contact().getType()))
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 ee9b38f74..8885432f1 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
@@ -624,8 +624,8 @@ public class IndexAction extends ActionSupport implements ServletRequestAware,
 			
 			check = user.getPhone();
 			if (MiscUtil.isNotEmpty(check)) {
-				if (ValidationHelper.containsPotentialCSSCharacter(check, false)) {
-					log.warn("Phonenumber contains potentail XSS characters: " + check);
+				if (!ValidationHelper.validatePhoneNumber(check)) {
+					log.warn("No valid Phone Number: " + check);
 					addActionError(LanguageHelper.getErrorString("validation.edituser.phone.valid", 
 							new Object[] {ValidationHelper.getPotentialCSSCharacter(false)} ));
 				}
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/ValidationHelper.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/ValidationHelper.java
index a95d967bb..c1feddfb8 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/ValidationHelper.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/ValidationHelper.java
@@ -167,6 +167,34 @@ public class ValidationHelper {
 		
 	}
 	
+	public static boolean validatePhoneNumber(String value) {
+		log.debug ("Validate PhoneNumber " + value);
+		
+        /* ************************************************************************************************
+         * Legende: 
+         * ========   AA = post/pre-Text
+         *            BB = (+49)
+         *            CC = Vorwahl  
+         *            DD = Durchwahl
+         *            EE = Nebenstelle                                                                
+         * Pattern p = Pattern.compile("^ [a-zA-Z .,;:/\\-]* [ ]* [(]{0,1}[ ]*[+]{0,1}[ ]*[0-9]{0,2}[ ]*[)]{0,1} [ ]* [0-9]*[ ]* [0-9][ ]* [0-9]* [ ]* [a-zA-Z .,;:\\/-]* $");
+         *                                ------- AA -------      --------------------- BB ---------------------      --------- CC --------          - DD -          - EE -          ------- AA -------
+         * ************************************************************************************************ */
+        Pattern pattern = Pattern.compile("^[a-zA-Z .,;:/\\-]*[ ]*[(]{0,1}[ ]*[+]{0,1}[ ]*[0-9]{0,2}[ ]*[)]{0,1}[ ]*[0-9]*[ ]*[0-9]*[ ]*[0-9]*[ ]*[a-zA-Z .,;:\\/-]*$");
+        Matcher matcher = pattern.matcher(value);
+        boolean b = matcher.matches();
+        if (b) {
+     	   log.debug("Parameter PhoneNumber erfolgreich ueberprueft");
+     	  return true;
+        }
+        else {
+     	   log.error("Fehler Ueberpruefung Parameter PhoneNumber. PhoneNumber entspricht nicht den Kriterien ^ [a-zA-Z .,;:/\\-]* [ ]* [(]{0,1}[ ]*[+]{0,1}[ ]*[0-9]{0,2}[ ]*[)]{0,1} [ ]* [0-9]*[ ]*[/\\-]{0,1} [ ]*[ ]* [0-9]* [ ]* [a-zA-Z .,;:\\/-]* $");
+     	  return false;  
+        }  
+        
+		
+	}
+	
 	public static boolean validateURL(String urlString) {
 		
 		log.debug("Validate URL " + urlString);
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/PVP2ContactValidator.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/PVP2ContactValidator.java
index f8ccebc09..5286725df 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/PVP2ContactValidator.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/PVP2ContactValidator.java
@@ -91,7 +91,7 @@ public class PVP2ContactValidator {
 		
 		check = contact.getPhone();
 		if (MiscUtil.isNotEmpty(check)) {
-			if (!ValidationHelper.containsPotentialCSSCharacter(check, false)) {
+			if (!ValidationHelper.validatePhoneNumber(check)) {
 				errors.add(LanguageHelper.getErrorString("validation.general.protocol.pvp2.contact.phone.valid"));
 			}
 		}
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
index de5e4841b..9f89f9a9d 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
@@ -174,12 +174,18 @@
 								cssClass="textfield_long">
 							</s:textfield>
 							
-							<s:textarea name="moaconfig.moaspssAuthTransformations" 
+<%-- 							<s:textarea name="moaconfig.moaspssAuthTransformations" 
 								value="%{moaconfig.moaspssAuthTransformations}" 
 								labelposition="left"
 								key="webpages.moaconfig.moasp.authblocktransform"
 								cssClass="textfield_large">
-							</s:textarea>
+							</s:textarea> --%>
+							<s:textfield name="moaconfig.moaspssAuthTransformations" 
+								value="%{moaconfig.moaspssAuthTransformations}" 
+								labelposition="left"
+								key="webpages.moaconfig.moasp.authblocktransform"
+								cssClass="textfield_long">
+							</s:textfield>
 							
 							<s:textfield name="moaconfig.moaspssURL" 
 								value="%{moaconfig.moaspssURL}"