use UTF-8 encoding for some parameters

3 files changed, 29 insertions, 8 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/helper/StringHelper.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/helper/StringHelper.java
index 43fc78821..53afa59a0 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/helper/StringHelper.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/helper/StringHelper.java
@@ -22,6 +22,8 @@
  *******************************************************************************/
 package at.gv.egovernment.moa.id.configuration.helper;
 
+import java.io.UnsupportedEncodingException;
+
 public class StringHelper {
 
 	public static String formatText(String strGivenText)
@@ -47,4 +49,14 @@ public class StringHelper {
         }
         return sbFormattedText.toString();
     }
+	
+	public static String getUTF8String(String input) {		
+		try {
+			return new String(input.getBytes(), "UTF-8");
+				
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+			return input;
+		}
+	}
 }
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 75e07a1a0..dfc9b8801 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
@@ -75,6 +75,7 @@ import at.gv.egovernment.moa.id.configuration.auth.AuthenticatedUser;
 import at.gv.egovernment.moa.id.configuration.data.GeneralMOAIDConfig;
 import at.gv.egovernment.moa.id.configuration.data.GeneralStorkConfig;
 import at.gv.egovernment.moa.id.configuration.helper.LanguageHelper;
+import at.gv.egovernment.moa.id.configuration.helper.StringHelper;
 import at.gv.egovernment.moa.id.configuration.validation.ValidationHelper;
 import at.gv.egovernment.moa.id.configuration.validation.moaconfig.MOAConfigValidator;
 import at.gv.egovernment.moa.id.configuration.validation.moaconfig.StorkConfigValidator;
@@ -332,9 +333,10 @@ public class EditGeneralConfigAction extends ActionSupport
 			pvp2.setOrganization(pvp2org);
 		}
 		if (MiscUtil.isNotEmpty(moaconfig.getPvp2OrgDisplayName()))
-			pvp2org.setDisplayName(moaconfig.getPvp2OrgDisplayName());
+			pvp2org.setDisplayName(StringHelper.getUTF8String(
+					moaconfig.getPvp2OrgDisplayName()));
 		if (MiscUtil.isNotEmpty(moaconfig.getPvp2OrgName()))
-			pvp2org.setName(moaconfig.getPvp2OrgName());
+			pvp2org.setName(StringHelper.getUTF8String(moaconfig.getPvp2OrgName()));
 		if (MiscUtil.isNotEmpty(moaconfig.getPvp2OrgURL()))
 			pvp2org.setURL(moaconfig.getPvp2OrgURL());
 		
@@ -351,10 +353,12 @@ public class EditGeneralConfigAction extends ActionSupport
 		
 		Contact cont = pvp2cont.get(0);		
 		if (MiscUtil.isNotEmpty(moaconfig.getPvp2Contact().getCompany()))
-			cont.setCompany(moaconfig.getPvp2Contact().getCompany());
+			cont.setCompany(StringHelper.getUTF8String(
+					moaconfig.getPvp2Contact().getCompany()));
 		
 		if (MiscUtil.isNotEmpty(moaconfig.getPvp2Contact().getGivenname()))
-			cont.setGivenName(moaconfig.getPvp2Contact().getGivenname());
+			cont.setGivenName(StringHelper.getUTF8String(
+					moaconfig.getPvp2Contact().getGivenname()));
 		
 		//TODO: change to list if required
 		if (MiscUtil.isNotEmpty(moaconfig.getPvp2Contact().getMail()))
@@ -363,7 +367,8 @@ public class EditGeneralConfigAction extends ActionSupport
 			cont.setPhone(Arrays.asList(moaconfig.getPvp2Contact().getPhone()));
 		
 		if (MiscUtil.isNotEmpty(moaconfig.getPvp2Contact().getSurname()))
-			cont.setSurName(moaconfig.getPvp2Contact().getSurname());
+			cont.setSurName(StringHelper.getUTF8String(
+					moaconfig.getPvp2Contact().getSurname()));
 		if (MiscUtil.isNotEmpty(moaconfig.getPvp2Contact().getType()))
 			cont.setType(moaconfig.getPvp2Contact().getType());
 		
@@ -374,9 +379,11 @@ public class EditGeneralConfigAction extends ActionSupport
 		}
 		
 		if (MiscUtil.isNotEmpty(moaconfig.getSsoFriendlyName()))
-			dbsso.setFriendlyName(moaconfig.getSsoFriendlyName());
+			dbsso.setFriendlyName(StringHelper.getUTF8String(
+					moaconfig.getSsoFriendlyName()));
 		if (MiscUtil.isNotEmpty(moaconfig.getSsoSpecialText()))
-			dbsso.setSpecialText(moaconfig.getSsoSpecialText());
+			dbsso.setSpecialText(StringHelper.getUTF8String(
+					moaconfig.getSsoSpecialText()));
 //		if (MiscUtil.isNotEmpty(moaconfig.getSsoPublicUrl()))
 //			dbsso.setPublicURL(moaconfig.getSsoPublicUrl());
 		
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 131a27935..19006ea22 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
@@ -84,6 +84,7 @@ import at.gv.egovernment.moa.id.configuration.data.oa.OASTORKConfig;
 import at.gv.egovernment.moa.id.configuration.exception.ConfigurationException;
 import at.gv.egovernment.moa.id.configuration.helper.LanguageHelper;
 import at.gv.egovernment.moa.id.configuration.helper.MailHelper;
+import at.gv.egovernment.moa.id.configuration.helper.StringHelper;
 import at.gv.egovernment.moa.id.configuration.validation.FormularCustomizationValitator;
 import at.gv.egovernment.moa.id.configuration.validation.TargetValidator;
 import at.gv.egovernment.moa.id.configuration.validation.ValidationHelper;
@@ -935,7 +936,8 @@ public class EditOAAction extends ActionSupport implements ServletRequestAware,
 		bkuselectioncustom.setOnlyMandateLoginAllowed(formOA.isOnlyMandateAllowed());
 		
 		if (authUser.isAdmin()) {
-			templates.setAditionalAuthBlockText(generalOA.getAditionalAuthBlockText());
+			templates.setAditionalAuthBlockText(StringHelper.getUTF8String(
+					generalOA.getAditionalAuthBlockText()));
 			
 			List<TemplateType> template = templates.getTemplate();
 			if (generalOA.isLegacy()) {