Author: toad
Date: 2008-04-19 16:50:17 +0000 (Sat, 19 Apr 2008)
New Revision: 19433
Modified:
trunk/freenet/src/freenet/clients/http/filter/GenericReadFilterCallback.java
trunk/freenet/src/freenet/node/IPDetectorPluginManager.java
Log:
Escape the port-forward help URL
Modified:
trunk/freenet/src/freenet/clients/http/filter/GenericReadFilterCallback.java
===================================================================
---
trunk/freenet/src/freenet/clients/http/filter/GenericReadFilterCallback.java
2008-04-19 16:47:37 UTC (rev 19432)
+++
trunk/freenet/src/freenet/clients/http/filter/GenericReadFilterCallback.java
2008-04-19 16:50:17 UTC (rev 19433)
@@ -281,5 +281,9 @@
// Otherwise disallow.
return null;
}
+
+ public static String escapeURL(String uri) {
+ return "/?" + magicHTTPEscapeString + '=' + uri;
+ }
}
Modified: trunk/freenet/src/freenet/node/IPDetectorPluginManager.java
===================================================================
--- trunk/freenet/src/freenet/node/IPDetectorPluginManager.java 2008-04-19
16:47:37 UTC (rev 19432)
+++ trunk/freenet/src/freenet/node/IPDetectorPluginManager.java 2008-04-19
16:50:17 UTC (rev 19433)
@@ -8,6 +8,7 @@
import java.util.Set;
import java.util.Vector;
+import freenet.clients.http.filter.GenericReadFilterCallback;
import freenet.io.AddressTracker;
import freenet.io.comm.FreenetInetAddress;
import freenet.io.comm.Peer;
@@ -53,7 +54,7 @@
public HTMLNode getHTMLText() {
HTMLNode div = new HTMLNode("div");
- String url =
HTMLEncoder.encode(l10n("portForwardHelpURL"));
+ String url =
GenericReadFilterCallback.escapeURL(HTMLEncoder.encode(l10n("portForwardHelpURL")));
if(portsNotForwarded.length == 1) {
L10n.addL10nSubstitution(div,
"IPDetectorPluginManager.forwardPort",
new String[] { "port", "link",
"/link" },
