X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FDeleteReplyAjaxPage.java;h=e12b2cf44272b1708ebbe482f05385cf481c309c;hb=d0ae5f106a59d7ac808e03287af2e5a33e50ba8b;hp=fa9de9b11047d30416d46cec651fd307c8e04032;hpb=bd2cbb229f68fb2535cf6010befa9c4a276d2ee6;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/DeleteReplyAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/DeleteReplyAjaxPage.java
index fa9de9b..e12b2cf 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/DeleteReplyAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/DeleteReplyAjaxPage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - DeleteReplysAjaxPage.java - Copyright © 2010 David Roden
+ * Sone - DeleteReplyAjaxPage.java - Copyright © 2010 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,7 +18,6 @@
 package net.pterodactylus.sone.web.ajax;
 
 import net.pterodactylus.sone.data.Reply;
-import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.web.WebInterface;
 import net.pterodactylus.util.json.JsonObject;
 
@@ -36,7 +35,7 @@ public class DeleteReplyAjaxPage extends JsonPage {
 	 *            The Sone web interface
 	 */
 	public DeleteReplyAjaxPage(WebInterface webInterface) {
-		super("ajax/deleteReply.ajax", webInterface);
+		super("deleteReply.ajax", webInterface);
 	}
 
 	//
@@ -50,18 +49,14 @@ public class DeleteReplyAjaxPage extends JsonPage {
 	protected JsonObject createJsonObject(Request request) {
 		String replyId = request.getHttpRequest().getParam("reply");
 		Reply reply = webInterface.getCore().getReply(replyId);
-		Sone currentSone = getCurrentSone(request.getToadletContext());
 		if (reply == null) {
-			return new JsonObject().put("success", false).put("error", "invalid-reply-id");
+			return createErrorJsonObject("invalid-reply-id");
 		}
-		if (currentSone == null) {
-			return new JsonObject().put("success", false).put("error", "auth-required");
-		}
-		if (!reply.getSone().equals(currentSone)) {
-			return new JsonObject().put("success", false).put("error", "not-authorized");
+		if (!webInterface.getCore().isLocalSone(reply.getSone())) {
+			return createErrorJsonObject("not-authorized");
 		}
 		webInterface.getCore().deleteReply(reply);
-		return new JsonObject().put("success", true);
+		return createSuccessJsonObject();
 	}
 
 }