From 0f0bd735f44c90a06a7ca6d4d03455c0972f076b Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Mon, 4 Feb 2019 09:01:35 +0100
Subject: add UTF-8 encoding infos into config-tool forms

---
 id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp  | 2 +-
 id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp  | 2 +-
 id/ConfigWebTool/src/main/webapp/jsp/edituser.jsp       | 2 +-
 id/ConfigWebTool/src/main/webapp/jsp/newUserRequest.jsp | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'id/ConfigWebTool/src/main/webapp/jsp')

diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
index 79c66f37c..f77996670 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
@@ -35,7 +35,7 @@
 			
 				<s:if test="authUser.isAdmin()">
 								
-					<s:form namespace="/secure" method="POST" enctype="multipart/form-data">
+					<s:form namespace="/secure" method="POST" enctype="multipart/form-data;charset=UTF-8">
 							
 							<s:if test="moaconfig.isVirtualPublicURLPrefixEnabled()">
 								<s:textarea name="moaconfig.publicURLPrefix" 
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
index cc4220d0e..7dc745e62 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
@@ -38,7 +38,7 @@
 			<div id="list_area">
 				<h2><%=LanguageHelper.getGUIString("webpages.oaconfig.header", request) %></h2>
 								
-				<s:form namespace="/secure" method="POST" enctype="multipart/form-data">
+				<s:form namespace="/secure" method="POST" enctype="multipart/form-data;charset=UTF-8">
 				
 					<s:include value="snippets/OA/generalInformation.jsp"></s:include>			
 		
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/edituser.jsp b/id/ConfigWebTool/src/main/webapp/jsp/edituser.jsp
index dffa7bd1b..6aa5a2728 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/edituser.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/edituser.jsp
@@ -38,7 +38,7 @@
 						
 			<div id="list_area">
 	
-					<s:form namespace="/secure" method="POST" enctype="multipart/form-data">
+					<s:form namespace="/secure" method="POST" enctype="multipart/form-data;charset=UTF-8">
 						<jsp:include page="snippets/userfields.jsp"></jsp:include>
 						
 						<s:hidden name="formID"	value="%{formID}"></s:hidden>
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/newUserRequest.jsp b/id/ConfigWebTool/src/main/webapp/jsp/newUserRequest.jsp
index 934296b3a..2fe337758 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/newUserRequest.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/newUserRequest.jsp
@@ -37,7 +37,7 @@
 						
 			<div id="list_area">
 	
-					<s:form namespace="/" method="POST" enctype="multipart/form-data">
+					<s:form namespace="/" method="POST" enctype="multipart/form-data;charset=UTF-8">
 						<jsp:include page="snippets/userfields.jsp"></jsp:include>
 						
 						<s:hidden name="formID"	value="%{formID}"></s:hidden>
-- 
cgit v1.2.3


From 198954f9257a4ec9984ea8766e216b85733a8c0f Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Mon, 18 Feb 2019 08:25:37 +0100
Subject: use UTF-8 servlet-filter instead of encoding information

---
 .../src/main/webapp/jsp/editMOAConfig.jsp           |  2 +-
 .../src/main/webapp/jsp/editOAGeneral.jsp           |  2 +-
 id/ConfigWebTool/src/main/webapp/jsp/edituser.jsp   |  2 +-
 .../src/main/webapp/jsp/newUserRequest.jsp          |  2 +-
 .../webapp/jsp/snippets/OA/targetConfiguration.jsp  | 21 ++++++++++++++++++++-
 5 files changed, 24 insertions(+), 5 deletions(-)

(limited to 'id/ConfigWebTool/src/main/webapp/jsp')

diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
index f77996670..79c66f37c 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
@@ -35,7 +35,7 @@
 			
 				<s:if test="authUser.isAdmin()">
 								
-					<s:form namespace="/secure" method="POST" enctype="multipart/form-data;charset=UTF-8">
+					<s:form namespace="/secure" method="POST" enctype="multipart/form-data">
 							
 							<s:if test="moaconfig.isVirtualPublicURLPrefixEnabled()">
 								<s:textarea name="moaconfig.publicURLPrefix" 
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
index 7dc745e62..cc4220d0e 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
@@ -38,7 +38,7 @@
 			<div id="list_area">
 				<h2><%=LanguageHelper.getGUIString("webpages.oaconfig.header", request) %></h2>
 								
-				<s:form namespace="/secure" method="POST" enctype="multipart/form-data;charset=UTF-8">
+				<s:form namespace="/secure" method="POST" enctype="multipart/form-data">
 				
 					<s:include value="snippets/OA/generalInformation.jsp"></s:include>			
 		
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/edituser.jsp b/id/ConfigWebTool/src/main/webapp/jsp/edituser.jsp
index 6aa5a2728..dffa7bd1b 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/edituser.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/edituser.jsp
@@ -38,7 +38,7 @@
 						
 			<div id="list_area">
 	
-					<s:form namespace="/secure" method="POST" enctype="multipart/form-data;charset=UTF-8">
+					<s:form namespace="/secure" method="POST" enctype="multipart/form-data">
 						<jsp:include page="snippets/userfields.jsp"></jsp:include>
 						
 						<s:hidden name="formID"	value="%{formID}"></s:hidden>
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/newUserRequest.jsp b/id/ConfigWebTool/src/main/webapp/jsp/newUserRequest.jsp
index 2fe337758..934296b3a 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/newUserRequest.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/newUserRequest.jsp
@@ -37,7 +37,7 @@
 						
 			<div id="list_area">
 	
-					<s:form namespace="/" method="POST" enctype="multipart/form-data;charset=UTF-8">
+					<s:form namespace="/" method="POST" enctype="multipart/form-data">
 						<jsp:include page="snippets/userfields.jsp"></jsp:include>
 						
 						<s:hidden name="formID"	value="%{formID}"></s:hidden>
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp
index a61ce3053..367dc445d 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp
@@ -112,8 +112,17 @@
 						</div>
 					</s:if>
 					
+										
 					<div id="oa_config_foreignbPKArea" class="oa_config_block">
-						<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.general.foreignbpk.header", request) %></h3>
+						<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.general.neweid.header", request) %></h3>
+						
+						<s:checkbox name="targetConfig.eidDemoActive" 
+								value="%{targetConfig.eidDemoActive}"
+								labelposition="left"
+								key="webpages.oaconfig.general.neweid.activate"
+								cssClass="checkbox">
+						</s:checkbox>
+						
 						<s:textarea name="targetConfig.foreignbPKTargets" 
 									value="%{targetConfig.foreignbPKTargets}" 
 									labelposition="left"
@@ -123,6 +132,16 @@
 									requiredLabel="true"
 									style="height:120px;">								
 						</s:textarea>
+						
+						<s:textarea name="targetConfig.additionalbPKTargets" 
+									value="%{targetConfig.additionalbPKTargets}" 
+									labelposition="left"
+									key="webpages.oaconfig.general.additionalbpks.sectors"
+									cssClass="textfield_long"
+									rows="6"								
+									requiredLabel="true"
+									style="height:120px;">								
+						</s:textarea>
 					
 					</div>
 					
-- 
cgit v1.2.3