/*
- * Sone - SoneTemplatePage.java - Copyright © 2010–2013 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
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.object.HashCode;
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.
*
* 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
//
/**
- * Returns the current session, creating a new session if there is no
- * current session.
- *
- * @param toadletContenxt
- * The toadlet context
- * @return The current session, or {@code null} if there is no current
- * session
- */
- protected Session getCurrentSession(ToadletContext toadletContenxt) {
- return webInterface.getCurrentSession(toadletContenxt);
- }
-
- /**
- * Returns the current session, creating a new session if there is no
- * current session and {@code create} is {@code true}.
- *
- * @param toadletContenxt
- * The toadlet context
- * @param create
- * {@code true} to create a new session if there is no current
- * session, {@code false} otherwise
- * @return The current session, or {@code null} if there is no current
- * session
- */
- protected Session getCurrentSession(ToadletContext toadletContenxt, boolean create) {
- return webInterface.getCurrentSession(toadletContenxt, create);
- }
-
- /**
* Returns the currently logged in Sone.
*
* @param toadletContext
* currently logged in
*/
protected Sone getCurrentSone(ToadletContext toadletContext) {
- return webInterface.getCurrentSone(toadletContext);
+ return webInterface.getCurrentSoneCreatingSession(toadletContext);
}
- /**
- * Returns the currently logged in Sone.
- *
- * @param toadletContext
- * The toadlet context
- * @param create
- * {@code true} to create a new session if no session exists,
- * {@code false} to not create a new session
- * @return The currently logged in Sone, or {@code null} if no Sone is
- * currently logged in
- */
- protected Sone getCurrentSone(ToadletContext toadletContext, boolean create) {
- return webInterface.getCurrentSone(toadletContext, create);
+ protected Sone getCurrentSoneWithoutCreatingSession(ToadletContext toadletContext) {
+ return webInterface.getCurrentSoneWithoutCreatingSession(toadletContext);
}
/**
* {@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());
+ Sone currentSone = getCurrentSoneWithoutCreatingSession(request.getToadletContext());
+ templateContext.set("preferences", webInterface.getCore().getPreferences());
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", HashCode.hashCode(notifications));
+ templateContext.set("notificationHash", notifications.hashCode());
+ handleRequest(request, templateContext);
+ }
+
+ protected void handleRequest(@Nonnull FreenetRequest request, @Nonnull TemplateContext templateContext) throws RedirectException {
}
/**
*/
@Override
protected String getRedirectTarget(FreenetRequest request) {
- if (requiresLogin() && (getCurrentSone(request.getToadletContext(), false) == null)) {
+ if (requiresLogin() && (getCurrentSoneWithoutCreatingSession(request.getToadletContext()) == null)) {
HTTPRequest httpRequest = request.getHttpRequest();
String originalUrl = httpRequest.getPath();
if (httpRequest.hasParameters()) {
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}
*/
return false;
}
if (requiresLogin()) {
- return getCurrentSone(toadletContext, false) != null;
+ return getCurrentSoneWithoutCreatingSession(toadletContext) != null;
}
return true;
}
projects / Sone.git / blobdiff