X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FGetSoneStatusPage.java;h=cac308e9a6a8d9b55947f6ba15ad4ff4bf98e7db;hb=bd2cbb229f68fb2535cf6010befa9c4a276d2ee6;hp=7a4bfda65999a1aaacbf5acfe17e914099b2281b;hpb=a1b2f42d03e3420bfc4a4aa896f5809b79400cd0;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/GetSoneStatusPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/GetSoneStatusPage.java
index 7a4bfda..cac308e 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/GetSoneStatusPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/GetSoneStatusPage.java
@@ -17,9 +17,13 @@
 
 package net.pterodactylus.sone.web.ajax;
 
-import net.pterodactylus.sone.core.Core;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
 import net.pterodactylus.sone.core.Core.SoneStatus;
 import net.pterodactylus.sone.data.Sone;
+import net.pterodactylus.sone.template.SoneAccessor;
+import net.pterodactylus.sone.web.WebInterface;
 import net.pterodactylus.util.json.JsonObject;
 
 /**
@@ -30,29 +34,37 @@ import net.pterodactylus.util.json.JsonObject;
  */
 public class GetSoneStatusPage extends JsonPage {
 
-	/** The Sone core. */
-	private final Core core;
-
 	/**
 	 * Creates a new AJAX sone status handler.
 	 *
-	 * @param core
-	 *            The Sone core
+	 * @param webInterface
+	 *            The Sone web interface
 	 */
-	public GetSoneStatusPage(Core core) {
-		super("ajax/getSoneStatus.ajax");
-		this.core = core;
+	public GetSoneStatusPage(WebInterface webInterface) {
+		super("ajax/getSoneStatus.ajax", webInterface);
 	}
 
+	//
+	// JSONPAGE METHODS
+	//
+
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
 	protected JsonObject createJsonObject(Request request) {
 		String soneId = request.getHttpRequest().getParam("sone");
-		Sone sone = core.getSone(soneId);
-		SoneStatus soneStatus = core.getSoneStatus(sone);
-		return new JsonObject().put("status", soneStatus.name()).put("modified", sone.getModificationCounter() > 0);
+		Sone sone = webInterface.getCore().getSone(soneId);
+		SoneStatus soneStatus = webInterface.getCore().getSoneStatus(sone);
+		return new JsonObject().put("status", soneStatus.name()).put("name", SoneAccessor.getNiceName(sone)).put("modified", sone.getModificationCounter() > 0).put("lastUpdated", new SimpleDateFormat("MMM d, yyyy, HH:mm:ss").format(new Date(sone.getTime()))).put("age", (System.currentTimeMillis() - sone.getTime()) / 1000);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected boolean needsFormPassword() {
+		return false;
 	}
 
 }