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

[bo...@freenetproject.org]

Author: bombe
Date: 2006-08-17 20:48:43 +0000 (Thu, 17 Aug 2006)
New Revision: 10179

Modified:
   trunk/freenet/src/freenet/clients/http/FProxyToadlet.java
   trunk/freenet/src/freenet/clients/http/LocalFileInsertToadlet.java
   trunk/freenet/src/freenet/clients/http/QueueToadlet.java
Log:
remove local file insert servlet from navigation
use home directory as default directory

Modified: trunk/freenet/src/freenet/clients/http/FProxyToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/FProxyToadlet.java   2006-08-17 
19:30:16 UTC (rev 10178)
+++ trunk/freenet/src/freenet/clients/http/FProxyToadlet.java   2006-08-17 
20:48:43 UTC (rev 10179)
@@ -376,7 +376,7 @@
                        server.register(queueToadlet, "/queue/", true, "Queue", 
"manage queued requests");

                        LocalFileInsertToadlet localFileInsertToadlet = new 
LocalFileInsertToadlet(core, client);
-                       server.register(localFileInsertToadlet, "/files/", 
true, "Insert Files", "insert files from the local disk");
+                       server.register(localFileInsertToadlet, "/files/", 
true);

                        // Now start the server.
                        server.start();

Modified: trunk/freenet/src/freenet/clients/http/LocalFileInsertToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/LocalFileInsertToadlet.java  
2006-08-17 19:30:16 UTC (rev 10178)
+++ trunk/freenet/src/freenet/clients/http/LocalFileInsertToadlet.java  
2006-08-17 20:48:43 UTC (rev 10179)
@@ -39,7 +39,7 @@
                String path = request.getParam("path");
                if (path.length() == 0) {
                        if (currentPath == null) {
-                               currentPath = new 
File(System.getProperty("user.dir"));
+                               currentPath = new 
File(System.getProperty("user.home"));
                        }
                        writePermanentRedirect(toadletContext, "Found", 
"?path=" + URLEncoder.encode(currentPath.getAbsolutePath()));
                        return;

Modified: trunk/freenet/src/freenet/clients/http/QueueToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/QueueToadlet.java    2006-08-17 
19:30:16 UTC (rev 10178)
+++ trunk/freenet/src/freenet/clients/http/QueueToadlet.java    2006-08-17 
20:48:43 UTC (rev 10179)
@@ -66,6 +66,13 @@
        public void handlePost(URI uri, Bucket data, ToadletContext ctx) throws 
ToadletContextClosedException, IOException, RedirectException {
                HTTPRequest request = new HTTPRequest(uri, data, ctx);
                try {
+                       if (request.getPartAsString("insert-local", 
128).length() > 0) {
+                               MultiValueTable responseHeaders = new 
MultiValueTable();
+                               responseHeaders.put("Location", "/files/");
+                               ctx.sendReplyHeaders(302, "Found", 
responseHeaders, null, 0);
+                               return;
+                       }
+                               
                        if ((data.size() > 1024 * 1024) && 
(request.getPartAsString("insert", 128).length() == 0)) {
                                this.writeReply(ctx, 400, "text/plain", "Too 
big", "Data exceeds 1MB limit");
                                return;
@@ -710,7 +717,8 @@
        private HTMLNode createInsertBox(PageMaker pageMaker) {
                /* the insert file box */
                HTMLNode insertBox = pageMaker.getInfobox("Insert File");
-               HTMLNode insertForm = 
pageMaker.getContentNode(insertBox).addChild("form", new String[] { "action", 
"method", "enctype" }, new String[] { ".", "post", "multipart/form-data" });
+               HTMLNode insertContent = pageMaker.getContentNode(insertBox);
+               HTMLNode insertForm = insertContent.addChild("form", new 
String[] { "action", "method", "enctype" }, new String[] { ".", "post", 
"multipart/form-data" });
                
insertForm.addChild(pageMaker.createFormPasswordInput(core.formPassword));
                insertForm.addChild("#", "Insert as: ");
                insertForm.addChild("input", new String[] { "type", "name", 
"value", "checked" }, new String[] { "radio", "keytype", "chk", "checked" });
@@ -725,6 +733,8 @@
                insertForm.addChild("#", " Compress \u00a0 ");
                insertForm.addChild("input", new String[] { "type", "name", 
"value" }, new String[] { "submit", "insert", "Insert file" });
                insertForm.addChild("#", " \u00a0 ");
+               insertForm.addChild("input", new String[] { "type", "name", 
"value" }, new String[] { "submit", "insert-local", "Insert local file" });
+               insertForm.addChild("#", " \u00a0 ");
                insertForm.addChild("input", new String[] { "type", "name" }, 
new String[] { "reset", "Reset form" });
                return insertBox;
        }