X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FEditAlbumPage.java;h=fd28e41f39d389d6b2c70cb96ee10eded540f047;hb=a88e930a23b550dae75116d7759924d760941776;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..fd28e41 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–2012 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,8 @@
 package net.pterodactylus.sone.web;
 
 import net.pterodactylus.sone.data.Album;
+import net.pterodactylus.sone.data.Sone;
+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;
@@ -49,14 +51,34 @@ public class EditAlbumPage extends SoneTemplatePage {
 	protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
 		super.processTemplate(request, templateContext);
 		if (request.getMethod() == Method.POST) {
+			Sone currentSone = getCurrentSone(request.getToadletContext());
 			String albumId = request.getHttpRequest().getPartAsStringFailsafe("album", 36);
 			Album album = webInterface.getCore().getAlbum(albumId, false);
 			if (album == null) {
 				throw new RedirectException("invalid.html");
 			}
-			if (!webInterface.getCore().isLocalSone(album.getSone())) {
+			if (!album.getSone().isLocal()) {
 				throw new RedirectException("noPermission.html");
 			}
+			if ("true".equals(request.getHttpRequest().getPartAsStringFailsafe("moveLeft", 4))) {
+				if (album.getParent() == null) {
+					currentSone.moveAlbumUp(album);
+					webInterface.getCore().touchConfiguration();
+					throw new RedirectException("imageBrowser.html?sone=" + currentSone.getId());
+				}
+				album.getParent().moveAlbumUp(album);
+				webInterface.getCore().touchConfiguration();
+				throw new RedirectException("imageBrowser.html?album=" + album.getParent().getId());
+			} else if ("true".equals(request.getHttpRequest().getPartAsStringFailsafe("moveRight", 4))) {
+				if (album.getParent() == null) {
+					currentSone.moveAlbumDown(album);
+					webInterface.getCore().touchConfiguration();
+					throw new RedirectException("imageBrowser.html?sone=" + currentSone.getId());
+				}
+				album.getParent().moveAlbumDown(album);
+				webInterface.getCore().touchConfiguration();
+				throw new RedirectException("imageBrowser.html?album=" + album.getParent().getId());
+			}
 			String albumImageId = request.getHttpRequest().getPartAsStringFailsafe("album-image", 36);
 			if (webInterface.getCore().getImage(albumImageId, false) == null) {
 				albumImageId = null;
@@ -68,7 +90,7 @@ public class EditAlbumPage extends SoneTemplatePage {
 				return;
 			}
 			String description = request.getHttpRequest().getPartAsStringFailsafe("description", 1000).trim();
-			album.setTitle(title).setDescription(description);
+			album.setTitle(title).setDescription(TextFilter.filter(request.getHttpRequest().getHeader("host"), description));
 			webInterface.getCore().touchConfiguration();
 			throw new RedirectException("imageBrowser.html?album=" + album.getId());
 		}