Author: volodya
Date: 2007-05-17 09:44:39 +0000 (Thu, 17 May 2007)
New Revision: 13259
Modified:
trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
trunk/freenet/src/freenet/clients/http/FProxyToadlet.java
trunk/freenet/src/freenet/clients/http/N2NTMToadlet.java
trunk/freenet/src/freenet/clients/http/filter/GenericReadFilterCallback.java
trunk/freenet/src/freenet/node/PeerNode.java
trunk/freenet/src/freenet/node/useralerts/PeerManagerUserAlert.java
Log:
If it's "friends" then it's "friends" everywhere
Modified: trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
2007-05-16 15:20:18 UTC (rev 13258)
+++ trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
2007-05-17 09:44:39 UTC (rev 13259)
@@ -614,7 +614,7 @@
String pass = request.getPartAsString("formPassword", 32);
if((pass == null) || !pass.equals(core.formPassword)) {
MultiValueTable headers = new MultiValueTable();
- headers.put("Location", "/darknet/");
+ headers.put("Location", "/friends/");
ctx.sendReplyHeaders(302, "Found", headers, null, 0);
if(logMINOR) Logger.minor(this, "No password ("+pass+"
should be "+core.formPassword+ ')');
return;
@@ -715,7 +715,7 @@
}
MultiValueTable headers = new MultiValueTable();
- headers.put("Location", "/darknet/");
+ headers.put("Location", "/friends/");
ctx.sendReplyHeaders(302, "Found", headers, null, 0);
return;
} else if (request.isPartSet("doAction") &&
request.getPartAsString("action",25).equals("send_n2ntm")) {
@@ -752,7 +752,7 @@
}
}
MultiValueTable headers = new MultiValueTable();
- headers.put("Location", "/darknet/");
+ headers.put("Location", "/friends/");
ctx.sendReplyHeaders(302, "Found", headers, null, 0);
return;
} else if (request.isPartSet("doAction") &&
request.getPartAsString("action",25).equals("enable")) {
@@ -765,7 +765,7 @@
}
}
MultiValueTable headers = new MultiValueTable();
- headers.put("Location", "/darknet/");
+ headers.put("Location", "/friends/");
ctx.sendReplyHeaders(302, "Found", headers, null, 0);
return;
} else if (request.isPartSet("doAction") &&
request.getPartAsString("action",25).equals("disable")) {
@@ -778,7 +778,7 @@
}
}
MultiValueTable headers = new MultiValueTable();
- headers.put("Location", "/darknet/");
+ headers.put("Location", "/friends/");
ctx.sendReplyHeaders(302, "Found", headers, null, 0);
return;
} else if (request.isPartSet("doAction") &&
request.getPartAsString("action",25).equals("set_burst_only")) {
@@ -791,7 +791,7 @@
}
}
MultiValueTable headers = new MultiValueTable();
- headers.put("Location", "/darknet/");
+ headers.put("Location", "/friends/");
ctx.sendReplyHeaders(302, "Found", headers, null, 0);
return;
} else if (request.isPartSet("doAction") &&
request.getPartAsString("action",25).equals("clear_burst_only")) {
@@ -804,7 +804,7 @@
}
}
MultiValueTable headers = new MultiValueTable();
- headers.put("Location", "/darknet/");
+ headers.put("Location", "/friends/");
ctx.sendReplyHeaders(302, "Found", headers, null, 0);
return;
} else if (request.isPartSet("doAction") &&
request.getPartAsString("action",25).equals("set_ignore_source_port")) {
@@ -817,7 +817,7 @@
}
}
MultiValueTable headers = new MultiValueTable();
- headers.put("Location", "/darknet/");
+ headers.put("Location", "/friends/");
ctx.sendReplyHeaders(302, "Found", headers, null, 0);
return;
} else if (request.isPartSet("doAction") &&
request.getPartAsString("action",25).equals("clear_ignore_source_port")) {
@@ -830,7 +830,7 @@
}
}
MultiValueTable headers = new MultiValueTable();
- headers.put("Location", "/darknet/");
+ headers.put("Location", "/friends/");
ctx.sendReplyHeaders(302, "Found", headers, null, 0);
return;
} else if (request.isPartSet("doAction") &&
request.getPartAsString("action",25).equals("set_listen_only")) {
@@ -843,7 +843,7 @@
}
}
MultiValueTable headers = new MultiValueTable();
- headers.put("Location", "/darknet/");
+ headers.put("Location", "/friends/");
ctx.sendReplyHeaders(302, "Found", headers, null, 0);
return;
} else if (request.isPartSet("doAction") &&
request.getPartAsString("action",25).equals("clear_listen_only")) {
@@ -856,7 +856,7 @@
}
}
MultiValueTable headers = new MultiValueTable();
- headers.put("Location", "/darknet/");
+ headers.put("Location", "/friends/");
ctx.sendReplyHeaders(302, "Found", headers, null, 0);
return;
} else if (request.isPartSet("doAction") &&
request.getPartAsString("action",25).equals("set_allow_local")) {
@@ -869,7 +869,7 @@
}
}
MultiValueTable headers = new MultiValueTable();
- headers.put("Location", "/darknet/");
+ headers.put("Location", "/friends/");
ctx.sendReplyHeaders(302, "Found", headers, null, 0);
return;
} else if (request.isPartSet("doAction") &&
request.getPartAsString("action",25).equals("clear_allow_local")) {
@@ -882,7 +882,7 @@
}
}
MultiValueTable headers = new MultiValueTable();
- headers.put("Location", "/darknet/");
+ headers.put("Location", "/friends/");
ctx.sendReplyHeaders(302, "Found", headers, null, 0);
return;
} else if (request.isPartSet("remove") ||
(request.isPartSet("doAction") &&
request.getPartAsString("action",25).equals("remove"))) {
@@ -902,7 +902,7 @@
HTMLNode content =
ctx.getPageMaker().getContentNode(infobox);
content.addChild("p").addChild("#",
L10n.getString("DarknetConnectionsToadlet.confirmRemoveNode", new String[] {
"name" }, new String[] { peerNodes[i].getName() }));
- HTMLNode removeForm =
ctx.addFormChild(content, "/darknet/", "removeConfirmForm");
+ HTMLNode removeForm =
ctx.addFormChild(content, "/friends/", "removeConfirmForm");
removeForm.addChild("input",
new String[] { "type", "name", "value" }, new String[] { "hidden",
"node_"+peerNodes[i].hashCode(), "remove" });
removeForm.addChild("input",
new String[] { "type", "name", "value" }, new String[] { "submit", "cancel",
L10n.getString("Toadlet.cancel") });
removeForm.addChild("input",
new String[] { "type", "name", "value" }, new String[] { "submit", "remove",
l10n("remove") });
@@ -916,7 +916,7 @@
}
}
MultiValueTable headers = new MultiValueTable();
- headers.put("Location", "/darknet/");
+ headers.put("Location", "/friends/");
ctx.sendReplyHeaders(302, "Found", headers, null, 0);
return;
} else {
Modified: trunk/freenet/src/freenet/clients/http/FProxyToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/FProxyToadlet.java 2007-05-16
15:20:18 UTC (rev 13258)
+++ trunk/freenet/src/freenet/clients/http/FProxyToadlet.java 2007-05-17
09:44:39 UTC (rev 13259)
@@ -589,8 +589,9 @@
SymlinkerToadlet symlinkToadlet = new
SymlinkerToadlet(client, node);
server.register(symlinkToadlet, "/sl/", true, false);
- DarknetConnectionsToadlet darknetToadlet = new
DarknetConnectionsToadlet(node, core, client);
- server.register(darknetToadlet, "/darknet/", true,
l10n("friendsTitle"), l10n("friends"), true);
+ DarknetConnectionsToadlet friendsToadlet = new
DarknetConnectionsToadlet(node, core, client);
+// server.register(friendsToadlet, "/darknet/", true,
l10n("friendsTitle"), l10n("friends"), true);
+ server.register(friendsToadlet, "/friends/", true,
l10n("friendsTitle"), l10n("friends"), true);
N2NTMToadlet n2ntmToadlet = new N2NTMToadlet(node,
core, client);
server.register(n2ntmToadlet, "/send_n2ntm/", true,
true);
Modified: trunk/freenet/src/freenet/clients/http/N2NTMToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/N2NTMToadlet.java 2007-05-16
15:20:18 UTC (rev 13258)
+++ trunk/freenet/src/freenet/clients/http/N2NTMToadlet.java 2007-05-17
09:44:39 UTC (rev 13259)
@@ -87,7 +87,7 @@
return;
}
MultiValueTable headers = new MultiValueTable();
- headers.put("Location", "/darknet/");
+ headers.put("Location", "/friends/");
ctx.sendReplyHeaders(302, "Found", headers, null, 0);
}
@@ -106,7 +106,7 @@
infoboxContent.addChild("#", message);
HTMLNode list = infoboxContent.addChild("ul");
Toadlet.addHomepageLink(list);
- list.addChild("li").addChild("a", new String[] { "href", "title" },
new String[] { "/darknet/", l10n("returnToFriends") }, l10n("friends"));
+ list.addChild("li").addChild("a", new String[] { "href", "title" },
new String[] { "/friends/", l10n("returnToFriends") }, l10n("friends"));
return infobox;
}
@@ -190,12 +190,12 @@
infoboxContent.addChild("#", message);
HTMLNode list = peerTableInfobox.addChild("ul");
Toadlet.addHomepageLink(list);
- list.addChild("li").addChild("a", new String[] {
"href", "title" }, new String[] { "/darknet/", l10n("returnToFriends") },
l10n("friends"));
+ list.addChild("li").addChild("a", new String[] {
"href", "title" }, new String[] { "/friends/", l10n("returnToFriends") },
l10n("friends"));
this.writeReply(ctx, 200, "text/html", "OK",
pageNode.generate());
return;
}
MultiValueTable headers = new MultiValueTable();
- headers.put("Location", "/darknet/");
+ headers.put("Location", "/friends/");
ctx.sendReplyHeaders(302, "Found", headers, null, 0);
}
Modified:
trunk/freenet/src/freenet/clients/http/filter/GenericReadFilterCallback.java
===================================================================
---
trunk/freenet/src/freenet/clients/http/filter/GenericReadFilterCallback.java
2007-05-16 15:20:18 UTC (rev 13258)
+++
trunk/freenet/src/freenet/clients/http/filter/GenericReadFilterCallback.java
2007-05-17 09:44:39 UTC (rev 13259)
@@ -253,7 +253,7 @@
// Everything is allowed to / - updating the node, shutting it
down, everything.
// Why? Becuase it's all protected by formPassword anyway.
// FIXME whitelist? Most things are okay if the user is
prompted for a confirmation...
- // FIXME what about /queue/ /darknet/ etc?
+ // FIXME what about /queue/ /friends/ etc?
if(action.equals("/"))
return action;
try {
Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java 2007-05-16 15:20:18 UTC
(rev 13258)
+++ trunk/freenet/src/freenet/node/PeerNode.java 2007-05-17 09:44:39 UTC
(rev 13259)
@@ -311,10 +311,10 @@
/** Average proportion of requests which are rejected or timed out */
private TimeDecayingRunningAverage pRejected;
- /** Private comment on the peer for /darknet/ page */
+ /** Private comment on the peer for /friends/ page */
private String privateDarknetComment;
- /** Private comment on the peer for /darknet/ page's extra peer data file
number */
+ /** Private comment on the peer for /friends/ page's extra peer data file
number */
private int privateDarknetCommentFileNumber;
/** Queued-to-send N2NTM extra peer data file numbers */
Modified: trunk/freenet/src/freenet/node/useralerts/PeerManagerUserAlert.java
===================================================================
--- trunk/freenet/src/freenet/node/useralerts/PeerManagerUserAlert.java
2007-05-16 15:20:18 UTC (rev 13258)
+++ trunk/freenet/src/freenet/node/useralerts/PeerManagerUserAlert.java
2007-05-17 09:44:39 UTC (rev 13259)
@@ -159,7 +159,7 @@
} else if (neverConn >
MAX_NEVER_CONNECTED_PEER_ALERT_THRESHOLD) {
L10n.addL10nSubstitution(alertNode,
"tooManyNeverConnectedWithLink",
new String[] { "link", "/link", "count"
},
- new String[] { "<a
href=\"/darknet/myref.fref\">", "</a>", Integer.toString(neverConn) });
+ new String[] { "<a
href=\"/friends/myref.fref\">", "</a>", Integer.toString(neverConn) });
} else if ((peers - conns) > MAX_DISCONN_PEER_ALERT_THRESHOLD) {
alertNode.addChild("#", l10n("tooManyDisconnected", new
String[] { "count", "max" }, new String[] { Integer.toString(disconnected),
Integer.toString(MAX_DISCONN_PEER_ALERT_THRESHOLD)}));
} else if (conns > MAX_CONN_ALERT_THRESHOLD) {
