* Fixed a problem that made WebCit go to the "no cookies" screen instead

  of the logout banner.
* Ford's latest stupid room has a name with more than 64 characters, and
  we still had a 64-byte room name in the march_list struct.  ooooops...

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index ea4689abd4bac57fc5b287edfe75c59521f6add2..e6ffc70e95bcdac6764aa169ee9c7d26591e6974 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,10 @@
 $Log$
+Revision 505.7  2004/02/26 04:08:56  ajc
+* Fixed a problem that made WebCit go to the "no cookies" screen instead
+  of the logout banner.
+* Ford's latest stupid room has a name with more than 64 characters, and
+  we still had a 64-byte room name in the march_list struct.  ooooops...
+
 Revision 505.6  2004/02/26 03:07:26  ajc
 * Put the /favicon.ico --> /static/favicon.ico hack back in.  Why not?
 
@@ -1684,3 +1690,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/context_loop.c b/webcit/context_loop.c
index 5d01bf297ec5ed5bd0d6f359812cc617ebde736e..e6e1bdbdb2238228bcd9a3a429d74dd11c1b1248 100644 (file)
--- a/webcit/context_loop.c
+++ b/webcit/context_loop.c
@@ -315,7 +315,7 @@ void context_loop(int sock)
                strcpy(req->line, "GET /static/robots.txt"
                                "?force_close_session=yes HTTP/1.0");
        }
-       if (!strncasecmp(buf, "/favicon.ico", 12)) {
+       else if (!strncasecmp(buf, "/favicon.ico", 12)) {
                strcpy(req->line, "GET /static/favicon.ico");
        }
 
@@ -338,10 +338,10 @@ void context_loop(int sock)
         * need JavaScript added to force the frameset to reload.
         */
        if ( (!strcasecmp(buf, "/"))
-          || (!strcasecmp(buf, "/static/mainframeset.html"))
-          || (!strcasecmp(buf, "/static/robots.txt"))
+          || (!strncasecmp(buf, "/static/", 8))
           || (!strncasecmp(buf, "/do_welcome", 11))
           || (!strncasecmp(buf, "/do_logout", 10))
+          || (!strncasecmp(buf, "/login", 6))
           || (!strncasecmp(buf, "/page_popup", 11))
           || (!strncasecmp(buf, "/page_user", 10))     /* Sometimes this is wrong */
           || (!strncasecmp(buf, "/listsub", 8))

diff --git a/webcit/static/head.html b/webcit/static/head.html
index 6cbd7cc8d92020fbae174d85d878ed71cc1f99c2..0a8ada22a5e65c19a9c948e2b880058859ccfa53 100644 (file)
--- a/webcit/static/head.html
+++ b/webcit/static/head.html
@@ -8,7 +8,6 @@
        <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
        <META HTTP-EQUIV="Content-Language" CONTENT="en">
        <LINK REL="StyleSheet" HREF="/static/style.css" TYPE="text/css" MEDIA="screen">
-       <LINK REL="shortcut icon" HREF="/static/favicon.ico" TYPE="image/x-icon">
 <?REFRESHTAG>
 </HEAD>
 <?PAGERSCRIPT>

diff --git a/webcit/static/mainframeset.html b/webcit/static/mainframeset.html
index 55ef53bfec6dee5abfd6eb591faa3cc7d38016d7..e07f5dc3bc714ce0b1c981ffadc4333c0e27fe8f 100644 (file)
--- a/webcit/static/mainframeset.html
+++ b/webcit/static/mainframeset.html
@@ -4,7 +4,6 @@
        <TITLE>Citadel</TITLE>
        <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
        <META HTTP-EQUIV="Content-Language" CONTENT="en">
-       <LINK REL="shortcut icon" HREF="/static/favicon.ico" TYPE="image/x-icon">
 </HEAD>
 
 <FRAMESET COLS="80, *" FRAMESPACING="0" BORDER="FALSE" FRAMEBORDER="0">

diff --git a/webcit/webcit.h b/webcit/webcit.h
index b9d261bd093a0cbe61792631d3493aaaadc66ef1..0cb600824ae28e2229e305e1c2a2617a0f2f1acf 100644 (file)
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -114,7 +114,7 @@ struct serv_info {
  */
 struct march {
        struct march *next;
-       char march_name[32];
+       char march_name[128];
        int march_floor;
        int march_order;
 };
@@ -126,7 +126,7 @@ struct march {
 struct roomlisting {
        struct roomlisting *lnext;
        struct roomlisting *rnext;
-       char rlname[64];
+       char rlname[128];
        unsigned rlflags;
        int rlfloor;
        int rlorder;