* fix file upload

* add file delete

diff --git a/webcit/downloads.c b/webcit/downloads.c
index 24276dc980c60cdd69acddb7aea051e0d355b767..65ea69bb4040423f7935464645f23a906a9a29c6 100644 (file)
--- a/webcit/downloads.c
+++ b/webcit/downloads.c
@@ -278,6 +278,27 @@ void download_file(void)
 
 
 
+void delete_file(void)
+{
+       StrBuf *Buf;
+       char buf[256];
+       
+       safestrncpy(buf, bstr("file"), sizeof buf);
+       unescape_input(buf);
+       serv_printf("DELF %s", buf);
+       Buf = NewStrBuf();
+       StrBuf_ServGetln(Buf);
+       GetServerStatus(Buf, NULL);
+       StrBufCutLeft(Buf, 4);
+       strcpy(WC->ImportantMessage, ChrPtr(Buf));
+       do_template("files", CTX_NONE);
+       output_headers(0, 0, 0, 0, 0, 0);
+       end_burst();
+       FreeStrBuf(&Buf);
+}
+
+
+
 void upload_file(void)
 {
        const char *MimeType;
@@ -293,6 +314,8 @@ void upload_file(void)
        {
                strcpy(WCC->ImportantMessage, &buf[4]);
                do_template("files", NULL);
+               output_headers(0, 0, 0, 0, 0, 0);
+               end_burst();
                return;
        }
 
@@ -317,6 +340,8 @@ void upload_file(void)
        serv_getln(buf, sizeof buf);
        strcpy(WCC->ImportantMessage, &buf[4]);
        do_template("files", CTX_NONE);
+       output_headers(0, 0, 0, 0, 0, 0);
+       end_burst();
 }
 
 
@@ -414,5 +439,6 @@ InitModule_DOWNLOAD
        WebcitAddUrlHandler(HKEY("image"), output_image, 0);
        WebcitAddUrlHandler(HKEY("display_mime_icon"), display_mime_icon , 0);
        WebcitAddUrlHandler(HKEY("download_file"), download_file, NEED_URL);
+       WebcitAddUrlHandler(HKEY("delete_file"), delete_file, NEED_URL);
        WebcitAddUrlHandler(HKEY("upload_file"), upload_file, 0);
 }

diff --git a/webcit/static/t/section_files_onefile.html b/webcit/static/t/section_files_onefile.html
index 3beb8d4dd253da990b0c6673b87554c2443e23cc..545ef00a97372af00599d028e5587b49e25a2aec 100644 (file)
--- a/webcit/static/t/section_files_onefile.html
+++ b/webcit/static/t/section_files_onefile.html
@@ -11,6 +11,7 @@
 <td><?FILE:SIZE></td>
 <td><?FILE:MIMETYPE></td>
 <td><?FILE:COMMENT("X")></td>
+<??("COND:AIDE", 4)><td><a href="delete_file?file=<?FILE:NAME("U")>"><img src="static/delete.gif" alt="<?_("Delete File")>"></a></td><??("X", 4)>
 </tr>
 
 <?!("COND:ITERATE:LASTN", 2)>