* *** HUGE CHANGES *** *** WARNING: NOT FULLY FUNCTIONAL ***

[citadel.git] / webcit / graphics.c

diff --git a/webcit/graphics.c b/webcit/graphics.c
index 9922e1dbf0e796aedc394d642321a8d1693c5805..964a05926ede2087c2fa82e7c8da3a4c67c5de30 100644 (file)
--- a/webcit/graphics.c
+++ b/webcit/graphics.c
@@ -27,10 +27,11 @@ void display_graphics_upload(char *description, char *check_cmd, char *uplurl)
        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(3);
+       output_headers(1, 1, 0, 0, 0, 0, 0);
 
        svprintf("BOXTITLE", WCS_STRING, "Set/change your photo");
        do_template("beginbox");
@@ -46,13 +47,15 @@ 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");
@@ -68,18 +71,23 @@ 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);
        if (buf[0] != '2') {
-               display_error(&buf[4]);
+               strcpy(WC->ImportantMessage, &buf[4]);
+               display_main_menu();
                return;
        }
        bytes_remaining = WC->upload_length;
@@ -88,9 +96,10 @@ void do_graphics_upload(char *upl_cmd)
                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);