X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FSoneTemplatePage.java;h=47a2ab0b17126eb7a1867e557c828acc2e8358d2;hb=e356df8e3458e3f905891291d41eaa1216b13652;hp=5f9ff5ddd8f4d6f1b494533908cde8c964ffd6c0;hpb=b6e8e4eb71b7cfcb7cff892cca23d20925eabeb8;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 5f9ff5d..47a2ab0 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);
 	}
@@ -111,6 +111,9 @@ public class SoneTemplatePage extends TemplatePage {
 			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
@@ -165,6 +176,7 @@ public class SoneTemplatePage extends TemplatePage {
 	protected void processTemplate(Request request, Template template) throws RedirectException {
 		super.processTemplate(request, template);
 		template.set("currentSone", getCurrentSone(request.getToadletContext()));
+		template.set("request", request);
 	}
 
 	/**