X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FDeleteImagePage.java;fp=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FDeleteImagePage.java;h=999a38aeaa1b7ef5ea3fb78f362a6150bcd85f52;hb=b8545de14af229c6b557ef2229ee0166459d3a16;hp=84222ee71f743623dcc1ba1c8f4df69d71e1b65e;hpb=102382a92bd1fda430a0bd882b2e065426a48e64;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..999a38a 100644
--- a/src/main/java/net/pterodactylus/sone/web/DeleteImagePage.java
+++ b/src/main/java/net/pterodactylus/sone/web/DeleteImagePage.java
@@ -51,18 +51,22 @@ public class DeleteImagePage extends SoneTemplatePage {
 	@Override
 	protected void processTemplate(Request request, TemplateContext templateContext) throws RedirectException {
 		super.processTemplate(request, templateContext);
+		String imageId = (request.getMethod() == Method.POST) ? request.getHttpRequest().getPartAsStringFailsafe("image", 36) : request.getHttpRequest().getParam("image");
+		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.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.getId());
 			}
 			webInterface.getCore().deleteImage(image);
 			throw new RedirectException("imageBrowser.html?album=" + image.getAlbum().getId());
 		}
+		templateContext.set("image", image);
 	}
 
 }