Change all copyright headers to include 2012.

[Sone.git] / src / main / java / net / pterodactylus / sone / web / ajax / DeletePostAjaxPage.java

diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/DeletePostAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/DeletePostAjaxPage.java
index d874493..ea2310c 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/web/ajax/DeletePostAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/DeletePostAjaxPage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - DeletePostAjaxPage.java - Copyright © 2010 David Roden
+ * Sone - DeletePostAjaxPage.java - Copyright © 2010–2012 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,8 +18,8 @@
 package net.pterodactylus.sone.web.ajax;
 
 import net.pterodactylus.sone.data.Post;
-import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.web.WebInterface;
+import net.pterodactylus.sone.web.page.FreenetRequest;
 import net.pterodactylus.util.json.JsonObject;
 
 /**
@@ -36,7 +36,7 @@ public class DeletePostAjaxPage extends JsonPage {
         *            The Sone web interface
         */
        public DeletePostAjaxPage(WebInterface webInterface) {
-               super("ajax/deletePost.ajax", webInterface);
+               super("deletePost.ajax", webInterface);
        }
 
        //
@@ -47,17 +47,13 @@ public class DeletePostAjaxPage extends JsonPage {
         * {@inheritDoc}
         */
        @Override
-       protected JsonObject createJsonObject(Request request) {
+       protected JsonObject createJsonObject(FreenetRequest request) {
                String postId = request.getHttpRequest().getParam("post");
-               Post post = webInterface.getCore().getPost(postId);
-               Sone currentSone = getCurrentSone(request.getToadletContext());
-               if (post == null) {
+               Post post = webInterface.getCore().getPost(postId, false);
+               if ((post == null) || (post.getSone() == null)) {
                        return createErrorJsonObject("invalid-post-id");
                }
-               if (currentSone == null) {
-                       return createErrorJsonObject("auth-required");
-               }
-               if (!post.getSone().equals(currentSone)) {
+               if (!webInterface.getCore().isLocalSone(post.getSone())) {
                        return createErrorJsonObject("not-authorized");
                }
                webInterface.getCore().deletePost(post);