Author: toad
Date: 2009-01-17 18:51:26 +0000 (Sat, 17 Jan 2009)
New Revision: 25113
Modified:
trunk/freenet/src/freenet/clients/http/NullToadletContainer.java
trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
trunk/freenet/src/freenet/clients/http/ToadletContainer.java
trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java
trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties
Log:
Make activelinks optional and off by default.
Modified: trunk/freenet/src/freenet/clients/http/NullToadletContainer.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/NullToadletContainer.java
2009-01-17 18:35:39 UTC (rev 25112)
+++ trunk/freenet/src/freenet/clients/http/NullToadletContainer.java
2009-01-17 18:51:26 UTC (rev 25113)
@@ -82,4 +82,8 @@
return uri;
}
+ public boolean enableActivelinks() {
+ return false;
+ }
+
}
Modified: trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
2009-01-17 18:35:39 UTC (rev 25112)
+++ trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
2009-01-17 18:51:26 UTC (rev 25113)
@@ -97,6 +97,7 @@
private boolean enablePersistentConnections;
private boolean enableInlinePrefetch;
private boolean enableHistoryCloaking;
+ private boolean enableActivelinks;
// Something does not really belongs to here
static boolean isPanicButtonToBeShown; // move
to QueueToadlet ?
@@ -492,6 +493,20 @@
});
enableInlinePrefetch =
fproxyConfig.getBoolean("enableInlinePrefetch");
+ fproxyConfig.register("enableActivelinks", false,
configItemOrder++, false, false, "SimpleToadletServer.enableActivelinks",
"SimpleToadletServer.enableActivelinksLong", new BooleanCallback() {
+
+ @Override
+ public Boolean get() {
+ return enableActivelinks;
+ }
+
+ @Override
+ public void set(Boolean val) throws
InvalidConfigValueException, NodeNeedRestartException {
+ enableActivelinks = val;
+ }
+
+ });
+
// Off by default, installer turns it on.
fproxyConfig.register("enableHistoryCloaking", false,
configItemOrder++, false, false, "SimpleToadletServer.enableHistoryCloaking",
"SimpleToadletServer.enableHistoryCloakingLong", new
FProxyHistoryCloakingCallback(this));
enableHistoryCloaking =
fproxyConfig.getBoolean("enableHistoryCloaking");
@@ -935,4 +950,10 @@
this.clientNonce = nonce;
}
+
+
+ public boolean enableActivelinks() {
+ return enableActivelinks;
+ }
+
}
Modified: trunk/freenet/src/freenet/clients/http/ToadletContainer.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/ToadletContainer.java
2009-01-17 18:35:39 UTC (rev 25112)
+++ trunk/freenet/src/freenet/clients/http/ToadletContainer.java
2009-01-17 18:51:26 UTC (rev 25113)
@@ -79,4 +79,6 @@
* @return
*/
public boolean isSecureIDCheckingDisabled();
+
+ public boolean enableActivelinks();
}
Modified: trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java 2009-01-17
18:35:39 UTC (rev 25112)
+++ trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java 2009-01-17
18:51:26 UTC (rev 25113)
@@ -586,7 +586,7 @@
HTMLNode bookmarksList = bookmarkBoxContent.addChild("ul", "id",
"bookmarks");
- addCategoryToList(BookmarkManager.MAIN_CATEGORY, bookmarksList,
useragent != null && useragent.contains("khtml") &&
!useragent.contains("chrome"), container);
+ addCategoryToList(BookmarkManager.MAIN_CATEGORY, bookmarksList,
(!container.enableActivelinks()) || (useragent != null &&
useragent.contains("khtml") && !useragent.contains("chrome")), container);
// Fetch-a-key box
HTMLNode fetchKeyBox =
contentNode.addChild(ctx.getPageMaker().getInfobox("infobox-normal",
l10n("fetchKeyLabel")));
Modified: trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties
===================================================================
--- trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties 2009-01-17
18:35:39 UTC (rev 25112)
+++ trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties 2009-01-17
18:51:26 UTC (rev 25113)
@@ -1143,6 +1143,8 @@
SimpleToadletServer.cssOverrideNotInUploads=We can't let you set that setting:
"${filename} isn't in a directory from which uploads are allowed!
SimpleToadletServer.doRobots=Exclude robots via robots.txt?
SimpleToadletServer.doRobotsLong=Whether to serve a /robots.txt telling
google, spiders, wget, etc to go away
+SimpleToadletServer.enableActivelinks=Enable activelinks?
+SimpleToadletServer.enableActivelinksLong=Should the Browse Freenet page show
icons for each bookmarked page? The page will load faster if it doesn't show
the icons...
SimpleToadletServer.enableHistoryCloaking=Enable history cloaking?
SimpleToadletServer.enableHistoryCloakingLong=Prevent websites from being able
to tell which freesites you have visited. If true, the Freenet web interface
will require a ?secureid= parameter on every page. Links on freesites and on
the web interface will include this, and Freenet will generate a file
freenet.url.dat for the start url, including the ?secureid=. Only turn this off
if you never use the same browser for Freenet as for non-anonymous websites.
SimpleToadletServer.enableJS=Enable FProxy use of Javascript?
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
