* added gcc printf format checking to wprintf

[citadel.git] / webcit / graphics.c

diff --git a/webcit/graphics.c b/webcit/graphics.c
index 5a0fa4e55b2b25694e0a9565c04ce0da3fe323e9..6949e09fd81b8f0175f5b59c0554f0561acbf351 100644 (file)
--- a/webcit/graphics.c
+++ b/webcit/graphics.c
@@ -2,73 +2,71 @@
  * $Id$
  *
  * Handles HTTP upload of graphics files into the system.
+ * \ingroup WebcitHttpServer
  */
 
 #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]);
                display_main_menu();
                return;
        }
-       output_headers(1, 1, 0, 0, 0, 0, 0);
-
-       output_headers(1, 1, 2, 0, 0, 0, 0);
-       wprintf("<div id=\"banner\">\n"
-               "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
-               "<SPAN CLASS=\"titlebar\">");
-       wprintf(_("Image upload"));
-       wprintf("</SPAN>"
-               "</TD></TR></TABLE>\n"
-               "</div>\n<div id=\"content\">\n"
-       );
+       output_headers(1, 1, 0, 0, 0, 0);
 
-       wprintf("<div id=\"fix_scrollbar_bug\">"
-               "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
+       output_headers(1, 1, 1, 0, 0, 0);
 
-       wprintf("<CENTER>\n");
+       svput("BOXTITLE", WCS_STRING, _("Image upload"));
+       do_template("beginbox");
 
-       wprintf("<FORM ENCTYPE=\"multipart/form-data\" ACTION=\"%s\" "
-               "METHOD=\"POST\" NAME=\"graphicsupload\">\n", uplurl);
+       wprintf("<form enctype=\"multipart/form-data\" action=\"%s\" "
+               "method=\"post\" name=\"graphicsupload\">\n", uplurl);
 
-       wprintf("<INPUT TYPE=\"hidden\" NAME=\"which_room\" VALUE=\"");
+       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+       wprintf("<input type=\"hidden\" name=\"which_room\" value=\"");
        urlescputs(bstr("which_room"));
        wprintf("\">\n");
 
-       wprintf(_("You can upload any image directly from your computer, "
-               "as long as it is in GIF format (JPEG, PNG, etc. won't "
-               "work)."));
+       wprintf(_("You can upload an image directly from your computer"));
        wprintf("<br /><br />\n");
 
        wprintf(_("Please select a file to upload:"));
-       wprintf("<br /><br />\n");
-       wprintf("<INPUT TYPE=\"FILE\" NAME=\"filename\" SIZE=\"35\">\n");
-       wprintf("<br /><br />");
-       wprintf("<INPUT TYPE=\"SUBMIT\" NAME=\"upload_button\" VALUE=\"%s\">\n", _("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;");
-       wprintf("<INPUT TYPE=\"RESET\" VALUE=\"%s\">\n", _("Reset form"));
+       wprintf("<input type=\"reset\" value=\"%s\">\n", _("Reset form"));
        wprintf("&nbsp;");
-       wprintf("<INPUT TYPE=\"SUBMIT\" NAME=\"cancel_button\" VALUE=\"%s\">\n", _("Cancel"));
-       wprintf("</FORM>\n");
-       wprintf("</CENTER>\n");
-       wprintf("</td></tr></table></div>\n");
+       wprintf("<input type=\"submit\" name=\"cancel_button\" value=\"%s\">\n", _("Cancel"));
+       wprintf("</div>\n");
+       wprintf("</form>\n");
+
+       do_template("endbox");
+
        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 (strlen(bstr("cancel_button")) > 0) {
+       if (havebstr("cancel_button")) {
                strcpy(WC->ImportantMessage,
                        _("Graphics upload has been cancelled."));
                display_main_menu();
@@ -81,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);