You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2012/06/24 16:13:01 UTC
svn commit: r1353270 [2/2] - in /roller/trunk: ./ weblogger-business/
weblogger-business/src/main/java/org/apache/roller/weblogger/business/
weblogger-business/src/main/java/org/apache/roller/weblogger/business/plugins/
weblogger-business/src/main/java...
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/CategoryAdd.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/CategoryAdd.jsp?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/CategoryAdd.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/CategoryAdd.jsp Sun Jun 24 14:12:52 2012
@@ -26,6 +26,7 @@
</p>
<s:form action="categoryAdd!save">
+ <s:hidden name="salt" />
<s:hidden name="weblog" />
<s:hidden name="categoryId" />
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/CategoryEdit.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/CategoryEdit.jsp?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/CategoryEdit.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/CategoryEdit.jsp Sun Jun 24 14:12:52 2012
@@ -26,6 +26,7 @@
</p>
<s:form action="categoryEdit!save">
+ <s:hidden name="salt" />
<s:hidden name="weblog" />
<s:hidden name="bean.id" />
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/CategoryRemove.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/CategoryRemove.jsp?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/CategoryRemove.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/CategoryRemove.jsp Sun Jun 24 14:12:52 2012
@@ -23,6 +23,7 @@
</h3>
<s:form action="categoryRemove!remove">
+ <s:hidden name="salt" />
<s:hidden name="weblog" />
<s:hidden name="removeId" />
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp Sun Jun 24 14:12:52 2012
@@ -60,6 +60,7 @@
<%-- ============================================================= --%>
<s:form action="comments!update">
+ <s:hidden name="salt" />
<s:hidden name="weblog" />
<s:hidden name="bean.ids" />
<s:hidden name="bean.entryId" />
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/CommentsSidebar.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/CommentsSidebar.jsp?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/CommentsSidebar.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/CommentsSidebar.jsp Sun Jun 24 14:12:52 2012
@@ -29,6 +29,7 @@
<p><s:text name="commentManagement.sidebarDescription" /></p>
<s:form action="comments!query" id="commentsQuery">
+ <s:hidden name="salt" />
<s:hidden name="weblog" />
<div class="sideformrow">
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/CustomPingTargetAdd.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/CustomPingTargetAdd.jsp?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/CustomPingTargetAdd.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/CustomPingTargetAdd.jsp Sun Jun 24 14:12:52 2012
@@ -24,6 +24,7 @@
</p>
<s:form action="customPingTargetAdd!save" >
+ <s:hidden name="salt" />
<s:hidden name="weblog" value="%{actionWeblog.handle}" />
<div class="formrow">
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/CustomPingTargetConfirm.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/CustomPingTargetConfirm.jsp?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/CustomPingTargetConfirm.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/CustomPingTargetConfirm.jsp Sun Jun 24 14:12:52 2012
@@ -33,12 +33,14 @@
<div class="control">
<s:form action="customPingTargets!delete">
+ <s:hidden name="salt" />
<s:hidden name="pingTargetId" />
<s:hidden name="weblog" value="%{actionWeblog.handle}" />
<s:submit value="%{getText('pingTarget.removeOK')}" />
</s:form>
<s:form action="customPingTargets">
+ <s:hidden name="salt" />
<s:hidden name="weblog" value="%{actionWeblog.handle}" />
<s:submit value="%{getText('pingTarget.cancel')}" />
</s:form>
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/CustomPingTargetEdit.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/CustomPingTargetEdit.jsp?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/CustomPingTargetEdit.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/CustomPingTargetEdit.jsp Sun Jun 24 14:12:52 2012
@@ -24,6 +24,7 @@
</p>
<s:form action="customPingTargetEdit!save" >
+ <s:hidden name="salt" />
<s:hidden name="bean.id" />
<s:hidden name="weblog" value="%{actionWeblog.handle}" />
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/EntriesSidebar.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/EntriesSidebar.jsp?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/EntriesSidebar.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/EntriesSidebar.jsp Sun Jun 24 14:12:52 2012
@@ -29,6 +29,7 @@
<p><s:text name="weblogEntryQuery.sidebarDescription" /></p>
<s:form action="entries">
+ <s:hidden name="salt" />
<s:hidden name="weblog" />
<s:hidden name="bean.count" />
<s:hidden name="bean.offset" />
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/EntryAdd.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/EntryAdd.jsp?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/EntryAdd.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/EntryAdd.jsp Sun Jun 24 14:12:52 2012
@@ -45,6 +45,7 @@
</p>
<s:form id="entry" action="entryAdd!save" onsubmit="editorCleanup()">
+ <s:hidden name="salt" />
<s:hidden name="weblog" />
<%-- ================================================================== --%>
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp Sun Jun 24 14:12:52 2012
@@ -53,6 +53,7 @@ function fullPreviewMode() {
</p>
<s:form id="entry" action="entryEdit!save" onsubmit="editorCleanup()">
+ <s:hidden name="salt" />
<s:hidden name="weblog" />
<s:hidden name="bean.id" />
<s:hidden name="bean.commentCount" />
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/EntryRemove.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/EntryRemove.jsp?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/EntryRemove.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/EntryRemove.jsp Sun Jun 24 14:12:52 2012
@@ -31,6 +31,7 @@
<tr>
<td>
<s:form action="entryRemove!remove">
+ <s:hidden name="salt" />
<s:hidden name="weblog" />
<s:hidden name="removeId" />
<s:submit value="%{getText('weblogEntryRemove.yes')}" />
@@ -38,6 +39,7 @@
</td>
<td>
<s:form action="entryEdit">
+ <s:hidden name="salt" />
<s:hidden name="weblog" />
<s:hidden name="bean.id" value="%{removeId}" />
<s:submit value="%{getText('weblogEntryRemove.no')}" />
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/FolderAdd.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/FolderAdd.jsp?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/FolderAdd.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/FolderAdd.jsp Sun Jun 24 14:12:52 2012
@@ -24,6 +24,7 @@
</p>
<s:form action="folderAdd!save">
+ <s:hidden name="salt" />
<s:hidden name="weblog" />
<s:hidden name="folderId" />
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/FolderEdit.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/FolderEdit.jsp?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/FolderEdit.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/FolderEdit.jsp Sun Jun 24 14:12:52 2012
@@ -24,6 +24,7 @@
</p>
<s:form action="folderEdit!save">
+ <s:hidden name="salt" />
<s:hidden name="weblog" />
<s:hidden name="bean.id" />
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/Maintenance.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/Maintenance.jsp?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/Maintenance.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/Maintenance.jsp Sun Jun 24 14:12:52 2012
@@ -20,6 +20,7 @@
<p class="subtitle"><s:text name="maintenance.subtitle" /></p>
<s:form action="maintenance">
+ <s:hidden name="salt" />
<s:hidden name="weblog" value="%{actionWeblog.handle}" />
<s:text name="maintenance.prompt.flush" /><br /><br />
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/MediaFileAdd.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/MediaFileAdd.jsp?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/MediaFileAdd.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/MediaFileAdd.jsp Sun Jun 24 14:12:52 2012
@@ -68,6 +68,7 @@
</p>
<s:form id="entry" action="mediaFileAdd!save" method="POST" enctype="multipart/form-data">
+ <s:hidden name="salt" />
<s:hidden name="weblog" />
<%-- ================================================================== --%>
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/MediaFileAddExternalInclude.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/MediaFileAddExternalInclude.jsp?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/MediaFileAddExternalInclude.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/MediaFileAddExternalInclude.jsp Sun Jun 24 14:12:52 2012
@@ -29,6 +29,7 @@ function submitPage(frm) {
</script>
<s:form id="entry" action=" " onsubmit="editorCleanup()" method="POST">
+ <s:hidden name="salt" />
<table class="entryEditTable" cellpadding="0" cellspacing="0" width="100%">
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/MediaFileAddSuccess.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/MediaFileAddSuccess.jsp?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/MediaFileAddSuccess.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/MediaFileAddSuccess.jsp Sun Jun 24 14:12:52 2012
@@ -69,6 +69,7 @@
</p>
<s:form id="entry" action="entryAddWithMediaFile">
+ <s:hidden name="salt" />
<s:hidden name="weblog" />
<s:hidden name="enclosureUrl" id="enclosureUrl" />
<input type="hidden" name="type" value="weblog" />
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp Sun Jun 24 14:12:52 2012
@@ -75,6 +75,7 @@ $("#d_clip_button").ready(function() {
</p>
<s:form id="entry" action="mediaFileEdit!save" method="POST" enctype="multipart/form-data">
+ <s:hidden name="salt" />
<s:hidden name="weblog" />
<s:hidden name="mediaFileId" id="mediaFileId" />
<s:hidden name="bean.permalink" />
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/MediaFileImageChooser.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/MediaFileImageChooser.jsp?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/MediaFileImageChooser.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/MediaFileImageChooser.jsp Sun Jun 24 14:12:52 2012
@@ -97,7 +97,7 @@
<s:if test="childFiles || childDirectories || (pager && pager.items.size() > 0)">
<s:form id="mediaFileChooserForm" name="mediaFileChooserForm" action="mediaFileView">
-
+ <s:hidden name="salt" />
<s:hidden name="weblog" />
<s:hidden name="directoryId" />
<input type="hidden" name="mediaFileId" value="" />
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/MediaFileSidebar.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/MediaFileSidebar.jsp?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/MediaFileSidebar.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/MediaFileSidebar.jsp Sun Jun 24 14:12:52 2012
@@ -63,6 +63,7 @@
<s:form id="mediaFileSearchForm" name="mediaFileSearchForm"
action="mediaFileView!search" onsubmit="editorCleanup()">
+ <s:hidden name="salt" />
<s:hidden name="weblog" />
<input type="hidden" name="mediaFileId" value="" />
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp Sun Jun 24 14:12:52 2012
@@ -182,6 +182,7 @@
<s:form id="createPostForm" action='entryAddWithMediaFile'>
+ <s:hidden name="salt" />
<input type="hidden" name="weblog" value='<s:property value="actionWeblog.handle" />' />
<input type="hidden" name="selectedImage" id="selectedImage" />
<input type="hidden" name="type" id="type" />
@@ -287,6 +288,7 @@
<s:if test="childFiles || childDirectories || (pager && pager.items.size() > 0)">
<s:form id="mediaFileViewForm" name="mediaFileViewForm" action="mediaFileView">
+ <s:hidden name="salt" />
<s:hidden name="weblog" />
<s:hidden name="directoryId" />
<s:hidden name="newDirectoryName" />
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/Members.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/Members.jsp?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/Members.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/Members.jsp Sun Jun 24 14:12:52 2012
@@ -42,6 +42,7 @@ function save() {
<p><s:text name="memberPermissions.description" /></p>
<s:form action="members!save">
+ <s:hidden name="salt" />
<s:hidden name="weblog" value="%{actionWeblog.handle}" />
<div style="text-align: right; padding-bottom: 6px;">
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/MembersInvite.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/MembersInvite.jsp?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/MembersInvite.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/MembersInvite.jsp Sun Jun 24 14:12:52 2012
@@ -27,6 +27,7 @@
<p><s:text name="inviteMember.prompt" /></p>
<s:form action="invite!save">
+ <s:hidden name="salt" />
<s:hidden name="weblog" value="%{actionWeblog.handle}" />
<div class="formrow">
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/Referrers.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/Referrers.jsp?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/Referrers.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/Referrers.jsp Sun Jun 24 14:12:52 2012
@@ -28,6 +28,7 @@
</p>
<s:form action="referrers!remove">
+ <s:hidden name="salt" />
<s:hidden name="weblog" />
<%-- Table of referers, with check box for each --%>
@@ -63,6 +64,7 @@
<h1><s:text name="referers.hitCounters" /></h1>
<p><s:text name="referers.hits" />: <s:property value="dayHits"/></p>
<s:form action="referrers!reset">
+ <s:hidden name="salt" />
<s:hidden name="weblog" />
<s:submit value="%{getText('referers.reset')}" />
</s:form>
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/StylesheetEdit.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/StylesheetEdit.jsp?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/StylesheetEdit.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/StylesheetEdit.jsp Sun Jun 24 14:12:52 2012
@@ -53,6 +53,7 @@
</p>
<s:form action="stylesheetEdit!save">
+ <s:hidden name="salt" />
<s:hidden name="weblog" />
<%-- ================================================================== --%>
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/TemplateEdit.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/TemplateEdit.jsp?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/TemplateEdit.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/TemplateEdit.jsp Sun Jun 24 14:12:52 2012
@@ -38,6 +38,7 @@
</s:else>
<s:form action="templateEdit!save" id="template">
+ <s:hidden name="salt" />
<s:hidden name="weblog" />
<s:hidden name="bean.id"/>
<s:hidden name ="bean.type"/>
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/TemplateRemove.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/TemplateRemove.jsp?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/TemplateRemove.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/TemplateRemove.jsp Sun Jun 24 14:12:52 2012
@@ -42,6 +42,8 @@
<tr>
<td>
<s:form action="templateRemove!remove">
+ <s:hidden name="salt" />
+
<s:hidden name="removeId" />
<s:hidden name="weblog" value="%{actionWeblog.handle}" />
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/TemplatesSidebar.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/TemplatesSidebar.jsp?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/TemplatesSidebar.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/TemplatesSidebar.jsp Sun Jun 24 14:12:52 2012
@@ -26,7 +26,8 @@
<hr size="1" noshade="noshade" />
<s:form action="templates!add">
- <s:hidden name="weblog" />
+ <s:hidden name="salt" />
+ <s:hidden name="weblog" />
<table cellpadding="0" cellspacing="6">
<tr>
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp Sun Jun 24 14:12:52 2012
@@ -59,6 +59,7 @@ function toggleImportThemeDisplay() {
</p>
<s:form action="themeEdit!save">
+ <s:hidden name="salt" />
<s:hidden name="weblog" />
<table width="100%" cellpadding="0" cellspacing="0">
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/ThemeEditSharedThemesOnly.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/ThemeEditSharedThemesOnly.jsp?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/ThemeEditSharedThemesOnly.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/ThemeEditSharedThemesOnly.jsp Sun Jun 24 14:12:52 2012
@@ -42,6 +42,7 @@ function previewMobileImage(element, the
</p>
<s:form action="themeEdit!save">
+ <s:hidden name="salt" />
<s:hidden name="weblog" />
<s:hidden name="themeType" value="shared" />
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/WeblogConfig.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/WeblogConfig.jsp?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/WeblogConfig.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/WeblogConfig.jsp Sun Jun 24 14:12:52 2012
@@ -24,7 +24,7 @@
</p>
<s:form action="weblogConfig!save">
-
+ <s:hidden name="salt" />
<s:hidden name="weblog" value="%{actionWeblog.handle}" />
<s:hidden name="bean.defaultCategoryId" />
@@ -265,6 +265,7 @@
<s:form action="weblogRemove">
+ <s:hidden name="salt" />
<s:hidden name="weblog" value="%{actionWeblog.handle}" />
<h2><s:text name="websiteSettings.removeWebsiteHeading" /></h2>
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/WeblogExport.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/WeblogExport.jsp?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/WeblogExport.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/WeblogExport.jsp Sun Jun 24 14:12:52 2012
@@ -30,6 +30,7 @@
<h2><s:text name="weblogExport.entries" /></h2>
<p class="pagetip" style="width:50%"><s:text name="weblogExport.entries.tip" /></p>
<s:form name="entriesExport" action="weblogExport!exportEntries" method="POST">
+ <s:hidden name="salt" />
<table cellpadding="0" cellspacing="5" border="0">
<tr>
<td valign="baseline" align="right"><s:text name="weblogExport.baseUrl"/></td>
@@ -51,6 +52,7 @@
<h2><s:text name="weblogExport.resources" /></h2>
<p class="pagetip" style="width:50%"><s:text name="weblogExport.resources.tip" /></p>
<s:form name="resourcesExport" action="weblogExport!exportResources" method="POST">
+ <s:hidden name="salt" />
<table cellpadding="0" cellspacing="5" border="0">
<tr>
<td valign="baseline">
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/WeblogRemoveConfirm.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/WeblogRemoveConfirm.jsp?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/WeblogRemoveConfirm.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/WeblogRemoveConfirm.jsp Sun Jun 24 14:12:52 2012
@@ -42,12 +42,14 @@
<tr>
<td>
<s:form action="weblogRemove!remove">
+ <s:hidden name="salt" />
<s:hidden name="weblog" value="%{actionWeblog.handle}" />
<s:submit value="%{getText('application.yes')}" />
</s:form>
</td>
<td>
<s:form action="weblogConfig" method="post">
+ <s:hidden name="salt" />
<s:hidden name="weblog" value="%{actionWeblog.handle}" />
<s:submit value="%{getText('application.no')}" />
</s:form>
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/web.xml?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/web.xml Sun Jun 24 14:12:52 2012
@@ -81,6 +81,15 @@
<filter-class>org.apache.roller.weblogger.ui.core.filters.CharEncodingFilter</filter-class>
</filter>
+ <filter>
+ <filter-name>LoadSaltFilter</filter-name>
+ <filter-class>org.apache.roller.weblogger.ui.core.filters.LoadSaltFilter</filter-class>
+ </filter>
+
+ <filter>
+ <filter-name>ValidateSaltFilter</filter-name>
+ <filter-class>org.apache.roller.weblogger.ui.core.filters.ValidateSaltFilter</filter-class>
+ </filter>
<!-- ******************************************
Filter mappings - order IS important here.
@@ -151,6 +160,18 @@
<dispatcher>REQUEST</dispatcher>
</filter-mapping>
+ <filter-mapping>
+ <filter-name>LoadSaltFilter</filter-name>
+ <url-pattern>/roller-ui/*</url-pattern>
+ <dispatcher>REQUEST</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
+ </filter-mapping>
+
+ <filter-mapping>
+ <filter-name>ValidateSaltFilter</filter-name>
+ <url-pattern>/roller-ui/*</url-pattern>
+ </filter-mapping>
+
<!-- Request mapping. this is what allows the urls to work -->
<filter-mapping>
<filter-name>RequestMappingFilter</filter-name>
Modified: roller/trunk/weblogger-webapp/src/test/resources/jetty.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/test/resources/jetty.xml?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/test/resources/jetty.xml (original)
+++ roller/trunk/weblogger-webapp/src/test/resources/jetty.xml Sun Jun 24 14:12:52 2012
@@ -5,7 +5,7 @@
<!-- Configure a log -->
- <New id="ServerLog" class="java.io.PrintStream">
+<!-- <New id="ServerLog" class="java.io.PrintStream">
<Arg>
<New class="org.mortbay.util.RolloverFileOutputStream">
<Arg>${project.build.directory}/yyyy_mm_dd.stderrout.log</Arg>
@@ -19,9 +19,9 @@
<Get id="ServerLogName" name="datedFilename"/>
</New>
</Arg>
- </New>
+ </New>-->
- <Call class="org.mortbay.log.Log" name="info">
+<!-- <Call class="org.mortbay.log.Log" name="info">
<Arg>Redirecting stderr/stdout to
<Ref id="ServerLogName"/>
</Arg>
@@ -35,6 +35,6 @@
<Arg>
<Ref id="ServerLog"/>
</Arg>
- </Call>
+ </Call>-->
</Configure>
Modified: roller/trunk/weblogger-webapp/src/test/resources/roller-custom.properties
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/test/resources/roller-custom.properties?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/test/resources/roller-custom.properties (original)
+++ roller/trunk/weblogger-webapp/src/test/resources/roller-custom.properties Sun Jun 24 14:12:52 2012
@@ -30,6 +30,13 @@ uploads.migrate.auto=false
# override tasks.enabled so we can add a test task
tasks.enabled=ScheduledEntriesTask,ResetHitCountsTask,TurnoverReferersTask,PingQueueTask,TestTask
+plugins.page=\
+ org.apache.roller.weblogger.business.plugins.entry.HTMLSubsetPlugin\
+,org.apache.roller.weblogger.business.plugins.entry.ConvertLineBreaksPlugin \
+,org.apache.roller.weblogger.business.plugins.entry.TopicTagPlugin \
+,org.apache.roller.weblogger.business.plugins.entry.ObfuscateEmailPlugin \
+,org.apache.roller.weblogger.business.plugins.entry.SmileysPlugin
+
# test task
tasks.TestTask.class=org.apache.roller.weblogger.business.TestTask
tasks.TestTask.startTime=immediate
@@ -46,4 +53,14 @@ cache.weblogfeed.enabled=false
cache.planet.enabled=false
# logging - you can set Log4J properties here
+log4j.rootLogger=WARN, stdout
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d %p [%t] %C{1} - %m\n
+
#log4j.logger.org.apache.roller.weblogger.business=DEBUG
+log4j.logger.org.apache.roller=ERROR
+#log4j.logger.org.apache.roller.weblogger.ui.core.filters.LoadSaltFilter=DEBUG
+#log4j.logger.org.apache.roller.weblogger.ui.core.filters.ValidateSaltFilter=DEBUG
+#log4j.logger.org.apache.roller.weblogger.ui.rendering.util.cache.SaltCache=DEBUG
+log4j.logger.org.apache.roller.weblogger.business.plugins.entry=DEBUG
\ No newline at end of file