X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FSoneTemplatePage.java;fp=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FSoneTemplatePage.java;h=62783213039ded3e481004fe3062501b3a7aafaa;hb=23202a30c41448d317a34ef87210bc236030ff89;hp=35c39b69a836d7df9ce7e3cdccdbe07cf067121c;hpb=76bbcf5d9baa5935ebd1fceb97ee59ac6a93c643;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 35c39b6..6278321 100644
--- a/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
+++ b/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
@@ -272,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}
 	 */