* Don't display room banner on screens that don't pertain to a particular room

[citadel.git] / webcit / graphics.c

diff --git a/webcit/graphics.c b/webcit/graphics.c
index ed1d687dc7f87d18161023e48f9acce7dc3453a4..d565654f9fc64dbdc17712cfee7bbe20682d921f 100644 (file)
--- a/webcit/graphics.c
+++ b/webcit/graphics.c
@@ -1,17 +1,28 @@
+
+#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];
+       char buf[SIZ];
 
        serv_puts(check_cmd);
        serv_gets(buf);
@@ -19,9 +30,8 @@ void display_graphics_upload(char *description, char *check_cmd, char *uplurl)
                display_error(&buf[4]);
                return;
        }
-       printf("HTTP/1.0 200 OK\n");
-       output_headers(1, "bottom");
-       wprintf("<TABLE WIDTH=100% BORDER=0 BGCOLOR=770000><TR><TD>");
+       output_headers(3);
+       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");
@@ -47,12 +57,12 @@ void display_graphics_upload(char *description, char *check_cmd, char *uplurl)
 
 void do_graphics_upload(char *upl_cmd)
 {
-       char buf[256];
+       char buf[SIZ];
        int bytes_remaining;
        int pos = 0;
        int thisblock;
 
-       if (upload_length == 0) {
+       if (WC->upload_length == 0) {
                display_error("You didn't upload a file.\n");
                return;
        }
@@ -62,7 +72,7 @@ void do_graphics_upload(char *upl_cmd)
                display_error(&buf[4]);
                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);
@@ -74,7 +84,7 @@ void do_graphics_upload(char *upl_cmd)
                        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;
        }
@@ -93,10 +103,9 @@ void select_floor_to_edit_pic(void)
 {
        int a;
 
-       printf("HTTP/1.0 200 OK\n");
-       output_headers(1, "bottom");
+       output_headers(3);
 
-       wprintf("<TABLE WIDTH=100% BORDER=0 BGCOLOR=770000><TR><TD>");
+       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");