X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FSoneTemplatePage.java;h=9a8bd9b65969e871e46a87692d3eaaaf269d613a;hb=85e6bdee8e9376766c131e85629b37a1dc0942e6;hp=67c529357da7c091ca871d1426474ed8bb4aa0a9;hpb=2f68aaf6cfc4b5665436bebdd560cad472ce79d7;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 67c5293..9a8bd9b 100644
--- a/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
+++ b/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
@@ -24,8 +24,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.
@@ -37,8 +37,12 @@ public class SoneTemplatePage extends TemplatePage {
 	/** The Sone core. */
 	protected final WebInterface webInterface;
 
+	/** Whether to require a login. */
+	private final boolean requireLogin;
+
 	/**
-	 * Creates a new template page for Freetalk.
+	 * Creates a new template page for Freetalk that does not require the user
+	 * to be logged in.
 	 *
 	 * @param path
 	 *            The path of the page
@@ -50,8 +54,27 @@ public class SoneTemplatePage extends TemplatePage {
 	 *            The Sone web interface
 	 */
 	public SoneTemplatePage(String path, Template template, String pageTitleKey, WebInterface webInterface) {
-		super(path, template, webInterface.l10n(), pageTitleKey);
+		this(path, template, pageTitleKey, webInterface, false);
+	}
+
+	/**
+	 * Creates a new template page for Freetalk.
+	 *
+	 * @param path
+	 *            The path of the page
+	 * @param template
+	 *            The template to render
+	 * @param pageTitleKey
+	 *            The l10n key of the page title
+	 * @param webInterface
+	 *            The Sone web interface
+	 * @param requireLogin
+	 *            Whether this page requires a login
+	 */
+	public SoneTemplatePage(String path, Template template, String pageTitleKey, WebInterface webInterface, boolean requireLogin) {
+		super(path, template, webInterface.getL10n(), pageTitleKey, "noPermission.html");
 		this.webInterface = webInterface;
+		this.requireLogin = requireLogin;
 		template.set("webInterface", webInterface);
 	}
 
@@ -60,35 +83,56 @@ public class SoneTemplatePage extends TemplatePage {
 	//
 
 	/**
-	 * Returns the current session.
+	 * 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) {
-		try {
-			return webInterface.sessionManager().useSession(request.getToadletContext());
-		} catch (RedirectException re1) {
-			return null;
-		}
+	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 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);
-		if (session == null) {
-			return null;
-		}
-		return (Sone) session.getAttribute("Sone.CurrentSone");
+	protected Sone getCurrentSone(ToadletContext toadletContext) {
+		return webInterface.getCurrentSone(toadletContext);
+	}
+
+	/**
+	 * Sets the currently logged in Sone.
+	 *
+	 * @param toadletContext
+	 *            The toadlet context
+	 * @param sone
+	 *            The Sone to set as currently logged in
+	 */
+	protected void setCurrentSone(ToadletContext toadletContext, Sone sone) {
+		webInterface.setCurrentSone(toadletContext, sone);
 	}
 
 	//
@@ -104,13 +148,31 @@ public class SoneTemplatePage extends TemplatePage {
 	}
 
 	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected String getShortcutIcon() {
+		return "images/icon.png";
+	}
+
+	/**
 	 * Returns whether this page requires the user to log in.
 	 *
 	 * @return {@code true} if the user is required to be logged in to use this
 	 *         page, {@code false} otherwise
 	 */
 	protected boolean requiresLogin() {
-		return false;
+		return requireLogin;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected void processTemplate(Request request, Template template) throws RedirectException {
+		super.processTemplate(request, template);
+		template.set("currentSone", getCurrentSone(request.getToadletContext()));
+		template.set("request", request);
 	}
 
 	/**
@@ -118,10 +180,21 @@ public class SoneTemplatePage extends TemplatePage {
 	 */
 	@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;
+	}
+
 }