kuvanotto ja sessiohäsmäkkä korjattu pääosin

code/MoyaWeb/WebContent/admin/adduser/update.xhtml

@@ -12,9 +12,12 @@
 		</f:metadata>
 		</f:metadata>
 
 
 		<ui:define name="topbar">
 		<ui:define name="topbar">
-			<h:link styleClass="userbackbutton" outcome="/admin/adduser/index">
-				<div>#{i18n['adduser.back']}</div>
-			</h:link>
+			<h:form>
+				<h:commandLink styleClass="userbackbutton" action="#{userView.incomingPhotoReady}" value="Valmis">
+					<div>#{i18n['adduser.back']}</div>
+				</h:commandLink>
+			</h:form>
+
 		</ui:define>
 		</ui:define>
 
 
 		<ui:define name="content">
 		<ui:define name="content">
@@ -35,7 +38,7 @@
 							<div id="webcamcontainer">
 							<div id="webcamcontainer">
 
 
 								<div id="count" />
 								<div id="count" />
-								<p:photoCam widgetVar="pc" listener="#{userView.oncapture}"  update="@all" />
+								<p:photoCam widgetVar="pc" listener="#{userView.oncapture}" update="@all" />
 								<!--  <p:commandButton type="button" value="Capture" onclick="dophoto(pc)" />
 								<!--  <p:commandButton type="button" value="Capture" onclick="dophoto(pc)" />
 								 -->
 								 -->
 							</div>
 							</div>
@@ -44,15 +47,17 @@
 				</h:form>
 				</h:form>
 			</div>
 			</div>
 			<div style="">
 			<div style="">
-			<h:link style="margin: 0 auto; font-size: 3em;" outcome="/admin/adduser/index" value="Valmis"/>
+				<h:form>
+					<h:commandLink style="margin: 0 auto; font-size: 3em;" action="#{userView.incomingPhotoReady}" value="Valmis" />
+				</h:form>
 			</div>
 			</div>
 
 
 			<script>
 			<script>
 				function dophoto(pc) {
 				function dophoto(pc) {
-					docount(5,pc);
+					docount(5, pc);
 				}
 				}
 
 
-				function docount(count,pc) {
+				function docount(count, pc) {
 					$('#count').html(count);
 					$('#count').html(count);
 					$('#count').css("opacity", 1);
 					$('#count').css("opacity", 1);
 					$('#count').css("font-size", "28pt");
 					$('#count').css("font-size", "28pt");
@@ -63,9 +68,9 @@
 					}, 1500, function() {
 					}, 1500, function() {
 						if (count > 1)
 						if (count > 1)
 							docount(count - 1, pc);
 							docount(count - 1, pc);
-						if (count == 1) { 
+						if (count == 1) {
 							pc.capture();
 							pc.capture();
-					}
+						}
 
 
 					});
 					});
 				}
 				}

code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/user/AuthView.java

@@ -84,6 +84,22 @@ public class AuthView extends GenericCDIView {
 
 
 		return "/frontpage";
 		return "/frontpage";
 	}
 	}
+	
+	public void executeLogoutNoRedirect() {
+		HttpServletRequest req = getRequest();
+		if (permbean.isLoggedIn()) {
+			try {
+				req.logout();
+			} catch (ServletException e) {
+				logger.warn("Error executing logout", e);
+			}
+		}
+
+		req.getSession().invalidate();
+
+		
+		
+	}
 
 
 	public void executeLogin() {
 	public void executeLogin() {
 		executeLogin(null);
 		executeLogin(null);

code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/user/UserView.java

@@ -393,7 +393,7 @@ public class UserView extends GenericCDIView {
 
 
 	public String createUserAdduserView() {
 	public String createUserAdduserView() {
 		userbean.createNewUser(user, getPassword());
 		userbean.createNewUser(user, getPassword());
-		// authView.executeAdduserAutoLogin(user, getPassword());
+		authView.executeAdduserAutoLogin(user, getPassword());
 		return "/admin/adduser/update";
 		return "/admin/adduser/update";
 	}
 	}
 
 
@@ -402,6 +402,14 @@ public class UserView extends GenericCDIView {
 		canSave = permbean.hasPermission(UserPermission.MODIFY);
 		canSave = permbean.hasPermission(UserPermission.MODIFY);
 		return "/useradmin/edit";
 		return "/useradmin/edit";
 	}
 	}
+	
+	 //  /admin/adduser/index
+	public String incomingPhotoReady() {
+		authView.executeLogoutNoRedirect();
+		
+		navihandler.forward("/admin/adduser/index?faces-redirect=true");
+		return "/admin/adduser/index";
+	}
 
 
 	public void setUserid(Integer userid) {
 	public void setUserid(Integer userid) {
 		this.userid = userid;
 		this.userid = userid;