Configuration Tool Update and Bugfix

 -- Username/Password login update
 -- EditUser, insert second password textfield
 -- OAConfig: insert OA specific SecurityLayer Templates
 -- OAConfig: SecurityLayer Version only for admin

1 files changed, 12 insertions, 3 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 8e6edf52a..276b0b4c8 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
@@ -111,6 +111,7 @@ public class UserDatabaseFormValidator {
 		}
 		
 		check = form.getPassword();
+			
 		if (MiscUtil.isEmpty(check)) {
 			if (userID == -1) {
 				log.warn("Password is empty");
@@ -124,9 +125,17 @@ public class UserDatabaseFormValidator {
 			}
 			
 		} else {
-			String key = AuthenticationHelper.generateKeyFormPassword(check);
-			if (key == null) {
-				errors.add(LanguageHelper.getErrorString("validation.edituser.password.valid"));
+			
+			if (check.equals(form.getPassword_second())) {
+			
+				String key = AuthenticationHelper.generateKeyFormPassword(check);
+				if (key == null) {
+					errors.add(LanguageHelper.getErrorString("validation.edituser.password.valid"));
+				}
+				
+			}
+			else {
+				errors.add(LanguageHelper.getErrorString("validation.edituser.password.equal"));
 			}
 		}