On Sunday 29 June 2003 10:00 pm, Tom Kaitchuck wrote:
> On Saturday 28 June 2003 05:29 pm, [EMAIL PROTECTED] wrote:
> > The number of people trying freenet for the first time is likely to
> > increase greatly in the next week or two. So lets think about making the
> > experience of the absolute newbie as pleasant as practically possible.
>
> Here is a first step.
Two more minor patches. One for
src/freenet/node/http/infolets/DefaultInfolet.java.
Another for
src/freenet/client/http/FproxyServlet.java
39c39
<
---
>
131,137c131,134
< sw.println("Freenet cannot find a valid internet address. "+
< "This means that requests to other nodes will get "+
< "lost sometimes, and your node will be unable to "+
< "serve requests for other nodes. Your computer may "+
< "not be online, or for some reason could not be "+
< "autodetected; the most common reason for this is "+
< "that you are using a NAT router/firewall. If so, you "+
---
> sw.println("Freenet cannot find a valid internet address! <br><br>"+
> "Your computer may be offline, or "+
> "the \"ipAddress\" setting in your config is incorrect. <br>"+
> "If you are behind a NAT router or Firewall, you "+
139,144c136,137
< " to this machine, and set ipAddress in the config "+
< "file ("+Main.paramFile+") to the external internet "+
< "address of the NAT router. If you don't understand "+
< "what was just said, don't use a NAT router! Another "+
< "possibility is that ipAddress is set in your config "+
< "file to an invalid address.");
---
> " to this machine. And in the config file ("+Main.paramFile+
> ") set \"ipAddress\" to your external internet address. ");
149c142
<
---
>
186d178
< sw.println("<ul>");
187a180,181
> sw.println("<p><font size=\"-1\"><b>Note</b>: These sites and their thumbnail images are published anonymously. We take no responsibility for their contents. These links are provided purely for your convenience. If the thumbnail image loads, the site probably will.</font></p>");
> sw.println("<ul>");
190,191c184
<
< sw.println("</ul><p><font size=\"-1\"><b>Note</b>: These sites and their thumbnail images are published anonymously. We take no responsibility for the contents therein; links are provided as a convenience. If the thumbnail image loads, the site probably will.</font></p>");
---
> sw.println("</ul>");
339,340c339,347
<
< pw.println("Freenet has determined that you are using Internet Explorer. Please be aware that Internet Explorer treats contents in a manner that makes it impossible for us to protect your anonymity while browsing Freenet using this browser. We recommend that you use a browser that does not do this, for example, Mozilla, K-Meleon, Phoenix, Lynx, Links, Amaya, or Arena.");
---
>
> pw.println("Freenet has determined that you are using Internet Explorer. " +
> "Using Internet Explorer makes it impossible for Freenet to protect your anonymity.
> "We recommend that you use another browser. For example, <a href=\"http://www.mozilla.org/\";>Mozilla</a> / " +
> "<a herf=\"http://www.mozilla.org/projects/firebird/\";>Firebird </a>,
> "<a href=\"http://kmeleon.sourceforge.net/\";>K-Meleon</a>, or " +
> "<a herf=\"http://www.w3.org/Amaya/Amaya.html\";>Amaya</a>.");
> //"If you want a text based browser you could use Lynx or Links.");
> //Does anyone who is using IE want a text based browser?
342,343c349,350
< pw.println("<p>If you are really really sure you want to proceed, don't ");
< pw.println("say we didn't warn you, and click <a href=\"" + req.getRequestURI() +
---
> pw.println("<p>Only if you are <b>absolutely sure</b> you want to proceed, don't ");
> pw.println("say we didn't warn you, click <a href=\"" + req.getRequestURI() +
1066c1073
< "<b>CHK@</b> or <b>SVK@</b>. The most common reason for this message " +
---
> "or <b>CHK@</b>. The most common reason for this message " +
1068c1075
< "key form as a search form. Please " +
---
> "key form as a search form. (Don't Do That.) Please " +
1071a1079
> //why do we offer this?
1080,1084c1088,1092
< pw.println("<p>The key you are trying to fetch does not exist in the ");
< pw.println("freesite it is supposed to be contained in, which was ");
< pw.println("found. This is a fatal error. You can click <a href=\"/" +
< HTMLEncoder.encode(rkey.popMetaString().toString(false)) +
< "\">here</a> to go to the parent site ");
---
> pw.println("<p>The key you are trying to fetch does not exist in the " +
> "Freesite it is supposed to be contained in. This means " +
> "the author messed up, and there is nothing you can do. " +
> "Go to <a href=\"/" +HTMLEncoder.encode(rkey.popMetaString().toString(false)) +
> "\"> the parent site </a>");
1478c1486
< warning = "<p class=\"warning\">" +
---
> warning = "<p class=\"warning\">" +
1494,1497c1502,1506
< "request to. You should retry, with the same Hops-To-Live; if it " +
< "persists, there may be a problem (check that your internet " +
< "connection is working). Try reseeding your node, and if that " +
< "doesn't work, contact [EMAIL PROTECTED]";
---
> "request to. Increasing your Hops-To-Live will NOT help. <br>" +
> "Check that your internet connection is working. <br>" +
> "Then try again later. If this problem persists, try " +
> "<a herf=\"/servlet/nodestatus/nodestatus.html\">reseeding your node</a>" +
> ", and if that doesn't work, contact [EMAIL PROTECTED]";
1500c1509,1510
< msg = "<p>The network is busy, please try again later</p>";
---
> msg = "<p>The network is busy, please try again later</p>" +
> "If this problem persists, contact [EMAIL PROTECTED]";
1519,1523c1529,1535
< "The request followed a Date Based Redirect, this is usually " +
< "used to provide an updateable freesite. It appears that the " +
< "current freesite is not available. You could try retrieving " +
< "an <A HREF=\"" + prevDbrUrl + "\">earlier dated version</A> (<a href=\""+altDbrUrl+"\">better but date-specific link</a>). "+
< "The site updates every " + dr.getIncrement()/(60*60) + " hours.</p><hr>";
---
> "The request followed a Date Based Redirect, this is usually " +
> "used to provide an updateable freesite. It appears that the " +
> "current freesite is not available. <br>" +
> "<a href=\""+altDbrUrl+"\">Click Here</a><br>" +
> "If the above fails you can get an " +
> "<A HREF=\"" + prevDbrUrl + "\">earlier dated version</A> <br><br>"+
> "The site updates every " + dr.getIncrement()/(60*60) + " hours.</p><hr>";
1524a1537
> //Is there a way to auto redirect to altDbrUrl without recursion?
1532,1533c1545,1546
< "Hops-To-Live nodes without finding the data. It may simply not be " +
< "there, but you can try again, possibly with a higher Hops-To-Live " +
---
> +requestHtl+" nodes without finding the data. It may simply not be " +
> "there, but you can try again, with a higher Hops-To-Live " +
