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

2 files changed, 31 insertions, 7 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
index 0f2a40aa7..297d80726 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
@@ -370,12 +370,35 @@ ServletResponseAware {
 		}
 		templates.setAditionalAuthBlockText(generalOA.getAditionalAuthBlockText());
 		
-		TemplateType template = templates.getTemplate();
-		if (template == null) {
-			//TODO: if OA specific templateURL is required
+		List<TemplateType> template = templates.getTemplate();
+		if (generalOA.isLegacy()) {
 			
+			if (template == null)
+				template = new ArrayList<TemplateType>();
+			else
+				template.clear();
+			
+			if (MiscUtil.isNotEmpty(generalOA.getSLTemplateURL1())) {
+				TemplateType el = new TemplateType();
+				el.setURL(generalOA.getSLTemplateURL1());
+				template.add(el);
+			}
+			if (MiscUtil.isNotEmpty(generalOA.getSLTemplateURL2())) {
+				TemplateType el = new TemplateType();
+				el.setURL(generalOA.getSLTemplateURL2());
+				template.add(el);
+			}
+			if (MiscUtil.isNotEmpty(generalOA.getSLTemplateURL3())) {
+				TemplateType el = new TemplateType();
+				el.setURL(generalOA.getSLTemplateURL3());
+				template.add(el);
+			}
+			
+		} else {
+			if (template != null && template.size() > 0)
+				template.clear();
 		}
-		
+				
 		//set default transformation if it is empty
 		List<TransformsInfoType> transformsInfo = authoa.getTransformsInfo();
 		if (transformsInfo == null) {
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 6aeebcf7b..6078caa87 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
@@ -72,22 +72,23 @@ public class IndexAction extends ActionSupport implements ServletRequestAware,
 			}
 		}
 		
+		
 		UserDatabase dbuser = ConfigurationDBRead.getUserWithUserName(username);
 		if (dbuser == null) {
 			log.warn("Unknown Username");
-			addActionError(LanguageHelper.getErrorString("webpages.index.username.unkown"));
+			addActionError(LanguageHelper.getErrorString("webpages.index.login.notallowed"));
 			return Constants.STRUTS_ERROR;
 			
 		} else {
 			if (!dbuser.isIsActive()) {
 				log.warn("Username " + dbuser.getUsername() + " is not active");
-				addActionError(LanguageHelper.getErrorString("webpages.index.username.notactive"));
+				addActionError(LanguageHelper.getErrorString("webpages.index.login.notallowed"));
 				return Constants.STRUTS_ERROR;
 			}
 			
 			if (!dbuser.getPassword().equals(key)) {
 				log.warn("Username " + dbuser.getUsername() + " use a false password");
-				addActionError(LanguageHelper.getErrorString("webpages.index.password.false"));
+				addActionError(LanguageHelper.getErrorString("webpages.index.login.notallowed"));
 				return Constants.STRUTS_ERROR;
 			}