* Cleaned up the rcs/cvs Id tags and leading comments at the top of some files

[citadel.git] / webcit / graphics.c

diff --git a/webcit/graphics.c b/webcit/graphics.c
index c2e6cb8ee6e5d7d796efa9b4e1d4d6915d5ffcd6..3f09ef837bc8566825f8f226cf323e04eebed005 100644 (file)
--- a/webcit/graphics.c
+++ b/webcit/graphics.c
@@ -1,108 +1,122 @@
+/*
+ * $Id$
+ *
+ * Handles HTTP upload of graphics files into the system.
+ */
+
+#include <ctype.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
-#include <ctype.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 <time.h>
+#include <stdarg.h>
+#include <pthread.h>
+#include <signal.h>
 #include "webcit.h"
-#include "child.h"
-
 
-void display_graphics_upload(char *description, char *check_cmd, char *uplurl) {
-       char buf[256];
+void display_graphics_upload(char *description, char *check_cmd, char *uplurl)
+{
+       char buf[SIZ];
 
        serv_puts(check_cmd);
        serv_gets(buf);
        if (buf[0] != '2') {
-               display_error(&buf[4]);
+               strcpy(WC->ImportantMessage, &buf[4]);
+               display_main_menu();
                return;
-               }
+       }
+       output_headers(1, 1, 0, 0, 0, 0, 0);
 
-       printf("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");
+       svprintf("BOXTITLE", WCS_STRING, "Set/change your photo");
+       do_template("beginbox");
 
        wprintf("<CENTER>\n");
 
-       wprintf("<FORM ENCTYPE=\"multipart/form-data\" ACTION=\"%s&which_room=%s\" METHOD=\"POST\">\n", uplurl, bstr("which_room"));
-       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></BODY></HTML>\n");
-       wDumpContent();
-       }
-
-void do_graphics_upload(char *upl_cmd) {
-       char buf[256];
+       wprintf("<FORM ENCTYPE=\"multipart/form-data\" ACTION=\"%s\" "
+               "METHOD=\"POST\" NAME=\"graphicsupload\">\n", uplurl);
+
+       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("Please select a file to upload:<br /><br />\n");
+       wprintf("<INPUT TYPE=\"FILE\" NAME=\"filename\" SIZE=\"35\">\n");
+       wprintf("<br /><br />");
+       wprintf("<INPUT TYPE=\"SUBMIT\" NAME=\"sc\" VALUE=\"Upload\">\n");
+       wprintf("&nbsp;");
+       wprintf("<INPUT TYPE=\"RESET\" VALUE=\"Reset Form\">\n");
+       wprintf("&nbsp;");
+       wprintf("<INPUT TYPE=\"SUBMIT\" NAME=\"sc\" VALUE=\"Cancel\">\n");
+       wprintf("</FORM>\n");
+       wprintf("</CENTER>\n");
+       do_template("endbox");
+       wDumpContent(1);
+}
+
+void do_graphics_upload(char *upl_cmd)
+{
+       char buf[SIZ];
        int bytes_remaining;
        int pos = 0;
        int thisblock;
 
-       if (upload_length == 0) {
-               display_error("You didn't upload a file.\n");
+       if (!strcasecmp(bstr("sc"), "Cancel")) {
+               strcpy(WC->ImportantMessage,
+                       "Graphics upload cancelled.");
+               display_main_menu();
                return;
-               }
+       }
 
+       if (WC->upload_length == 0) {
+               strcpy(WC->ImportantMessage,
+                       "You didn't upload a file.");
+               display_main_menu();
+               return;
+       }
        serv_puts(upl_cmd);
        serv_gets(buf);
        if (buf[0] != '2') {
-               display_error(&buf[4]);
+               strcpy(WC->ImportantMessage, &buf[4]);
+               display_main_menu();
                return;
-               }
-
-       bytes_remaining = upload_length;
+       }
+       bytes_remaining = WC->upload_length;
        while (bytes_remaining) {
                thisblock = ((bytes_remaining > 4096) ? 4096 : bytes_remaining);
                serv_printf("WRIT %d", thisblock);
                serv_gets(buf);
                if (buf[0] != '7') {
-                       display_error(&buf[4]);
+                       strcpy(WC->ImportantMessage, &buf[4]);
                        serv_puts("UCLS 0");
                        serv_gets(buf);
+                       display_main_menu();
                        return;
-                       }
+               }
                thisblock = extract_int(&buf[4], 0);
-               serv_write(&upload[pos], thisblock);
+               serv_write(&WC->upload[pos], thisblock);
                pos = pos + thisblock;
                bytes_remaining = bytes_remaining - thisblock;
-               }
+       }
 
        serv_puts("UCLS 1");
        serv_gets(buf);
        if (buf[0] != 'x') {
                display_success(&buf[4]);
                return;
-               }
-       }
-
-
-
-void select_floor_to_edit_pic(void) {
-       int a;
-
-       printf("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");
-               }
-       
-       wprintf("</BODY></HTML>\n");
-       wDumpContent();
        }
+}