X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=inline;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FSoneTemplatePage.java;h=bece45d4e32cf0ad49ac35cf2a95029041b314a6;hb=972ca0e1490124c9da45a12ee9a079d91d62d6dc;hp=2a56c57a1a158ea2b15e0ebaff16a137018707df;hpb=5069a213ae0d5891e598e93269b2cee20511b89b;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 2a56c57..bece45d 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â2016 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,29 +17,51 @@
package net.pterodactylus.sone.web;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
-import java.util.UUID;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Nonnull;
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.web.page.FreenetRequest;
+import net.pterodactylus.sone.web.page.FreenetTemplatePage;
+import net.pterodactylus.util.notify.Notification;
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;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
/**
- * 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.
+ * Creates a new template page for Sone that does not require the user to be
+ * logged in.
*
* @param path
* The path of the page
@@ -51,52 +73,50 @@ 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.webInterface = webInterface;
- template.set("webInterface", webInterface);
+ this(path, template, pageTitleKey, webInterface, false);
}
- //
- // PROTECTED METHODS
- //
-
/**
- * Returns the current session, creating a new session if there is no
- * current session.
+ * Creates a new template page for Sone.
*
- * @param toadletContenxt
- * The toadlet context
- * @return The current session, or {@code null} if there is no current
- * session
+ * @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
*/
- protected Session getCurrentSession(ToadletContext toadletContenxt) {
- return getCurrentSession(toadletContenxt, true);
+ public SoneTemplatePage(String path, Template template, WebInterface webInterface, boolean requireLogin) {
+ this(path, template, null, webInterface, requireLogin);
}
/**
- * Returns the current session, creating a new session if there is no
- * current session and {@code create} is {@code true}.
+ * Creates a new template page for Sone.
*
- * @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
+ * @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
*/
- protected Session getCurrentSession(ToadletContext toadletContenxt, boolean create) {
- try {
- Session session = webInterface.sessionManager().useSession(toadletContenxt);
- if (create && (session == null)) {
- session = webInterface.sessionManager().createSession(UUID.randomUUID().toString(), toadletContenxt);
- }
- return session;
- } catch (freenet.clients.http.RedirectException re1) {
- return null;
- }
+ 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;
+ this.requireLogin = requireLogin;
}
+ //
+ // PROTECTED METHODS
+ //
+
/**
* Returns the currently logged in Sone.
*
@@ -106,20 +126,11 @@ 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;
- }
- for (Sone sone : webInterface.core().getSones()) {
- if (sone.getId().equals(soneId)) {
- return sone;
- }
- }
- return null;
+ return webInterface.getCurrentSoneCreatingSession(toadletContext);
+ }
+
+ protected Sone getCurrentSoneWithoutCreatingSession(ToadletContext toadletContext) {
+ return webInterface.getCurrentSoneWithoutCreatingSession(toadletContext);
}
/**
@@ -131,12 +142,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);
}
//
@@ -147,6 +153,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