X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FSoneTemplatePage.java;h=095db9e75e08b49ff7cb30a755893f60e9d1bcca;hb=5e30dc1ca805f1a2d87b6c752da68a57275cb159;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..095db9e 100644
--- a/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
+++ b/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
@@ -1,5 +1,5 @@
/*
- * Freetalk - FreetalkTemplatePage.java - Copyright © 2010 David Roden
+ * Sone - SoneTemplatePage.java - Copyright © 2010 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,28 +17,60 @@
package net.pterodactylus.sone.web;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
import java.util.Arrays;
import java.util.Collection;
+import java.util.List;
+import java.util.Map;
import net.pterodactylus.sone.data.Sone;
-import net.pterodactylus.sone.web.page.Page;
-import net.pterodactylus.sone.web.page.TemplatePage;
+import net.pterodactylus.sone.main.SonePlugin;
+import net.pterodactylus.sone.notify.ListNotificationFilters;
+import net.pterodactylus.sone.web.page.FreenetRequest;
+import net.pterodactylus.sone.web.page.FreenetTemplatePage;
+import net.pterodactylus.util.collection.ListBuilder;
+import net.pterodactylus.util.collection.MapBuilder;
import net.pterodactylus.util.template.Template;
-import freenet.clients.http.RedirectException;
+import net.pterodactylus.util.template.TemplateContext;
import freenet.clients.http.SessionManager.Session;
+import freenet.clients.http.ToadletContext;
+import freenet.support.api.HTTPRequest;
/**
- * Base page for the Freetalk web interface.
+ * Base page for the Sone web interface.
*
* @author David âBombeâ Roden
*/
-public class SoneTemplatePage extends TemplatePage {
+public class SoneTemplatePage extends FreenetTemplatePage {
/** The Sone core. */
protected final WebInterface webInterface;
+ /** The page title l10n key. */
+ private final String pageTitleKey;
+
+ /** Whether to require a login. */
+ private final boolean requireLogin;
+
+ /**
+ * Creates a new template page for Sone that does not require the user to be
+ * logged in.
+ *
+ * @param path
+ * The path of the page
+ * @param template
+ * The template to render
+ * @param webInterface
+ * The Sone web interface
+ */
+ public SoneTemplatePage(String path, Template template, WebInterface webInterface) {
+ this(path, template, null, webInterface, false);
+ }
+
/**
- * Creates a new template page for Freetalk.
+ * Creates a new template page for Sone that does not require the user to be
+ * logged in.
*
* @param path
* The path of the page
@@ -50,9 +82,44 @@ 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 Sone.
+ *
+ * @param path
+ * The path of the page
+ * @param template
+ * The template to render
+ * @param webInterface
+ * The Sone web interface
+ * @param requireLogin
+ * Whether this page requires a login
+ */
+ public SoneTemplatePage(String path, Template template, WebInterface webInterface, boolean requireLogin) {
+ this(path, template, null, webInterface, requireLogin);
+ }
+
+ /**
+ * Creates a new template page for Sone.
+ *
+ * @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, webInterface.getTemplateContextFactory(), template, "noPermission.html");
+ this.pageTitleKey = pageTitleKey;
this.webInterface = webInterface;
- template.set("webInterface", webInterface);
+ this.requireLogin = requireLogin;
}
//
@@ -60,35 +127,71 @@ 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);
+ }
+
+ /**
+ * 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);
+ }
+
+ /**
+ * 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);
}
//
@@ -99,29 +202,116 @@ public class SoneTemplatePage extends TemplatePage {
* {@inheritDoc}
*/
@Override
+ protected String getPageTitle(FreenetRequest request) {
+ if (pageTitleKey != null) {
+ return webInterface.getL10n().getString(pageTitleKey);
+ }
+ return "";
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected List