X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FDeleteAlbumPage.java;h=e5889765db2ec22e6ffae7ffffffae9e36f85cf1;hb=6b65a32a69b0e3721c58b4501a6b58fa4989f162;hp=2f2b7669c91adbd56ce93debc405879d45607ba8;hpb=a47643aed43d118ca68044f95451bb5374cdb332;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/DeleteAlbumPage.java b/src/main/java/net/pterodactylus/sone/web/DeleteAlbumPage.java
index 2f2b766..e588976 100644
--- a/src/main/java/net/pterodactylus/sone/web/DeleteAlbumPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/DeleteAlbumPage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - DeleteAlbumPage.java - Copyright © 2011–2012 David Roden
+ * Sone - DeleteAlbumPage.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,6 +18,7 @@
 package net.pterodactylus.sone.web;
 
 import net.pterodactylus.sone.data.Album;
+import net.pterodactylus.sone.data.IdBuilder;
 import net.pterodactylus.sone.web.page.FreenetRequest;
 import net.pterodactylus.util.template.Template;
 import net.pterodactylus.util.template.TemplateContext;
@@ -49,12 +50,12 @@ public class DeleteAlbumPage extends SoneTemplatePage {
 	protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
 		super.processTemplate(request, templateContext);
 		if (request.getMethod() == Method.POST) {
-			String albumId = request.getHttpRequest().getPartAsStringFailsafe("album", 36);
-			Album album = webInterface.getCore().getAlbum(albumId, false);
+			String albumId = request.getHttpRequest().getPartAsStringFailsafe("album", IdBuilder.ID_STRING_LENGTH);
+			Album album = webInterface.getCore().getAlbum(albumId);
 			if (album == null) {
 				throw new RedirectException("invalid.html");
 			}
-			if (!webInterface.getCore().isLocalSone(album.getSone())) {
+			if (!album.getSone().isLocal()) {
 				throw new RedirectException("noPermission.html");
 			}
 			if (request.getHttpRequest().isPartSet("abortDelete")) {
@@ -62,13 +63,13 @@ public class DeleteAlbumPage extends SoneTemplatePage {
 			}
 			Album parentAlbum = album.getParent();
 			webInterface.getCore().deleteAlbum(album);
-			if (parentAlbum == null) {
+			if (parentAlbum.equals(album.getSone().getRootAlbum())) {
 				throw new RedirectException("imageBrowser.html?sone=" + album.getSone().getId());
 			}
 			throw new RedirectException("imageBrowser.html?album=" + parentAlbum.getId());
 		}
 		String albumId = request.getHttpRequest().getParam("album");
-		Album album = webInterface.getCore().getAlbum(albumId, false);
+		Album album = webInterface.getCore().getAlbum(albumId);
 		if (album == null) {
 			throw new RedirectException("invalid.html");
 		}