Author: nextgens
Date: 2006-08-18 15:46:58 +0000 (Fri, 18 Aug 2006)
New Revision: 10194
Modified:
trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
trunk/freenet/src/freenet/clients/http/QueueToadlet.java
trunk/freenet/src/freenet/node/useralerts/MeaningfulNodeNameUserAlert.java
trunk/freenet/src/freenet/node/useralerts/PeerManagerUserAlert.java
Log:
several tweakings on fproxy
* myref.txt become myref.fref
* on the /queue/ page, show user alerts on top
* some cleanup on the getText() method of MeaningfulNodeNameUserAlert
Modified: trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
2006-08-18 15:28:28 UTC (rev 10193)
+++ trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
2006-08-18 15:46:58 UTC (rev 10194)
@@ -83,7 +83,7 @@
public void handleGet(URI uri, ToadletContext ctx) throws
ToadletContextClosedException, IOException, RedirectException {
String path = uri.getPath();
- if(path.endsWith("myref.txt")) {
+ if(path.endsWith("myref.fref")) {
SimpleFieldSet fs = node.exportPublicFieldSet();
StringWriter sw = new StringWriter();
fs.writeTo(sw);
@@ -484,7 +484,7 @@
// our reference
HTMLNode referenceInfobox = contentNode.addChild("div",
"class", "infobox infobox-normal");
- referenceInfobox.addChild("div", "class",
"infobox-header").addChild("a", "href", "myref.txt", "My reference");
+ referenceInfobox.addChild("div", "class",
"infobox-header").addChild("a", "href", "myref.fref", "My reference");
referenceInfobox.addChild("div", "class",
"infobox-content").addChild("pre", "id", "reference",
node.exportPublicFieldSet().toString());
StringBuffer pageBuffer = new StringBuffer();
Modified: trunk/freenet/src/freenet/clients/http/QueueToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/QueueToadlet.java 2006-08-18
15:28:28 UTC (rev 10193)
+++ trunk/freenet/src/freenet/clients/http/QueueToadlet.java 2006-08-18
15:46:58 UTC (rev 10194)
@@ -289,10 +289,10 @@
if(reqs.length < 1){
HTMLNode pageNode = pageMaker.getPageNode("Global queue
of " + core.getMyName());
HTMLNode contentNode =
pageMaker.getContentNode(pageNode);
+ /* add alert summary box */
+ contentNode.addChild(core.alerts.createSummary());
HTMLNode infobox =
contentNode.addChild(pageMaker.getInfobox("infobox-information", "Global queue
is empty"));
HTMLNode infoboxContent =
pageMaker.getContentNode(infobox);
- /* add alert summary box */
- contentNode.addChild(core.alerts.createSummary());
infoboxContent.addChild("#", "There is no task queued
on the global queue at the moment.");
contentNode.addChild(createInsertBox(pageMaker));
writeReply(ctx, 200, "text/html", "OK",
pageNode.generate());
Modified:
trunk/freenet/src/freenet/node/useralerts/MeaningfulNodeNameUserAlert.java
===================================================================
--- trunk/freenet/src/freenet/node/useralerts/MeaningfulNodeNameUserAlert.java
2006-08-18 15:28:28 UTC (rev 10193)
+++ trunk/freenet/src/freenet/node/useralerts/MeaningfulNodeNameUserAlert.java
2006-08-18 15:46:58 UTC (rev 10194)
@@ -3,7 +3,6 @@
import freenet.config.Option;
import freenet.config.SubConfig;
import freenet.node.Node;
-import freenet.support.HTMLEncoder;
import freenet.support.HTMLNode;
public class MeaningfulNodeNameUserAlert implements UserAlert {
@@ -23,8 +22,6 @@
}
public String getText() {
- SubConfig sc = node.config.get("node");
- Option o = sc.getOption("name");
StringBuffer buf = new StringBuffer();
buf.append("It seems that your node's name isn't defined.
Setting " +
@@ -33,26 +30,6 @@
"to reach you. You can change the node's name at the
Configuration page. " +
"Putting your e-mail address or IRC nickname there is generally
speaking " +
"a good idea and helps your friends to identify your node.");
- buf.append("<form method=\"post\" action=\"/config/\">");
- buf.append("<input type=\"hidden\" name=\"formPassword\"
value=\""+node.clientCore.formPassword+"\">");
- //buf.append("<ul class=\"config\"><span
class=\"configprefix\">"+sc.getPrefix()+"</span>\n");
- buf.append("<ul class=\"config\">\n");
- buf.append("<li>");
- buf.append("<span class=\"configshortdesc\">");
- buf.append(o.getShortDesc());
- buf.append("</span>");
- buf.append("<span class=\"config\">");
- buf.append("<input alt=\""+o.getShortDesc()+"\"
class=\"config\"" +
- " type=\"text\"
name=\""+sc.getPrefix()+".name\"
value=\""+HTMLEncoder.encode(o.getValueString())+"\" />");
- buf.append("</span>");
- buf.append("<span class=\"configlongdesc\">");
- buf.append(o.getLongDesc());
- buf.append("</span>");
- buf.append("</li>\n");
- buf.append("</ul>\n");
- buf.append("<input type=\"submit\" value=\"Apply\" />");
- buf.append("<input type=\"reset\" value=\"Reset\" />");
- buf.append("</form>");
return buf.toString();
}
Modified: trunk/freenet/src/freenet/node/useralerts/PeerManagerUserAlert.java
===================================================================
--- trunk/freenet/src/freenet/node/useralerts/PeerManagerUserAlert.java
2006-08-18 15:28:28 UTC (rev 10193)
+++ trunk/freenet/src/freenet/node/useralerts/PeerManagerUserAlert.java
2006-08-18 15:46:58 UTC (rev 10194)
@@ -130,7 +130,7 @@
alertNode.addChild("#", "This node has only two
connections. Performance and security will not be very good, and your node is
not doing any routing for other nodes. Your node is embedded like a
\u201cchain\u201d in the network and does not contribute to the network\u2019s
health. Try to get at least 3 connected peers at any given time.");
} else if (neverConn >
MAX_NEVER_CONNECTED_PEER_ALERT_THRESHOLD) {
alertNode.addChild("#", neverConn + " of your
node\u2019s peers have never connected even once. You should not add peers
unless you know that they have also added ");
- alertNode.addChild("a", "href", "/darknet/myref.txt",
"your reference");
+ alertNode.addChild("a", "href", "/darknet/myref.fref",
"your reference");
alertNode.addChild("#", ".");
} else if ((peers - conns) > MAX_DISCONN_PEER_ALERT_THRESHOLD) {
alertNode.addChild("#", (peers - conns) + " of your
node\u2019s peers are disconnected. This will have a slight impact on your
performance as disconnected peers also consume a small amount of bandwidth and
CPU. Consider \u201ccleaning up\u201d your peer list. Note that ideally you
should connect to nodes run by people you know.");
