* migrated SUBST stuff to hash

[citadel.git] / webcit / graphics.c

diff --git a/webcit/graphics.c b/webcit/graphics.c
index 3179d580f01bb33c789f2e3c7628b40f868ec4d7..a1d50b9e44e790369b5cdaef5918cf80c7d078d0 100644 (file)
--- a/webcit/graphics.c
+++ b/webcit/graphics.c
@@ -7,11 +7,13 @@
 
 #include "webcit.h"
 
-void display_graphics_upload(char *description, char *check_cmd, char *uplurl)
+void display_graphics_upload(char *description, char *filename, char *uplurl)
 {
        char buf[SIZ];
 
-       serv_puts(check_cmd);
+
+       snprintf(buf, SIZ, "UIMG 0||%s", filename);
+       serv_puts(buf);
        serv_getln(buf, sizeof buf);
        if (buf[0] != '2') {
                strcpy(WC->ImportantMessage, &buf[4]);
@@ -22,7 +24,7 @@ void display_graphics_upload(char *description, char *check_cmd, char *uplurl)
 
        output_headers(1, 1, 1, 0, 0, 0);
 
-       svprintf("BOXTITLE", WCS_STRING, _("Image upload"));
+       svput("BOXTITLE", WCS_STRING, _("Image upload"));
        do_template("beginbox");
 
        wprintf("<form enctype=\"multipart/form-data\" action=\"%s\" "
@@ -33,12 +35,14 @@ void display_graphics_upload(char *description, char *check_cmd, char *uplurl)
        urlescputs(bstr("which_room"));
        wprintf("\">\n");
 
-       wprintf(_("You can upload any image directly from your computer, "
-                 "as long as it is in GIF, JPEG or PNG"));
+       wprintf(_("You can upload an image directly from your computer"));
        wprintf("<br /><br />\n");
 
        wprintf(_("Please select a file to upload:"));
        wprintf("<input type=\"file\" name=\"filename\" size=\"35\">\n");
+
+       wprintf("<div class=\"uploadpic\"><img src=\"image&name=%s\"></div>\n", filename);
+
        wprintf("<div class=\"buttons\">");
        wprintf("<input type=\"submit\" name=\"upload_button\" value=\"%s\">\n", _("Upload"));
        wprintf("&nbsp;");
@@ -53,14 +57,16 @@ void display_graphics_upload(char *description, char *check_cmd, char *uplurl)
        wDumpContent(1);
 }
 
-void do_graphics_upload(char *upl_cmd)
+void do_graphics_upload(char *filename)
 {
+       const char *MimeType;
        char buf[SIZ];
        int bytes_remaining;
        int pos = 0;
        int thisblock;
+       bytes_remaining = WC->upload_length;
 
-       if (!IsEmptyStr(bstr("cancel_button"))) {
+       if (havebstr("cancel_button")) {
                strcpy(WC->ImportantMessage,
                        _("Graphics upload has been cancelled."));
                display_main_menu();
@@ -73,14 +79,17 @@ void do_graphics_upload(char *upl_cmd)
                display_main_menu();
                return;
        }
-       serv_puts(upl_cmd);
+       
+       MimeType = GuessMimeType(&WC->upload[0], bytes_remaining);
+       snprintf(buf, SIZ, "UIMG 1|%s|%s", MimeType, filename);
+       serv_puts(buf);
+
        serv_getln(buf, sizeof buf);
        if (buf[0] != '2') {
                strcpy(WC->ImportantMessage, &buf[4]);
                display_main_menu();
                return;
        }
-       bytes_remaining = WC->upload_length;
        while (bytes_remaining) {
                thisblock = ((bytes_remaining > 4096) ? 4096 : bytes_remaining);
                serv_printf("WRIT %d", thisblock);