X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FDeleteImagePage.java;h=8aa36a91c14cbca632dad0d2f43e74ba7ccc4d05;hb=e80be3f00b1d486fd3995d8f29ce3bf04da7b61d;hp=84222ee71f743623dcc1ba1c8f4df69d71e1b65e;hpb=eb0f0b56e248146f0523feb93c75f9dff5cedde1;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/DeleteImagePage.java b/src/main/java/net/pterodactylus/sone/web/DeleteImagePage.java
index 84222ee..8aa36a9 100644
--- a/src/main/java/net/pterodactylus/sone/web/DeleteImagePage.java
+++ b/src/main/java/net/pterodactylus/sone/web/DeleteImagePage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - DeleteImagePage.java - Copyright © 2011 David Roden
+ * Sone - DeleteImagePage.java - Copyright © 2011–2013 David Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,9 +18,12 @@
 package net.pterodactylus.sone.web;
 
 import net.pterodactylus.sone.data.Image;
-import net.pterodactylus.sone.web.page.Page.Request.Method;
+import net.pterodactylus.sone.web.page.FreenetRequest;
 import net.pterodactylus.util.template.Template;
 import net.pterodactylus.util.template.TemplateContext;
+import net.pterodactylus.util.web.Method;
+
+import com.google.common.base.Optional;
 
 /**
  * Page that lets the user delete an {@link Image}.
@@ -45,24 +48,25 @@ public class DeleteImagePage extends SoneTemplatePage {
 	// SONETEMPLATEPAGE METHODS
 	//
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
-	protected void processTemplate(Request request, TemplateContext templateContext) throws RedirectException {
+	protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
 		super.processTemplate(request, templateContext);
+		String imageId = (request.getMethod() == Method.POST) ? request.getHttpRequest().getPartAsStringFailsafe("image", 36) : request.getHttpRequest().getParam("image");
+		Optional<Image> image = webInterface.getCore().getImage(imageId);
+		if (!image.isPresent()) {
+			throw new RedirectException("invalid.html");
+		}
+		if (!image.get().getSone().isLocal()) {
+			throw new RedirectException("noPermission.html");
+		}
 		if (request.getMethod() == Method.POST) {
-			String imageId = request.getHttpRequest().getPartAsStringFailsafe("image", 36);
-			Image image = webInterface.getCore().getImage(imageId, false);
-			if (image == null) {
-				throw new RedirectException("invalid.html");
-			}
-			if (!webInterface.getCore().isLocalSone(image.getSone())) {
-				throw new RedirectException("noPermission.html");
+			if (request.getHttpRequest().isPartSet("abortDelete")) {
+				throw new RedirectException("imageBrowser.html?image=" + image.get().getId());
 			}
-			webInterface.getCore().deleteImage(image);
-			throw new RedirectException("imageBrowser.html?album=" + image.getAlbum().getId());
+			webInterface.getCore().deleteImage(image.get());
+			throw new RedirectException("imageBrowser.html?album=" + image.get().getAlbum().getId());
 		}
+		templateContext.set("image", image);
 	}
 
 }