* Fixed the frameset force reload logic. Now it does the whole frameset

  without displaying an error in the main frame.

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index bc211bec2b3b3d6b8c588633116c702e91e8c58c..d204dbe4b045124c27478f31d9bbc71c9913ad23 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,8 @@
 $Log$
+Revision 504.6  2004/02/18 20:08:29  ajc
+* Fixed the frameset force reload logic.  Now it does the whole frameset
+  without displaying an error in the main frame.
+
 Revision 504.5  2004/02/18 19:17:51  ajc
 * Force reload of frameset if someone tries to escape it.  Not perfect
   but it mostly works at this poing.
@@ -1654,4 +1658,3 @@ 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 037d3c1a85a6d2bbb3e75b71f378e20baf1efa05..c5b6d85616e38ec0a147eec84eaf38ae8f1c6f0c 100644 (file)
--- a/webcit/context_loop.c
+++ b/webcit/context_loop.c
@@ -335,6 +335,7 @@ void context_loop(int sock)
        if ( (!strcasecmp(buf, "/"))
           || (!strcasecmp(buf, "/static/mainframeset.html"))
           || (!strcasecmp(buf, "/static/robots.txt"))
+          || (!strncasecmp(buf, "/do_welcome", 11))
           || (!strncasecmp(buf, "/page_popup", 11))
           || (!strncasecmp(buf, "/listsub", 8))
           || (!strncasecmp(buf, "/freebusy", 9))

diff --git a/webcit/webcit.c b/webcit/webcit.c
index 5d14735937e1df6a2a9fabe421b5ae0cab5c77a8..a4363adc5fc02cfb1a17264e308555414a639dac 100644 (file)
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -350,7 +350,7 @@ void output_headers(int controlcode)
                        "}\n"
                        "function force_frameset() { \n"
                        " if (top.frames.length == 0) { \n"
-                       "  top.location.replace('/static/mainframeset.html'); \n"
+                       "  top.location.replace('/do_welcome'); \n"
                        " } \n"
                        "} \n"
                        "%s\n"