# HG changeset patch
# User František Kučera <franta-hg@frantovo.cz>
# Date 1267700561 -3600
# Node ID d01685a7e07d3ab72fa2ff1009459026505d9e34
# Parent  d259a2dfea67af93a796a068452159c5c24386b6
Registrace uživatelů. TODO:
 - hashovat heslo, aby se mohl přihlásit
 - generovat náhodný token (csrf)

diff -r d259a2dfea67 -r d01685a7e07d java/nekurak.net-web/src/java/cz/frantovo/nekurak/preklady_cs.properties
--- a/java/nekurak.net-web/src/java/cz/frantovo/nekurak/preklady_cs.properties	Thu Mar 04 11:00:19 2010 +0100
+++ b/java/nekurak.net-web/src/java/cz/frantovo/nekurak/preklady_cs.properties	Thu Mar 04 12:02:41 2010 +0100
@@ -5,6 +5,7 @@
 licence=\u00A9 2010 nekurak.net. Licence: Affero GPL.
 
 uvod=\u00DAvod
+registrovatSe=Registrovat se
 prihlasitSe=P\u0159ihl\u00E1sit se
 odhlasitSe=Odhl\u00E1sit se
 pridatPodnik=P\u0159idat podnik
@@ -48,3 +49,19 @@
 dto.podnik.cisloPopisne=\u010D.p.
 dto.podnik.cisloPopisne.tip=\u010D\u00EDslo popisn\u00E9
 dto.podnik.mesto=M\u011Bsto
+
+registrace.nadpis=Registrace nov\u00E9ho u\u017Eivatele
+registrace.kontrola=Zkontrolujte pros\u00EDm zadan\u00E9 \u00FAdaje
+registrace.hotovo=\u00DA\u010Det byl \u00FAsp\u011B\u0161n\u011B zalo\u017Een, m\u016F\u017Eete se
+registrace.hotovo.prihlasit=p\u0159ihl\u00E1sit
+registrace.tlacitko=Registrovat se
+registrace.potvrdit=Potvrdit registraci
+registrace.chybnyToken=Relace vypr\u0161ela, registraci nelze dokon\u010Dit. Vypl\u0148te pros\u00EDm formul\u00E1\u0159 znovu.
+
+dto.uzivatel.prezdivka=P\u0159ezd\u00EDvka
+dto.uzivatel.prezdivka.tip=U\u017Eivatelsk\u00E9 jm\u00E9no
+dto.uzivatel.heslo=Heslo
+dto.uzivatel.heslo.kontrola=Heslo znovu
+dto.uzivatel.jmeno=Jm\u00E9no
+dto.uzivatel.prijmeni=P\u0159\u00EDjmen\u00ED
+dto.uzivatel.email=e-mail
\ No newline at end of file
diff -r d259a2dfea67 -r d01685a7e07d java/nekurak.net-web/src/java/cz/frantovo/nekurak/preklady_en.properties
--- a/java/nekurak.net-web/src/java/cz/frantovo/nekurak/preklady_en.properties	Thu Mar 04 11:00:19 2010 +0100
+++ b/java/nekurak.net-web/src/java/cz/frantovo/nekurak/preklady_en.properties	Thu Mar 04 12:02:41 2010 +0100
@@ -5,6 +5,7 @@
 licence=\u00A9 2010 nekurak.net. License: Affero GPL.
 
 uvod=Overview
+registrovatSe=New user
 prihlasitSe=Log in
 odhlasitSe=Log out
 pridatPodnik=Add place
diff -r d259a2dfea67 -r d01685a7e07d java/nekurak.net-web/src/java/cz/frantovo/nekurak/preklady_sk.properties
--- a/java/nekurak.net-web/src/java/cz/frantovo/nekurak/preklady_sk.properties	Thu Mar 04 11:00:19 2010 +0100
+++ b/java/nekurak.net-web/src/java/cz/frantovo/nekurak/preklady_sk.properties	Thu Mar 04 12:02:41 2010 +0100
@@ -5,6 +5,7 @@
 licence=\u00A9 2010 nekurak.net. Licence: Affero GPL.
 
 uvod=\u00DAvod
+registrovatSe=Registrovat sa
 prihlasitSe=P\u0159ihl\u00E1sit sa
 odhlasitSe=Odhl\u00E1sit sa
 pridatPodnik=P\u0159idat podnik
diff -r d259a2dfea67 -r d01685a7e07d java/nekurak.net-web/src/java/cz/frantovo/nekurak/web/HledacSluzby.java
--- a/java/nekurak.net-web/src/java/cz/frantovo/nekurak/web/HledacSluzby.java	Thu Mar 04 11:00:19 2010 +0100
+++ b/java/nekurak.net-web/src/java/cz/frantovo/nekurak/web/HledacSluzby.java	Thu Mar 04 12:02:41 2010 +0100
@@ -1,6 +1,7 @@
 package cz.frantovo.nekurak.web;
 
 import cz.frantovo.nekurak.ejb.PodnikRemote;
+import cz.frantovo.nekurak.ejb.UzivatelRemote;
 import java.io.Serializable;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -15,6 +16,7 @@
 public class HledacSluzby implements Serializable {
 
     private PodnikRemote podnikEJB;
+    private UzivatelRemote uzivatelEJB;
     private static final Logger log = Logger.getLogger(HledacSluzby.class.getSimpleName());
 
     public PodnikRemote getPodnikEJB() {
@@ -29,4 +31,17 @@
 	}
 	return podnikEJB;
     }
+
+    public UzivatelRemote getUzivatelEJB() {
+	if (uzivatelEJB == null) {
+	    try {
+		Context c = new InitialContext();
+		uzivatelEJB = (UzivatelRemote) c.lookup("cz.frantovo.nekurak.ejb.UzivatelRemote");
+	    } catch (NamingException e) {
+		log.log(Level.SEVERE, "Chyba při hledání UzivatelRemote", e);
+		throw new RuntimeException(e);
+	    }
+	}
+	return uzivatelEJB;
+    }
 }
diff -r d259a2dfea67 -r d01685a7e07d java/nekurak.net-web/src/java/cz/frantovo/nekurak/web/RegistraceUzivatele.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/java/nekurak.net-web/src/java/cz/frantovo/nekurak/web/RegistraceUzivatele.java	Thu Mar 04 12:02:41 2010 +0100
@@ -0,0 +1,37 @@
+package cz.frantovo.nekurak.web;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ *
+ * @author fiki
+ */
+public class RegistraceUzivatele {
+
+    private HledacSluzby hledac = new HledacSluzby();
+    private Map<String, UzivatelPredRegistraci> uzivatele = Collections.synchronizedMap(new HashMap<String, UzivatelPredRegistraci>());
+    private String token;
+
+    public void setUzivatel(UzivatelPredRegistraci uzivatel) {
+	uzivatele.put(uzivatel.getToken(), uzivatel);
+    }
+
+    public void setToken(String token) {
+	this.token = token;
+    }
+
+    public boolean getDokonciRegistraci() {
+
+	UzivatelPredRegistraci u = uzivatele.get(token);
+
+	if (u == null) {
+	    /** Chybný token – uživatel se snaží dokončit neexistující registraci */
+	    return false;
+	} else {
+	    hledac.getUzivatelEJB().zalozUzivatele(u.getUzivatel());
+	    return true;
+	}
+    }
+}
diff -r d259a2dfea67 -r d01685a7e07d java/nekurak.net-web/src/java/cz/frantovo/nekurak/web/UzivatelPredRegistraci.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/java/nekurak.net-web/src/java/cz/frantovo/nekurak/web/UzivatelPredRegistraci.java	Thu Mar 04 12:02:41 2010 +0100
@@ -0,0 +1,31 @@
+package cz.frantovo.nekurak.web;
+
+import cz.frantovo.nekurak.dto.Uzivatel;
+
+/**
+ * Pomocná třída obalujícího uživatele a token (kvůli CSRF)
+ * @author fiki
+ */
+public class UzivatelPredRegistraci {
+
+    private Uzivatel uzivatel;
+    private final String token = generujToken();
+
+    public Uzivatel getUzivatel() {
+	return uzivatel;
+    }
+
+    public void setUzivatel(Uzivatel uzivatel) {
+	this.uzivatel = uzivatel;
+    }
+
+    public String getToken() {
+	return token;
+    }
+
+    private static String generujToken() {
+	/** TODO: generovat náhodný. */
+	return "XXX_TODO_generovat_nahodny_token";
+    }
+
+}
diff -r d259a2dfea67 -r d01685a7e07d java/nekurak.net-web/web/WEB-INF/casti/registrovatUzivatele.jsp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/java/nekurak.net-web/web/WEB-INF/casti/registrovatUzivatele.jsp	Thu Mar 04 12:02:41 2010 +0100
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
+	  xmlns:c="http://java.sun.com/jsp/jstl/core"
+	  xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
+	  xmlns:fn="http://java.sun.com/jsp/jstl/functions"
+	  version="2.0">
+
+    <jsp:useBean id="uzivatel" class="cz.frantovo.nekurak.dto.Uzivatel" scope="request"/>
+    <jsp:useBean id="uzivatelPredRegistraci" class="cz.frantovo.nekurak.web.UzivatelPredRegistraci" scope="request"/>
+    <jsp:useBean id="registraceUzivatele" class="cz.frantovo.nekurak.web.RegistraceUzivatele" scope="session"/>
+
+    <h1><fmt:message key="registrace.nadpis"/></h1>
+
+    <c:choose>
+	<c:when test="${param.akceRegistrace == 'kontrola'}">
+	    <jsp:setProperty name="uzivatel" property="*"/>
+	    <jsp:setProperty name="uzivatelPredRegistraci" property="uzivatel" value="${uzivatel}"/>
+	    <jsp:setProperty name="registraceUzivatele" property="uzivatel" value="${uzivatelPredRegistraci}"/>
+
+	    <p><fmt:message key="registrace.kontrola"/></p>
+
+	    <p>
+		<fmt:message key="dto.uzivatel.prezdivka"/>: <c:out value="${uzivatel.prezdivka}"/><br/>
+		<fmt:message key="dto.uzivatel.jmeno"/>: <c:out value="${uzivatel.jmeno}"/><br/>
+		<fmt:message key="dto.uzivatel.prijmeni"/>: <c:out value="${uzivatel.prijmeni}"/><br/>
+		<fmt:message key="dto.uzivatel.email"/>: <c:out value="${uzivatel.email}"/><br/>
+	    </p>
+
+	    <p>
+		<a href="?akce=registrovatUzivatele&amp;amp;akceRegistrace=dokonceni&amp;amp;token=${fn:escapeXml(uzivatelPredRegistraci.token)}">
+		    <fmt:message key="registrace.potvrdit"/>
+		</a>
+	    </p>
+
+	</c:when>
+	<c:when test="${param.akceRegistrace == 'dokonceni'}">
+
+	    <jsp:setProperty name="registraceUzivatele" property="token" value="${param.token}"/>
+
+	    <c:choose>
+		<c:when test="${registraceUzivatele.dokonciRegistraci}">
+		    <p>
+			<fmt:message key="registrace.hotovo"/>&amp;#160;
+			<a href="?akce=prihlaseni">
+			    <fmt:message key="registrace.hotovo.prihlasit"/>
+			</a>
+		    </p>
+		</c:when>
+		<c:otherwise>
+		    <!--
+		    Zaznamenali jsme pokus o CSRF nebo vypršela relace
+		    a uživatel se pokouší dokončit registraci po dlouhé době.
+		    -->
+		    <p><fmt:message key="registrace.chybnyToken"/></p>
+		</c:otherwise>
+	    </c:choose>
+
+
+	</c:when>
+	<c:otherwise>
+	    <form method="post" action="?akce=registrovatUzivatele&amp;amp;akceRegistrace=kontrola">
+		<fieldset>
+		    <fmt:message key="dto.uzivatel.prezdivka.tip" var="prezdivkaTip"/>
+		    <label title="${prezdivkaTip}"><fmt:message key="dto.uzivatel.prezdivka"/>: <input type="text" name="prezdivka" maxlength="255"/></label><br/>
+		    <label><fmt:message key="dto.uzivatel.heslo"/>: <input type="password" name="heslo" maxlength="255"/></label><br/>
+		    <label><fmt:message key="dto.uzivatel.heslo.kontrola"/>: <input type="password" name="heslo_kontrola" maxlength="255"/></label><br/>
+		    <br/>
+		    <label><fmt:message key="dto.uzivatel.jmeno"/>: <input type="text" name="jmeno" maxlength="255"/></label><br/>
+		    <label><fmt:message key="dto.uzivatel.prijmeni"/>: <input type="text" name="prijmeni" maxlength="255"/></label><br/>
+		    <label><fmt:message key="dto.uzivatel.email"/>: <input type="text" name="email" maxlength="255"/></label><br/>
+		    <button value="submit"><fmt:message key="registrace.tlacitko"/></button>
+		</fieldset>
+	    </form>
+	</c:otherwise>
+    </c:choose>
+
+
+
+
+</jsp:root>
diff -r d259a2dfea67 -r d01685a7e07d java/nekurak.net-web/web/index.jsp
--- a/java/nekurak.net-web/web/index.jsp	Thu Mar 04 11:00:19 2010 +0100
+++ b/java/nekurak.net-web/web/index.jsp	Thu Mar 04 12:02:41 2010 +0100
@@ -50,6 +50,7 @@
 		    <c:choose>
 			<c:when test="${prihlasenyUzivatel == null}">
 			    <li><a href="?akce=prihlaseni"><fmt:message key="prihlasitSe"/></a></li>
+			    <li><a href="?akce=registrovatUzivatele"><fmt:message key="registrovatSe"/></a></li>
 			</c:when>
 			<c:otherwise>
 			    <li><a href="?akce=pridatPodnik"><fmt:message key="pridatPodnik"/></a></li>
@@ -71,6 +72,9 @@
 			<c:when test="${param.akce == 'pridatPodnik'}">
 			    <jsp:include page="/WEB-INF/casti/pridatPodnik.jsp" flush="false"/>
 			</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>