ConfigWebTool Version 0.9.5

 --PVP2 Login
 --PVP2 Users to UserDatabase functionality
 --Mailaddress verification
 --Mail status messages to users and admin
 --add List with OpenRequests for admins
 --change OA Target configuration
 --add cleanUp Thread to remove old unused UserAccount requests
 --update UserDatabase to support PVP2 logins
 --add formID element validate received forms

 -- add first classes for STORK configuration

make some Bugfixes

17 files changed, 650 insertions, 229 deletions

diff --git a/id/ConfigWebTool/src/main/webapp/WEB-INF/web.xml b/id/ConfigWebTool/src/main/webapp/WEB-INF/web.xml
index 7b27b0c4d..a44cf8ce5 100644
--- a/id/ConfigWebTool/src/main/webapp/WEB-INF/web.xml
+++ b/id/ConfigWebTool/src/main/webapp/WEB-INF/web.xml
@@ -24,7 +24,7 @@
 		</init-param>
 		<init-param>
 			<param-name>allowed</param-name>
-			<param-value>^.*((/index.action)|(/error.action)|(/authenticate.action)|(/logout.action)|(/jsp/.*)|(/css/.*)|(/images/.*)|(/js/.*))$</param-value>
+			<param-value>^.*((/index.action)|(/error.action)|(/authenticate.action)|(/pvp2login.action.*)|(/mailAddressVerification.action.*)|(/logout.action)|(/jsp/.*)|(/css/.*)|(/servlet/.*)|(/images/.*)|(/js/.*))$</param-value>
 		</init-param>
 	</filter>
 	<filter-mapping>
@@ -61,6 +61,28 @@
 		</init-param>
 	</filter>
 	
+  <servlet>
+		<servlet-name>pvp2login</servlet-name>
+		<display-name>pvp2login</display-name>
+		<servlet-class>at.gv.egovernment.moa.id.configuration.auth.pvp2.Authenticate</servlet-class>
+	</servlet>
+   
+  <servlet>
+		<servlet-name>buildmetadata</servlet-name>
+		<display-name>buildmetadata</display-name>
+		<servlet-class>at.gv.egovernment.moa.id.configuration.auth.pvp2.BuildMetadata</servlet-class>
+	</servlet> 
+  
+  <servlet-mapping>
+		<servlet-name>buildmetadata</servlet-name>
+		<url-pattern>/servlet/metadata</url-pattern>
+	</servlet-mapping>
+  
+  <servlet-mapping>
+		<servlet-name>pvp2login</servlet-name>
+		<url-pattern>/servlet/pvp2login</url-pattern>
+	</servlet-mapping>
+   
 <!--  	<filter-mapping>
 	    <filter-name>sitemash</filter-name>
 	    <url-pattern>/*</url-pattern>
diff --git a/id/ConfigWebTool/src/main/webapp/css/index.css b/id/ConfigWebTool/src/main/webapp/css/index.css
index 6eeb6a4ee..6733efd4d 100644
--- a/id/ConfigWebTool/src/main/webapp/css/index.css
+++ b/id/ConfigWebTool/src/main/webapp/css/index.css
@@ -22,6 +22,34 @@
     padding-right: 25px;
 }
 
+#passwordlogin {
+	float: left;
+}
+
+#bkulogin {
+	float: left;
+	margin-left: 50px;
+}
+
+#bkuloginbutton {
+	background:-moz-linear-gradient(bottom,#b3b3b3,#f1f1f1); /* Firefox */
+	background:-webkit-gradient(linear,left top,left bottom,from(#b3b3b3),to(#f1f1f1)); /* Chrome, Safari */
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#b3b3b3',endColorstr='#f1f1f1');
+	
+	display: block;
+	padding-top: 10px;
+	padding-bottom: 10px;
+	text-align: center;
+	width: 200px;
+	/* background-color: gold; */
+	border-radius: 10px;
+	box-shadow: 8px 8px 8px #666;
+	border-style: solid;
+	border-color: black;
+	border-width: 2px;
+
+}
+
 #menu_area {
 	margin-top: 25px;
 	border-color: black;
@@ -106,6 +134,10 @@
 	display: none;
 }
 
+#mail_area input {
+	float: right;
+}
+
 .oa_protocol_area {
     clear: both;
     margin-left: 25px;
@@ -147,6 +179,7 @@
 		margin-top: 6px;
 }
 
+
 .oa_config_block h3 {
 		padding-top: 25px;
 }
@@ -193,6 +226,10 @@
 	margin-right: 50px;
 }
 
+#oa_config_businessservice .wwgrp {
+	clear: none;
+}
+
 div .wwgrp br { 
 	display: none; 
 }
@@ -202,6 +239,15 @@ div .wwgrp br {
 	
 }
 
+.textfield_middle {
+	width: 100px;
+	
+}
+
+.textfield_mail {
+	width: 400px;
+}
+
 .textfield_long {
 	width: 600px;
 	
@@ -212,7 +258,13 @@ div .wwgrp br {
 	height: 200px;
 	text-align: left;
 }
-	
+
+.selectfield {
+	width: 80px;
+	float: left;
+	margin-right: 5px;
+}
+
 .checkbox{
 	margin-top: 7px;
 }
@@ -271,13 +323,19 @@ div .wwgrp br {
 	width: 200px;
 }
 
-.userListThird {
+.userListFirstSecond {
 	position: relative;
+	width: 400px;
 	float: left;
 }
 
-.disabled {
+.userListThird {
+	position: relative;
+	float: left;
+}
 
+#usernamepassword_area {
+	display: none;
 }
 
 #footer_area {
diff --git a/id/ConfigWebTool/src/main/webapp/error.jsp b/id/ConfigWebTool/src/main/webapp/error.jsp
index 97dc218e7..8993c1102 100644
--- a/id/ConfigWebTool/src/main/webapp/error.jsp
+++ b/id/ConfigWebTool/src/main/webapp/error.jsp
@@ -1,3 +1,4 @@
+<%@page import="at.gv.egovernment.moa.id.configuration.config.ConfigurationProvider"%>
 <%@page import="at.gv.egovernment.moa.id.configuration.helper.LanguageHelper"%>
 
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
@@ -11,10 +12,11 @@
 		<title><%=LanguageHelper.getGUIString("title", request) %></title>
 	</head>
 	
-	<body>
-		<h1><%=LanguageHelper.getGUIString("webpages.error.header", request) %></h1>
+	<body style="text-align: center;">
+		<h1 style="color: red;"><%=LanguageHelper.getGUIString("webpages.error.header", request) %></h1>
 		
 		<div id="information_area">
+			<p><%=LanguageHelper.getGUIString("error.general.text", request) %></p>
 			<s:if test="hasActionErrors()">
    			<div id="error_area">
    				<label><%=LanguageHelper.getGUIString("error.title", request) %></label>
diff --git a/id/ConfigWebTool/src/main/webapp/index.jsp b/id/ConfigWebTool/src/main/webapp/index.jsp
index 4e49eac75..f4c853792 100644
--- a/id/ConfigWebTool/src/main/webapp/index.jsp
+++ b/id/ConfigWebTool/src/main/webapp/index.jsp
@@ -13,42 +13,55 @@
 	
 	<body>
 		<h1><%=LanguageHelper.getGUIString("webpages.index.header", request) %></h1>
-		
+				
 		<div id="information_area">
+		
+			<s:if test="hasActionMessages()">
+   			<div id="message_area">
+   				<label><%=LanguageHelper.getGUIString("message.title", request) %></label>
+      			<s:actionmessage/>
+   			</div>
+			</s:if>	
+		
 			<s:if test="hasActionErrors()">
    			<div id="error_area">
-   			<label><%=LanguageHelper.getGUIString("error.title", request) %></label>
-    		<s:actionerror/>
-   		</div>
-		</s:if>	
+   				<label><%=LanguageHelper.getGUIString("error.title", request) %></label>
+    			<s:actionerror/>
+   			</div>
+			</s:if>	
 		
 		<div id="information_area">
 			<p><%=LanguageHelper.getGUIString("webpages.index.desciption.head", request) %></p>
 			
 			<div class="oa_config_block">
 				
-					<s:form namespace="/" method="POST" enctype="multipart/form-data">
+					<s:form id="passwordlogin" namespace="/" method="POST" enctype="multipart/form-data">
 				
 							<s:textfield name="username" 
 								value="%{username}" 
 								labelposition="left"
 								key="webpages.edituser.username"
-								cssClass="textfield_long"
+								cssClass="textfield_mail"
 								maxlength="16">
 							</s:textfield>
 								
 							<s:password name="password"  
 								labelposition="left"
 								key="webpages.edituser.password"
-								cssClass="textfield_long"
+								cssClass="textfield_mail"
 								maxlength="16">
 							</s:password>
 							
 							<s:submit key="webpages.index.login" action="authenticate"/>		
 							
 					</s:form>
+					
+					<div id="bkulogin">
+						<a id="bkuloginbutton" href="servlet/pvp2login"><%=LanguageHelper.getGUIString("webpages.index.login.pvp2", request) %></a>
+					</div>
+						
 			</div>
-			
+						
 		</div>
 		
 	</body>
diff --git a/id/ConfigWebTool/src/main/webapp/js/common.js b/id/ConfigWebTool/src/main/webapp/js/common.js
index 249cb37fa..0b69854da 100644
--- a/id/ConfigWebTool/src/main/webapp/js/common.js
+++ b/id/ConfigWebTool/src/main/webapp/js/common.js
@@ -63,9 +63,64 @@ function oaLegacyService() {
 		
 	}
 }
+function AdminTarget() {
+	if ($('#adminTarget').attr('checked') == 'checked') {
+		
+		$('#admin_target_area').css('display', "block");
+		
+	} else {
+		
+		$('#admin_target_area').css('display', "none");
+		
+	}
+}
+function HideAdminTarget() {
+	$('#adminTarget').removeAttr("checked");
+	$('#admin_target_area').css('display', "none");
+}
+function UseUserNamePassword() {
+	if ($('#isusernamepasswordallowed').size() == 0) {
+		$('#usernamepassword_area').css('display', "none");
+		return;
+	}
+	
+	if ($('#isusernamepasswordallowed').attr('checked') == 'checked') {
+		if ($('#editUser_user_username').val() == "") {
+			$('#editUser_user_username').removeAttr("disabled");
+		}
+		$('#usernamepassword_area').css('display', "block");
+		
+	} else {
+		$('#editUser_user_username').prop("disabled", "disabled");
+		$('#usernamepassword_area').css('display', "none");
+		
+	}
+}
+function sendVerificationMail() {
+	$.ajax({
+		xhr: function() {
+			var xhr = new window.XMLHttpRequest();
+		    return xhr;
+		  },
+		  type: "GET",
+	      url: "servlet/sendVerificationMail.action",
+		  data: "",
+		  success: function (msg) {
+			  alert(msg);
+		  },
+		  error: function () {
+			  alert('Anfrage konnte nicht gesendet werden!');
+			},
+	});
+}
+function userOnLoad() {
+	UseUserNamePassword();
+	return true;
+}
 function oaOnLoad() {
 	oaBusinessService();
 	oaSSOService();
 	oaLegacyService();
+	AdminTarget();
 	return true;
 }
\ No newline at end of file
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
index 2b24f0b89..05f4a1106 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
@@ -341,6 +341,9 @@
 						
 						<br>
 						<br>
+						
+						<s:hidden name="formID" 
+							value="%{formID}"></s:hidden>
 																	
 						<div id="button_area">					
 							<s:submit key="webpages.edit.back" action="backGeneralConfig"/>		
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
index 60f253222..68d47d6b8 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
@@ -71,102 +71,177 @@
  					<div id="oa_config_businessservice" class="oa_config_block">
 						<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.general.business.header", request) %></h3>
 						
-						<s:textfield name="generalOA.identificationNumber" 
+<%-- 						<s:select list="generalOA.identificationTypeList"
+											key="webpages.oaconfig.general.business.type"
+											labelposition="left"
+											cssClass="selectfield"
+											value="%{generalOA.identificationType}"
+											name="generalOA.identificationType">
+						</s:select> --%>
+						
+						<s:select list="generalOA.identificationTypeList"
+											key="webpages.oaconfig.general.business.value"
+											labelposition="left"
+											cssClass="selectfield"
+											value="%{generalOA.identificationType}"
+											name="generalOA.identificationType">
+						</s:select>
+						
+<%-- 						<s:textfield name="generalOA.identificationNumber" 
 							value="%{generalOA.identificationNumber}" 
 							labelposition="left"
 							key="webpages.oaconfig.general.business.value"
-							cssClass="textfield_long">
+							cssClass="selectfield">
+						</s:textfield>		 --%>
+						
+						<s:textfield name="generalOA.identificationNumber" 
+							value="%{generalOA.identificationNumber}" 
+							cssClass="textfield_middle">
 						</s:textfield>		
 					</div>
 					
 					<div id="oa_config_publicservice" class="oa_config_block">
 						<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.general.public.header", request) %></h3>
 						
-						<s:textfield name="generalOA.target" 
-							value="%{generalOA.target}" 
-							labelposition="left"
-							key="webpages.oaconfig.general.target"
-							cssClass="textfield_short">
-						</s:textfield>
-
-						<s:textfield name="generalOA.targetFriendlyName" 
-							value="%{generalOA.targetFriendlyName}" 
-							labelposition="left"
-							key="webpages.oaconfig.general.target.friendlyname"
-							cssClass="textfield_long">
-						</s:textfield>
-					</div>
-					
-					<div class="oa_config_block">
-						<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.general.bku.header", request) %></h3>
+						<s:if test="authUser.isAdmin()">
+							<s:select list="generalOA.targetList"
+												key="webpages.oaconfig.general.target"
+												labelposition="left"
+												cssClass="selectfield"
+												value="%{generalOA.target}"
+												name="generalOA.target"
+												onchange="HideAdminTarget();">
+							</s:select>						
+						</s:if>
+						<s:else>
+							<s:select list="generalOA.targetList"
+												key="webpages.oaconfig.general.target"
+												labelposition="left"
+												cssClass="selectfield"
+												value="%{generalOA.target}"
+												name="generalOA.target">
+							</s:select>
+						</s:else>
 						
-						<s:textfield name="generalOA.bkuOnlineURL" 
-							value="%{generalOA.bkuOnlineURL}" 
+						<s:textfield name="generalOA.target_subsector" 
+							value="%{generalOA.target_subsector}" 
 							labelposition="left"
-							key="webpages.oaconfig.general.bku.online"
-							cssClass="textfield_long">
+							key="webpages.oaconfig.general.target.subsector"
+							cssClass="selectfield">
 						</s:textfield>
+						
+						
+ 						<s:if test="authUser.isAdmin()">
+ 							<s:checkbox
+	 							name="generalOA.AdminTarget" 
+								value="%{generalOA.AdminTarget}"
+								cssClass="checkbox"
+ 								onclick="AdminTarget();"
+ 								labelposition="left"
+								key="webpages.oaconfig.general.target.admin.checkbox"
+								id="adminTarget">
+ 							</s:checkbox>
+ 							
+ 							<div id="admin_target_area">
+								<s:textfield name="generalOA.target_admin" 
+									value="%{generalOA.target_admin}" 
+									labelposition="left"
+									key="webpages.oaconfig.general.target.admin"
+									cssClass="textfield_short">
+								</s:textfield>
+								<s:textfield name="generalOA.targetFriendlyName" 
+									value="%{generalOA.targetFriendlyName}" 
+									labelposition="left"
+									key="webpages.oaconfig.general.target.friendlyname"
+									cssClass="textfield_long">
+								</s:textfield>
+							</div>
+ 						</s:if>
+ 						<s:else>
+ 							<s:if test="generalOA.target_admin neq null">
+ 								<s:textfield name="generalOA.target_admin" 
+									value="%{generalOA.target_admin}" 
+									labelposition="left"
+									key="webpages.oaconfig.general.target.admin.disabled"
+									cssClass="textfield_short"
+									disabled="true">
+								</s:textfield>
+							</s:if>
+<%-- 							<s:if test="generalOA.targetFriendlyName neq null">
+								<s:textfield name="generalOA.targetFriendlyName" 
+									value="%{generalOA.targetFriendlyName}" 
+									labelposition="left"
+									key="webpages.oaconfig.general.target.friendlyname.disabled"
+									cssClass="textfield_long">
+								</s:textfield>
+							</s:if> --%>
+ 						</s:else>
 
-						<s:textfield name="generalOA.bkuHandyURL" 
-							value="%{generalOA.bkuHandyURL}" 
-							labelposition="left"
-							key="webpages.oaconfig.general.bku.handy"
-							cssClass="textfield_long">
-						</s:textfield>
 
-						<s:textfield name="generalOA.bkuLocalURL" 
-							value="%{generalOA.bkuLocalURL}" 
-							labelposition="left"
-							key="webpages.oaconfig.general.bku.local"
-							cssClass="textfield_long">
-						</s:textfield>
-						
-						<s:if test="authUser.isAdmin()">
-							<s:textfield name="generalOA.slVersion" 
-								value="%{generalOA.slVersion}" 
+					</div>
+					
+					<s:if test="authUser.isAdmin()">
+						<div class="oa_config_block">
+							<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.general.bku.header", request) %></h3>
+							
+							<s:textfield name="generalOA.bkuOnlineURL" 
+								value="%{generalOA.bkuOnlineURL}" 
 								labelposition="left"
-								key="webpages.oaconfig.general.bku.slversion"
+								key="webpages.oaconfig.general.bku.online"
 								cssClass="textfield_long">
 							</s:textfield>
-						</s:if>
-						<s:radio list="generalOA.keyBoxIdentifierList"
-							name="generalOA.keyBoxIdentifier"
-							value="%{generalOA.keyBoxIdentifier}"
-							labelposition="left"
-							key="webpages.oaconfig.general.bku.keyboxidentifier"
-							cssClass="radio">
-						</s:radio>						
-						<s:checkbox name="generalOA.legacy" 
-							value="%{generalOA.legacy}"
-							labelposition="left"
-							key="webpages.oaconfig.general.bku.legacy"
-							cssClass="checkbox"
-							onclick="oaLegacyService();"
-							id="OAislegacy">
-						</s:checkbox>
-						<div id="oa_config_sltemplates">
-							<s:textfield name="generalOA.SLTemplateURL1" 
-								value="%{generalOA.SLTemplateURL1}" 
+	
+							<s:textfield name="generalOA.bkuHandyURL" 
+								value="%{generalOA.bkuHandyURL}" 
 								labelposition="left"
-								key="webpages.oaconfig.general.bku.sltemplate.first"
+								key="webpages.oaconfig.general.bku.handy"
 								cssClass="textfield_long">
 							</s:textfield>
-							<s:textfield name="generalOA.SLTemplateURL2" 
-								value="%{generalOA.SLTemplateURL2}" 
+	
+							<s:textfield name="generalOA.bkuLocalURL" 
+								value="%{generalOA.bkuLocalURL}" 
 								labelposition="left"
-								key="webpages.oaconfig.general.bku.sltemplate.second"
+								key="webpages.oaconfig.general.bku.local"
 								cssClass="textfield_long">
 							</s:textfield>
-							<s:textfield name="generalOA.SLTemplateURL3" 
-								value="%{generalOA.SLTemplateURL3}" 
+							
+							<s:radio list="generalOA.keyBoxIdentifierList"
+								name="generalOA.keyBoxIdentifier"
+								value="%{generalOA.keyBoxIdentifier}"
 								labelposition="left"
-								key="webpages.oaconfig.general.bku.sltemplate.third"
-								cssClass="textfield_long">
-							</s:textfield>
+								key="webpages.oaconfig.general.bku.keyboxidentifier"
+								cssClass="radio">
+							</s:radio>						
+							<s:checkbox name="generalOA.legacy" 
+								value="%{generalOA.legacy}"
+								labelposition="left"
+								key="webpages.oaconfig.general.bku.legacy"
+								cssClass="checkbox"
+								onclick="oaLegacyService();"
+								id="OAislegacy">
+							</s:checkbox>
+							<div id="oa_config_sltemplates">
+								<s:textfield name="generalOA.SLTemplateURL1" 
+									value="%{generalOA.SLTemplateURL1}" 
+									labelposition="left"
+									key="webpages.oaconfig.general.bku.sltemplate.first"
+									cssClass="textfield_long">
+								</s:textfield>
+								<s:textfield name="generalOA.SLTemplateURL2" 
+									value="%{generalOA.SLTemplateURL2}" 
+									labelposition="left"
+									key="webpages.oaconfig.general.bku.sltemplate.second"
+									cssClass="textfield_long">
+								</s:textfield>
+								<s:textfield name="generalOA.SLTemplateURL3" 
+									value="%{generalOA.SLTemplateURL3}" 
+									labelposition="left"
+									key="webpages.oaconfig.general.bku.sltemplate.third"
+									cssClass="textfield_long">
+								</s:textfield>
+							</div>
 						</div>
-
-
-					</div>
+					</s:if>
 					
 					<div class="oa_config_block">
 						<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.general.mandate.header", request) %></h3>
@@ -300,38 +375,33 @@
 					<div class="oa_config_block">
 						<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.general.aditional.header", request) %></h3>
 												
-						<s:checkbox name="generalOA.useIFrame" 
-							value="%{generalOA.useIFrame}"
-							labelposition="left"
-							key="webpages.oaconfig.general.aditional.iframe"
-							cssClass="checkbox">
-						</s:checkbox>
-
-						<s:checkbox name="generalOA.useUTC" 
-							value="%{generalOA.useUTC}"
-							labelposition="left"
-							key="webpages.oaconfig.general.aditional.useUTC"
-							cssClass="checkbox">
-						</s:checkbox>
-
 <%-- 				<s:checkbox name="generalOA.calculateHPI" 
 							value="%{generalOA.calculateHPI}"
 							labelposition="left"
 							key="webpages.oaconfig.general.aditional.calculateHPI"
 							cssClass="textfield_long">
 						</s:checkbox> --%>
-												
-						<s:textarea name="generalOA.aditionalAuthBlockText" 
-							value="%{generalOA.aditionalAuthBlockText}" 
+						
+						<s:checkbox name="generalOA.HideBPKAuthBlock" 
+							value="%{generalOA.HideBPKAuthBlock}"
 							labelposition="left"
-							key="webpages.oaconfig.general.aditional.authblocktext"
-							cssClass="textfield_large">
-						</s:textarea>
+							key="webpages.oaconfig.general.isHideBPKAuthBlock"
+							cssClass="checkbox">
+						</s:checkbox>
 						
+						<s:if test="authUser.isAdmin()">						
+							<s:textarea name="generalOA.aditionalAuthBlockText" 
+								value="%{generalOA.aditionalAuthBlockText}" 
+								labelposition="left"
+								key="webpages.oaconfig.general.aditional.authblocktext"
+								cssClass="textfield_large">
+							</s:textarea>
+						</s:if>
+							
 					</div>
 					
-<%-- 					<s:hidden name="generalOA.dbID" 
-							value="%{generalOA.dbID}"></s:hidden> --%>
+					<s:hidden name="formID" 
+							value="%{formID}"></s:hidden>
 					
 					<div id="button_area">
 					
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/edituser.jsp b/id/ConfigWebTool/src/main/webapp/jsp/edituser.jsp
index 067bcd57d..994389de3 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/edituser.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/edituser.jsp
@@ -6,20 +6,29 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 	<head>
+		<title><%=LanguageHelper.getGUIString("title", request) %></title>
 		<meta content="text/html; charset=utf-8" http-equiv="Content-Type">
+		
 		<link rel="stylesheet" type="text/css" href="../css/index.css">
-		<title><%=LanguageHelper.getGUIString("title", request) %></title>
 		<script type="text/javascript" src="../js/common.js"></script>
 		<script src="../js/jquery.js"></script>
 	</head>
 	
-	<body>
+	<body onload="userOnLoad();">
 		
  		<jsp:include page="snippets/header_userinfos.jsp"></jsp:include>
-
+ 		
 		<jsp:include page="snippets/main_menu.jsp"></jsp:include>
 		
 		<div id="information_area">
+			
+			<s:if test="hasActionMessages()">
+   			<div id="error_area">
+   				<label><%=LanguageHelper.getGUIString("error.title", request) %></label>
+      			<s:actionmessage/>
+   			</div>
+			</s:if>	
+				
 			<s:if test="hasActionErrors()">
    			<div id="error_area">
    				<label><%=LanguageHelper.getGUIString("error.title", request) %></label>
@@ -28,118 +37,26 @@
 			</s:if>	
 						
 			<div id="list_area">
-							
+	
 					<s:form namespace="/secure" method="POST" enctype="multipart/form-data">
-				
-						<div class="oa_config_block">	
-							<h3><%=LanguageHelper.getGUIString("webpages.edituser.header", request) %></h3>												
-							<s:textfield name="user.givenName" 
-								value="%{user.givenName}" 
-								labelposition="left"
-								key="webpages.edituser.givenname"
-								cssClass="textfield_long">
-							</s:textfield>	
-							<s:textfield name="user.familyName" 
-								value="%{user.familyName}" 
-								labelposition="left"
-								key="webpages.edituser.familyName"
-								cssClass="textfield_long">
-							</s:textfield>
-							<s:textfield name="user.institut" 
-								value="%{user.institut}" 
-								labelposition="left"
-								key="webpages.edituser.institut"
-								cssClass="textfield_long">
-							</s:textfield>
-							<s:textfield name="user.mail" 
-								value="%{user.mail}" 
-								labelposition="left"
-								key="webpages.edituser.mail"
-								cssClass="textfield_long">
-							</s:textfield>
-							<s:textfield name="user.phone" 
-								value="%{user.phone}" 
-								labelposition="left"
-								key="webpages.edituser.phone"
-								cssClass="textfield_long">
-							</s:textfield>
-						</div>
+						<jsp:include page="snippets/userfields.jsp"></jsp:include>
 						
-						<div class="oa_config_block">	
-							<h3><%=LanguageHelper.getGUIString("webpages.edituser.access.header", request) %></h3>
-							<s:if test="isNewUser()">	
-								<s:textfield name="user.username" 
-									value="%{user.username}" 
-									labelposition="left"
-									key="webpages.edituser.username"
-									cssClass="textfield_long"
-									maxlength="16">
-								</s:textfield>
-							</s:if>
-							<s:else>
-								<s:textfield name="user.username" 
-									value="%{user.username}" 
-									labelposition="left"
-									key="webpages.edituser.username"
-									cssClass="textfield_long"
-									disabled="true"
-									maxlength="16">
-								</s:textfield>
-							</s:else>
-								
-							<s:password name="user.password"  
-								labelposition="left"
-								key="webpages.edituser.password"
-								cssClass="textfield_long"
-								maxlength="16">
-							</s:password>
-							
-  						<s:password name="user.password_second"  
-								labelposition="left"
-								key="webpages.edituser.password_second"
-								cssClass="textfield_long"
-								maxlength="16">
-							</s:password>
-													
-							<s:textfield name="user.bpk" 
-								value="%{user.bpk}" 
-								labelposition="left"
-								key="webpages.edituser.bpk"
-								cssClass="textfield_long">
-							</s:textfield>							
-						</div>
-						
-						<s:if test="authUser.isAdmin()">
-							<div class="oa_config_block">	
-								<h3><%=LanguageHelper.getGUIString("webpages.edituser.role.header", request) %></h3>	
-								<s:checkbox name="user.active" 
-									value="%{user.active}" 
-									labelposition="left"
-									key="webpages.edituser.active"
-									cssClass="checkbox">
-								</s:checkbox>
-								<s:checkbox name="user.admin" 
-									value="%{user.admin}"
-									labelposition="left"
-									key="webpages.edituser.admin"
-									cssClass="checkbox">
-								</s:checkbox>
-							</div>
-						</s:if>
-						
-						<s:hidden name="user.userID" value="%{user.userID}"></s:hidden>
+						<s:hidden name="formID"	value="%{formID}"></s:hidden>
 						
 						<div id="button_area">
 							
 							<s:if test="authUser.isAdmin()">
-								<s:submit key="webpages.edit.back" action="usermanagementInit"/>
-							</s:if>		
+								<s:submit key="webpages.edit.back" action="%{nextPage}"/>
+							</s:if>
+									
 							<s:submit key="webpages.edit.save" action="saveUser"/>
-							<s:if test="!isNewUser()">
-								<s:submit key="webpages.edit.delete.user" action="deleteUser"/>
+								<s:if test="!isNewUser()">
+									<s:submit key="webpages.edit.delete.user" action="deleteUser"/>
 							</s:if>								
-					</div>												
+					</div>  
+																						
 					</s:form>
+		
 				</div>
 		</div>
 		
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/importexport.jsp b/id/ConfigWebTool/src/main/webapp/jsp/importexport.jsp
index b28bc5f57..c619e64b1 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/importexport.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/importexport.jsp
@@ -42,6 +42,8 @@
 							<h3><%=LanguageHelper.getGUIString("webpages.inportexport.legacyimport.header", request) %></h3>					
 							<s:file name="fileUpload" key="webpages.inportexport.legacyimport.upload" cssClass="textfield_long"></s:file>
 							
+							<s:hidden name="formID"	value="%{formID}"></s:hidden>
+							
 							<div id="button_area">
 								<%-- <s:submit key="webpages.edit.back" action="main"/> --%>		
 								<s:submit key="webpages.edit.import" action="importlegacy"/>
@@ -57,6 +59,8 @@
 							<h3><%=LanguageHelper.getGUIString("webpages.inportexport.import.header", request) %></h3>					
  							<s:file name="fileUpload" key="webpages.inportexport.import.upload" cssClass="textfield_long"></s:file>
 
+							<s:hidden name="formID"	value="%{formID}"></s:hidden>
+
 							<div id="button_area">
 								<s:submit key="webpages.edit.import" action="importConfig"/>		
 								<s:submit key="webpages.edit.export" action="exportConfig"/>
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/mainpage.jsp b/id/ConfigWebTool/src/main/webapp/jsp/mainpage.jsp
index b700970cc..c9f1e00f6 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/mainpage.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/mainpage.jsp
@@ -25,6 +25,14 @@
       			<s:actionmessage/>
    			</div>
 			</s:if>	
+			
+			<s:if test="hasActionErrors()">
+   			<div id="error_area">
+   				<label><%=LanguageHelper.getGUIString("error.title", request) %></label>
+    			<s:actionerror/>
+   			</div>
+			</s:if>	
+			
 		
 			<p>Im Menü auf der rechten Seite können Sie die einzelnen Operationen wählen.</p>
 		</div>
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/newUserRequest.jsp b/id/ConfigWebTool/src/main/webapp/jsp/newUserRequest.jsp
new file mode 100644
index 000000000..9995f9f31
--- /dev/null
+++ b/id/ConfigWebTool/src/main/webapp/jsp/newUserRequest.jsp
@@ -0,0 +1,57 @@
+<%@page import="at.gv.egovernment.moa.id.configuration.helper.LanguageHelper"%>
+
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+	<head>
+		<title><%=LanguageHelper.getGUIString("title", request) %></title>
+		<meta content="text/html; charset=utf-8" http-equiv="Content-Type">
+		
+		<link rel="stylesheet" type="text/css" href="./css/index.css">
+		<script type="text/javascript" src="./js/common.js"></script>
+		<script src="./js/jquery.js"></script>
+	</head>
+	
+	<body>
+		
+ 		<jsp:include page="snippets/header_userinfos.jsp"></jsp:include>
+ 				
+		<div id="information_area">
+		
+			<s:if test="!authUser.isAuthenticated()">
+				<p>Füllen sie die nachstehenden Felder aus um einen neuen Benutzer zu beantraten.</p>
+				<p>Danach erhalten sie eine Mail zur Verifzierung Ihrer Mailadresse. 
+				Nach Bestätiung dieser Verifikationsmail wird der Administrator über Ihre Anfrage informiert.
+				Die Freischaltung kann somit eine gewisse Zeit in Anspruch nehmen. </p>
+		
+			</s:if>
+		
+			<s:if test="hasActionErrors()">
+   			<div id="error_area">
+   				<label><%=LanguageHelper.getGUIString("error.title", request) %></label>
+      			<s:actionerror/>
+   			</div>
+			</s:if>	
+						
+			<div id="list_area">
+	
+					<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>
+						
+						<div id="button_area">
+							<s:submit key="webpages.edit.newUser" action="requestNewUser"/>
+						</div>  
+																						
+					</s:form>
+		
+				</div>
+		</div>
+		
+		<jsp:include page="snippets/footer.jsp"></jsp:include>
+		
+	</body>
+</html>
\ No newline at end of file
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/openadminrequests.jsp b/id/ConfigWebTool/src/main/webapp/jsp/openadminrequests.jsp
new file mode 100644
index 000000000..954bf9b8b
--- /dev/null
+++ b/id/ConfigWebTool/src/main/webapp/jsp/openadminrequests.jsp
@@ -0,0 +1,51 @@
+<%@page import="at.gv.egovernment.moa.id.configuration.helper.LanguageHelper"%>
+
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+	<head>
+		<meta content="text/html; charset=utf-8" http-equiv="Content-Type">
+		<link rel="stylesheet" type="text/css" href="../css/index.css">
+		<title><%=LanguageHelper.getGUIString("title", request) %></title>
+		<script type="text/javascript" src="../js/common.js"></script>
+		<script src="../js/jquery.js"></script>
+	</head>
+	
+	<body>
+		
+ 		<jsp:include page="snippets/header_userinfos.jsp"></jsp:include>
+
+		<jsp:include page="snippets/main_menu.jsp"></jsp:include>
+		
+		<div id="information_area">
+			<s:if test="hasActionErrors()">
+   			<div id="error_area">
+   				<label><%=LanguageHelper.getGUIString("error.title", request) %></label>
+      			<s:actionerror/>
+   			</div>
+			</s:if>	
+			
+			<h2><%=LanguageHelper.getGUIString("webpages.openadminrequests.header", request) %></h2>
+			
+			<s:if test="authUser.isAdmin()">
+				
+				<div class="oa_config_block">
+					<h3><%=LanguageHelper.getGUIString("webpages.openadminrequests.users.header", request) %></h3>		
+					<jsp:include page="snippets/user_list.jsp"></jsp:include>
+				</div>
+
+				<div class="oa_config_block">
+					<h3><%=LanguageHelper.getGUIString("webpages.openadminrequests.oas.header", request) %></h3>
+					<jsp:include page="snippets/oas_list.jsp"></jsp:include>
+				</div>
+
+			</s:if>
+				
+		</div>
+		
+		<jsp:include page="snippets/footer.jsp"></jsp:include>
+		
+	</body>
+</html>
\ No newline at end of file
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/header_userinfos.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/header_userinfos.jsp
index 72affde79..e9192b46e 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/header_userinfos.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/header_userinfos.jsp
@@ -5,9 +5,14 @@
 <html>
 	<div id="header_area"> 
 <!-- 		<div> -->
-			<%=LanguageHelper.getGUIString("webpages.header.info", request) %> 
-			<s:property value="authUser.givenName"/> <s:property value="authUser.familyName"/>,&nbsp;&nbsp;&nbsp; 
-		 	<%=LanguageHelper.getGUIString("webpages.header.lastlogin", request) %> <s:property value="authUser.lastLogin"/>
+			<%=LanguageHelper.getGUIString("webpages.header.info", request) %>
+			<s:if test="authUser.isMandateUser()">
+				<s:property value="authUser.institute"/>
+			</s:if>
+			<s:else>
+				<s:property value="authUser.givenName"/> <s:property value="authUser.familyName"/>,&nbsp;&nbsp;&nbsp;
+			</s:else>  
+		 	<%=LanguageHelper.getGUIString("webpages.header.lastlogin", request) %> <s:property value="authUser.getFormatedLastLogin()"/>
 		 	
 		 	<s:url action="logout" var="logoutURL" namespace="/"/>
 			<a id="logoutbutton" href="<s:property value="#logoutURL" />"><%=LanguageHelper.getGUIString("webpages.index.logout", request) %></a>
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/main_menu.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/main_menu.jsp
index 26b12cdcb..4d02f4bda 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/main_menu.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/main_menu.jsp
@@ -32,11 +32,13 @@
 					<s:url action="usermanagementInit" var="userManagementUrl" namespace="/secure"/>
 					<a href="<s:property value="#userManagementUrl" />"><%=LanguageHelper.getGUIString("webpages.mainpage.menu.general.usermanagement", request) %></a>
 			</div>
-
 			
-<%-- 			<div class="menu_element">
-				<a href=""><%=LanguageHelper.getGUIString("webpages.mainpage.menu.general.user", request) %></a>			
-			</div> --%>
+			<s:if test="authUser.isAdmin()">
+				<div class="menu_element">
+						<s:url action="adminRequestsInit" var="adminRequestsUrl" namespace="/secure"/>
+						<a href="<s:property value="#adminRequestsUrl" />"><%=LanguageHelper.getGUIString("webpages.mainpage.menu.general.adminrequests", request) %></a>
+				</div>
+			</s:if>
 
 		</div>  
 </html>
\ No newline at end of file
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/user_list.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/user_list.jsp
index c5b67cbac..a1e8530af 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/user_list.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/user_list.jsp
@@ -4,7 +4,6 @@
 
 <html>
 		<s:if test="userlist && userlist.size > 0">	
-			<h3><%=LanguageHelper.getGUIString("webpages.listUsers.list.header", request) %></h3>
 			<div id="list_area">
 					<div id="listHeader" class="listElement">
 						<div class="userListFirst">
@@ -21,12 +20,22 @@
 				<s:iterator var="UserElement" value="userlist">
 
 					<div class="listElement" onclick="userOA(<s:property value='userID'/>);">
-						<div class="userListFirst">
-							<s:property value="givenName"/>
-						</div>
-						<div class="userListSecond">
-							<s:property value="familyName"/>
-						</div>
+						<s:if test="isMandateUser()">
+							<div class="userListFirstSecond">
+								<s:property value="institute"/>
+							</div>
+<!-- 							<div class="userListSecond">
+								
+							</div>
+ -->						</s:if>
+						<s:else>
+							<div class="userListFirst">
+								<s:property value="familyName"/>
+							</div>
+							<div class="userListSecond">
+								<s:property value="givenName"/>
+							</div>
+						</s:else>
 						<div class="userListThird">
 							<s:property value="userName"/>
 						</div>
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/userfields.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/userfields.jsp
new file mode 100644
index 000000000..7d28a9236
--- /dev/null
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/userfields.jsp
@@ -0,0 +1,144 @@
+<%@page import="at.gv.egovernment.moa.id.configuration.helper.LanguageHelper"%>
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+
+<html>
+							<div class="oa_config_block">	
+							<h3><%=LanguageHelper.getGUIString("webpages.edituser.header", request) %></h3>			
+							
+							<s:if test="!user.isIsmandateuser()">							
+								<s:textfield name="user.givenName" 
+									value="%{user.givenName}" 
+									labelposition="left"
+									key="webpages.edituser.givenname"
+									cssClass="textfield_long"
+									disabled="%{user.isPVPGenerated()}">
+								</s:textfield>	
+								<s:textfield name="user.familyName" 
+									value="%{user.familyName}" 
+									labelposition="left"
+									key="webpages.edituser.familyName"
+									cssClass="textfield_long"
+									disabled="%{user.isPVPGenerated()}">
+								</s:textfield>
+							</s:if>
+							<s:textfield name="user.institut" 
+								value="%{user.institut}" 
+								labelposition="left"
+								key="webpages.edituser.institut"
+								cssClass="textfield_long"
+								disabled="%{user.isPVPGenerated() && user.isIsmandateuser()}">
+							</s:textfield>
+							
+							<s:if test="authUser.isAuthenticated()">
+								<div id="mail_area">
+									<s:textfield name="user.mail" 
+										value="%{user.mail}" 
+										labelposition="left"
+										key="webpages.edituser.mail"
+										cssClass="textfield_mail">
+									</s:textfield>
+									<input 	type="button" 
+														onclick="sendVerificationMail();" 
+														value='<%=LanguageHelper.getGUIString("webpages.edituser.verify.mail.button", request) %>'
+									/>
+								</div>
+							</s:if>
+							<s:else>
+								<s:textfield name="user.mail" 
+										value="%{user.mail}" 
+										labelposition="left"
+										key="webpages.edituser.mail"
+										cssClass="textfield_long">
+								</s:textfield>
+							</s:else>
+
+							
+							<s:textfield name="user.phone" 
+								value="%{user.phone}" 
+								labelposition="left"
+								key="webpages.edituser.phone"
+								cssClass="textfield_long">
+							</s:textfield>
+						</div>
+						
+						<div class="oa_config_block">	
+							<h3><%=LanguageHelper.getGUIString("webpages.edituser.access.header", request) %></h3>
+							
+							<div id="usernamepassword_area">
+<%-- 							<s:if test="user.isIsusernamepasswordallowed()"> --%>
+								<s:if test="isNewUser()">	
+									<s:textfield name="user.username" 
+										value="%{user.username}" 
+										labelposition="left"
+										key="webpages.edituser.username"
+										cssClass="textfield_long"
+										maxlength="16">
+									</s:textfield>
+								</s:if>
+								<s:else>
+									<s:textfield name="user.username" 
+										value="%{user.username}" 
+										labelposition="left"
+										key="webpages.edituser.username"
+										cssClass="textfield_long"
+										disabled="true"
+										maxlength="16">
+									</s:textfield>
+								</s:else>
+									
+								<s:password name="user.password"  
+									labelposition="left"
+									key="webpages.edituser.password"
+									cssClass="textfield_long"
+									maxlength="16">
+								</s:password>
+								
+	  						<s:password name="user.password_second"  
+									labelposition="left"
+									key="webpages.edituser.password_second"
+									cssClass="textfield_long"
+									maxlength="16">
+								</s:password>
+							<%-- </s:if> --%>
+							</div>
+													
+							<s:textfield name="user.bpk" 
+								value="%{user.bpk}" 
+								labelposition="left"
+								key="webpages.edituser.bpk"
+								cssClass="textfield_long"
+								disabled="%{user.isPVPGenerated()}">
+							</s:textfield>							
+						</div>
+						
+						<s:if test="authUser.isAdmin() || user.isIsusernamepasswordallowed()">						
+							<div class="oa_config_block">	
+								<h3><%=LanguageHelper.getGUIString("webpages.edituser.role.header", request) %></h3>
+								<s:if test="authUser.isAdmin()">	
+									<s:checkbox name="user.active" 
+										value="%{user.active}" 
+										labelposition="left"
+										key="webpages.edituser.active"
+										cssClass="checkbox">
+									</s:checkbox>
+									<s:checkbox name="user.admin" 
+										value="%{user.admin}"
+										labelposition="left"
+										key="webpages.edituser.admin"
+										cssClass="checkbox">
+									</s:checkbox>
+								</s:if>
+								<s:checkbox name="user.isusernamepasswordallowed" 
+									value="%{user.isusernamepasswordallowed}"
+									labelposition="left"
+									key="webpages.edituser.isusernamepasswordallowed"
+									cssClass="checkbox"
+									id="isusernamepasswordallowed"
+									onclick="UseUserNamePassword();">
+								</s:checkbox>	
+							</div>
+						</s:if>
+						
+						<s:hidden name="user.userID" value="%{user.userID}"></s:hidden>
+</html>
\ No newline at end of file
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/usermanagement.jsp b/id/ConfigWebTool/src/main/webapp/jsp/usermanagement.jsp
index a29780cff..1d5d4ac12 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/usermanagement.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/usermanagement.jsp
@@ -30,7 +30,8 @@
 			<h2><%=LanguageHelper.getGUIString("webpages.usermanagement.header", request) %></h2>
 			
 			<s:if test="authUser.isAdmin()">
-						
+			
+				<h3><%=LanguageHelper.getGUIString("webpages.listUsers.list.header", request) %></h3>						
 				<jsp:include page="snippets/user_list.jsp"></jsp:include>
 			
 				<div id="list_area">