You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ag...@apache.org on 2006/10/30 19:20:35 UTC
svn commit: r469217 -
/incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/PageServlet.java
Author: agilliland
Date: Mon Oct 30 10:20:34 2006
New Revision: 469217
URL: http://svn.apache.org/viewvc?view=rev&rev=469217
Log:
make sure that entries which are not published or are published to future are not available as permalinks.
Modified:
incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/PageServlet.java
Modified: incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/PageServlet.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/PageServlet.java?view=diff&rev=469217&r1=469216&r2=469217
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/PageServlet.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/PageServlet.java Mon Oct 30 10:20:34 2006
@@ -40,6 +40,7 @@
import org.apache.roller.config.RollerRuntimeConfig;
import org.apache.roller.business.RollerFactory;
import org.apache.roller.pojos.Template;
+import org.apache.roller.pojos.WeblogEntryData;
import org.apache.roller.pojos.WeblogTemplate;
import org.apache.roller.pojos.WebsiteData;
import org.apache.roller.ui.core.RollerContext;
@@ -277,11 +278,17 @@
}
if(pageRequest.getWeblogAnchor() != null) {
- // permalink specified. entry must exist and locale must match
- if(pageRequest.getWeblogEntry() == null) {
+ // permalink specified.
+ // entry must exist, be published before current time, and locale must match
+ WeblogEntryData entry = pageRequest.getWeblogEntry();
+ if(entry == null) {
invalid = true;
} else if (pageRequest.getLocale() != null &&
- !pageRequest.getWeblogEntry().getLocale().startsWith(pageRequest.getLocale())) {
+ !entry.getLocale().startsWith(pageRequest.getLocale())) {
+ invalid = true;
+ } else if (!entry.isPublished()) {
+ invalid = true;
+ } else if (new Date().before(entry.getPubTime())) {
invalid = true;
}