X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FEditAlbumPage.java;h=f54f887b484c18f91dbe12987bf21485823136c4;hb=00a434a23c9ea1e57c63d8a3c0fc4b09277af431;hp=fd4bf7c672ec7ed1462866cef6b744d7ce749e75;hpb=38cb6c5ec82298ee351d0eb15ddd8331db273af2;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/EditAlbumPage.java b/src/main/java/net/pterodactylus/sone/web/EditAlbumPage.java
index fd4bf7c..f54f887 100644
--- a/src/main/java/net/pterodactylus/sone/web/EditAlbumPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/EditAlbumPage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - EditAlbumPage.java - Copyright © 2011 David Roden
+ * Sone - EditAlbumPage.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,11 +18,16 @@
 package net.pterodactylus.sone.web;
 
 import net.pterodactylus.sone.data.Album;
+import net.pterodactylus.sone.data.Album.Modifier.AlbumTitleMustNotBeEmpty;
+import net.pterodactylus.sone.data.IdBuilder;
+import net.pterodactylus.sone.text.TextFilter;
 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 edit the name and description of an album.
  *
@@ -49,28 +54,37 @@ public class EditAlbumPage 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);
-			if (album == null) {
+			String albumId = request.getHttpRequest().getPartAsStringFailsafe("album", IdBuilder.ID_STRING_LENGTH);
+			Optional<Album> album = webInterface.getCore().getAlbum(albumId);
+			if (!album.isPresent()) {
 				throw new RedirectException("invalid.html");
 			}
-			if (!webInterface.getCore().isLocalSone(album.getSone())) {
+			if (!album.get().getSone().isLocal()) {
 				throw new RedirectException("noPermission.html");
 			}
-			String albumImageId = request.getHttpRequest().getPartAsStringFailsafe("album-image", 36);
+			if ("true".equals(request.getHttpRequest().getPartAsStringFailsafe("moveLeft", 4))) {
+				album.get().getParent().moveAlbumUp(album.get());
+				webInterface.getCore().touchConfiguration();
+				throw new RedirectException("imageBrowser.html?album=" + album.get().getParent().getId());
+			} else if ("true".equals(request.getHttpRequest().getPartAsStringFailsafe("moveRight", 4))) {
+				album.get().getParent().moveAlbumDown(album.get());
+				webInterface.getCore().touchConfiguration();
+				throw new RedirectException("imageBrowser.html?album=" + album.get().getParent().getId());
+			}
+			String albumImageId = request.getHttpRequest().getPartAsStringFailsafe("album-image", IdBuilder.ID_STRING_LENGTH);
 			if (webInterface.getCore().getImage(albumImageId, false) == null) {
 				albumImageId = null;
 			}
-			album.setAlbumImage(albumImageId);
+			album.get().modify().setAlbumImage(albumImageId).update();
 			String title = request.getHttpRequest().getPartAsStringFailsafe("title", 100).trim();
-			if (title.length() == 0) {
-				templateContext.set("titleMissing", true);
-				return;
-			}
 			String description = request.getHttpRequest().getPartAsStringFailsafe("description", 1000).trim();
-			album.setTitle(title).setDescription(description);
+			try {
+				album.get().modify().setTitle(title).setDescription(TextFilter.filter(request.getHttpRequest().getHeader("host"), description)).update();
+			} catch (AlbumTitleMustNotBeEmpty atmnbe) {
+				throw new RedirectException("emptyAlbumTitle.html");
+			}
 			webInterface.getCore().touchConfiguration();
-			throw new RedirectException("imageBrowser.html?album=" + album.getId());
+			throw new RedirectException("imageBrowser.html?album=" + album.get().getId());
 		}
 	}