X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FEditImagePage.java;h=cec6990323ace5c903fcd39487fe0f383b165947;hb=37d40a97c65c078a03b71b98177be6551b3ea28a;hp=afb8787c718818fcba8e8339ac475e07e13f6a21;hpb=0df5e91852f737d760c5a9f54c5667309fbadcc2;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/EditImagePage.java b/src/main/java/net/pterodactylus/sone/web/EditImagePage.java
index afb8787..cec6990 100644
--- a/src/main/java/net/pterodactylus/sone/web/EditImagePage.java
+++ b/src/main/java/net/pterodactylus/sone/web/EditImagePage.java
@@ -1,5 +1,5 @@
 /*
- * FreenetSone - WebInterface.java - Copyright © 2010 David Roden
+ * Sone - EditImagePage.java - Copyright © 2010–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,14 @@
 package net.pterodactylus.sone.web;
 
 import net.pterodactylus.sone.data.Image;
+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 title and description of an {@link Image}.
  *
@@ -54,22 +57,28 @@ public class EditImagePage extends SoneTemplatePage {
 		super.processTemplate(request, templateContext);
 		if (request.getMethod() == Method.POST) {
 			String imageId = request.getHttpRequest().getPartAsStringFailsafe("image", 36);
-			Image image = webInterface.getCore().getImage(imageId, false);
-			if (image == null) {
+			String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 256);
+			Optional<Image> image = webInterface.getCore().getImage(imageId);
+			if (!image.isPresent()) {
 				throw new RedirectException("invalid.html");
 			}
-			if (!webInterface.getCore().isLocalSone(image.getSone())) {
+			if (!image.get().getSone().isLocal()) {
 				throw new RedirectException("noPermission.html");
 			}
-			String title = request.getHttpRequest().getPartAsStringFailsafe("title", 100).trim();
-			String description = request.getHttpRequest().getPartAsStringFailsafe("description", 1024).trim();
-			if (title.length() == 0) {
-				templateContext.set("titleMissing", true);
+			if ("true".equals(request.getHttpRequest().getPartAsStringFailsafe("moveLeft", 4))) {
+				image.get().getAlbum().moveImageUp(image.get());
+			} else if ("true".equals(request.getHttpRequest().getPartAsStringFailsafe("moveRight", 4))) {
+				image.get().getAlbum().moveImageDown(image.get());
+			} else {
+				String title = request.getHttpRequest().getPartAsStringFailsafe("title", 100).trim();
+				String description = request.getHttpRequest().getPartAsStringFailsafe("description", 1024).trim();
+				if (title.length() == 0) {
+					templateContext.set("titleMissing", true);
+				}
+				image.get().modify().setTitle(title).setDescription(TextFilter.filter(request.getHttpRequest().getHeader("host"), description)).update();
 			}
-			image.setTitle(title);
-			image.setDescription(description);
 			webInterface.getCore().touchConfiguration();
-			throw new RedirectException("imageBrowser.html?image=" + image.getId());
+			throw new RedirectException(returnPage);
 		}
 	}