Author: tchemit Date: 2012-09-30 18:09:37 +0200 (Sun, 30 Sep 2012) New Revision: 3713 Url: http://chorem.org/repositories/revision/pollen/3713 Log: fixes #817: Protect some forms Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/register.jsp Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp 2012-09-30 12:57:25 UTC (rev 3712) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp 2012-09-30 16:09:37 UTC (rev 3713) @@ -42,17 +42,15 @@ <sj:head locale="%{locale}" jqueryui="true" jquerytheme="%{jqueryTheme}"/> </head> -<%-- TODO AThimel 24/01/2012 Remove this when refactoring is over --%> -<div id="in-progress"> +<%--div id="in-progress"> <a href="http://chorem.org/projects/pollen"> <s:text name="pollen.banner.newVersion"/> </a> -</div> +</div--%> - <script type="text/javascript"> - jQuery(document).ready(function () { + $(document).ready(function () { // apply common style $('fieldset').addClass('ui-widget-content ui-corner-all'); @@ -68,6 +66,26 @@ dialog.dialog('open'); return false; }); + + $(document).one('mousemove', function() { + function KMe(node, attrName, pattern) { + var attr = node.attr(attrName).replace( pattern + '\/', ''); + //console.info("Unlock " + pattern + " " + node.attr('id') + + // " - " + attrName + " = " + attr); + node.attr(attrName, attr); + node.removeClass(pattern); + } + $('form.KForm').each(function () { + KMe($(this),'action','KForm'); + }); + $('input[type="submit"].KAction').each(function () { + var $this = $(this); + KMe($(this),'name','KAction'); + }); + $('a.KLink').each(function () { + KMe($(this),'href','KLink'); + }); + }); }); </script> <s:set var="user" value="%{#session.pollenSession.userAccount}"/> @@ -139,7 +157,8 @@ <sj:dialog id="lostPasswordDialog" autoOpen="false" modal="true" width="500"/> - <s:form id="connection" method="POST" namespace="/user" action="login"> + <s:form id="connection" method="POST" namespace="/user" + action="KForm/login" cssClass="KForm"> <s:hidden name="redirectUrl" value="%{currentUrl}"/> <ul class="top_middle<s:property value='%{pageLogo}'/>"> <li> @@ -163,14 +182,15 @@ </a> </li> <li> - <s:submit id="submitform" action="login" key="pollen.action.login" - align="right"/> + <s:submit id="submitform" action="KAction/login" align="right" + key="pollen.action.login" cssClass="KAction"/> </li> </ul> </s:form> </div> <s:text name="pollen.common.or"/> - <s:a action="register" method="input" namespace="/user"> + <s:a action="KLink/register" method="input" namespace="/user" + cssClass="KLink" id='registerLink'> <s:text name="pollen.menu.register"/> </s:a> </s:else> @@ -193,7 +213,8 @@ <div class="top_left<s:property value='%{pageLogo}'/>"></div> <ul class="top_middle<s:property value='%{pageLogo}'/>"> <li> - <s:a action="create" namespace="/poll"> + <s:a id='createPollLink' action="KLink/create" namespace="/poll" + cssClass="KLink"> <s:text name="pollen.menu.createPoll"/> </s:a> </li> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp 2012-09-30 12:57:25 UTC (rev 3712) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp 2012-09-30 16:09:37 UTC (rev 3713) @@ -85,7 +85,7 @@ </h1> <s:form method="POST" id="registerForm" namespace="/poll" - enctype="multipart/form-data"> + enctype="multipart/form-data" cssClass="KForm" action="KForm/create"> <s:hidden key="poll.topiaId" label=""/> @@ -214,12 +214,6 @@ label='%{getText("pollen.common.pollOption.pollVoteVisibility")}' tooltip="%{getText('pollen.common.pollOption.pollVoteVisibility.help')}" tooltipIconPath="/img/tooltip.png"/> - - <%--s:checkbox key="poll.anonymous" - label="%{getText('pollen.common.pollOption.anonymous')}" - disabled="%{voteStarted}" - tooltip="%{getText('pollen.common.pollOption.anonymous.help')}" - tooltipIconPath="/img/tooltip.png"/--%> <s:checkbox key="poll.anonymousVoteAllowed" label="%{getText('pollen.common.pollOption.anonymousVoteAllowed')}" disabled="%{voteStarted}" @@ -324,7 +318,8 @@ <s:submit action="clone/%{pollUri}" value="%{actionLabel}" align="center"/> </s:elseif> <s:else> - <s:submit action="create" value="%{actionLabel}" align="center"/> + <s:submit action="KAction/create" value="%{actionLabel}" align="center" + cssClass="KAction"/> </s:else> </s:form> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/register.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/register.jsp 2012-09-30 12:57:25 UTC (rev 3712) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/register.jsp 2012-09-30 16:09:37 UTC (rev 3713) @@ -29,7 +29,8 @@ <s:text name="pollen.title.register"/> </h1> -<s:form method="POST"> +<s:form method="POST" namespace="/user" action="KForm/register" + cssClass="KForm" id="registerForm"> <fieldset> <legend><s:text name="pollen.fieldset.connexionInformation"/></legend> @@ -52,5 +53,6 @@ key="pollen.common.lastName"/> </fieldset> <br/> - <s:submit action="register" key="pollen.action.register" align="center"/> + <s:submit action="KAction/register" key="pollen.action.register" + align="center" cssClass="KAction"/> </s:form>