# HG changeset patch
# User František Kučera <franta-hg@frantovo.cz>
# Date 1269353359 -3600
# Node ID 6767606d6342e971f2aacccb6816e994cd6f36e3
# Parent  df86ad0c0e55314c78ce3d8d982a65938c5a6422
Kaptcha & E-mail

diff -r df86ad0c0e55 -r 6767606d6342 java/nekurak.net-web/nbproject/build-impl.xml
--- a/java/nekurak.net-web/nbproject/build-impl.xml	Tue Mar 23 12:11:04 2010 +0100
+++ b/java/nekurak.net-web/nbproject/build-impl.xml	Tue Mar 23 15:09:19 2010 +0100
@@ -537,13 +537,13 @@
     <target depends="init,compile,compile-jsps,-pre-dist,-do-dist-with-manifest,-do-dist-without-manifest" name="do-dist"/>
     <target depends="init" if="dist.ear.dir" name="library-inclusion-in-manifest">
         <copyfiles files="${reference.nekurak_net-lib.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
-        <copyfiles files="${libs.restlib_gfv3ee6.classpath}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${libs.Kaptcha.classpath}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <mkdir dir="${build.web.dir}/META-INF"/>
         <manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update"/>
     </target>
     <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir">
         <copyfiles files="${reference.nekurak_net-lib.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copyfiles files="${libs.restlib_gfv3ee6.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${libs.Kaptcha.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
     </target>
     <target depends="init" if="dist.ear.dir" name="-clean-webinf-lib">
         <delete dir="${build.web.dir}/WEB-INF/lib"/>
diff -r df86ad0c0e55 -r 6767606d6342 java/nekurak.net-web/nbproject/genfiles.properties
--- a/java/nekurak.net-web/nbproject/genfiles.properties	Tue Mar 23 12:11:04 2010 +0100
+++ b/java/nekurak.net-web/nbproject/genfiles.properties	Tue Mar 23 15:09:19 2010 +0100
@@ -3,8 +3,8 @@
 build.xml.stylesheet.CRC32=c0ebde35@1.21.2.1
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=44af31d0
-nbproject/build-impl.xml.script.CRC32=aefcc545
+nbproject/build-impl.xml.data.CRC32=28fc3c5a
+nbproject/build-impl.xml.script.CRC32=cdc87d62
 nbproject/build-impl.xml.stylesheet.CRC32=b139b33b@1.21.2.1
 nbproject/rest-build.xml.data.CRC32=84da1c7b
 nbproject/rest-build.xml.script.CRC32=3db088b3
diff -r df86ad0c0e55 -r 6767606d6342 java/nekurak.net-web/nbproject/project.properties
--- a/java/nekurak.net-web/nbproject/project.properties	Tue Mar 23 12:11:04 2010 +0100
+++ b/java/nekurak.net-web/nbproject/project.properties	Tue Mar 23 15:09:19 2010 +0100
@@ -27,7 +27,7 @@
 jar.compress=false
 javac.classpath=\
     ${reference.nekurak_net-lib.jar}:\
-    ${libs.restlib_gfv3ee6.classpath}
+    ${libs.Kaptcha.classpath}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.debug=true
diff -r df86ad0c0e55 -r 6767606d6342 java/nekurak.net-web/nbproject/project.xml
--- a/java/nekurak.net-web/nbproject/project.xml	Tue Mar 23 12:11:04 2010 +0100
+++ b/java/nekurak.net-web/nbproject/project.xml	Tue Mar 23 15:09:19 2010 +0100
@@ -16,7 +16,7 @@
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library dirs="200">
-                    <file>${libs.restlib_gfv3ee6.classpath}</file>
+                    <file>${libs.Kaptcha.classpath}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
             </web-module-libraries>
diff -r df86ad0c0e55 -r 6767606d6342 java/nekurak.net-web/web/WEB-INF/web.xml
--- a/java/nekurak.net-web/web/WEB-INF/web.xml	Tue Mar 23 12:11:04 2010 +0100
+++ b/java/nekurak.net-web/web/WEB-INF/web.xml	Tue Mar 23 15:09:19 2010 +0100
@@ -1,81 +1,89 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
     <session-config>
-        <session-timeout>30</session-timeout>
+	<session-timeout>30</session-timeout>
     </session-config>
     <welcome-file-list>
-        <welcome-file>index.jsp</welcome-file>
+	<welcome-file>index.jsp</welcome-file>
     </welcome-file-list>
     <!-- <chybovéStránky> -->
     <error-page>
-        <!-- Stránka nenalezena -->
-        <error-code>404</error-code>
-        <location>/WEB-INF/chyby/404.jsp</location>
+	<!-- Stránka nenalezena -->
+	<error-code>404</error-code>
+	<location>/WEB-INF/chyby/404.jsp</location>
     </error-page>
     <error-page>
-        <!-- Interní chyba serveru -->
-        <error-code>500</error-code>
-        <location>/WEB-INF/chyby/500.jsp</location>
+	<!-- Interní chyba serveru -->
+	<error-code>500</error-code>
+	<location>/WEB-INF/chyby/500.jsp</location>
     </error-page>
     <!-- </chybovéStránky> -->
     <!-- <definiceServletů> -->
     <servlet>
-        <servlet-name>atom</servlet-name>
-        <jsp-file>/WEB-INF/atom/atom.jsp</jsp-file>
+	<servlet-name>atom</servlet-name>
+	<jsp-file>/WEB-INF/atom/atom.jsp</jsp-file>
     </servlet>
     <servlet>
-        <description>
+	<description>
 	    Servlet zpřístupňující fotky umístěné ve zvláštním adresáři
 	    (data oddělená od aplikace).
 	</description>
-        <servlet-name>fotky</servlet-name>
-        <servlet-class>cz.frantovo.nekurak.servlet.Fotky</servlet-class>
-        <init-param>
-            <description>
+	<servlet-name>fotky</servlet-name>
+	<servlet-class>cz.frantovo.nekurak.servlet.Fotky</servlet-class>
+	<init-param>
+	    <description>
 		Adresář na disku, který obsahuje fotky podniků.
 		Musí existovat při startu aplikace.
 	    </description>
-            <param-name>adresar</param-name>
-            <param-value>/var/www/nekurak.net/fotky</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
+	    <param-name>adresar</param-name>
+	    <param-value>/var/www/nekurak.net/fotky</param-value>
+	</init-param>
+	<load-on-startup>1</load-on-startup>
+    </servlet>
+    <servlet>
+	<servlet-name>Kaptcha</servlet-name>
+	<servlet-class>com.google.code.kaptcha.servlet.KaptchaServlet</servlet-class>
     </servlet>
     <!-- </definiceServletů> -->
     <!-- <mapováníServletů> -->
     <servlet-mapping>
-        <servlet-name>fotky</servlet-name>
-        <url-pattern>/fotky/*</url-pattern>
+	<servlet-name>fotky</servlet-name>
+	<url-pattern>/fotky/*</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
-        <servlet-name>atom</servlet-name>
-        <url-pattern>/atom/*</url-pattern>
+	<servlet-name>atom</servlet-name>
+	<url-pattern>/atom/*</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+	<servlet-name>Kaptcha</servlet-name>
+	<url-pattern>/kaptcha.jpg</url-pattern>
     </servlet-mapping>
     <!-- </mapováníServletů> -->
     <context-param>
-        <!-- Pro případ, že chybí hlavička „Accept-language“ v HTTP požadavku -->
-        <param-name>javax.servlet.jsp.jstl.fmt.fallbackLocale</param-name>
-        <param-value>cs</param-value>
+	<!-- Pro případ, že chybí hlavička „Accept-language“ v HTTP požadavku -->
+	<param-name>javax.servlet.jsp.jstl.fmt.fallbackLocale</param-name>
+	<param-value>cs</param-value>
     </context-param>
     <!--  <zabezpečení> -->
     <security-role>
-        <role-name>opravneny</role-name>
+	<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>
+	<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-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-config>
     </login-config>
     <!--  </zabezpečení> -->
 </web-app>
diff -r df86ad0c0e55 -r 6767606d6342 java/nekurak.net-web/web/grafika/info.png
Binary file java/nekurak.net-web/web/grafika/info.png has changed
diff -r df86ad0c0e55 -r 6767606d6342 java/nekurak.net-web/web/kaptcha.jsp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/java/nekurak.net-web/web/kaptcha.jsp	Tue Mar 23 15:09:19 2010 +0100
@@ -0,0 +1,72 @@
+<?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"
+	  xmlns:nk="urn:jsptagdir:/WEB-INF/tags/nekurak"
+	  version="2.0">
+
+    <jsp:directive.page contentType="application/xhtml+xml"/>
+
+    <!-- <lokalizace> -->
+    <c:if test="${param.jazyk != null}">
+	<fmt:setLocale value="${param.jazyk}" scope="session"/>
+    </c:if>
+    <fmt:setBundle basename="cz.frantovo.nekurak.preklady" scope="application"/>
+    <!-- </lokalizace> -->
+
+    <nk:stranka titulek="Kaptcha">
+
+	<h1><c:out value="Kaptcha – ukázka"/></h1>
+
+	<c:choose>
+	    <c:when test="${param.akce == 'odeslat'}">
+		<p>Odeslané údaje:</p>
+
+		<p>Políčko 1: <c:out value="${param.policko1}"/></p>
+		<p>Políčko 2: <c:out value="${param.policko2}"/></p>
+		<p>Kaptcha: <c:out value="${param.kaptcha}"/></p>
+
+		<p>Očekávaná hodnota: <c:out value="${sessionScope['KAPTCHA_SESSION_KEY']}"/></p>
+
+		<c:choose>
+		    <c:when test="${sessionScope['KAPTCHA_SESSION_KEY'] == param.kaptcha}">
+			<p class="informacniHlaska">Správně opsaný kód z obrázku.</p>
+		    </c:when>
+		    <c:otherwise>
+			<p class="chybovaHlaska">Špatně obsaný kód z obrázku.</p>
+		    </c:otherwise>
+		</c:choose>
+
+
+
+	    </c:when>
+	    <c:otherwise>
+		<!-- Zobrazíme uživateli registrační formulář. -->
+		<p>Nějaký formulář, který chceme ochránit proti spamu:</p>
+		<form method="post" action="kaptcha.jsp?akce=odeslat">
+		    <fieldset>
+			<label>Políčko 1: <input type="text" name="policko1" maxlength="255"/></label><br/>
+			<label>Políčko 2: <input type="text" name="policko2" maxlength="255"/></label><br/>
+		    </fieldset>
+		    <fieldset>
+			<!-- Kaptcha -->
+			<img src="kaptcha.jpg" alt="ochrana proti spamu" id="kaptchaIMG" title="klikněte pro vygenerování nového obrázku"/><br/>
+			<script type="text/javascript">
+			    $(function(){
+				$('#kaptchaIMG').click(function () { $(this).attr('src', 'kaptcha.jpg?' + Math.floor(Math.random()*100) ); })
+			    });
+			</script>
+
+			<label>Opište: <input type="text" name="kaptcha" maxlength="255"/></label><br/>
+		    </fieldset>
+		    <fieldset>
+			<button value="submit">Odeslat</button>
+		    </fieldset>
+		</form>
+	    </c:otherwise>
+	</c:choose>
+
+    </nk:stranka>
+
+</jsp:root>
diff -r df86ad0c0e55 -r 6767606d6342 java/nekurak.net-web/web/styl.css
--- a/java/nekurak.net-web/web/styl.css	Tue Mar 23 12:11:04 2010 +0100
+++ b/java/nekurak.net-web/web/styl.css	Tue Mar 23 15:09:19 2010 +0100
@@ -142,6 +142,19 @@
     background-color: #ffc65e;
 }
 
+.informacniHlaska {
+    background-image: url('grafika/info.png');
+    background-repeat: no-repeat;
+    background-position: 8px 8px;
+    min-height: 33px;
+    padding-top: 15px;
+    padding-left: 50px;
+    margin-top: 10px;
+    margin-bottom: 10px;
+    border: 2px solid #99ccff;
+    background-color: #bfdfff;
+}
+
 .registraceKontrolaUdaju {
     color: gray;
 }