Add web interface to all template contexts more reliably.

[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 e30c8f8..a0174a9 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
+++ b/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
@@ -26,8 +26,9 @@ import java.util.Map;
 
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.main.SonePlugin;
-import net.pterodactylus.sone.web.page.Page;
+import net.pterodactylus.sone.notify.ListNotificationFilters;
 import net.pterodactylus.sone.web.page.FreenetTemplatePage;
+import net.pterodactylus.sone.web.page.Page;
 import net.pterodactylus.util.collection.ListBuilder;
 import net.pterodactylus.util.collection.MapBuilder;
 import net.pterodactylus.util.template.Template;
@@ -53,8 +54,8 @@ public class SoneTemplatePage extends FreenetTemplatePage {
        private final boolean requireLogin;
 
        /**
-        * Creates a new template page for Sone 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
@@ -68,8 +69,8 @@ public class SoneTemplatePage extends FreenetTemplatePage {
        }
 
        /**
-        * Creates a new template page for Sone 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
@@ -119,7 +120,6 @@ public class SoneTemplatePage extends FreenetTemplatePage {
                this.pageTitleKey = pageTitleKey;
                this.webInterface = webInterface;
                this.requireLogin = requireLogin;
-               template.getInitialContext().set("webInterface", webInterface);
        }
 
        //
@@ -249,7 +249,8 @@ public class SoneTemplatePage extends FreenetTemplatePage {
        @Override
        protected void processTemplate(Request request, TemplateContext templateContext) throws RedirectException {
                super.processTemplate(request, templateContext);
-               templateContext.set("currentSone", getCurrentSone(request.getToadletContext(), false));
+               Sone currentSone = getCurrentSone(request.getToadletContext(), false);
+               templateContext.set("currentSone", currentSone);
                templateContext.set("localSones", webInterface.getCore().getLocalSones());
                templateContext.set("request", request);
                templateContext.set("currentVersion", SonePlugin.VERSION);
@@ -257,6 +258,7 @@ public class SoneTemplatePage extends FreenetTemplatePage {
                templateContext.set("latestEdition", webInterface.getCore().getUpdateChecker().getLatestEdition());
                templateContext.set("latestVersion", webInterface.getCore().getUpdateChecker().getLatestVersion());
                templateContext.set("latestVersionTime", webInterface.getCore().getUpdateChecker().getLatestVersionDate());
+               templateContext.set("notifications", ListNotificationFilters.filterNotifications(webInterface.getNotifications().getNotifications(), currentSone));
        }
 
        /**
@@ -293,7 +295,18 @@ public class SoneTemplatePage extends FreenetTemplatePage {
         * {@inheritDoc}
         */
        @Override
+       protected boolean isFullAccessOnly() {
+               return webInterface.getCore().getPreferences().isRequireFullAccess();
+       }
+
+       /**
+        * {@inheritDoc}
+        */
+       @Override
        public boolean isEnabled(ToadletContext toadletContext) {
+               if (webInterface.getCore().getPreferences().isRequireFullAccess() && !toadletContext.isAllowedFullAccess()) {
+                       return false;
+               }
                if (requiresLogin()) {
                        return getCurrentSone(toadletContext, false) != null;
                }