Author: toad
Date: 2009-01-21 16:55:20 +0000 (Wed, 21 Jan 2009)
New Revision: 25201
Modified:
trunk/freenet/src/freenet/clients/http/FirstTimeWizardToadlet.java
trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties
Log:
Warn new users about using a separate browser for Freenet.
Modified: trunk/freenet/src/freenet/clients/http/FirstTimeWizardToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/FirstTimeWizardToadlet.java
2009-01-21 16:26:56 UTC (rev 25200)
+++ trunk/freenet/src/freenet/clients/http/FirstTimeWizardToadlet.java
2009-01-21 16:55:20 UTC (rev 25201)
@@ -39,6 +39,9 @@
private enum WIZARD_STEP {
WELCOME,
+ // Before security levels, because once the network security
level has been set, we won't redirect
+ // the user to the wizard page.
+ BROWSER_WARNING,
SECURITY_NETWORK,
SECURITY_FRIENDS,
SECURITY_PHYSICAL,
@@ -68,7 +71,23 @@
WIZARD_STEP currentStep =
WIZARD_STEP.valueOf(request.getParam("step", WIZARD_STEP.WELCOME.toString()));
- if(currentStep == WIZARD_STEP.SECURITY_NETWORK) {
+ if(currentStep == WIZARD_STEP.BROWSER_WARNING) {
+ HTMLNode pageNode =
ctx.getPageMaker().getPageNode(l10n("browserWarningPageTitle"), false, ctx);
+ HTMLNode contentNode =
ctx.getPageMaker().getContentNode(pageNode);
+
+ HTMLNode infobox = contentNode.addChild("div", "class",
"infobox infobox-normal");
+ HTMLNode infoboxHeader = infobox.addChild("div",
"class", "infobox-header");
+ HTMLNode infoboxContent = infobox.addChild("div",
"class", "infobox-content");
+
+ infoboxHeader.addChild("#",
l10n("browserWarningShort"));
+ L10n.addL10nSubstitution(infoboxContent,
"FirstTimeWizardToadlet.browserWarning", new String[] { "bold", "/bold" }, new
String[] { "<b>", "</b>" });
+ infoboxContent.addChild("p",
l10n("browserWarningSuggestion"));
+
+ infoboxContent.addChild("p").addChild("a", "href",
"?step="+WIZARD_STEP.SECURITY_NETWORK,
L10n.getString("FirstTimeWizardToadlet.clickContinue"));
+
+ this.writeHTMLReply(ctx, 200, "OK",
pageNode.generate());
+ return;
+ } else if(currentStep == WIZARD_STEP.SECURITY_NETWORK) {
HTMLNode pageNode =
ctx.getPageMaker().getPageNode(l10n("networkSecurityPageTitle"), false, ctx);
HTMLNode contentNode =
ctx.getPageMaker().getContentNode(pageNode);
@@ -316,7 +335,7 @@
HTMLNode firstParagraph = welcomeInfoboxContent.addChild("p");
firstParagraph.addChild("#", l10n("welcomeInfoboxContent1"));
HTMLNode secondParagraph = welcomeInfoboxContent.addChild("p");
- secondParagraph.addChild("a", "href",
"?step="+WIZARD_STEP.SECURITY_NETWORK).addChild("#",
L10n.getString("FirstTimeWizardToadlet.clickContinue"));
+ secondParagraph.addChild("a", "href",
"?step="+WIZARD_STEP.BROWSER_WARNING).addChild("#",
L10n.getString("FirstTimeWizardToadlet.clickContinue"));
HTMLNode thirdParagraph = welcomeInfoboxContent.addChild("p");
thirdParagraph.addChild("a", "href",
"?step="+WIZARD_STEP.FINAL).addChild("#", l10n("skipWizard"));
Modified: trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties
===================================================================
--- trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties 2009-01-21
16:26:56 UTC (rev 25200)
+++ trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties 2009-01-21
16:55:20 UTC (rev 25201)
@@ -257,6 +257,10 @@
ExtOldAgeUserAlert.extTooOldTitle=Freenet-ext too old
ExtOldAgeUserAlert.extTooOldShort=Your freenet-ext.jar is out of date. Please
upgrade.
FirstTimeWizardToadlet.homepageTitle=Freenet first time wizard!
+FirstTimeWizardToadlet.browserWarningPageTitle=You must use a separate browser
for Freenet!
+FirstTimeWizardToadlet.browserWarningShort=You must use a separate browser for
Freenet!
+FirstTimeWizardToadlet.browserWarning=We ${bold}strongly${/bold} recommend
that you not use the same web browser to both browse the ordinary web and
access Freenet. Browser history stealing attacks in particular may enable
malicious websites to determine which Freenet-based websites ("freesites") you
have recently visited, breaking your anonymity. Please use a separate browser,
or at least a separate browser profile, to access the Freenet web interface.
+FirstTimeWizardToadlet.browserWarningSuggestion=Most web browsers, apart from
Microsoft Internet Explorer (which has some issues with content type detection
which are difficult to work around), will work adequately with Freenet, for
example Firefox, Opera, Safari, and Lynx are known to work. You should install
one of these, or create a new profile in your existing browser, then copy the
current URL from the location bar, and open it in your new browser.
FirstTimeWizardToadlet.chooseNodeName=Node name required!
FirstTimeWizardToadlet.chooseNodeNameLong=Please enter a node name in the
field below (we recommend a nickname possibly with an email address). This is
so that your friends (trusted peers, which you have manually added) can easily
tell your node from their other nodes. This is not visible to strangers
(untrusted automatically added peers). Note that any friend or stranger may
trivially identify you from your IP address, since you are connected to them,
but they cannot easily tell what you are requesting.
FirstTimeWizardToadlet.connectToStrangers=Connect to strangers?
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
