Redirect to “noPermission.html” if a POST request does not have the correct form...

[Sone.git] / src / main / java / net / pterodactylus / sone / web / SoneTemplatePage.java

diff --git a/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java b/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
index 4078585..427b0ff 100644 (file)
--- 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,18 +100,21 @@ 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");
-               for (Sone sone : webInterface.core().localSones()) {
+               if (soneId == null) {
+                       return null;
+               }
+               for (Sone sone : webInterface.core().getSones()) {
                        if (sone.getId().equals(soneId)) {
                                return sone;
                        }
@@ -129,7 +132,11 @@ public class SoneTemplatePage extends TemplatePage {
         */
        protected void setCurrentSone(ToadletContext toadletContext, Sone sone) {
                Session session = getCurrentSession(toadletContext);
-               session.setAttribute("Sone.CurrentSone", sone.getId());
+               if (sone == null) {
+                       session.removeAttribute("Sone.CurrentSone");
+               } else {
+                       session.setAttribute("Sone.CurrentSone", sone.getId());
+               }
        }
 
        //
@@ -145,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
@@ -158,6 +173,15 @@ public class SoneTemplatePage extends TemplatePage {
         * {@inheritDoc}
         */
        @Override
+       protected void processTemplate(Request request, Template template) throws RedirectException {
+               super.processTemplate(request, template);
+               template.set("currentSone", getCurrentSone(request.getToadletContext()));
+       }
+
+       /**
+        * {@inheritDoc}
+        */
+       @Override
        protected String getRedirectTarget(Page.Request request) {
                if (requiresLogin() && (getCurrentSone(request.getToadletContext()) == null)) {
                        return "login.html";