# HG changeset patch
# User František Kučera <franta-hg@frantovo.cz>
# Date 1311081647 -7200
# Node ID e7b3ef7aaef45d8bcd7d460e3edbdf9e09d91d66
# Parent  b0f7d9ab4a072c975392e7b6fd14c8ff6ab1b8e1
Odhlašování pomocí servletu.

diff -r b0f7d9ab4a07 -r e7b3ef7aaef4 java/nekurak.net-web/src/java/cz/frantovo/nekurak/servlet/Odhlaseni.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/java/nekurak.net-web/src/java/cz/frantovo/nekurak/servlet/Odhlaseni.java	Tue Jul 19 15:20:47 2011 +0200
@@ -0,0 +1,22 @@
+package cz.frantovo.nekurak.servlet;
+
+import java.io.IOException;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ *
+ * @author fiki
+ */
+public class Odhlaseni extends SuperServlet {
+
+	@Override
+	protected void doGet(HttpServletRequest požadavek, HttpServletResponse odpověď) throws ServletException, IOException {
+		požadavek.logout();
+		super.doGet(požadavek, odpověď);
+		zpracujJSP("odhlášení-dokončeno.jsp", požadavek, odpověď);
+	}
+
+	
+}
diff -r b0f7d9ab4a07 -r e7b3ef7aaef4 java/nekurak.net-web/web/WEB-INF/web.xml
--- a/java/nekurak.net-web/web/WEB-INF/web.xml	Fri Jul 15 22:25:39 2011 +0200
+++ b/java/nekurak.net-web/web/WEB-INF/web.xml	Tue Jul 19 15:20:47 2011 +0200
@@ -62,6 +62,16 @@
 		<servlet-name>komentare</servlet-name>
 		<servlet-class>cz.frantovo.nekurak.servlet.Komentare</servlet-class>
 	</servlet>
+	<servlet>
+		<description>Přihlašovací formulář</description>
+		<servlet-name>prihlaseni</servlet-name>
+		<jsp-file>/WEB-INF/casti/prihlaseni.jsp</jsp-file>
+	</servlet>
+	<servlet>
+		<description>Odhlášení uživatele</description>
+		<servlet-name>odhlaseni</servlet-name>
+		<servlet-class>cz.frantovo.nekurak.servlet.Odhlaseni</servlet-class>
+	</servlet>
     <!-- </definiceServletů> -->
     <!-- <mapováníServletů> -->
 	<servlet-mapping>
@@ -89,6 +99,15 @@
 		<servlet-name>komentare</servlet-name>
 		<url-pattern>/komentare</url-pattern>
 	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>prihlaseni</servlet-name>
+		<url-pattern>/prihlaseni</url-pattern>
+		<url-pattern>/prihlaseni-chyba</url-pattern>		
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>odhlaseni</servlet-name>
+		<url-pattern>/odhlaseni</url-pattern>
+	</servlet-mapping>
     <!-- </mapováníServletů> -->
 	<context-param>
         <!-- Pro případ, že chybí hlavička „Accept-language“ v HTTP požadavku -->
@@ -103,21 +122,12 @@
 	<security-role>
 		<role-name>opravneny</role-name>
 	</security-role>
-	<security-constraint>
-		<web-resource-collection>
-			<web-resource-name>Správa Nekuřák.net</web-resource-name>
-			<url-pattern>/sprava/*</url-pattern>
-		</web-resource-collection>
-		<auth-constraint>
-			<role-name>opravneny</role-name>
-		</auth-constraint>
-	</security-constraint>
 	<login-config>
 		<auth-method>FORM</auth-method>
 		<realm-name>nekurakNET</realm-name>
 		<form-login-config>
-			<form-login-page>/?akce=prihlaseni</form-login-page>
-			<form-error-page>/?akce=prihlaseni&amp;chyba=ano</form-error-page>
+			<form-login-page>/prihlaseni</form-login-page>
+			<form-error-page>/prihlaseni-chyba</form-error-page>
 		</form-login-config>
 	</login-config>
     <!--  </zabezpečení> -->
diff -r b0f7d9ab4a07 -r e7b3ef7aaef4 java/nekurak.net-web/web/index.jsp
--- a/java/nekurak.net-web/web/index.jsp	Fri Jul 15 22:25:39 2011 +0200
+++ b/java/nekurak.net-web/web/index.jsp	Tue Jul 19 15:20:47 2011 +0200
@@ -23,16 +23,10 @@
 		</c:when>
 		<c:when test="${param.akce == 'registrovatUzivatele'}">
 			<jsp:include page="/WEB-INF/casti/registrovatUzivatele.jsp" flush="false"/>
-		</c:when>
-		<c:when test="${param.akce == 'prihlaseni'}">
-			<jsp:include page="/WEB-INF/casti/prihlaseni.jsp" flush="false"/>
-		</c:when>
+		</c:when>		
 		<c:when test="${param.akce == 'odeslatKomentar'}">
 			<jsp:include page="/WEB-INF/casti/odeslatKomentar.jsp" flush="false"/>
-		</c:when>
-		<c:when test="${param.akce == 'chat'}">
-			<jsp:include page="/WEB-INF/casti/chat.jsp" flush="false"/>
-		</c:when>
+		</c:when>		
 		<c:otherwise>
 			<jsp:include page="/WEB-INF/casti/uvod.jsp" flush="false"/>
 		</c:otherwise>