X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FCreateAlbumPage.java;h=eaacb89510754e250d6414b6a3f91a2839595323;hb=00d6cb2688d8dda20ce55d71825b4446701a3a7a;hp=e0f072537bfd8d11ddef6efa367fdf39f11e31c0;hpb=6b65a32a69b0e3721c58b4501a6b58fa4989f162;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/CreateAlbumPage.java b/src/main/java/net/pterodactylus/sone/web/CreateAlbumPage.java
index e0f0725..eaacb89 100644
--- a/src/main/java/net/pterodactylus/sone/web/CreateAlbumPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/CreateAlbumPage.java
@@ -27,6 +27,8 @@ 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 create a new album.
  *
@@ -54,8 +56,7 @@ public class CreateAlbumPage extends SoneTemplatePage {
 	 * {@inheritDoc}
 	 */
 	@Override
-	protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
-		super.processTemplate(request, templateContext);
+	protected void processSonePage(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
 		if (request.getMethod() == Method.POST) {
 			String name = request.getHttpRequest().getPartAsStringFailsafe("name", 64).trim();
 			if (name.length() == 0) {
@@ -65,11 +66,16 @@ public class CreateAlbumPage extends SoneTemplatePage {
 			String description = request.getHttpRequest().getPartAsStringFailsafe("description", 256).trim();
 			Sone currentSone = getCurrentSone(request.getToadletContext());
 			String parentId = request.getHttpRequest().getPartAsStringFailsafe("parent", IdBuilder.ID_STRING_LENGTH);
-			Album parent = webInterface.getCore().getAlbum(parentId);
+			Optional<Album> parent;
 			if (parentId.equals("")) {
-				parent = currentSone.getRootAlbum();
+				parent = Optional.of(currentSone.getRootAlbum());
+			} else {
+				parent = webInterface.getCore().getAlbum(parentId);
+				if (!parent.isPresent()) {
+					throw new RedirectException("noPermission.html");
+				}
 			}
-			Album album = webInterface.getCore().createAlbum(currentSone, parent);
+			Album album = webInterface.getCore().createAlbum(currentSone, parent.get());
 			try {
 				album.modify().setTitle(name).setDescription(TextFilter.filter(request.getHttpRequest().getHeader("host"), description)).update();
 			} catch (AlbumTitleMustNotBeEmpty atmnbe) {