X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FJsonPage.java;h=b9bdc77deb89ac3ec7181d13f50e8ad61741e2af;hb=341d8308a20e234dbec084be1b370367fa63ff94;hp=918cb97595c206be6f89d90362f474f67f0eedc1;hpb=b5661eeaf3b6e20b099291f2cf65ab6989f9f363;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/JsonPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/JsonPage.java
index 918cb97..b9bdc77 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/JsonPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/JsonPage.java
@@ -85,9 +85,9 @@ public abstract class JsonPage implements Page {
 	 */
 	protected Session getCurrentSession(ToadletContext toadletContenxt, boolean create) {
 		try {
-			Session session = webInterface.sessionManager().useSession(toadletContenxt);
+			Session session = webInterface.getSessionManager().useSession(toadletContenxt);
 			if (create && (session == null)) {
-				session = webInterface.sessionManager().createSession(UUID.randomUUID().toString(), toadletContenxt);
+				session = webInterface.getSessionManager().createSession(UUID.randomUUID().toString(), toadletContenxt);
 			}
 			return session;
 		} catch (freenet.clients.http.RedirectException re1) {
@@ -112,12 +112,7 @@ public abstract class JsonPage implements Page {
 		if (soneId == null) {
 			return null;
 		}
-		for (Sone sone : webInterface.core().getSones()) {
-			if (sone.getId().equals(soneId)) {
-				return sone;
-			}
-		}
-		return null;
+		return webInterface.getCore().getLocalSone(soneId, false);
 	}
 
 	//
@@ -146,6 +141,30 @@ public abstract class JsonPage implements Page {
 	}
 
 	//
+	// PROTECTED METHODS
+	//
+
+	/**
+	 * Creates a success reply.
+	 *
+	 * @return A reply signaling success
+	 */
+	protected JsonObject createSuccessJsonObject() {
+		return new JsonObject().put("success", true);
+	}
+
+	/**
+	 * Creates an error reply.
+	 *
+	 * @param error
+	 *            The error that has occured
+	 * @return The JSON object, signalling failure and the error code
+	 */
+	protected JsonObject createErrorJsonObject(String error) {
+		return new JsonObject().put("success", false).put("error", error);
+	}
+
+	//
 	// PAGE METHODS
 	//
 
@@ -164,7 +183,7 @@ public abstract class JsonPage implements Page {
 	public Response handleRequest(Request request) {
 		if (needsFormPassword()) {
 			String formPassword = request.getHttpRequest().getParam("formPassword");
-			if (!webInterface.formPassword().equals(formPassword)) {
+			if (!webInterface.getFormPassword().equals(formPassword)) {
 				return new Response(401, "Not authorized", "application/json", JsonUtils.format(new JsonObject().put("success", false).put("error", "auth-required")));
 			}
 		}