* we have now several bstrs:

[citadel.git] / webcit / graphics.c

diff --git a/webcit/graphics.c b/webcit/graphics.c
index 3e8ebc61759aad0858036b71fff771e80cc8d341..e9c0d8c3410067c6a24f7753128278372b383579 100644 (file)
--- a/webcit/graphics.c
+++ b/webcit/graphics.c
@@ -1,87 +1,104 @@
+/*
+ * $Id$
+ *
+ * Handles HTTP upload of graphics files into the system.
+ * \ingroup WebcitHttpServer
+ */
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <limits.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
 #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[256];
+       char buf[SIZ];
 
-       serv_puts(check_cmd);
-       serv_gets(buf);
+
+       snprintf(buf, SIZ, "UIMG 0||%s", filename);
+       serv_puts(buf);
+       serv_getln(buf, sizeof buf);
        if (buf[0] != '2') {
-               display_error(&buf[4]);
+               strcpy(WC->ImportantMessage, &buf[4]);
+               display_main_menu();
                return;
        }
-       wprintf("HTTP/1.0 200 OK\n");
-       output_headers(1);
-       wprintf("<TABLE WIDTH=100% BORDER=0 BGCOLOR=770000><TR><TD>");
-       wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
-       wprintf("<B>Set/change %s</B>\n", description);
-       wprintf("</FONT></TD></TR></TABLE>\n");
-
-       wprintf("<CENTER>\n");
-
-       wprintf("<FORM ENCTYPE=\"multipart/form-data\" ACTION=\"%s&which_room=%s\" METHOD=\"POST\">\n", uplurl, bstr("which_room"));
-
-       wprintf("You can upload any image directly from your computer,\n");
-       wprintf("as long as it is in GIF format (JPEG, PNG, etc. won't\n");
-       wprintf("work).<BR><BR>\n");
-
-       wprintf("Please select a file to upload:<BR>\n");
-       wprintf("<INPUT TYPE=\"FILE\" NAME=\"filename\" SIZE=\"35\">\n");
-       wprintf("<BR>");
-       wprintf("<INPUT TYPE=\"SUBMIT\" VALUE=\"Upload\">\n");
-       wprintf("<INPUT TYPE=\"RESET\" VALUE=\"Reset Form\">\n");
-       wprintf("</FORM>\n");
-       wprintf("<A HREF=\"/display_main_menu\">Cancel</A>\n");
-       wprintf("</CENTER>\n");
+       output_headers(1, 1, 0, 0, 0, 0);
+
+       output_headers(1, 1, 1, 0, 0, 0);
+
+       svprintf("BOXTITLE", WCS_STRING, _("Image upload"));
+       do_template("beginbox");
+
+       wprintf("<form enctype=\"multipart/form-data\" action=\"%s\" "
+               "method=\"post\" name=\"graphicsupload\">\n", uplurl);
+
+       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+       wprintf("<input type=\"hidden\" name=\"which_room\" value=\"");
+       urlescputs(bstr("which_room"));
+       wprintf("\">\n");
+
+       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;");
+       wprintf("<input type=\"reset\" value=\"%s\">\n", _("Reset form"));
+       wprintf("&nbsp;");
+       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)
 {
-       char buf[256];
+       const char *MimeType;
+       char buf[SIZ];
        int bytes_remaining;
        int pos = 0;
        int thisblock;
+       bytes_remaining = WC->upload_length;
+
+       if (havebstr("cancel_button")) {
+               strcpy(WC->ImportantMessage,
+                       _("Graphics upload has been cancelled."));
+               display_main_menu();
+               return;
+       }
 
        if (WC->upload_length == 0) {
-               display_error("You didn't upload a file.\n");
+               strcpy(WC->ImportantMessage,
+                       _("You didn't upload a file."));
+               display_main_menu();
                return;
        }
-       serv_puts(upl_cmd);
-       serv_gets(buf);
+       
+       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') {
-               display_error(&buf[4]);
+               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);
-               serv_gets(buf);
+               serv_getln(buf, sizeof buf);
                if (buf[0] != '7') {
-                       display_error(&buf[4]);
+                       strcpy(WC->ImportantMessage, &buf[4]);
                        serv_puts("UCLS 0");
-                       serv_gets(buf);
+                       serv_getln(buf, sizeof buf);
+                       display_main_menu();
                        return;
                }
                thisblock = extract_int(&buf[4], 0);
@@ -91,33 +108,9 @@ void do_graphics_upload(char *upl_cmd)
        }
 
        serv_puts("UCLS 1");
-       serv_gets(buf);
+       serv_getln(buf, sizeof buf);
        if (buf[0] != 'x') {
                display_success(&buf[4]);
                return;
        }
 }
-
-
-
-void select_floor_to_edit_pic(void)
-{
-       int a;
-
-       wprintf("HTTP/1.0 200 OK\n");
-       output_headers(1);
-
-       wprintf("<TABLE WIDTH=100% BORDER=0 BGCOLOR=770000><TR><TD>");
-       wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
-       wprintf("<B>Select floor to edit label graphic</B>\n");
-       wprintf("</FONT></TD></TR></TABLE>\n");
-
-       load_floorlist();
-       for (a = 0; a < 128; ++a)
-               if (strlen(floorlist[a]) > 0) {
-                       wprintf("<A HREF=\"/display_editfloorpic&which_floor=%d\">", a);
-                       escputs(floorlist[a]);
-                       wprintf("</A>\n");
-               }
-       wDumpContent(1);
-}