X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FSoneTemplatePage.java;h=427b0ffc03197b9c6862742b299918f8541ceaf0;hb=62603dd80cc0a5539d5032e4537c88b86c158085;hp=6afc3b7bd3d12271d3b7cf6996dc2befac7fd314;hpb=fcd011a16b119966906b3137513e9432ab86c3a8;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 6afc3b7..427b0ff 100644
--- a/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
+++ b/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
@@ -51,7 +51,7 @@ 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);
+		super(path, template, webInterface.l10n(), pageTitleKey, "noPermission.html");
 		this.webInterface = webInterface;
 		template.set("webInterface", webInterface);
 	}
@@ -100,17 +100,20 @@ public class SoneTemplatePage extends TemplatePage {
 	/**
 	 * Returns the currently logged in Sone.
 	 *
-	 * @param toadletContenxt
+	 * @param toadletContext
 	 *            The toadlet context
 	 * @return The currently logged in Sone, or {@code null} if no Sone is
 	 *         currently logged in
 	 */
-	protected Sone getCurrentSone(ToadletContext toadletContenxt) {
-		Session session = getCurrentSession(toadletContenxt);
+	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;
@@ -149,6 +152,14 @@ public class SoneTemplatePage extends TemplatePage {
 	}
 
 	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected String getShortcutIcon() {
+		return "images/icon.png";
+	}
+
+	/**
 	 * Returns whether this page requires the user to log in.
 	 *
 	 * @return {@code true} if the user is required to be logged in to use this