X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FUploadImagePage.java;h=d938641f6384cd3788836b7ffc8f10f85e34586d;hb=1360e42f232e2f0fd2ae0cb1308b2c3fe1f57ce7;hp=3844082ac31744706be4f88eac20be599d0c6343;hpb=9d32a0f70e14a764946ae29edcf07304f9e5f75e;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/UploadImagePage.java b/src/main/java/net/pterodactylus/sone/web/UploadImagePage.java
index 3844082..d938641 100644
--- a/src/main/java/net/pterodactylus/sone/web/UploadImagePage.java
+++ b/src/main/java/net/pterodactylus/sone/web/UploadImagePage.java
@@ -81,14 +81,12 @@ public class UploadImagePage extends SoneTemplatePage {
 		if (request.getMethod() == Method.POST) {
 			Sone currentSone = getCurrentSone(request.getToadletContext());
 			String parentId = request.getHttpRequest().getPartAsStringFailsafe("parent", 36);
-			Album parent = webInterface.getCore().getAlbum(parentId, false);
+			Album parent = webInterface.getCore().getAlbum(parentId);
 			if (parent == null) {
-				/* TODO - signal error */
-				return;
+				throw new RedirectException("noPermission.html");
 			}
 			if (!currentSone.equals(parent.getSone())) {
-				/* TODO - signal error. */
-				return;
+				throw new RedirectException("noPermission.html");
 			}
 			String name = request.getHttpRequest().getPartAsStringFailsafe("title", 200);
 			String description = request.getHttpRequest().getPartAsStringFailsafe("description", 4000);
@@ -96,7 +94,6 @@ public class UploadImagePage extends SoneTemplatePage {
 			Bucket fileBucket = uploadedFile.getData();
 			InputStream imageInputStream = null;
 			ByteArrayOutputStream imageDataOutputStream = null;
-			net.pterodactylus.sone.data.Image image = null;
 			try {
 				imageInputStream = fileBucket.getInputStream();
 				/* TODO - check length */
@@ -122,7 +119,7 @@ public class UploadImagePage extends SoneTemplatePage {
 				}
 				String mimeType = getMimeType(imageData);
 				TemporaryImage temporaryImage = webInterface.getCore().createTemporaryImage(mimeType, imageData);
-				image = webInterface.getCore().createImage(currentSone, parent, temporaryImage);
+				net.pterodactylus.sone.data.Image image = webInterface.getCore().createImage(currentSone, parent, temporaryImage);
 				image.modify().setTitle(name).setDescription(TextFilter.filter(request.getHttpRequest().getHeader("host"), description)).setWidth(uploadedImage.getWidth(null)).setHeight(uploadedImage.getHeight(null)).update();
 			} catch (IOException ioe1) {
 				logger.log(Level.WARNING, "Could not read uploaded image!", ioe1);