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

[t...@freenetproject.org]

Author: toad
Date: 2008-01-18 15:19:13 +0000 (Fri, 18 Jan 2008)
New Revision: 17145

Modified:
   trunk/freenet/src/freenet/clients/http/QueueToadlet.java
Log:
Don't offer to return to the queue page

Modified: trunk/freenet/src/freenet/clients/http/QueueToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/QueueToadlet.java    2008-01-18 
15:13:48 UTC (rev 17144)
+++ trunk/freenet/src/freenet/clients/http/QueueToadlet.java    2008-01-18 
15:19:13 UTC (rev 17145)
@@ -75,7 +75,7 @@
        public void handlePost(URI uri, HTTPRequest request, ToadletContext 
ctx) throws ToadletContextClosedException, IOException, RedirectException {

                if(!core.hasLoadedQueue()) {
-                       
writeError(L10n.getString("QueueToadlet.notLoadedYetTitle"), 
L10n.getString("QueueToadlet.notLoadedYet"), ctx);
+                       
writeError(L10n.getString("QueueToadlet.notLoadedYetTitle"), 
L10n.getString("QueueToadlet.notLoadedYet"), ctx, false);
                        return;
                }

@@ -373,6 +373,10 @@
        }

        private void writeError(String header, String message, ToadletContext 
context) throws ToadletContextClosedException, IOException {
+               writeError(header, message, context, true);
+       }
+       
+       private void writeError(String header, String message, ToadletContext 
context, boolean returnToQueuePage) throws ToadletContextClosedException, 
IOException {
                PageMaker pageMaker = context.getPageMaker();
                HTMLNode pageNode = pageMaker.getPageNode(header, context);
                HTMLNode contentNode = pageMaker.getContentNode(pageNode);
@@ -381,7 +385,8 @@
                HTMLNode infobox = 
contentNode.addChild(pageMaker.getInfobox("infobox-error", header));
                HTMLNode infoboxContent = pageMaker.getContentNode(infobox);
                infoboxContent.addChild("#", message);
-               infoboxContent.addChild("div").addChildren(new HTMLNode[] { new 
HTMLNode("#", "Return to "), new HTMLNode("a", "href", "/queue/", "queue 
page"), new HTMLNode("#", ".") });
+               if(returnToQueuePage)
+                       infoboxContent.addChild("div").addChildren(new 
HTMLNode[] { new HTMLNode("#", "Return to "), new HTMLNode("a", "href", 
"/queue/", "queue page"), new HTMLNode("#", ".") });
                writeHTMLReply(context, 400, "Bad request", 
pageNode.generate());
        }

@@ -390,12 +395,12 @@

                // We ensure that we have a FCP server running
                if(!fcp.enabled){
-                       writeError(L10n.getString("QueueToadlet.fcpIsMissing"), 
L10n.getString("QueueToadlet.pleaseEnableFCP"), ctx);
+                       writeError(L10n.getString("QueueToadlet.fcpIsMissing"), 
L10n.getString("QueueToadlet.pleaseEnableFCP"), ctx, false);
                        return;
                }

                if(!core.hasLoadedQueue()) {
-                       
writeError(L10n.getString("QueueToadlet.notLoadedYetTitle"), 
L10n.getString("QueueToadlet.notLoadedYet"), ctx);
+                       
writeError(L10n.getString("QueueToadlet.notLoadedYetTitle"), 
L10n.getString("QueueToadlet.notLoadedYet"), ctx, false);
                        return;
                }