X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FEditImagePage.java;h=c9bd705ae26cca3c9c2c8d0351a470d5b0e215d4;hb=31a732a2e18008ea65a31a4e8180c337458b2df9;hp=7e9eb7ebf183be6180419e2d22288a854dc5c8be;hpb=4f92a116596bf5d42c5b8beadb5df2bc8149e809;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 7e9eb7e..c9bd705 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}.
  *
@@ -55,25 +58,24 @@ public class EditImagePage extends SoneTemplatePage {
 		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) {
+			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");
 			}
 			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);
+				image.get().moveUp();
+			} else if ("true".equals(request.getHttpRequest().getPartAsStringFailsafe("moveRight", 4))) {
+				image.get().moveDown();
 			} 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.setTitle(title);
-				image.setDescription(description);
+				image.get().modify().setTitle(title).setDescription(TextFilter.filter(request.getHttpRequest().getHeader("host"), description)).update();
 			}
 			webInterface.getCore().touchConfiguration();
 			throw new RedirectException(returnPage);