X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FDeletePostPage.java;h=5722ee3d0c0a73b7b152fe0a236285c0e505a0be;hb=927f9d885b134b7d4f45a68c42c5700b3c75cdbe;hp=ea8aeffbee3cd9bcff9889a98833896859edb869;hpb=309334f7379f58c848225e1bf47676bc40bfe5b2;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/DeletePostPage.java b/src/main/java/net/pterodactylus/sone/web/DeletePostPage.java
index ea8aeff..5722ee3 100644
--- a/src/main/java/net/pterodactylus/sone/web/DeletePostPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/DeletePostPage.java
@@ -20,6 +20,7 @@ package net.pterodactylus.sone.web;
 import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.web.page.Page.Request.Method;
+import net.pterodactylus.util.template.DataProvider;
 import net.pterodactylus.util.template.Template;
 
 /**
@@ -38,7 +39,7 @@ public class DeletePostPage extends SoneTemplatePage {
 	 *            The Sone web interface
 	 */
 	public DeletePostPage(Template template, WebInterface webInterface) {
-		super("deletePost.html", template, "Page.DeletePost.Title", webInterface);
+		super("deletePost.html", template, "Page.DeletePost.Title", webInterface, true);
 	}
 
 	//
@@ -49,35 +50,32 @@ public class DeletePostPage extends SoneTemplatePage {
 	 * {@inheritDoc}
 	 */
 	@Override
-	protected void processTemplate(Request request, Template template) throws RedirectException {
-		super.processTemplate(request, template);
-		String postId = request.getHttpRequest().getParam("post", null);
-		if (postId == null) {
-			postId = request.getHttpRequest().getPartAsStringFailsafe("post", 36);
-		}
-		Post post = webInterface.core().getPost(postId);
-		Sone currentSone = getCurrentSone(request.getToadletContext());
-		if (!post.getSone().equals(currentSone)) {
-			throw new RedirectException("noPermission.html");
-		}
-		if (request.getMethod() == Method.POST) {
+	protected void processTemplate(Request request, DataProvider dataProvider) throws RedirectException {
+		super.processTemplate(request, dataProvider);
+		if (request.getMethod() == Method.GET) {
+			String postId = request.getHttpRequest().getParam("post");
+			String returnPage = request.getHttpRequest().getParam("returnPage");
+			Post post = webInterface.getCore().getPost(postId);
+			dataProvider.set("post", post);
+			dataProvider.set("returnPage", returnPage);
+			return;
+		} else if (request.getMethod() == Method.POST) {
+			String postId = request.getHttpRequest().getPartAsStringFailsafe("post", 36);
+			String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 256);
+			Post post = webInterface.getCore().getPost(postId);
+			Sone currentSone = getCurrentSone(request.getToadletContext());
+			if (!post.getSone().equals(currentSone)) {
+				throw new RedirectException("noPermission.html");
+			}
 			if (request.getHttpRequest().isPartSet("confirmDelete")) {
 				currentSone.removePost(post);
+				throw new RedirectException(returnPage);
+			} else if (request.getHttpRequest().isPartSet("abortDelete")) {
+				throw new RedirectException(returnPage);
 			}
-			throw new RedirectException("index.html");
+			dataProvider.set("post", post);
+			dataProvider.set("returnPage", returnPage);
 		}
 	}
 
-	//
-	// SONETEMPLATEPAGE METHODS
-	//
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected boolean requiresLogin() {
-		return true;
-	}
-
 }