X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FSoneTemplatePage.java;h=bece45d4e32cf0ad49ac35cf2a95029041b314a6;hp=62783213039ded3e481004fe3062501b3a7aafaa;hb=9acbc5bdec4ccb752e0856a501568b0bb6161579;hpb=23202a30c41448d317a34ef87210bc236030ff89

diff --git a/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java b/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
index 6278321..bece45d 100644
--- a/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
+++ b/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
@@ -118,35 +118,6 @@ public class SoneTemplatePage extends FreenetTemplatePage {
 	//
 
 	/**
-	 * Returns the current session, creating a new session if there is no
-	 * current session.
-	 *
-	 * @param toadletContenxt
-	 *            The toadlet context
-	 * @return The current session, or {@code null} if there is no current
-	 *         session
-	 */
-	protected Session getCurrentSession(ToadletContext toadletContenxt) {
-		return webInterface.getCurrentSession(toadletContenxt);
-	}
-
-	/**
-	 * Returns the current session, creating a new session if there is no
-	 * current session and {@code create} is {@code true}.
-	 *
-	 * @param toadletContenxt
-	 *            The toadlet context
-	 * @param create
-	 *            {@code true} to create a new session if there is no current
-	 *            session, {@code false} otherwise
-	 * @return The current session, or {@code null} if there is no current
-	 *         session
-	 */
-	protected Session getCurrentSession(ToadletContext toadletContenxt, boolean create) {
-		return webInterface.getCurrentSession(toadletContenxt, create);
-	}
-
-	/**
 	 * Returns the currently logged in Sone.
 	 *
 	 * @param toadletContext
@@ -155,22 +126,11 @@ public class SoneTemplatePage extends FreenetTemplatePage {
 	 *         currently logged in
 	 */
 	protected Sone getCurrentSone(ToadletContext toadletContext) {
-		return webInterface.getCurrentSone(toadletContext);
+		return webInterface.getCurrentSoneCreatingSession(toadletContext);
 	}
 
-	/**
-	 * Returns the currently logged in Sone.
-	 *
-	 * @param toadletContext
-	 *            The toadlet context
-	 * @param create
-	 *            {@code true} to create a new session if no session exists,
-	 *            {@code false} to not create a new session
-	 * @return The currently logged in Sone, or {@code null} if no Sone is
-	 *         currently logged in
-	 */
-	protected Sone getCurrentSone(ToadletContext toadletContext, boolean create) {
-		return webInterface.getCurrentSone(toadletContext, create);
+	protected Sone getCurrentSoneWithoutCreatingSession(ToadletContext toadletContext) {
+		return webInterface.getCurrentSoneWithoutCreatingSession(toadletContext);
 	}
 
 	/**
@@ -240,8 +200,8 @@ public class SoneTemplatePage extends FreenetTemplatePage {
 	@Override
 	protected final void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
 		super.processTemplate(request, templateContext);
-		Sone currentSone = getCurrentSone(request.getToadletContext(), false);
-		templateContext.set("core", webInterface.getCore());
+		Sone currentSone = getCurrentSoneWithoutCreatingSession(request.getToadletContext());
+		templateContext.set("preferences", webInterface.getCore().getPreferences());
 		templateContext.set("currentSone", currentSone);
 		templateContext.set("localSones", webInterface.getCore().getLocalSones());
 		templateContext.set("request", request);
@@ -265,7 +225,7 @@ public class SoneTemplatePage extends FreenetTemplatePage {
 	 */
 	@Override
 	protected String getRedirectTarget(FreenetRequest request) {
-		if (requiresLogin() && (getCurrentSone(request.getToadletContext(), false) == null)) {
+		if (requiresLogin() && (getCurrentSoneWithoutCreatingSession(request.getToadletContext()) == null)) {
 			HTTPRequest httpRequest = request.getHttpRequest();
 			String originalUrl = httpRequest.getPath();
 			if (httpRequest.hasParameters()) {
@@ -312,7 +272,7 @@ public class SoneTemplatePage extends FreenetTemplatePage {
 			return false;
 		}
 		if (requiresLogin()) {
-			return getCurrentSone(toadletContext, false) != null;
+			return getCurrentSoneWithoutCreatingSession(toadletContext) != null;
 		}
 		return true;
 	}