X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FSoneTemplatePage.java;h=bece45d4e32cf0ad49ac35cf2a95029041b314a6;hb=fe8a83bdb1d644d4d1bf4342feab4c58115409b3;hp=d6c41c14ed36af3a7348de3aaa6e9df476680ae3;hpb=2ee1747f28b213da04a98456aac925f315f52dac;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 d6c41c1..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
@@ -19,25 +19,32 @@ 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.Collections;
import java.util.List;
import java.util.Map;
+import javax.annotation.Nonnull;
+
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.main.SonePlugin;
-import net.pterodactylus.sone.web.page.Page;
+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.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
*/
@@ -53,23 +60,8 @@ public class SoneTemplatePage extends FreenetTemplatePage {
private final boolean requireLogin;
/**
- * Creates a new template page for Freetalk 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 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
@@ -85,7 +77,7 @@ public class SoneTemplatePage extends FreenetTemplatePage {
}
/**
- * Creates a new template page for Freetalk.
+ * Creates a new template page for Sone.
*
* @param path
* The path of the page
@@ -101,7 +93,7 @@ public class SoneTemplatePage extends FreenetTemplatePage {
}
/**
- * Creates a new template page for Freetalk.
+ * Creates a new template page for Sone.
*
* @param path
* The path of the page
@@ -119,7 +111,6 @@ public class SoneTemplatePage extends FreenetTemplatePage {
this.pageTitleKey = pageTitleKey;
this.webInterface = webInterface;
this.requireLogin = requireLogin;
- template.getInitialContext().set("webInterface", webInterface);
}
//
@@ -127,35 +118,6 @@ public class SoneTemplatePage extends FreenetTemplatePage {
//
/**
- * Returns the current session, creating a new session if there is no
- * current session.
- *
- * @param toadletContenxt
- * The toadlet context
- * @return The current session, or {@code null} if there is no current
- * session
- */
- 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 toadletContext
@@ -164,22 +126,11 @@ public class SoneTemplatePage extends FreenetTemplatePage {
* currently logged in
*/
protected Sone getCurrentSone(ToadletContext toadletContext) {
- return webInterface.getCurrentSone(toadletContext);
+ return webInterface.getCurrentSoneCreatingSession(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);
+ protected Sone getCurrentSoneWithoutCreatingSession(ToadletContext toadletContext) {
+ return webInterface.getCurrentSoneWithoutCreatingSession(toadletContext);
}
/**
@@ -202,7 +153,7 @@ public class SoneTemplatePage extends FreenetTemplatePage {
* {@inheritDoc}
*/
@Override
- protected String getPageTitle(Request request) {
+ protected String getPageTitle(FreenetRequest request) {
if (pageTitleKey != null) {
return webInterface.getL10n().getString(pageTitleKey);
}
@@ -213,8 +164,8 @@ public class SoneTemplatePage extends FreenetTemplatePage {
* {@inheritDoc}
*/
@Override
- protected List