X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FEditImagePage.java;h=419bc1d06accb09760ad6a228e594a82a43655f8;hp=eab3bb9f6436212f85f802d89673c632974afa8a;hb=7b55e0be6a3283e43a9bbab98f82aebdd948eb33;hpb=a23c4f218c3adf236d89d5927cae37d6e6e4feda

diff --git a/src/main/java/net/pterodactylus/sone/web/EditImagePage.java b/src/main/java/net/pterodactylus/sone/web/EditImagePage.java
index eab3bb9..419bc1d 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–2016 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,9 +18,11 @@
 package net.pterodactylus.sone.web;
 
 import net.pterodactylus.sone.data.Image;
-import net.pterodactylus.sone.web.page.Page.Request.Method;
+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;
 
 /**
  * Page that lets the user edit title and description of an {@link Image}.
@@ -49,26 +51,31 @@ public class EditImagePage extends SoneTemplatePage {
 	 * {@inheritDoc}
 	 */
 	@Override
-	protected void processTemplate(Request request, TemplateContext templateContext) throws RedirectException {
-		super.processTemplate(request, templateContext);
+	protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
 		if (request.getMethod() == Method.POST) {
 			String imageId = request.getHttpRequest().getPartAsStringFailsafe("image", 36);
+			String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 256);
 			Image image = webInterface.getCore().getImage(imageId, false);
 			if (image == null) {
 				throw new RedirectException("invalid.html");
 			}
-			if (!webInterface.getCore().isLocalSone(image.getSone())) {
+			if (!image.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.getAlbum().moveImageUp(image);
+			} else if ("true".equals(request.getHttpRequest().getPartAsStringFailsafe("moveRight", 4))) {
+				image.getAlbum().moveImageDown(image);
+			} else {
+				String title = request.getHttpRequest().getPartAsStringFailsafe("title", 100).trim();
+				String description = request.getHttpRequest().getPartAsStringFailsafe("description", 1024).trim();
+				if (title.length() == 0) {
+					throw new RedirectException("emptyImageTitle.html");
+				}
+				image.modify().setTitle(title).setDescription(TextFilter.filter(request.getHttpRequest().getHeader("host"), description)).update();
 			}
-			image.setTitle(title);
-			image.setDescription(description);
-			webInterface.getCore().saveSone(image.getSone());
-			throw new RedirectException("imageBrowser.html?image=" + image.getId());
+			webInterface.getCore().touchConfiguration();
+			throw new RedirectException(returnPage);
 		}
 	}