[freenet-cvs] r8796 - trunk/freenet/src/freenet/clients/http

[nextg...@freenetproject.org]

Author: nextgens
Date: 2006-05-20 06:49:59 +0000 (Sat, 20 May 2006)
New Revision: 8796

Modified:
   trunk/freenet/src/freenet/clients/http/FproxyToadlet.java
   trunk/freenet/src/freenet/clients/http/PageMaker.java
   trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java
Log:
I'm not sure whatever my back() thingy is working with referers or not...
Let's put it into PageMaker so that if it needs fixing, it's easier to find it.

Modified: trunk/freenet/src/freenet/clients/http/FproxyToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/FproxyToadlet.java   2006-05-20 
06:40:55 UTC (rev 8795)
+++ trunk/freenet/src/freenet/clients/http/FproxyToadlet.java   2006-05-20 
06:49:59 UTC (rev 8796)
@@ -133,12 +133,7 @@
                        buf.append("<div class=\"infobox-content\">\n");

                        buf.append("Expected a freenet key, but got 
"+HTMLEncoder.encode(ks)+"\n");             
-                       // My browser sends it with one 'r'
-                       String ref = (String)ctx.getHeaders().get("Referer");
-                       if(ref!=null) 
-                               buf.append("<br><a href=\""+ref+"\" 
title=\"Back\" Back</a>\n");
-                       else
-                               buf.append("<br><a href=\"javascript:back()\" 
title=\"Back\">Back</a>\n");
+                       ctx.getPageMaker().makeBackLink(buf,ctx);
                        buf.append("<br><a href=\"/\" title=\"Node 
Homepage\">Homepage</a>\n");
                        buf.append("</div>\n");
                        buf.append("</div>\n");
@@ -292,12 +287,7 @@
                                buf.append("<div class=\"infobox-content\">\n");

                                buf.append("Error : 
"+HTMLEncoder.encode(msg)+extra+"\n");              
-                               // My browser sends it with one 'r'
-                               String ref = 
(String)ctx.getHeaders().get("Referer");
-                               if(ref!=null) 
-                                       buf.append("<br><a href=\""+ref+"\" 
title=\"Back\" Back</a>\n");
-                               else
-                                       buf.append("<br><a 
href=\"javascript:back()\" title=\"Back\">Back</a>\n");
+                               ctx.getPageMaker().makeBackLink(buf,ctx);
                                buf.append("<br><a href=\"/\" title=\"Node 
Homepage\">Homepage</a>\n");
                                buf.append("</div>\n");
                                buf.append("</div>\n");

Modified: trunk/freenet/src/freenet/clients/http/PageMaker.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/PageMaker.java       2006-05-20 
06:40:55 UTC (rev 8795)
+++ trunk/freenet/src/freenet/clients/http/PageMaker.java       2006-05-20 
06:49:59 UTC (rev 8796)
@@ -33,6 +33,15 @@
                }
        }

+       public void makeBackLink(StringBuffer buf, ToadletContext ctx){
+               // My browser sends it with one 'r'
+               String ref = (String)ctx.getHeaders().get("Referer");
+               if(ref!=null) 
+                       buf.append("<br><a href=\""+ref+"\" title=\"Back\" 
Back</a>\n");
+               else
+                       buf.append("<br><a href=\"javascript:back()\" 
title=\"Back\">Back</a>\n");
+       }
+       
        public void makeTopHead(StringBuffer buf) {
                buf.append("<!DOCTYPE\n"
                                + "     html PUBLIC \"-//W3C//DTD XHTML 
1.1//EN\">\n"

Modified: trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java  2006-05-20 
06:40:55 UTC (rev 8795)
+++ trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java  2006-05-20 
06:49:59 UTC (rev 8796)
@@ -198,12 +198,7 @@
                                        }
                                }

-                               // My browser sends it with one 'r'
-                               String ref = 
(String)ctx.getHeaders().get("Referer");
-                               if(ref!=null) 
-                                       buf.append("<br><a href=\""+ref+"\" 
title=\"Back\" Back</a>\n");
-                               else
-                                       buf.append("<br><a 
href=\"javascript:back()\" title=\"Back\">Back</a>\n");
+                               ctx.getPageMaker().makeBackLink(buf,ctx);
                                buf.append("<br><a href=\"/\" title=\"Node 
Homepage\">Homepage</a>\n");
                                buf.append("</div>\n");
                                buf.append("</div>\n");