AGentooCat/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Plugins: console-icon path is relative to consoleLinkURL if specified,

Browse Source 
otherwise relative to plugin name, as before
This commit is contained in:
zzz
2022-01-05 15:08:35 -05:00
parent 8167f5184d
commit aaa1da4c66
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
apps/routerconsole/java/src/net/i2p/router/web/PluginStarter.java
View File

@@ -486,9 +486,23 @@ public class PluginStarter implements Runnable {
String icfile = stripHTML(props, "console-icon");
if (icfile != null && !icfile.contains("..")) {
StringBuilder buf = new StringBuilder(32);
buf.append('/').append(appName);
if (!icfile.startsWith("/"))
String url = stripHTML(props, "consoleLinkURL");
if (url != null) {
if (url.endsWith(".html") || url.endsWith(".htm") || url.endsWith(".jsp") || url.endsWith("/home")) {
int slash = url.lastIndexOf('/');
if (slash > 0)
url = url.substring(0, slash);
}
} else {
url = appName;
}
if (!url.startsWith("/"))
buf.append('/');
buf.append(url);
if (!url.endsWith("/") && !icfile.startsWith("/"))
buf.append('/');
else if (url.endsWith("/") && icfile.startsWith("/"))
icfile = icfile.substring(1);
buf.append(icfile);
iconfile = buf.toString();
}