[freenet-cvs] r15651 - in trunk/freenet: . src/freenet/clients/http

[bo...@freenetproject.org]

Author: bombe
Date: 2007-10-30 19:49:12 +0000 (Tue, 30 Oct 2007)
New Revision: 15651

Modified:
   trunk/freenet/
   trunk/freenet/src/freenet/clients/http/BookmarkEditorToadlet.java
Log:
 r10337 at natrium:  bombe | 2007-10-30 20:41:36 +0100
 fix browser timeouts



Property changes on: trunk/freenet
___________________________________________________________________
Name: svk:merge
   - 6a5e1407-ac3d-0410-81af-9028a69beae8:/branch/freenet-bookmark-editor:10336
   + 6a5e1407-ac3d-0410-81af-9028a69beae8:/branch/freenet-bookmark-editor:10337

Modified: trunk/freenet/src/freenet/clients/http/BookmarkEditorToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/BookmarkEditorToadlet.java   
2007-10-30 19:48:15 UTC (rev 15650)
+++ trunk/freenet/src/freenet/clients/http/BookmarkEditorToadlet.java   
2007-10-30 19:49:12 UTC (rev 15651)
@@ -253,8 +253,10 @@

                String passwd = req.getPartAsString("formPassword", 32);
                boolean noPassword = (passwd == null) || 
!passwd.equals(core.formPassword);
-               if(noPassword) 
+               if(noPassword) {
+                       writePermanentRedirect(ctx, "Invalid", "");
                        return;
+               }


                String bookmarkPath = req.getPartAsString("bookmark", 
MAX_BOOKMARK_PATH_LENGTH);
@@ -268,6 +270,7 @@
                        if(bookmark == null) {
                                HTMLNode errorBox = 
content.addChild(ctx.getPageMaker().getInfobox("infobox-error", 
L10n.getString("BookmarkEditorToadlet.error")));
                                errorBox.addChild("#", 
L10n.getString("BookmarkEditorToadlet.bookmarkDoesNotExist", new String[] { 
"bookmark" } , new String[] { bookmarkPath }));
+                               this.writeHTMLReply(ctx, 200, "OK", 
pageNode.generate());
                                return;
                        }