X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FLoginPage.java;h=ff8156213f6c3c70016e0ec05220fdd12081b5b3;hb=8c251a1b15c1d8a8a2766e55e6decf10e9330bbe;hp=1e281b5eecc0ae3a38aa5b47e50339cb0699bd66;hpb=bd2cbb229f68fb2535cf6010befa9c4a276d2ee6;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 1e281b5..ff81562 100644
--- a/src/main/java/net/pterodactylus/sone/web/LoginPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/LoginPage.java
@@ -26,6 +26,7 @@ import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.freenet.wot.OwnIdentity;
 import net.pterodactylus.sone.web.page.Page.Request.Method;
 import net.pterodactylus.util.logging.Logging;
+import net.pterodactylus.util.template.DataProvider;
 import net.pterodactylus.util.template.Template;
 import freenet.clients.http.ToadletContext;
 
@@ -60,28 +61,33 @@ public class LoginPage extends SoneTemplatePage {
 	 * {@inheritDoc}
 	 */
 	@Override
-	protected void processTemplate(Request request, Template template) throws RedirectException {
-		super.processTemplate(request, template);
+	protected void processTemplate(Request request, DataProvider dataProvider) throws RedirectException {
+		super.processTemplate(request, dataProvider);
 		/* get all own identities. */
 		List<Sone> localSones = new ArrayList<Sone>(webInterface.getCore().getLocalSones());
 		Collections.sort(localSones, Sone.NICE_NAME_COMPARATOR);
-		template.set("sones", localSones);
+		dataProvider.set("sones", localSones);
 		if (request.getMethod() == Method.POST) {
 			String soneId = request.getHttpRequest().getPartAsStringFailsafe("sone-id", 100);
-			Sone selectedSone = null;
-			for (Sone sone : webInterface.getCore().getSones()) {
-				if (sone.getId().equals(soneId)) {
-					selectedSone = sone;
-					break;
-				}
-			}
+			Sone selectedSone = webInterface.getCore().getLocalSone(soneId, false);
 			if (selectedSone != null) {
 				setCurrentSone(request.getToadletContext(), selectedSone);
 				throw new RedirectException("index.html");
 			}
 		}
 		List<OwnIdentity> ownIdentitiesWithoutSone = CreateSonePage.getOwnIdentitiesWithoutSone(webInterface.getCore());
-		template.set("identitiesWithoutSone", ownIdentitiesWithoutSone);
+		dataProvider.set("identitiesWithoutSone", ownIdentitiesWithoutSone);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected String getRedirectTarget(Request request) {
+		if (getCurrentSone(request.getToadletContext()) != null) {
+			return "index.html";
+		}
+		return null;
 	}
 
 	//