X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FSoneTemplatePage.java;h=496fb60a77b4104f37abe95aab782fb726d8f5aa;hb=a9aafa22d72dd596f4686cda7fe2f17074235394;hp=47a2ab0b17126eb7a1867e557c828acc2e8358d2;hpb=e356df8e3458e3f905891291d41eaa1216b13652;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 47a2ab0..496fb60 100644
--- a/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
+++ b/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
@@ -38,8 +38,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
@@ -51,8 +55,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, "noPermission.html");
+		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);
 	}
 
@@ -86,15 +109,11 @@ public class SoneTemplatePage extends TemplatePage {
 	 *         session
 	 */
 	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;
+		Session session = webInterface.getSessionManager().useSession(toadletContenxt);
+		if (create && (session == null)) {
+			session = webInterface.getSessionManager().createSession(UUID.randomUUID().toString(), toadletContenxt);
 		}
+		return session;
 	}
 
 	/**
@@ -114,12 +133,7 @@ public class SoneTemplatePage extends TemplatePage {
 		if (soneId == null) {
 			return null;
 		}
-		for (Sone sone : webInterface.core().getSones()) {
-			if (sone.getId().equals(soneId)) {
-				return sone;
-			}
-		}
-		return null;
+		return webInterface.getCore().getLocalSone(soneId, false);
 	}
 
 	/**
@@ -166,7 +180,7 @@ public class SoneTemplatePage extends TemplatePage {
 	 *         page, {@code false} otherwise
 	 */
 	protected boolean requiresLogin() {
-		return false;
+		return requireLogin;
 	}
 
 	/**