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=496fb60a77b4104f37abe95aab782fb726d8f5aa;hpb=a9aafa22d72dd596f4686cda7fe2f17074235394;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 496fb60..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,33 +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.UUID;
+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 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 Freetalk that does not require the user
- * to be logged in.
+ * 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 Sone that does not require the user to be
+ * logged in.
*
* @param path
* The path of the page
@@ -59,7 +86,23 @@ public class SoneTemplatePage extends TemplatePage {
}
/**
- * Creates a new template page for Freetalk.
+ * 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
@@ -73,10 +116,10 @@ public class SoneTemplatePage extends TemplatePage {
* 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");
+ super(path, webInterface.getTemplateContextFactory(), template, "noPermission.html");
+ this.pageTitleKey = pageTitleKey;
this.webInterface = webInterface;
this.requireLogin = requireLogin;
- template.set("webInterface", webInterface);
}
//
@@ -93,7 +136,7 @@ public class SoneTemplatePage extends TemplatePage {
* session
*/
protected Session getCurrentSession(ToadletContext toadletContenxt) {
- return getCurrentSession(toadletContenxt, true);
+ return webInterface.getCurrentSession(toadletContenxt);
}
/**
@@ -109,11 +152,7 @@ public class SoneTemplatePage extends TemplatePage {
* session
*/
protected Session getCurrentSession(ToadletContext toadletContenxt, boolean create) {
- Session session = webInterface.getSessionManager().useSession(toadletContenxt);
- if (create && (session == null)) {
- session = webInterface.getSessionManager().createSession(UUID.randomUUID().toString(), toadletContenxt);
- }
- return session;
+ return webInterface.getCurrentSession(toadletContenxt, create);
}
/**
@@ -125,15 +164,22 @@ public class SoneTemplatePage extends TemplatePage {
* currently logged in
*/
protected Sone getCurrentSone(ToadletContext toadletContext) {
- Session session = getCurrentSession(toadletContext);
- if (session == null) {
- return null;
- }
- String soneId = (String) session.getAttribute("Sone.CurrentSone");
- if (soneId == null) {
- return null;
- }
- return webInterface.getCore().getLocalSone(soneId, false);
+ 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);
}
/**
@@ -145,12 +191,7 @@ public class SoneTemplatePage extends TemplatePage {
* The Sone to set as currently logged in
*/
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());
- }
+ webInterface.setCurrentSone(toadletContext, sone);
}
//
@@ -161,6 +202,25 @@ 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