Author: nextgens
Date: 2006-06-17 06:20:20 +0000 (Sat, 17 Jun 2006)
New Revision: 9249
Modified:
trunk/freenet/src/freenet/clients/http/ConfigToadlet.java
trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
trunk/freenet/src/freenet/config/Option.java
Log:
>From now on, we have a proper "usermode" support in fproxy. I'll bump the
>version number as soon as I've fixed the configuration callbacks.
Modified: trunk/freenet/src/freenet/clients/http/ConfigToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/ConfigToadlet.java 2006-06-17
05:56:11 UTC (rev 9248)
+++ trunk/freenet/src/freenet/clients/http/ConfigToadlet.java 2006-06-17
06:20:20 UTC (rev 9249)
@@ -116,8 +116,8 @@
public void handleGet(URI uri, ToadletContext ctx) throws
ToadletContextClosedException, IOException {
StringBuffer buf = new StringBuffer(1024);
SubConfig[] sc = config.getConfigs();
+ boolean advancedEnabled =
node.getToadletContainer().isAdvancedDarknetEnabled();
- //HTTPRequest request = new HTTPRequest(uri);
ctx.getPageMaker().makeHead(buf, "Freenet Node Configuration");
buf.append("<div class=\"infobox infobox-normal\">\n");
@@ -128,57 +128,50 @@
buf.append("<form method=\"post\" action=\".\">");
buf.append("<input type=\"hidden\" name=\"formPassword\"
value=\""+node.formPassword+"\">");
- //String last = null;
-
for(int i=0; i<sc.length;i++){
+ StringBuffer buf2 = new StringBuffer();
+ short displayedConfigElements = 0;
+
Option[] o = sc[i].getOptions();
- //String prefix = new String(sc[i].getPrefix());
+ buf2.append("<ul class=\"config\"><span
class=\"configprefix\">"+sc[i].getPrefix()+"</span>\n");
- /*
- if(last == null || ! last.equalsIgnoreCase(prefix)){
- //buf.append("</p>\n");
- buf.append("</span>\n");
- buf.append("<span id=\""+prefix+"\">\n");
- //buf.append("<p>\n");
- }
- */
-
- buf.append("<ul class=\"config\"><span
class=\"configprefix\">"+sc[i].getPrefix()+"</span>\n");
-
for(int j=0; j<o.length; j++){
- String configName = o[j].getName();
-
- buf.append("<li>");
- //
- buf.append("<span class=\"configshortdesc\">");
- buf.append(o[j].getShortDesc());
- buf.append("</span>");
- buf.append("<span class=\"config\">");
- //
- if(o[j].getValueString().equals("true") ||
o[j].getValueString().equals("false")){
- buf.append("<select
name=\""+sc[i].getPrefix()+"."+configName+"\" >");
-
if(o[j].getValueString().equals("true")){
- buf.append("<option
value=\"true\" selected>true</option>");
- buf.append("<option
value=\"false\">false</option>");
+ if(! (!advancedEnabled && o[j].isExpert())){
+ displayedConfigElements++;
+ String configName = o[j].getName();
+
+ buf2.append("<li>");
+ buf2.append("<span
class=\"configshortdesc\">");
+ buf2.append(o[j].getShortDesc());
+ buf2.append("</span>");
+ buf2.append("<span class=\"config\">");
+
+ if(o[j].getValueString().equals("true")
|| o[j].getValueString().equals("false")){
+ buf2.append("<select
name=\""+sc[i].getPrefix()+"."+configName+"\" >");
+
if(o[j].getValueString().equals("true")){
+ buf2.append("<option
value=\"true\" selected>true</option>");
+ buf2.append("<option
value=\"false\">false</option>");
+ }else{
+ buf2.append("<option
value=\"true\">true</option>");
+ buf2.append("<option
value=\"false\" selected>false</option>");
+ }
+ buf2.append("</select>");
}else{
- buf.append("<option
value=\"true\">true</option>");
- buf.append("<option
value=\"false\" selected>false</option>");
+ buf2.append("<input
alt=\""+o[j].getShortDesc()+"\" class=\"config\"" +
+ " type=\"text\"
name=\""+sc[i].getPrefix()+"."+configName+"\"
value=\""+HTMLEncoder.encode(o[j].getValueString())+"\" />");
}
- buf.append("</select>");
- }else{
- buf.append("<input
alt=\""+o[j].getShortDesc()+"\" class=\"config\"" +
- " type=\"text\"
name=\""+sc[i].getPrefix()+"."+configName+"\"
value=\""+HTMLEncoder.encode(o[j].getValueString())+"\" />");
+ buf2.append("</span>");
+ buf2.append("<span
class=\"configlongdesc\">");
+ buf2.append(o[j].getLongDesc());
+ buf2.append("</span>");
+
+ buf2.append("</li>\n");
}
- buf.append("</span>");
- buf.append("<span class=\"configlongdesc\">");
- buf.append(o[j].getLongDesc());
- buf.append("</span>");
-
- buf.append("</li>\n");
}
+ buf2.append("</ul>\n");
-
- buf.append("</ul>\n");
+ if(displayedConfigElements>0)
+ buf.append(buf2);
}
buf.append("<input type=\"submit\" value=\"Apply\" />");
Modified: trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
2006-06-17 05:56:11 UTC (rev 9248)
+++ trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
2006-06-17 06:20:20 UTC (rev 9249)
@@ -16,7 +16,6 @@
import freenet.node.FSParseException;
import freenet.node.Node;
import freenet.node.PeerNode;
-import freenet.node.Version;
import freenet.support.Bucket;
import freenet.support.HTMLEncoder;
import freenet.support.MultiValueTable;
@@ -72,7 +71,7 @@
long now = System.currentTimeMillis();
- boolean advancedEnabled =
node.getToadletContainer().isAdvancedDarknetEnabled();
+ final boolean advancedEnabled =
node.getToadletContainer().isAdvancedDarknetEnabled();
node.alerts.toSummaryHtml(buf);
@@ -237,7 +236,6 @@
for(int i=0;i<peerNodes.length;i++) {
PeerNode pn = peerNodes[i];
long routingBackedOffUntil =
pn.getRoutingBackedOffUntil();
- boolean routingBackedOffNow = (now <
routingBackedOffUntil);
int backoff =
(int)(Math.max(routingBackedOffUntil - now, 0));
// Don't list the backoff as zero before it's
actually zero
if(backoff > 0 && backoff < 1000 )
@@ -304,7 +302,6 @@
// Convert status codes into status strings
for(int i=0;i<rows.length;i++) {
Object[] row = rows[i];
- int x = ((Integer) row[2]).intValue();
String arkAsterisk = "";
if(advancedEnabled) {
if(((PeerNode) row[0]).isFetchingARK())
{
Modified: trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
2006-06-17 05:56:11 UTC (rev 9248)
+++ trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
2006-06-17 06:20:20 UTC (rev 9249)
@@ -160,7 +160,7 @@
new FProxyAllowedHostsCallback());
fproxyConfig.register("css", "clean", 1, true, "CSS Name",
"Name of the CSS FProxy should use",
new FProxyCSSNameCallback());
- fproxyConfig.register("advancedDarknetEnabled", false, 1, true,
"Enable Advanced Darknet?", "Whether to enable show information meant for
advanced users/devs on /darkenet/ page",
+ fproxyConfig.register("advancedDarknetEnabled", false, 1,
false, "Enable Advanced Darknet?", "Whether to show or not informations meant
for advanced users/devs. This setting should be turned to false in most cases.",
new FProxyAdvancedDarknetEnabledCallback(this));
this.bf = node.tempBucketFactory;
Modified: trunk/freenet/src/freenet/config/Option.java
===================================================================
--- trunk/freenet/src/freenet/config/Option.java 2006-06-17 05:56:11 UTC
(rev 9248)
+++ trunk/freenet/src/freenet/config/Option.java 2006-06-17 06:20:20 UTC
(rev 9249)
@@ -63,4 +63,8 @@
public String getLongDesc(){
return longDesc;
}
+
+ public boolean isExpert(){
+ return expert;
+ }
}
