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

Addressbook: Rename the book nobody uses

Browse Source 
Config migration
Version the svg
Remove very old standalone files
This commit is contained in:
zzz
2020-07-09 16:45:37 +00:00
parent ed14aa130c
commit 31d7d7d9bb
18 changed files with 53 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java
View File

@@ -1460,7 +1460,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
"<h4>" + _t("Save {0} to router address book and continue to website", destination) + "</h4>\n<p>" +
_t("This address will be saved to your Router address book where your subscription-based addresses are stored."));
if(_context.namingService().getName().equals("BlockfileNamingService")) {
out.write(" " + _t("If you want to keep track of sites you have added manually, add to your Master or Private address book instead."));
out.write(" " + _t("If you want to keep track of sites you have added manually, add to your Local or Private address book instead."));
}
// FIXME wasn't escaped
String label = _t("Save & continue").replace("&", "&amp;");
@@ -1470,9 +1470,9 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
if(_context.namingService().getName().equals("BlockfileNamingService")) {
// only blockfile supports multiple books
out.write("<h4>" + _t("Save {0} to master address book and continue to website", destination) + "</h4>\n<p>" +
_t("This address will be saved to your Master address book. Select this option for addresses you wish to keep separate from the main router address book, but don't mind publishing.") +
"</p>\n<div class=\"formaction\"><button type=\"submit\" class=\"accept\" name=\"master\" value=\"master\">" +
out.write("<h4>" + _t("Save {0} to local address book and continue to website", destination) + "</h4>\n<p>" +
_t("This address will be saved to your Local address book. Select this option for addresses you wish to keep separate from the main router address book, but don't mind publishing.") +
"</p>\n<div class=\"formaction\"><button type=\"submit\" class=\"accept\" name=\"local\" value=\"local\">" +
label + "</button></div>\n");
out.write("<h4>" + _t("Save {0} to private address book and continue to website", destination) + "</h4>\n<p>" +

6
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java
View File

@@ -155,7 +155,7 @@ public abstract class LocalHTTPServer {
}
// Add to addressbook (form submit)
// Parameters are url, host, dest, nonce, and master | router | private.
// Parameters are url, host, dest, nonce, and local | router | private.
// Do the add and redirect.
if (targetRequest.equals("/add")) {
if (query == null) {
@@ -170,7 +170,7 @@ public abstract class LocalHTTPServer {
String nonce = opts.get("nonce");
String referer = opts.get("referer");
String book = "privatehosts.txt";
if (opts.get("master") != null)
if (opts.get("local") != null)
book = "userhosts.txt";
else if (opts.get("router") != null)
book = "hosts.txt";
@@ -345,7 +345,7 @@ public abstract class LocalHTTPServer {
if ("hosts.txt".equals(book))
tbook = _t("router");
else if ("userhosts.txt".equals(book))
tbook = _t("master");
tbook = _t("local");
else if ("privatehosts.txt".equals(book))
tbook = _t("private");
else