X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FSoneTemplatePage.java;h=a152d303f4347a605a10f2a0b0a243f4bbf0b671;hb=554a8f521027da73bd6519f3480b1ed70b108903;hp=e0b42b14464b9976734ef815a34207cd32eb854d;hpb=98aedbc2097b3007e1529a8dded81cbfa0914513;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java b/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
index e0b42b1..a152d30 100644
--- a/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
+++ b/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
@@ -25,8 +25,8 @@ import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.web.page.Page;
 import net.pterodactylus.sone.web.page.TemplatePage;
 import net.pterodactylus.util.template.Template;
-import freenet.clients.http.RedirectException;
 import freenet.clients.http.SessionManager.Session;
+import freenet.clients.http.ToadletContext;
 
 /**
  * Base page for the Freetalk web interface.
@@ -64,35 +64,35 @@ public class SoneTemplatePage extends TemplatePage {
 	 * Returns the current session, creating a new session if there is no
 	 * current session.
 	 *
-	 * @param request
-	 *            The request to extract the session information from
+	 * @param toadletContenxt
+	 *            The toadlet context
 	 * @return The current session, or {@code null} if there is no current
 	 *         session
 	 */
-	protected Session getCurrentSession(Request request) {
-		return getCurrentSession(request, true);
+	protected Session getCurrentSession(ToadletContext toadletContenxt) {
+		return getCurrentSession(toadletContenxt, true);
 	}
 
 	/**
 	 * Returns the current session, creating a new session if there is no
 	 * current session and {@code create} is {@code true}.
 	 *
-	 * @param request
-	 *            The request to extract the session information from
+	 * @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(Request request, boolean create) {
+	protected Session getCurrentSession(ToadletContext toadletContenxt, boolean create) {
 		try {
-			Session session = webInterface.sessionManager().useSession(request.getToadletContext());
+			Session session = webInterface.sessionManager().useSession(toadletContenxt);
 			if (create && (session == null)) {
-				session = webInterface.sessionManager().createSession(UUID.randomUUID().toString(), request.getToadletContext());
+				session = webInterface.sessionManager().createSession(UUID.randomUUID().toString(), toadletContenxt);
 			}
 			return session;
-		} catch (RedirectException re1) {
+		} catch (freenet.clients.http.RedirectException re1) {
 			return null;
 		}
 	}
@@ -100,30 +100,43 @@ public class SoneTemplatePage extends TemplatePage {
 	/**
 	 * Returns the currently logged in Sone.
 	 *
-	 * @param request
-	 *            The request to extract the session information from
+	 * @param toadletContext
+	 *            The toadlet context
 	 * @return The currently logged in Sone, or {@code null} if no Sone is
 	 *         currently logged in
 	 */
-	protected Sone getCurrentSone(Request request) {
-		Session session = getCurrentSession(request);
+	protected Sone getCurrentSone(ToadletContext toadletContext) {
+		Session session = getCurrentSession(toadletContext);
 		if (session == null) {
 			return null;
 		}
-		return (Sone) session.getAttribute("Sone.CurrentSone");
+		String soneId = (String) session.getAttribute("Sone.CurrentSone");
+		if (soneId == null) {
+			return null;
+		}
+		for (Sone sone : webInterface.core().getSones()) {
+			if (sone.getId().equals(soneId)) {
+				return sone;
+			}
+		}
+		return null;
 	}
 
 	/**
 	 * Sets the currently logged in Sone.
 	 *
-	 * @param request
-	 *            The request
+	 * @param toadletContext
+	 *            The toadlet context
 	 * @param sone
 	 *            The Sone to set as currently logged in
 	 */
-	protected void setCurrentSone(Request request, Sone sone) {
-		Session session = getCurrentSession(request);
-		session.setAttribute("Sone.CurrentSone", sone);
+	protected void setCurrentSone(ToadletContext toadletContext, Sone sone) {
+		Session session = getCurrentSession(toadletContext);
+		if (sone == null) {
+			session.removeAttribute("Sone.CurrentSone");
+		} else {
+			session.setAttribute("Sone.CurrentSone", sone.getId());
+		}
 	}
 
 	//
@@ -152,11 +165,31 @@ public class SoneTemplatePage extends TemplatePage {
 	 * {@inheritDoc}
 	 */
 	@Override
+	protected void processTemplate(Request request, Template template) throws RedirectException {
+		super.processTemplate(request, template);
+		template.set("currentSone", getCurrentSone(request.getToadletContext()));
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
 	protected String getRedirectTarget(Page.Request request) {
-		if (requiresLogin() && (getCurrentSone(request) == null)) {
+		if (requiresLogin() && (getCurrentSone(request.getToadletContext()) == null)) {
 			return "login.html";
 		}
 		return null;
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean isEnabled(ToadletContext toadletContext) {
+		if (requiresLogin()) {
+			return getCurrentSone(toadletContext) != null;
+		}
+		return true;
+	}
+
 }