Add new language selection

Conflicts:
	id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/helper/LanguageHelper.java

1 files changed, 23 insertions, 20 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/UserDatabaseFormValidator.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/UserDatabaseFormValidator.java
index a837ee855..3ed0157da 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/UserDatabaseFormValidator.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/UserDatabaseFormValidator.java
@@ -25,6 +25,8 @@ package at.gv.egovernment.moa.id.configuration.validation;
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.servlet.http.HttpServletRequest;
+
 import org.apache.log4j.Logger;
 
 import at.gv.egovernment.moa.id.commons.db.ConfigurationDBRead;
@@ -38,7 +40,8 @@ public class UserDatabaseFormValidator {
 
 	private static final Logger log = Logger.getLogger(UserDatabaseFormValidator.class);
 	
-	public List<String> validate(UserDatabaseFrom form, long userID, boolean isPVP2Generated, boolean isMandateUser) {
+	public List<String> validate(UserDatabaseFrom form, long userID, boolean isPVP2Generated, 
+			boolean isMandateUser, HttpServletRequest request) {
 		List<String> errors = new ArrayList<String>();
 		
 		String check = null;
@@ -49,11 +52,11 @@ public class UserDatabaseFormValidator {
 				if (ValidationHelper.containsPotentialCSSCharacter(check, false)) {
 					log.warn("GivenName contains potentail XSS characters: " + check);
 					errors.add(LanguageHelper.getErrorString("validation.edituser.givenname.valid", 
-							new Object[] {ValidationHelper.getPotentialCSSCharacter(false)} ));
+							new Object[] {ValidationHelper.getPotentialCSSCharacter(false)}, request ));
 				}
 			} else {
 				log.warn("GivenName is empty");
-				errors.add(LanguageHelper.getErrorString("validation.edituser.givenname.empty"));			
+				errors.add(LanguageHelper.getErrorString("validation.edituser.givenname.empty", request));			
 			}
 			
 			
@@ -62,11 +65,11 @@ public class UserDatabaseFormValidator {
 				if (ValidationHelper.containsPotentialCSSCharacter(check, false)) {
 					log.warn("FamilyName contains potentail XSS characters: " + check);
 					errors.add(LanguageHelper.getErrorString("validation.edituser.familyname.valid", 
-							new Object[] {ValidationHelper.getPotentialCSSCharacter(false)} ));
+							new Object[] {ValidationHelper.getPotentialCSSCharacter(false)}, request ));
 				}
 			} else {
 				log.warn("FamilyName is empty");
-				errors.add(LanguageHelper.getErrorString("validation.edituser.familyname.empty"));			
+				errors.add(LanguageHelper.getErrorString("validation.edituser.familyname.empty", request));			
 			}
 		}
 		
@@ -76,11 +79,11 @@ public class UserDatabaseFormValidator {
 				if (ValidationHelper.containsPotentialCSSCharacter(check, false)) {
 					log.warn("Organisation contains potentail XSS characters: " + check);
 					errors.add(LanguageHelper.getErrorString("validation.edituser.institut.valid", 
-							new Object[] {ValidationHelper.getPotentialCSSCharacter(false)} ));
+							new Object[] {ValidationHelper.getPotentialCSSCharacter(false)}, request ));
 				}
 			} else {
 				log.warn("Organisation is empty");
-				errors.add(LanguageHelper.getErrorString("validation.edituser.institut.empty"));			
+				errors.add(LanguageHelper.getErrorString("validation.edituser.institut.empty", request));			
 			}
 		}
 		
@@ -89,11 +92,11 @@ public class UserDatabaseFormValidator {
 			if (!ValidationHelper.isEmailAddressFormat(check)) {
 				log.warn("Mailaddress is not valid: " + check);
 				errors.add(LanguageHelper.getErrorString("validation.edituser.mail.valid", 
-						new Object[] {ValidationHelper.getPotentialCSSCharacter(false)} ));
+						new Object[] {ValidationHelper.getPotentialCSSCharacter(false)}, request ));
 			}
 		} else {
 			log.warn("Mailaddress is empty");
-			errors.add(LanguageHelper.getErrorString("validation.edituser.mail.empty"));			
+			errors.add(LanguageHelper.getErrorString("validation.edituser.mail.empty", request));			
 		}
 		
 		check = form.getPhone();
@@ -101,11 +104,11 @@ public class UserDatabaseFormValidator {
 			if (ValidationHelper.containsPotentialCSSCharacter(check, false)) {
 				log.warn("Phonenumber contains potentail XSS characters: " + check);
 				errors.add(LanguageHelper.getErrorString("validation.edituser.phone.valid", 
-						new Object[] {ValidationHelper.getPotentialCSSCharacter(false)} ));
+						new Object[] {ValidationHelper.getPotentialCSSCharacter(false)}, request ));
 			}
 		} else {
 			log.warn("Phonenumber is empty");
-			errors.add(LanguageHelper.getErrorString("validation.edituser.phone.empty"));			
+			errors.add(LanguageHelper.getErrorString("validation.edituser.phone.empty", request));			
 		}
 		
 		if (form.isIsusernamepasswordallowed()) {
@@ -114,25 +117,25 @@ public class UserDatabaseFormValidator {
 				if (ValidationHelper.containsPotentialCSSCharacter(check, false)) {
 					log.warn("Username contains potentail XSS characters: " + check);
 					errors.add(LanguageHelper.getErrorString("validation.edituser.username.valid", 
-							new Object[] {ValidationHelper.getPotentialCSSCharacter(false)} ));
+							new Object[] {ValidationHelper.getPotentialCSSCharacter(false)}, request ));
 					
 				} else {
 					UserDatabase dbuser = ConfigurationDBRead.getUserWithUserName(check);
 					if (dbuser != null && userID != dbuser.getHjid()) {
 						log.warn("Username " + check + " exists in UserDatabase");
-						errors.add(LanguageHelper.getErrorString("validation.edituser.username.duplicate"));
+						errors.add(LanguageHelper.getErrorString("validation.edituser.username.duplicate", request));
 						form.setUsername("");
 					}	
 				}
 			} else {
 				if (userID == -1) {
 					log.warn("Username is empty");
-					errors.add(LanguageHelper.getErrorString("validation.edituser.username.empty"));
+					errors.add(LanguageHelper.getErrorString("validation.edituser.username.empty", request));
 				} else {
 					UserDatabase dbuser = ConfigurationDBRead.getUserWithID(userID);
 					if (dbuser == null) {
 						log.warn("Username is empty");
-						errors.add(LanguageHelper.getErrorString("validation.edituser.username.empty"));
+						errors.add(LanguageHelper.getErrorString("validation.edituser.username.empty", request));
 					} else {
 						form.setUsername(dbuser.getUsername());
 					}
@@ -144,12 +147,12 @@ public class UserDatabaseFormValidator {
 			if (MiscUtil.isEmpty(check)) {
 				if (userID == -1) {
 					log.warn("Password is empty");
-					errors.add(LanguageHelper.getErrorString("validation.edituser.password.empty"));
+					errors.add(LanguageHelper.getErrorString("validation.edituser.password.empty", request));
 				} else {
 					UserDatabase dbuser = ConfigurationDBRead.getUserWithID(userID);
 					if (dbuser == null || MiscUtil.isEmpty(dbuser.getPassword())) {
 						log.warn("Password is empty");
-						errors.add(LanguageHelper.getErrorString("validation.edituser.password.empty"));
+						errors.add(LanguageHelper.getErrorString("validation.edituser.password.empty", request));
 					}
 				}
 				
@@ -159,12 +162,12 @@ public class UserDatabaseFormValidator {
 				
 					String key = AuthenticationHelper.generateKeyFormPassword(check);
 					if (key == null) {
-						errors.add(LanguageHelper.getErrorString("validation.edituser.password.valid"));
+						errors.add(LanguageHelper.getErrorString("validation.edituser.password.valid", request));
 					}
 					
 				}
 				else {
-					errors.add(LanguageHelper.getErrorString("validation.edituser.password.equal"));
+					errors.add(LanguageHelper.getErrorString("validation.edituser.password.equal", request));
 				}
 			}
 		}
@@ -174,7 +177,7 @@ public class UserDatabaseFormValidator {
 			if (ValidationHelper.containsPotentialCSSCharacter(check, false)) {
 				log.warn("BPK contains potentail XSS characters: " + check);
 				errors.add(LanguageHelper.getErrorString("validation.edituser.bpk.valid", 
-						new Object[] {ValidationHelper.getPotentialCSSCharacter(false)} ));
+						new Object[] {ValidationHelper.getPotentialCSSCharacter(false)}, request ));
 			}
 		}