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.web.page.FreenetRequest;
//
/**
- * 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
* {@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());
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 {
}
/**
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}
*/