X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FSoneTemplatePage.java;h=b0d31d24f2482dd8ac0f3618d5dc7475b2a88cae;hp=e30c8f88fd3acbeab82c33a21dad4fde926e5c2b;hb=c9e306ac8e3ada846e87a0cc256a20fc148f381c;hpb=6d859b8cb7dceeebdd2d9f3b0ee12f30a230de33

diff --git a/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java b/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
index e30c8f8..b0d31d2 100644
--- a/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
+++ b/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
@@ -21,15 +21,19 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 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.FreenetRequest;
 import net.pterodactylus.sone.web.page.FreenetTemplatePage;
 import net.pterodactylus.util.collection.ListBuilder;
 import net.pterodactylus.util.collection.MapBuilder;
+import net.pterodactylus.util.notify.Notification;
+import net.pterodactylus.util.object.HashCode;
 import net.pterodactylus.util.template.Template;
 import net.pterodactylus.util.template.TemplateContext;
 import freenet.clients.http.SessionManager.Session;
@@ -53,8 +57,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 +72,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 +123,6 @@ public class SoneTemplatePage extends FreenetTemplatePage {
 		this.pageTitleKey = pageTitleKey;
 		this.webInterface = webInterface;
 		this.requireLogin = requireLogin;
-		template.getInitialContext().set("webInterface", webInterface);
 	}
 
 	//
@@ -202,7 +205,7 @@ public class SoneTemplatePage extends FreenetTemplatePage {
 	 * {@inheritDoc}
 	 */
 	@Override
-	protected String getPageTitle(Request request) {
+	protected String getPageTitle(FreenetRequest request) {
 		if (pageTitleKey != null) {
 			return webInterface.getL10n().getString(pageTitleKey);
 		}
@@ -213,7 +216,7 @@ public class SoneTemplatePage extends FreenetTemplatePage {
 	 * {@inheritDoc}
 	 */
 	@Override
-	protected List<Map<String, String>> getAdditionalLinkNodes(Request request) {
+	protected List<Map<String, String>> getAdditionalLinkNodes(FreenetRequest request) {
 		return new ListBuilder<Map<String, String>>().add(new MapBuilder<String, String>().put("rel", "search").put("type", "application/opensearchdescription+xml").put("title", "Sone").put("href", "http://" + request.getHttpRequest().getHeader("host") + "/Sone/OpenSearch.xml").get()).get();
 	}
 
@@ -247,9 +250,11 @@ public class SoneTemplatePage extends FreenetTemplatePage {
 	 * {@inheritDoc}
 	 */
 	@Override
-	protected void processTemplate(Request request, TemplateContext templateContext) throws RedirectException {
+	protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
 		super.processTemplate(request, templateContext);
-		templateContext.set("currentSone", getCurrentSone(request.getToadletContext(), false));
+		Sone currentSone = getCurrentSone(request.getToadletContext(), false);
+		templateContext.set("core", webInterface.getCore());
+		templateContext.set("currentSone", currentSone);
 		templateContext.set("localSones", webInterface.getCore().getLocalSones());
 		templateContext.set("request", request);
 		templateContext.set("currentVersion", SonePlugin.VERSION);
@@ -257,13 +262,17 @@ 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());
+		List<Notification> notifications = ListNotificationFilters.filterNotifications(webInterface.getNotifications().getNotifications(), currentSone);
+		Collections.sort(notifications, Notification.CREATED_TIME_SORTER);
+		templateContext.set("notifications", notifications);
+		templateContext.set("notificationHash", HashCode.hashCode(notifications));
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
-	protected String getRedirectTarget(Page.Request request) {
+	protected String getRedirectTarget(FreenetRequest request) {
 		if (requiresLogin() && (getCurrentSone(request.getToadletContext(), false) == null)) {
 			HTTPRequest httpRequest = request.getHttpRequest();
 			String originalUrl = httpRequest.getPath();
@@ -293,7 +302,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;
 		}