* When no icon is present on the server for a room, display the default

[citadel.git] / webcit / graphics.c

diff --git a/webcit/graphics.c b/webcit/graphics.c
index 9922e1dbf0e796aedc394d642321a8d1693c5805..7bf365ab8f4d4961bc4046f3a777e1e93ddc7183 100644 (file)
--- a/webcit/graphics.c
+++ b/webcit/graphics.c
@@ -1,3 +1,8 @@
+/*
+ * $Id$
+ *
+ * Handles HTTP upload of graphics files into the system.
+ */
 
 #include <ctype.h>
 #include <stdlib.h>
@@ -25,15 +30,24 @@ 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);
+       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\">Image upload</SPAN>"
+               "</TD></TR></TABLE>\n"
+               "</div>\n<div id=\"content\">\n"
+       );
 
-       svprintf("BOXTITLE", WCS_STRING, "Set/change your photo");
-       do_template("beginbox");
+       wprintf("<div id=\"fix_scrollbar_bug\">"
+               "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
 
        wprintf("<CENTER>\n");
 
@@ -46,17 +60,19 @@ void display_graphics_upload(char *description, char *check_cmd, char *uplurl)
 
        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("work).<br /><br />\n");
 
-       wprintf("Please select a file to upload:<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("<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");
+       wprintf("</td></tr></table></div>\n");
        wDumpContent(1);
 }
 
@@ -68,29 +84,35 @@ void do_graphics_upload(char *upl_cmd)
        int thisblock;
 
        if (!strcasecmp(bstr("sc"), "Cancel")) {
+               strcpy(WC->ImportantMessage,
+                       "Graphics upload 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);
@@ -100,7 +122,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;