* calendar_view.c event.c floors.c graphics.c html2html.c iconbar.c: i18n

[citadel.git] / webcit / graphics.c

diff --git a/webcit/graphics.c b/webcit/graphics.c
index 90845b5ee0d73e06831d4fb2cc561434b3269d11..5a0fa4e55b2b25694e0a9565c04ce0da3fe323e9 100644 (file)
--- a/webcit/graphics.c
+++ b/webcit/graphics.c
@@ -1,23 +1,9 @@
+/*
+ * $Id$
+ *
+ * Handles HTTP upload of graphics files into the system.
+ */
 
-#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)
@@ -25,40 +11,53 @@ void display_graphics_upload(char *description, char *check_cmd, char *uplurl)
        char buf[SIZ];
 
        serv_puts(check_cmd);
-       serv_gets(buf);
+       serv_getln(buf, sizeof buf);
        if (buf[0] != '2') {
-               display_error(&buf[4]);
+               strcpy(WC->ImportantMessage, &buf[4]);
+               display_main_menu();
                return;
        }
-       output_headers(3);
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#770000\"><TR><TD>");
-       wprintf("<SPAN CLASS=\"titlebar\">Set/change %s</SPAN>\n", description);
-       wprintf("</TD></TR></TABLE>\n");
+       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"
+       );
+
+       wprintf("<div id=\"fix_scrollbar_bug\">"
+               "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
 
        wprintf("<CENTER>\n");
 
        wprintf("<FORM ENCTYPE=\"multipart/form-data\" ACTION=\"%s\" "
                "METHOD=\"POST\" NAME=\"graphicsupload\">\n", uplurl);
 
-       wprintf("<INPUT TYPE=\"hidden\" NAME=\"foo\" VALUE=\"bar\">\n");
-
        wprintf("<INPUT TYPE=\"hidden\" NAME=\"which_room\" VALUE=\"");
        urlescputs(bstr("which_room"));
        wprintf("\">\n");
 
-       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(_("You can upload any image directly from your computer, "
+               "as long as it is in GIF format (JPEG, PNG, etc. won't "
+               "work)."));
+       wprintf("<br /><br />\n");
 
-       wprintf("Please select a file to upload:<BR>\n");
+       wprintf(_("Please select a file to upload:"));
+       wprintf("<br /><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("<INPUT TYPE=\"hidden\" NAME=\"baz\" VALUE=\"eek\">\n");
+       wprintf("<br /><br />");
+       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("</FORM>\n");
-       wprintf("<A HREF=\"/display_main_menu\">Cancel</A>\n");
        wprintf("</CENTER>\n");
+       wprintf("</td></tr></table></div>\n");
        wDumpContent(1);
 }
 
@@ -69,25 +68,36 @@ void do_graphics_upload(char *upl_cmd)
        int pos = 0;
        int thisblock;
 
+       if (strlen(bstr("cancel_button")) > 0) {
+               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);
+       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);
@@ -97,7 +107,7 @@ 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;