This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen_1.x. See http://git.chorem.org/pollen_1.x.git commit 69ac33dd3b2361fea36ca4d217a393e6ae573caf Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Nov 8 14:02:50 2014 +0100 fixes #1142: Do not use anymore the dynamic methods (improve security) --- .../src/main/resources/config/struts-admin.xml | 4 +- .../src/main/resources/config/struts-io.xml | 4 +- .../src/main/resources/config/struts-poll.xml | 36 ++++++++-------- .../src/main/resources/config/struts-user.xml | 49 ++++++++++++++-------- pollen-ui-struts2/src/main/resources/struts.xml | 3 +- .../webapp/WEB-INF/decorators/layout-default.jsp | 8 ++-- .../webapp/WEB-INF/jsp/admin/confirmDeleteUser.jsp | 7 ++-- .../main/webapp/WEB-INF/jsp/admin/usersList.jsp | 10 ++--- .../webapp/WEB-INF/jsp/poll/confirmClonePoll.jsp | 6 +-- .../webapp/WEB-INF/jsp/poll/confirmClosePoll.jsp | 6 +-- .../webapp/WEB-INF/jsp/poll/confirmDeletePoll.jsp | 6 +-- .../WEB-INF/jsp/poll/confirmDeletePollChoice.jsp | 6 +-- .../WEB-INF/jsp/poll/confirmDeletePollComment.jsp | 6 +-- .../WEB-INF/jsp/poll/confirmDeletePollVote.jsp | 6 +-- .../src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp | 2 +- .../src/main/webapp/WEB-INF/jsp/poll/vote.jsp | 9 ++-- .../WEB-INF/jsp/user/confirmDeleteFavoriteList.jsp | 6 +-- .../WEB-INF/jsp/user/confirmDeletePollAccount.jsp | 6 +-- .../main/webapp/WEB-INF/jsp/user/createdList.jsp | 2 +- .../webapp/WEB-INF/jsp/user/dialogLostPassword.jsp | 5 +-- .../src/main/webapp/WEB-INF/jsp/user/edit.jsp | 4 +- .../main/webapp/WEB-INF/jsp/user/favoriteList.jsp | 15 +++---- .../main/webapp/WEB-INF/jsp/user/favoriteLists.jsp | 7 ++-- .../src/main/webapp/WEB-INF/jsp/user/login.jsp | 5 +-- .../src/main/webapp/WEB-INF/jsp/user/register.jsp | 3 +- .../src/main/webapp/WEB-INF/jsp/user/show.jsp | 5 +-- 26 files changed, 104 insertions(+), 122 deletions(-) diff --git a/pollen-ui-struts2/src/main/resources/config/struts-admin.xml b/pollen-ui-struts2/src/main/resources/config/struts-admin.xml index 537f458..9fc0043 100644 --- a/pollen-ui-struts2/src/main/resources/config/struts-admin.xml +++ b/pollen-ui-struts2/src/main/resources/config/struts-admin.xml @@ -60,13 +60,13 @@ </action> <!-- confirm delete user --> - <action name="confirmDeleteUser" + <action name="confirmDeleteUser" method="execute" class="org.chorem.pollen.ui.actions.admin.Confirm"> <result>/WEB-INF/jsp/admin/confirmDeleteUser.jsp</result> </action> <!-- delete user --> - <action name="deleteUser" + <action name="deleteUser" method="execute" class="org.chorem.pollen.ui.actions.admin.DeleteUser"> <result type="redirect2"/> </action> diff --git a/pollen-ui-struts2/src/main/resources/config/struts-io.xml b/pollen-ui-struts2/src/main/resources/config/struts-io.xml index c1a7809..3390b57 100644 --- a/pollen-ui-struts2/src/main/resources/config/struts-io.xml +++ b/pollen-ui-struts2/src/main/resources/config/struts-io.xml @@ -35,7 +35,7 @@ </result-types> <!-- generate a chart as an image --> - <action name="generateChart" + <action name="generateChart" method="execute" class="org.chorem.pollen.ui.actions.io.GenerateChart"> <result type="chart"> <param name="width">${width}</param> @@ -44,7 +44,7 @@ </action> <!-- generate a chart as an image --> - <action name="getPollChoiceImage" + <action name="getPollChoiceImage" method="execute" class="org.chorem.pollen.ui.actions.io.GetPollImageChoice"> <result type="stream"> <param name="contentType">${contentType}</param> diff --git a/pollen-ui-struts2/src/main/resources/config/struts-poll.xml b/pollen-ui-struts2/src/main/resources/config/struts-poll.xml index 1542318..d80b12f 100644 --- a/pollen-ui-struts2/src/main/resources/config/struts-poll.xml +++ b/pollen-ui-struts2/src/main/resources/config/struts-poll.xml @@ -76,7 +76,7 @@ </action> <!-- export poll --> - <action name="export/*" + <action name="export/*" method="execute" class="org.chorem.pollen.ui.actions.poll.admin.ExportPoll"> <!--<param name="pollUri">{1}</param>--> <result type="stream"> @@ -91,7 +91,7 @@ </action> <!-- confirm close poll --> - <action name="confirmClosePoll/*" + <action name="confirmClosePoll/*" method="execute" class="org.chorem.pollen.ui.actions.poll.admin.ConfirmPollAction"> <result>/WEB-INF/jsp/poll/confirmClosePoll.jsp</result> </action> @@ -103,13 +103,13 @@ </action> <!-- confirm delete poll --> - <action name="confirmDeletePoll/*" + <action name="confirmDeletePoll/*" method="execute" class="org.chorem.pollen.ui.actions.poll.admin.ConfirmPollAction"> <result>/WEB-INF/jsp/poll/confirmDeletePoll.jsp</result> </action> <!-- delete poll --> - <action name="delete/*" + <action name="delete/*" method="execute" class="org.chorem.pollen.ui.actions.poll.admin.DeletePoll"> <!--<param name="pollUri">{1}</param>--> <result type="redirectToHome"/> @@ -161,19 +161,19 @@ </action> <!-- confirm delete poll vote --> - <action name="confirmDeleteVote/*" + <action name="confirmDeleteVote/*" method="execute" class="org.chorem.pollen.ui.actions.poll.vote.ConfirmDeleteVote"> <result>/WEB-INF/jsp/poll/confirmDeletePollVote.jsp</result> </action> <!-- delete poll vote --> - <action name="deleteVote/*" + <action name="deleteVote/*" method="execute" class="org.chorem.pollen.ui.actions.poll.vote.DeleteVote"> <result type="redirectToVote"/> </action> <!-- add a poll comment --> - <action name="addComment/*" + <action name="addComment/*" method="execute" class="org.chorem.pollen.ui.actions.poll.vote.AddComment"> <!--<param name="pollUri">{1}</param>--> <result name="input">/WEB-INF/jsp/poll/vote.jsp</result> @@ -181,19 +181,19 @@ </action> <!-- confirm delete comment --> - <action name="confirmDeleteComment/*" + <action name="confirmDeleteComment/*" method="execute" class="org.chorem.pollen.ui.actions.poll.vote.ConfirmDeleteComment"> <result>/WEB-INF/jsp/poll/confirmDeletePollComment.jsp</result> </action> <!-- delete a poll comment --> - <action name="deleteComment/*" + <action name="deleteComment/*" method="execute" class="org.chorem.pollen.ui.actions.poll.vote.DeleteComment"> <result type="redirectToVote"/> </action> <!-- add a choice --> - <action name="addChoice/*" + <action name="addChoice/*" method="execute" class="org.chorem.pollen.ui.actions.poll.vote.AddChoice"> <!--<param name="pollUri">{1}</param>--> <result name="input">/WEB-INF/jsp/poll/vote.jsp</result> @@ -201,19 +201,19 @@ </action> <!-- confirm delete poll choice --> - <action name="confirmDeleteChoice/*" + <action name="confirmDeleteChoice/*" method="execute" class="org.chorem.pollen.ui.actions.poll.vote.ConfirmDeleteChoice"> <result>/WEB-INF/jsp/poll/confirmDeletePollChoice.jsp</result> </action> <!-- delete poll choice --> - <action name="deleteChoice/*" + <action name="deleteChoice/*" method="execute" class="org.chorem.pollen.ui.actions.poll.vote.DeleteChoice"> <result type="redirectToVote"/> </action> <!-- display * --> - <action name="display*" + <action name="display*" method="execute" class="org.chorem.pollen.ui.actions.poll.form.Display{1}"> <result>/WEB-INF/jsp/poll/display{1}.jsp</result> </action> @@ -226,7 +226,7 @@ </action> <!-- get the feed of a given poll --> - <action name="getFeed" + <action name="getFeed" method="execute" class="org.chorem.pollen.ui.actions.poll.GetPollFeed"> <result type="stream"> <param name="contentCharSet">UTF-8</param> @@ -237,26 +237,26 @@ </action> <!-- Select a favorite list to add to a voting list --> - <action name="selectPersonListToAddToVotingList" + <action name="selectPersonListToAddToVotingList" method="execute" class="org.chorem.pollen.ui.actions.poll.form.SelectPersonListToVotingList"> <result>/WEB-INF/jsp/poll/selectPersonListToAddToVotingList.jsp</result> </action> <!-- Select a favorite list to import into a new voting list --> - <action name="selectPersonListToCreateNewVotingList" + <action name="selectPersonListToCreateNewVotingList" method="execute" class="org.chorem.pollen.ui.actions.poll.form.SelectPersonListToVotingList"> <result>/WEB-INF/jsp/poll/selectPersonListToCreateNewVotingList.jsp </result> </action> <!-- Load in session a personList to be imported into a voting list --> - <action name="importPersonListToVotingList" + <action name="importPersonListToVotingList" method="execute" class="org.chorem.pollen.ui.actions.poll.form.ImportPersonListToVotingList"> <result>/WEB-INF/jsp/poll/displayVotingListPersons.jsp</result> </action> <!-- Load in session a personList to be imported into a new voting list --> - <action name="importPersonListToNewVotingList" + <action name="importPersonListToNewVotingList" method="execute" class="org.chorem.pollen.ui.actions.poll.form.ImportPersonListToVotingList"> <result>/WEB-INF/jsp/poll/displayVotingList.jsp</result> </action> diff --git a/pollen-ui-struts2/src/main/resources/config/struts-user.xml b/pollen-ui-struts2/src/main/resources/config/struts-user.xml index d32089f..26fce4a 100644 --- a/pollen-ui-struts2/src/main/resources/config/struts-user.xml +++ b/pollen-ui-struts2/src/main/resources/config/struts-user.xml @@ -49,19 +49,29 @@ <result type="redirect2"/> </action> + <!-- register user (input) --> + <action name="registerInput" class="org.chorem.pollen.ui.actions.user.Register" method="input"> + <result name="input">/WEB-INF/jsp/user/register.jsp</result> + </action> + <!-- register user --> - <action name="register" class="org.chorem.pollen.ui.actions.user.Register"> + <action name="register" class="org.chorem.pollen.ui.actions.user.Register" method="execute"> <result name="input">/WEB-INF/jsp/user/register.jsp</result> <result type="redirectToHome"/> </action> <!-- show user account --> - <action name="show" class="org.chorem.pollen.ui.actions.PollenActionSupportForEdition"> + <action name="show" class="org.chorem.pollen.ui.actions.PollenActionSupportForEdition" method="execute"> <result>/WEB-INF/jsp/user/show.jsp</result> </action> + <!-- edit user account (input) --> + <action name="editInput" class="org.chorem.pollen.ui.actions.user.Edit" method="input"> + <result name="input">/WEB-INF/jsp/user/edit.jsp</result> + </action> + <!-- edit user account --> - <action name="edit" class="org.chorem.pollen.ui.actions.user.Edit"> + <action name="edit" class="org.chorem.pollen.ui.actions.user.Edit" method="execute"> <result name="input">/WEB-INF/jsp/user/edit.jsp</result> <result type="redirectAction"> <param name="actionName">show</param> @@ -69,14 +79,19 @@ </result> </action> + <!-- lost password (input) --> + <action name="lostPasswordInput" class="org.chorem.pollen.ui.actions.user.LostPassword" method="input"> + <result name="input">/WEB-INF/jsp/user/dialogLostPassword.jsp</result> + </action> + <!-- lost password --> - <action name="lostPassword" class="org.chorem.pollen.ui.actions.user.LostPassword"> + <action name="lostPassword" class="org.chorem.pollen.ui.actions.user.LostPassword" method="execute"> <result name="input">/WEB-INF/jsp/user/dialogLostPassword.jsp</result> <result type="redirectToHome"/> </action> <!-- logout --> - <action name="logout" class="org.chorem.pollen.ui.actions.user.Logout"> + <action name="logout" class="org.chorem.pollen.ui.actions.user.Logout" method="execute"> <result type="redirectToHome"/> </action> @@ -89,7 +104,7 @@ </action> <!-- create favorite list --> - <action name="createFavoriteList" + <action name="createFavoriteList" method="execute" class="org.chorem.pollen.ui.actions.user.CreateFavoriteList"> <interceptor-ref name="pollenParamsPrepareParamsStack"/> <result name="input">/WEB-INF/jsp/user/favoriteLists.jsp</result> @@ -97,27 +112,27 @@ </action> <!-- confirm delete favorite list --> - <action name="confirmDeleteFavoriteList" + <action name="confirmDeleteFavoriteList" method="execute" class="org.chorem.pollen.ui.actions.user.Confirm"> <result>/WEB-INF/jsp/user/confirmDeleteFavoriteList.jsp</result> </action> <!-- delete favorite list --> - <action name="deleteFavoriteList" + <action name="deleteFavoriteList" method="execute" class="org.chorem.pollen.ui.actions.user.DeleteFavoriteList"> <interceptor-ref name="pollenParamsPrepareParamsStack"/> <result type="redirect2"/> </action> <!-- edit favorite list --> - <action name="editFavoriteList" + <action name="editFavoriteList" method="execute" class="org.chorem.pollen.ui.actions.user.EditFavoriteList"> <interceptor-ref name="pollenParamsPrepareParamsStack"/> <result>/WEB-INF/jsp/user/favoriteList.jsp</result> </action> <!-- add poll account to favorite list --> - <action name="addPollAccount" + <action name="addPollAccount" method="execute" class="org.chorem.pollen.ui.actions.user.CreateFavoriteListVoter"> <interceptor-ref name="pollenParamsPrepareParamsStack"/> <result name="input">/WEB-INF/jsp/user/favoriteList.jsp</result> @@ -125,7 +140,7 @@ </action> <!-- edit poll account to favorite list --> - <action name="editPollAccount" + <action name="editPollAccount" method="execute" class="org.chorem.pollen.ui.actions.user.EditFavoriteListVoter"> <interceptor-ref name="pollenParamsPrepareParamsStack"/> <result name="input">/WEB-INF/jsp/user/favoriteList.jsp</result> @@ -133,20 +148,20 @@ </action> <!-- confirm delete poll account from a favorite list --> - <action name="confirmDeletePollAccount" + <action name="confirmDeletePollAccount" method="execute" class="org.chorem.pollen.ui.actions.user.Confirm"> <result>/WEB-INF/jsp/user/confirmDeletePollAccount.jsp</result> </action> <!-- remove poll account from a favorite list --> - <action name="deletePollAccount" + <action name="deletePollAccount" method="execute" class="org.chorem.pollen.ui.actions.user.DeleteFavoriteListVoter"> <interceptor-ref name="pollenParamsPrepareParamsStack"/> <result type="redirect2"/> </action> <!-- attach poll to the connected user account --> - <action name="attachPoll" + <action name="attachPoll" method="execute" class="org.chorem.pollen.ui.actions.user.AttachPoll"> <result name="input">/WEB-INF/jsp/user/createdList.jsp</result> <result type="redirectAction"> @@ -156,21 +171,21 @@ </action> <!-- display createds polls --> - <action name="createdList" + <action name="createdList" method="execute" class="org.chorem.pollen.ui.actions.PollenActionSupportForEdition"> <interceptor-ref name="pollenBasicStack"/> <result>/WEB-INF/jsp/user/createdList.jsp</result> </action> <!-- display invited polls --> - <action name="invitedList" + <action name="invitedList" method="execute" class="org.chorem.pollen.ui.actions.PollenActionSupportForVote"> <interceptor-ref name="pollenBasicStack"/> <result>/WEB-INF/jsp/user/invitedList.jsp</result> </action> <!-- display participated polls --> - <action name="participatedList" + <action name="participatedList" method="execute" class="org.chorem.pollen.ui.actions.PollenActionSupportForVote"> <interceptor-ref name="pollenBasicStack"/> <result>/WEB-INF/jsp/user/participatedList.jsp</result> diff --git a/pollen-ui-struts2/src/main/resources/struts.xml b/pollen-ui-struts2/src/main/resources/struts.xml index f22ae89..e030b52 100644 --- a/pollen-ui-struts2/src/main/resources/struts.xml +++ b/pollen-ui-struts2/src/main/resources/struts.xml @@ -48,8 +48,7 @@ <constant name="struts.devMode" value="false"/> <!-- See voir http://struts.apache.org/release/2.3.x/docs/s2-019.html --> - <constant name="struts.enable.DynamicMethodInvocation" value="true"/> - + <!--<constant name="struts.enable.DynamicMethodInvocation" value="true"/>--> <bean class="org.chorem.pollen.services.PollenServiceFactory"/> <!--Performance tuning--> diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp index 81184fd..f487fa8 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp @@ -60,7 +60,7 @@ $('.ui-dialog-title').html('<s:text name="pollen.link.lostPassword"/>'); - var url = '<s:url action="lostPassword" method="input" namespace="/user"/>'; + var url = '<s:url action="lostPasswordInput" namespace="/user"/>'; var dialog = $("#lostPasswordDialog"); dialog.load(url); dialog.dialog('open'); @@ -183,15 +183,13 @@ </a> </li> <li> - <s:submit id="submitform" action="KAction/login" align="right" - key="pollen.action.login" cssClass="KAction"/> + <s:submit id="submitform" align="right" key="pollen.action.login"/> </li> </ul> </s:form> </div> <s:text name="pollen.common.or"/> - <s:a action="KLink/register" method="input" namespace="/user" - cssClass="KLink" id='registerLink'> + <s:a action="KLink/registerInput" namespace="/user" cssClass="KLink" id='registerLink'> <s:text name="pollen.menu.register"/> </s:a> </s:else> diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteUser.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteUser.jsp index 413746f..350e543 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteUser.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteUser.jsp @@ -26,7 +26,7 @@ return false; } </script> -<s:form method="POST" namespace="/admin"> +<s:form method="POST" namespace="/admin" action="deleteUser"> <fieldset class="ui-widget-content ui-corner-all"> <s:hidden key="redirectUrl" label=''/> @@ -45,9 +45,8 @@ </div> <hr/> <div align="right"> - <s:submit onclick="return cancel();" theme="simple" - key="pollen.action.cancel"/> - <s:submit key="pollen.action.delete" theme="simple" action="deleteUser"/> + <s:submit onclick="return cancel();" theme="simple" key="pollen.action.cancel"/> + <s:submit key="pollen.action.delete" theme="simple"/> </div> </fieldset> </s:form> diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp index 65bceb9..4622f20 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp @@ -82,8 +82,7 @@ <br/> -<s:form id='createForm' method="POST" namespace="/admin" - cssClass="hidden userForm"> +<s:form id='createForm' method="POST" namespace="/admin" action="create" cssClass="hidden userForm"> <s:hidden name="action" value="create"/> <fieldset> @@ -102,11 +101,10 @@ label="%{getText('pollen.common.administrator')}"/> </fieldset> <br/> - <s:submit action="create" key="pollen.action.create" align="center"/> + <s:submit key="pollen.action.create" align="center"/> </s:form> -<s:form id='editForm' method="POST" namespace="/admin" - cssClass="hidden userForm"> +<s:form id='editForm' method="POST" namespace="/admin" action="edit" cssClass="hidden userForm"> <s:hidden name="action" value="edit"/> <s:hidden key="editUser.topiaId" label=""/> @@ -126,7 +124,7 @@ <s:hidden key="editUser.email" label=""/> </fieldset> <br/> - <s:submit action="edit" key="pollen.action.validate" align="center"/> + <s:submit key="pollen.action.validate" align="center"/> </s:form> diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmClonePoll.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmClonePoll.jsp index 3490dd8..2dccc95 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmClonePoll.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmClonePoll.jsp @@ -46,10 +46,8 @@ </div> <hr/> <div align="right"> - <s:submit onclick="return cancel();" theme="simple" - key="pollen.action.cancel"/> - <s:submit key="pollen.action.clone" theme="simple" disabled="true" - action="clone/%{pollUri}"/> + <s:submit key="pollen.action.cancel" onclick="return cancel();" theme="simple"/> + <s:submit key="pollen.action.clone" theme="simple" disabled="true"/> </div> </fieldset> </s:form> diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmClosePoll.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmClosePoll.jsp index d07c6ad..0f15cb3 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmClosePoll.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmClosePoll.jsp @@ -43,10 +43,8 @@ </div> <hr/> <div align="right"> - <s:submit onclick="return cancel();" theme="simple" - key="pollen.action.cancel"/> - <s:submit key="pollen.action.close" theme="simple" - action="close/%{pollUri}"/> + <s:submit key="pollen.action.cancel" onclick="return cancel();" theme="simple"/> + <s:submit key="pollen.action.close" theme="simple"/> </div> </fieldset> </s:form> diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePoll.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePoll.jsp index cca19d6..2959425 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePoll.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePoll.jsp @@ -43,10 +43,8 @@ </div> <hr/> <div align="right"> - <s:submit onclick="return cancel();" theme="simple" - key="pollen.action.cancel"/> - <s:submit key="pollen.action.delete" theme="simple" - action="delete/%{pollUri}"/> + <s:submit key="pollen.action.cancel" onclick="return cancel();" theme="simple"/> + <s:submit key="pollen.action.delete" theme="simple"/> </div> </fieldset> </s:form> diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollChoice.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollChoice.jsp index 9c0688f..22b2f92 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollChoice.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollChoice.jsp @@ -37,9 +37,7 @@ <hr/> <div align="right"> - <s:submit onclick="return closeConfirmDialog();" theme="simple" - key="pollen.action.cancel"/> - <s:submit key="pollen.action.delete" theme="simple" - action="deleteChoice/%{pollUri}"/> + <s:submit key="pollen.action.cancel" onclick="return closeConfirmDialog();" theme="simple"/> + <s:submit key="pollen.action.delete" theme="simple"/> </div> </s:form> diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollComment.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollComment.jsp index cad454f..7136e15 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollComment.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollComment.jsp @@ -42,9 +42,7 @@ <hr/> <div align="right"> - <s:submit onclick="return closeConfirmDialog();" theme="simple" - key="pollen.action.cancel"/> - <s:submit key="pollen.action.delete" theme="simple" - action="deleteComment/%{pollUri}"/> + <s:submit key="pollen.action.cancel" onclick="return closeConfirmDialog();" theme="simple"/> + <s:submit key="pollen.action.delete" theme="simple"/> </div> </s:form> diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollVote.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollVote.jsp index 8a1e6db..52b6bbc 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollVote.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollVote.jsp @@ -39,9 +39,7 @@ <hr/> <div align="right"> - <s:submit onclick="return closeConfirmDialog();" theme="simple" - key="pollen.action.cancel"/> - <s:submit key="pollen.action.delete" theme="simple" - action="deleteVote/%{pollUri}"/> + <s:submit key="pollen.action.cancel" onclick="return closeConfirmDialog();" theme="simple"/> + <s:submit key="pollen.action.delete" theme="simple"/> </div> </s:form> diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp index 1bec920..6b50683 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp @@ -104,7 +104,7 @@ </h1> <s:form method="POST" id="registerForm" namespace="/poll" - enctype="multipart/form-data" cssClass="KForm hidden" action="KForm/create"> + enctype="multipart/form-data" cssClass="KForm hidden"> <s:hidden key="poll.topiaId" label=""/> diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp index cff527e..0d55c93 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp @@ -341,8 +341,7 @@ label='%{getText("pollen.common.voteAnonymous")}'/> <br/> </s:if> - <s:submit action="vote/%{pollUri}" key="pollen.action.pollVote" - align="center"/> + <s:submit key="pollen.action.pollVote" align="center"/> </div> </s:if> </s:form> @@ -374,8 +373,7 @@ <br/> <div class="cleanBoth"> - <s:submit action="addChoice/%{pollUri}" key="pollen.action.addChoice" - align="center"/> + <s:submit key="pollen.action.addChoice" align="center"/> </div> </s:form> </div> @@ -405,8 +403,7 @@ toolbar="PollenToolbar" customConfig="%{configUrl}" editorLocal="%{safeLanguage}" /> <div class="cleanBoth"> - <s:submit action="addComment/%{pollUri}" key="pollen.action.addComment" - align="center"/> + <s:submit key="pollen.action.addComment" align="center"/> </div> </s:form> diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/confirmDeleteFavoriteList.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/confirmDeleteFavoriteList.jsp index 822c34f..f7cb926 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/confirmDeleteFavoriteList.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/confirmDeleteFavoriteList.jsp @@ -44,10 +44,8 @@ </div> <hr/> <div align="right"> - <s:submit onclick="return cancel();" theme="simple" - key="pollen.action.cancel"/> - <s:submit key="pollen.action.delete" theme="simple" - action="deleteFavoriteList"/> + <s:submit key="pollen.action.cancel" onclick="return cancel();" theme="simple"/> + <s:submit key="pollen.action.delete" theme="simple"/> </div> </fieldset> </s:form> diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/confirmDeletePollAccount.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/confirmDeletePollAccount.jsp index d47ec92..a8b8cad 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/confirmDeletePollAccount.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/confirmDeletePollAccount.jsp @@ -45,10 +45,8 @@ </div> <hr/> <div align="right"> - <s:submit onclick="return cancel();" theme="simple" - key="pollen.action.cancel"/> - <s:submit key="pollen.action.delete" theme="simple" - action="deletePollAccount"/> + <s:submit key="pollen.action.cancel" onclick="return cancel();" theme="simple"/> + <s:submit key="pollen.action.delete" theme="simple"/> </div> </fieldset> </s:form> diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/createdList.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/createdList.jsp index e19cb90..9d7640e 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/createdList.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/createdList.jsp @@ -96,6 +96,6 @@ tooltip='%{getText("poll.help.pollId")}'/> <br/> - <s:submit action="attachPoll" key="pollen.action.attachPoll"/> + <s:submit key="pollen.action.attachPoll"/> </s:form> </fieldset> diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/dialogLostPassword.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/dialogLostPassword.jsp index 21f5427..23ed356 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/dialogLostPassword.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/dialogLostPassword.jsp @@ -26,7 +26,7 @@ return false; } </script> -<s:form method="POST" namespace="/user"> +<s:form method="POST" namespace="/user" action="lostPassword"> <fieldset class="ui-widget-content ui-corner-all"> <s:text name="pollen.information.lostPassword"/> @@ -41,8 +41,7 @@ <button onclick="return cancel();"> <s:text name="pollen.action.cancel"/> </button> - <s:submit key="pollen.action.send" theme="simple" - action="lostPassword"/> + <s:submit key="pollen.action.send" theme="simple"/> </div> </fieldset> </s:form> diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/edit.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/edit.jsp index 139bf4c..fc24ec0 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/edit.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/edit.jsp @@ -29,7 +29,7 @@ <s:text name="pollen.title.myAccount"/> </h1> -<s:form method="POST" namespace="/user"> +<s:form method="POST" namespace="/user" action="edit"> <fieldset> <legend><s:text name="pollen.fieldset.connexionInformation"/></legend> @@ -57,5 +57,5 @@ </s:if> </fieldset> <br/> - <s:submit action="edit" key="pollen.action.validate" align="center"/> + <s:submit key="pollen.action.validate" align="center"/> </s:form> diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteList.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteList.jsp index fcd501f..a074adb 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteList.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteList.jsp @@ -94,7 +94,7 @@ <br/> <s:form id='createForm' method="POST" namespace="/user" - cssClass="hidden pollAccountForm"> + cssClass="hidden pollAccountForm" action="addPollAccount"> <s:hidden name="action" value="create"/> <s:hidden key="favoriteListId" label=""/> @@ -109,11 +109,10 @@ </fieldset> <br/> - <s:submit action="addPollAccount" - key="pollen.action.create" align="center"/> + <s:submit key="pollen.action.create" align="center"/> </s:form> -<s:form id='editForm' method="POST" namespace="/user" +<s:form id='editForm' method="POST" namespace="/user" action="editPollAccount" cssClass="hidden pollAccountForm"> <s:hidden name="action" value="edit"/> @@ -130,15 +129,13 @@ label="%{getText('pollen.common.email')}" size="40"/> </fieldset> <br/> - <s:submit action="editPollAccount" key="pollen.action.validate" - align="center"/> + <s:submit key="pollen.action.validate" align="center"/> </s:form> <br/> -<s:form method="POST" namespace="/user"> +<s:form method="POST" namespace="/user" action="favoriteLists"> - <s:submit action="favoriteLists" - key="pollen.action.backToFavoriteLists" align="center"/> + <s:submit key="pollen.action.backToFavoriteLists" align="center"/> </s:form> <sj:dialog id="confirmDialog" autoOpen="false" modal="true" width="500"/> diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp index 8787829..a59381f 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp @@ -90,7 +90,7 @@ </sjg:grid> <br/> -<s:form id='createForm' method="POST" namespace="/user" +<s:form id='createForm' method="POST" namespace="/user" action="createFavoriteList" cssClass="hidden favoriteForm" enctype="multipart/form-data"> <fieldset> @@ -107,15 +107,14 @@ size="40"/> </fieldset> <br/> - <s:submit action="createFavoriteList" key="pollen.action.create" - align="center"/> + <s:submit key="pollen.action.create" align="center"/> </s:form> <s:form id='editForm' method="POST" namespace="/user" theme="simple" action="editFavoriteList" cssClass="hidden"> <s:hidden key="favoriteListId" label=""/> - <s:submit action="editFavoriteList"/> + <s:submit key="pollen.action.edit" /> </s:form> diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/login.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/login.jsp index 855b6a7..215be6a 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/login.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/login.jsp @@ -32,7 +32,7 @@ <br/> -<s:form id="connection" action="login" method="POST" namespace="/user"> +<s:form id="connection" method="POST" namespace="/user" action="login"> <fieldset> <legend><s:text name="pollen.fieldset.login"/></legend> @@ -46,8 +46,7 @@ </fieldset> <br/> - <s:submit id="submitform" action="login" key="pollen.action.login" - align="center"/> + <s:submit id="submitform" key="pollen.action.login" align="center"/> </s:form> <div class="center" style="margin-bottom:20px;"> <img src="<s:url value='/img/pollen_%{safeLanguage}.png' />" diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/register.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/register.jsp index 7c7929a..95fefd6 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/register.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/register.jsp @@ -53,6 +53,5 @@ key="pollen.common.lastName"/> </fieldset> <br/> - <s:submit action="KAction/register" key="pollen.action.register" - align="center" cssClass="KAction"/> + <s:submit key="pollen.action.register" align="center"/> </s:form> diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/show.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/show.jsp index 2baf244..419a7e7 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/show.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/show.jsp @@ -29,7 +29,7 @@ <s:text name="pollen.title.myAccount"/> </h1> -<s:form method="POST" namespace="/user"> +<s:form method="POST" namespace="/user" action="editInput"> <fieldset> <legend><s:text name="pollen.fieldset.connexionInformation"/></legend> @@ -48,6 +48,5 @@ key="pollen.common.lastName"/> </fieldset> <br/> - <s:submit action="edit" method="input" - key="pollen.action.modify" align="center"/> + <s:submit key="pollen.action.modify" align="center"/> </s:form> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.