projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add unit test for sone template page and fix parameter encoding
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
web
/
SoneTemplatePage.java
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
(file)
--- 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) {
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) {
}
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();
}
}
}
originalUrl += "?" + requestParameters.toString();
}
- return "login.html?target=" +
originalUrl
;
+ return "login.html?target=" +
urlEncode(originalUrl)
;
}
return null;
}
}
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}
*/
/**
* {@inheritDoc}
*/