X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FLoginPage.java;h=0505220b1497ed6559b6f92a9b82c3bb3127d1e6;hb=4c831fb948000bc1730ebcde73eeb62317f4ac54;hp=e5ef1285151b7778bf966a3e036ddb783d6461c4;hpb=191965f25b39609ab8d71b833cb9d9855a91ff61;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/LoginPage.java b/src/main/java/net/pterodactylus/sone/web/LoginPage.java
index e5ef128..0505220 100644
--- a/src/main/java/net/pterodactylus/sone/web/LoginPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/LoginPage.java
@@ -17,12 +17,15 @@
 
 package net.pterodactylus.sone.web;
 
-import java.util.Set;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
 
 import net.pterodactylus.sone.data.Sone;
+import net.pterodactylus.sone.template.SoneAccessor;
 import net.pterodactylus.sone.web.page.Page.Request.Method;
 import net.pterodactylus.util.template.Template;
-import freenet.clients.http.ToadletContext;
 
 /**
  * The login page manages logging the user in.
@@ -40,7 +43,7 @@ public class LoginPage extends SoneTemplatePage {
 	 *            The Sone web interface
 	 */
 	public LoginPage(Template template, WebInterface webInterface) {
-		super("login.html", template, "Page.Login.Title", webInterface);
+		super("login.html", template, "Page.Login.Title", webInterface, false);
 	}
 
 	//
@@ -51,20 +54,26 @@ public class LoginPage extends SoneTemplatePage {
 	 * {@inheritDoc}
 	 */
 	@Override
-	protected void processTemplate(Request request, Template template) {
-		Set<Sone> localSones = webInterface.core().localSones();
-		template.set("sones", localSones);
-	}
+	protected void processTemplate(Request request, Template template) throws RedirectException {
+		super.processTemplate(request, template);
+		List<Sone> localSones = new ArrayList<Sone>(webInterface.core().getSones());
+		Collections.sort(localSones, new Comparator<Sone>() {
 
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getRedirectTarget(Request request) {
+			@Override
+			public int compare(Sone leftSone, Sone rightSone) {
+				int diff = SoneAccessor.getNiceName(leftSone).compareToIgnoreCase(SoneAccessor.getNiceName(rightSone));
+				if (diff != 0) {
+					return diff;
+				}
+				return (int) Math.max(Integer.MIN_VALUE, Math.min(Integer.MAX_VALUE, rightSone.getTime() - leftSone.getTime()));
+			}
+
+		});
+		template.set("sones", localSones);
 		if (request.getMethod() == Method.POST) {
-			String soneId = request.getHttpRequest().getParam("sone-id");
+			String soneId = request.getHttpRequest().getPartAsStringFailsafe("sone-id", 100);
 			Sone selectedSone = null;
-			for (Sone sone : webInterface.core().localSones()) {
+			for (Sone sone : webInterface.core().getSones()) {
 				if (sone.getId().equals(soneId)) {
 					selectedSone = sone;
 					break;
@@ -72,18 +81,9 @@ public class LoginPage extends SoneTemplatePage {
 			}
 			if (selectedSone != null) {
 				setCurrentSone(request.getToadletContext(), selectedSone);
-				return "index.html";
+				throw new RedirectException("index.html");
 			}
 		}
-		return null;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean isEnabled(ToadletContext toadletContext) {
-		return getCurrentSone(toadletContext) == null;
 	}
 
 }