X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FEditImagePage.java;h=304b19c59789a0a296af7ecddd7c2d59889ac42f;hb=e4daf856661958be1f88f0d3861823df91c78b1e;hp=b0297a8b5c27c395776fa848454186b349b9d9ff;hpb=480691a26222e035e53bda56029524e160fdf898;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 b0297a8..304b19c 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–2012 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
@@ -17,6 +17,7 @@
 
 package net.pterodactylus.sone.web;
 
+import net.pterodactylus.sone.data.IdBuilder;
 import net.pterodactylus.sone.data.Image;
 import net.pterodactylus.sone.text.TextFilter;
 import net.pterodactylus.sone.web.page.FreenetRequest;
@@ -54,27 +55,26 @@ public class EditImagePage extends SoneTemplatePage {
 	protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
 		super.processTemplate(request, templateContext);
 		if (request.getMethod() == Method.POST) {
-			String imageId = request.getHttpRequest().getPartAsStringFailsafe("image", 36);
+			String imageId = request.getHttpRequest().getPartAsStringFailsafe("image", IdBuilder.ID_STRING_LENGTH);
 			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");
 			}
 			if ("true".equals(request.getHttpRequest().getPartAsStringFailsafe("moveLeft", 4))) {
 				image.getAlbum().moveImageUp(image);
-			} else  if ("true".equals(request.getHttpRequest().getPartAsStringFailsafe("moveRight", 4))) {
+			} 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) {
-					templateContext.set("titleMissing", true);
+					throw new RedirectException("emptyImageTitle.html");
 				}
-				image.setTitle(title);
-				image.setDescription(TextFilter.filter(request.getHttpRequest().getHeader("host"), description));
+				image.modify().setTitle(title).setDescription(TextFilter.filter(request.getHttpRequest().getHeader("host"), description)).update();
 			}
 			webInterface.getCore().touchConfiguration();
 			throw new RedirectException(returnPage);