X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FSoneTemplatePage.java;h=62783213039ded3e481004fe3062501b3a7aafaa;hb=23202a30c41448d317a34ef87210bc236030ff89;hp=15810ca708ac3224449666af2f5e0743ed834317;hpb=76ed638264e531a26e35647d13702db865a52321;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 15810ca..6278321 100644
--- a/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
+++ b/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - SoneTemplatePage.java - Copyright © 2010–2015 David Roden
+ * Sone - SoneTemplatePage.java - Copyright © 2010–2016 David Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,28 +19,30 @@ package net.pterodactylus.sone.web;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
+import javax.annotation.Nonnull;
+
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.main.SonePlugin;
-import net.pterodactylus.sone.notify.ListNotificationFilters;
 import net.pterodactylus.sone.web.page.FreenetRequest;
 import net.pterodactylus.sone.web.page.FreenetTemplatePage;
 import net.pterodactylus.util.notify.Notification;
 import net.pterodactylus.util.template.Template;
 import net.pterodactylus.util.template.TemplateContext;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-
 import freenet.clients.http.SessionManager.Session;
 import freenet.clients.http.ToadletContext;
 import freenet.support.api.HTTPRequest;
 
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+
 /**
  * Base page for the Sone web interface.
  *
@@ -65,21 +67,6 @@ public class SoneTemplatePage extends FreenetTemplatePage {
 	 *            The path of the page
 	 * @param template
 	 *            The template to render
-	 * @param webInterface
-	 *            The Sone web interface
-	 */
-	public SoneTemplatePage(String path, Template template, WebInterface webInterface) {
-		this(path, template, null, webInterface, false);
-	}
-
-	/**
-	 * Creates a new template page for Sone that does not require the user to be
-	 * logged in.
-	 *
-	 * @param path
-	 *            The path of the page
-	 * @param template
-	 *            The template to render
 	 * @param pageTitleKey
 	 *            The l10n key of the page title
 	 * @param webInterface
@@ -251,22 +238,26 @@ public class SoneTemplatePage extends FreenetTemplatePage {
 	 * {@inheritDoc}
 	 */
 	@Override
-	protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
+	protected final void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
 		super.processTemplate(request, templateContext);
 		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);
+		templateContext.set("currentVersion", SonePlugin.getPluginVersion());
 		templateContext.set("hasLatestVersion", webInterface.getCore().getUpdateChecker().hasLatestVersion());
 		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);
+		List<Notification> notifications = new ArrayList<Notification>(webInterface.getNotifications(currentSone));
 		Collections.sort(notifications, Notification.CREATED_TIME_SORTER);
 		templateContext.set("notifications", notifications);
 		templateContext.set("notificationHash", notifications.hashCode());
+		handleRequest(request, templateContext);
+	}
+
+	protected void handleRequest(@Nonnull FreenetRequest request, @Nonnull TemplateContext templateContext) throws RedirectException {
 	}
 
 	/**
@@ -281,24 +272,29 @@ public class SoneTemplatePage extends FreenetTemplatePage {
 				StringBuilder requestParameters = new StringBuilder();
 				for (String parameterName : httpRequest.getParameterNames()) {
 					if (requestParameters.length() > 0) {
-						requestParameters.append("%26");
+						requestParameters.append("&");
 					}
 					String[] parameterValues = httpRequest.getMultipleParam(parameterName);
 					for (String parameterValue : parameterValues) {
-						try {
-							requestParameters.append(URLEncoder.encode(parameterName, "UTF-8")).append("%3d").append(URLEncoder.encode(parameterValue, "UTF-8"));
-						} catch (UnsupportedEncodingException uee1) {
-							/* A JVM without UTF-8? I don’t think so. */
-						}
+						requestParameters.append(urlEncode(parameterName)).append("=").append(urlEncode(parameterValue));
 					}
 				}
 				originalUrl += "?" + requestParameters.toString();
 			}
-			return "login.html?target=" + originalUrl;
+			return "login.html?target=" + urlEncode(originalUrl);
 		}
 		return null;
 	}
 
+	private static String urlEncode(String value) {
+		try {
+			return URLEncoder.encode(value, "UTF-8");
+		} catch (UnsupportedEncodingException uee1) {
+							/* A JVM without UTF-8? I don’t think so. */
+			throw new RuntimeException(uee1);
+		}
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */