* We don't need no steenking workaround. Problem fixed. MIME parser not

  broken.  Web server was calling it with bad parameters.  All fixed now.
* Slightly tweaked the look of the tabs in the room edit screen.  Still looks
  like crap.

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index ab8cf7caff8652389b876f8313f8368f862a5e56..53f102a33f50f515d72c5bc0b72deeb70310d2b1 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,10 @@
 $Log$
+Revision 410.29  2003/05/16 04:11:29  ajc
+* We don't need no steenking workaround.  Problem fixed.  MIME parser not
+  broken.  Web server was calling it with bad parameters.  All fixed now.
+* Slightly tweaked the look of the tabs in the room edit screen.  Still looks
+  like crap.
+
 Revision 410.28  2003/05/15 04:52:26  ajc
 * Minor workaround in web forms to handle mime parser problem in uploads
 
@@ -1391,3 +1397,4 @@ Sun Dec  6 19:50:55 EST 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
 
 1998-12-03 Nathan Bryant <bryant@cs.usm.maine.edu>
        * webserver.c: warning fix
+

diff --git a/webcit/graphics.c b/webcit/graphics.c
index 90845b5ee0d73e06831d4fb2cc561434b3269d11..7616be44772e8f8aed99547d5a79ef7a8fc56459 100644 (file)
--- a/webcit/graphics.c
+++ b/webcit/graphics.c
@@ -40,8 +40,6 @@ void display_graphics_upload(char *description, char *check_cmd, char *uplurl)
        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");
@@ -55,7 +53,6 @@ void display_graphics_upload(char *description, char *check_cmd, char *uplurl)
        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("</FORM>\n");
        wprintf("<A HREF=\"/display_main_menu\">Cancel</A>\n");
        wprintf("</CENTER>\n");

diff --git a/webcit/roomops.c b/webcit/roomops.c
index 7031fd6da10eb7ed788872013aa52428e268dee1..7d5e1068e59480d27266455ac94fc5af11c8ff70 100644 (file)
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -756,11 +756,11 @@ void display_editroom(void)
 
        /* print the tabbed dialog */
        wprintf("<TABLE border=0 cellspacing=0 cellpadding=0 width=100%%>"
-               "<TR ALIGN=CENTER BGCOLOR=\"#FFFFFF\">"
+               "<TR ALIGN=CENTER>"
                "<TD>&nbsp;</TD>\n");
 
        if (!strcmp(tab, "admin")) {
-               wprintf("<TD BGCOLOR=\"#000077\"><SPAN CLASS=\"tablabel\">");
+               wprintf("<TD BGCOLOR=\"#FFFFFF\"><SPAN CLASS=\"tablabel\">");
        }
        else {
                wprintf("<TD BGCOLOR=\"#AAAAAA\"><A HREF=\"/display_editroom&tab=admin\">");
@@ -776,7 +776,7 @@ void display_editroom(void)
        wprintf("<TD>&nbsp;</TD>\n");
 
        if (!strcmp(tab, "config")) {
-               wprintf("<TD BGCOLOR=\"#000077\"><SPAN CLASS=\"tablabel\">");
+               wprintf("<TD BGCOLOR=\"#FFFFFF\"><SPAN CLASS=\"tablabel\">");
        }
        else {
                wprintf("<TD BGCOLOR=\"#AAAAAA\"><A HREF=\"/display_editroom&tab=config\">");
@@ -792,7 +792,7 @@ void display_editroom(void)
        wprintf("<TD>&nbsp;</TD>\n");
 
        if (!strcmp(tab, "sharing")) {
-               wprintf("<TD BGCOLOR=\"#000077\"><SPAN CLASS=\"tablabel\">");
+               wprintf("<TD BGCOLOR=\"#FFFFFF\"><SPAN CLASS=\"tablabel\">");
        }
        else {
                wprintf("<TD BGCOLOR=\"#AAAAAA\"><A HREF=\"/display_editroom&tab=sharing\">");
@@ -808,7 +808,7 @@ void display_editroom(void)
        wprintf("<TD>&nbsp;</TD>\n");
 
        if (!strcmp(tab, "listserv")) {
-               wprintf("<TD BGCOLOR=\"#000077\"><SPAN CLASS=\"tablabel\">");
+               wprintf("<TD BGCOLOR=\"#FFFFFF\"><SPAN CLASS=\"tablabel\">");
        }
        else {
                wprintf("<TD BGCOLOR=\"#AAAAAA\"><A HREF=\"/display_editroom&tab=listserv\">");

diff --git a/webcit/static/style.css b/webcit/static/style.css
index 6afbe87d68bfabc872b10b05b4efa178e04cdc15..34aa54bfb8becafaa76e3f3d5c4858e3fa1a45f0 100644 (file)
--- a/webcit/static/style.css
+++ b/webcit/static/style.css
@@ -53,7 +53,7 @@ a:active {
        font-family: Bitstream Vera Sans,Arial,Helvetica,sans-serif;
        font-size: 10pt;
        font-style: bold;
-       color: #FFFFEE;
+       color: #000000;
 }
 
 .boxlabel {

diff --git a/webcit/webcit.c b/webcit/webcit.c
index 3b1c058af9d1930d52df5a63099567d2a615e8c0..58f4f5e6304e7f58b6ec314d3f42ee3fc5e0c36c 100644 (file)
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -821,7 +821,7 @@ void session_loop(struct httprequest *req)
                              "application/x-www-form-urlencoded", 33)) {
                        addurls(&content[body_start]);
                } else if (!strncasecmp(ContentType, "multipart", 9)) {
-                       content_end = content + ContentLength;
+                       content_end = content + ContentLength + body_start;
                        lprintf(9, "Calling MIME parser\n");
                        mime_parser(content, content_end, *upload_handler,
                                        NULL, NULL, NULL, 0);