X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FLoginPage.java;h=65ab0cf4a41357c018a8a3f9f1301b43ee933a40;hb=fe8a83bdb1d644d4d1bf4342feab4c58115409b3;hp=a837bd1241344189640f92d6816f7707df5b0011;hpb=6e9a43ccd93ae125720547c0fe421dc81a54ba90;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 a837bd1..65ab0cf 100644
--- a/src/main/java/net/pterodactylus/sone/web/LoginPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/LoginPage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - LoginPage.java - Copyright © 2010–2013 David Roden
+ * Sone - LoginPage.java - Copyright © 2010–2016 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
@@ -17,6 +17,8 @@
 
 package net.pterodactylus.sone.web;
 
+import static java.util.logging.Logger.getLogger;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -25,7 +27,6 @@ import java.util.logging.Logger;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.freenet.wot.OwnIdentity;
 import net.pterodactylus.sone.web.page.FreenetRequest;
-import net.pterodactylus.util.logging.Logging;
 import net.pterodactylus.util.template.Template;
 import net.pterodactylus.util.template.TemplateContext;
 import net.pterodactylus.util.web.Method;
@@ -40,7 +41,7 @@ public class LoginPage extends SoneTemplatePage {
 
 	/** The logger. */
 	@SuppressWarnings("unused")
-	private static final Logger logger = Logging.getLogger(LoginPage.class);
+	private static final Logger logger = getLogger(LoginPage.class.getName());
 
 	/**
 	 * Creates a new login page.
@@ -62,15 +63,14 @@ public class LoginPage extends SoneTemplatePage {
 	 * {@inheritDoc}
 	 */
 	@Override
-	protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
-		super.processTemplate(request, templateContext);
+	protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
 		/* get all own identities. */
 		List<Sone> localSones = new ArrayList<Sone>(webInterface.getCore().getLocalSones());
 		Collections.sort(localSones, Sone.NICE_NAME_COMPARATOR);
 		templateContext.set("sones", localSones);
 		if (request.getMethod() == Method.POST) {
 			String soneId = request.getHttpRequest().getPartAsStringFailsafe("sone-id", 100);
-			Sone selectedSone = webInterface.getCore().getLocalSone(soneId, false);
+			Sone selectedSone = webInterface.getCore().getLocalSone(soneId);
 			if (selectedSone != null) {
 				setCurrentSone(request.getToadletContext(), selectedSone);
 				String target = request.getHttpRequest().getParam("target");
@@ -89,7 +89,7 @@ public class LoginPage extends SoneTemplatePage {
 	 */
 	@Override
 	protected String getRedirectTarget(FreenetRequest request) {
-		if (getCurrentSone(request.getToadletContext(), false) != null) {
+		if (getCurrentSoneWithoutCreatingSession(request.getToadletContext()) != null) {
 			return "index.html";
 		}
 		return null;
@@ -107,7 +107,7 @@ public class LoginPage extends SoneTemplatePage {
 		if (webInterface.getCore().getPreferences().isRequireFullAccess() && !toadletContext.isAllowedFullAccess()) {
 			return false;
 		}
-		return getCurrentSone(toadletContext, false) == null;
+		return getCurrentSoneWithoutCreatingSession(toadletContext) == null;
 	}
 
 }