* wDumpContent() is now responsible for </BODY></HTML> most of the

          time (parameter settable) so that the main menu can easily be
          embedded in every page when running in noframes mode
        * noframes mode selection is now carried in the cookie

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 8e8315f7e4faabb4950b835137440f2d918796ac..671181ee090c5e7cac2d07a6804611fd3db75f50 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,3 +1,9 @@
+Fri Jan 29 14:49:49 EST 1999 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
+       * wDumpContent() is now responsible for </BODY></HTML> most of the
+         time (parameter settable) so that the main menu can easily be
+         embedded in every page when running in noframes mode
+       * noframes mode selection is now carried in the cookie
+
 Thu Jan 28 20:30:08 EST 1999 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
        * Made the frames stuff less dependent on the HTML TARGET= directive
          and more dependent on the HTTP Window-target: directive.

diff --git a/webcit/auth.c b/webcit/auth.c
index 7a00800a02e51844601c213e5f60ea520955a193..24fc878f0cfdaaacea1743625aeebe939bebe678 100644 (file)
--- a/webcit/auth.c
+++ b/webcit/auth.c
@@ -83,8 +83,7 @@ void display_login(char *mesg) {
        wprintf("and <i>cookies</i>.\n");
        wprintf("</EM></UL>\n");
 
-       wprintf("</BODY></HTML>\n");
-       wDumpContent();
+       wDumpContent(1);
        }
 
 
@@ -187,8 +186,7 @@ void do_welcome(void) {
                wprintf("<HR>");
                embed_main_menu();
        
-               wprintf("</BODY></HTML>\n");
-               wDumpContent();
+               wDumpContent(1);
                }
 
        else {
@@ -214,9 +212,8 @@ void do_logout(void) {
        if (buf[0]=='1') fmout(NULL);
        else wprintf("Goodbye\n");
 
-       wprintf("<HR><A HREF=\"/\">Log in again</A>\n");
-       wprintf("</CENTER></BODY></HTML>\n");
-       wDumpContent();
+       wprintf("<HR><A HREF=\"/\">Log in again</A></CENTER>\n");
+       wDumpContent(1);
        serv_puts("QUIT");
        exit(0);
        }
@@ -250,8 +247,8 @@ void validate(void) {
        serv_gets(buf);
 
        if (buf[0]!='3') {
-               wprintf("<EM>%s</EM><BR></BODY></HTML>\n", &buf[4]);
-               wDumpContent();
+               wprintf("<EM>%s</EM><BR>\n", &buf[4]);
+               wDumpContent(1);
                return;
                }
 
@@ -288,7 +285,7 @@ void validate(void) {
                        urlesc(user), a, axdefs[a]);
                }
        wprintf("</TR></TABLE><CENTER><BR>\n");
-       wDumpContent();
+       wDumpContent(1);
        }
 
 
@@ -355,8 +352,8 @@ void display_reg(int during_login) {
                }
        wprintf("<INPUT type=\"submit\" NAME=\"action\" VALUE=\"Register\">\n");
        wprintf("<INPUT type=\"submit\" NAME=\"action\" VALUE=\"Cancel\">\n");
-       wprintf("</CENTER></BODY></HTML>\n");
-       wDumpContent();
+       wprintf("</CENTER>\n");
+       wDumpContent(1);
        }
 
 /*
@@ -424,8 +421,8 @@ void display_changepw(void) {
        wprintf("</TABLE>\n");  
        wprintf("<INPUT type=\"submit\" NAME=\"action\" VALUE=\"Change\">\n");
        wprintf("<INPUT type=\"submit\" NAME=\"action\" VALUE=\"Cancel\">\n");
-       wprintf("</CENTER></BODY></HTML>\n");
-       wDumpContent();
+       wprintf("</CENTER>\n");
+       wDumpContent(1);
        }
 
 /*

diff --git a/webcit/child.h b/webcit/child.h
index 59eed7e42a4eb32262e74746f6e23c22750dfd33..b13d3fe878ceedbc225cbd5b5b5e0c8200ce8513 100644 (file)
--- a/webcit/child.h
+++ b/webcit/child.h
@@ -21,7 +21,7 @@ void serv_gets(char *strbuf);
 void serv_puts(char *string);
 void whobbs(void);
 void fmout(FILE *fp);
-void wDumpContent(void);
+void wDumpContent(int);
 void serv_printf(const char *format, ...);
 char *bstr(char *key);
 char *urlesc(char *);

diff --git a/webcit/context_loop.c b/webcit/context_loop.c
index 705b3710c8d8b6e4727a0b5a79c9320de376bde6..cf76bca4695ada1302f905d7b77db1181b31d00e 100644 (file)
--- a/webcit/context_loop.c
+++ b/webcit/context_loop.c
@@ -256,7 +256,7 @@ void *context_loop(int sock) {
        do {
                req_gets(sock, buf, hold);
                if (!strncasecmp(buf, "Cookie: webcit=", 15)) {
-                       cookie_to_stuff(&buf[15], &desired_session, NULL, NULL, NULL);
+                       cookie_to_stuff(&buf[15], &desired_session, NULL, NULL, NULL, NULL);
                        }
                if (!strncasecmp(buf, "Content-length: ", 16)) {
                        ContentLength = atoi(&buf[16]);

diff --git a/webcit/cookie_conversion.c b/webcit/cookie_conversion.c
index 2f11c211b4cc5ae1b64c727af228d98918f80ace..dd082849e195a77d6aec72d8fbd6076e3302769e 100644 (file)
--- a/webcit/cookie_conversion.c
+++ b/webcit/cookie_conversion.c
@@ -11,11 +11,11 @@
 /*
  * Pack all session info into one easy-to-digest cookie.  Healthy and delicious!
  */
-void stuff_to_cookie(char *cookie, int session, char *user, char *pass, char *room) {
+void stuff_to_cookie(char *cookie, int session, char *user, char *pass, char *room, int nofr) {
        char buf[256];
        int i;
 
-       sprintf(buf, "%d|%s|%s|%s", session, user, pass, room);
+       sprintf(buf, "%d|%s|%s|%s|%d", session, user, pass, room, nofr);
        strcpy(cookie, "");
        
        for (i=0; i<strlen(buf); ++i)
@@ -27,7 +27,7 @@ void stuff_to_cookie(char *cookie, int session, char *user, char *pass, char *ro
 /*
  * Extract all that fun stuff out of the cookie.
  */
-void cookie_to_stuff(char *cookie, int *session, char *user, char *pass, char *room) {
+void cookie_to_stuff(char *cookie, int *session, char *user, char *pass, char *room, int *nofr) {
        char buf[256];
        int i;
 
@@ -40,4 +40,5 @@ void cookie_to_stuff(char *cookie, int *session, char *user, char *pass, char *r
        if (user != NULL)       extract(user, buf, 1);
        if (pass != NULL)       extract(pass, buf, 2);
        if (room != NULL)       extract(room, buf, 3);
+       if (nofr != NULL)       *nofr = extract_int(buf, 4);
 }

diff --git a/webcit/graphics.c b/webcit/graphics.c
index 633b09f36766541cc8a335e6457b3fe5bbef3bb1..56422315026942c4996582b480a61cb78c5881c0 100644 (file)
--- a/webcit/graphics.c
+++ b/webcit/graphics.c
@@ -41,8 +41,8 @@ void display_graphics_upload(char *description, char *check_cmd, char *uplurl) {
         wprintf("<INPUT TYPE=\"RESET\" VALUE=\"Reset Form\">\n");
         wprintf("</FORM>\n");
        wprintf("<A HREF=\"/display_main_menu\">Cancel</A>\n");
-       wprintf("</CENTER></BODY></HTML>\n");
-       wDumpContent();
+       wprintf("</CENTER>\n");
+       wDumpContent(1);
        }
 
 void do_graphics_upload(char *upl_cmd) {
@@ -108,6 +108,5 @@ void select_floor_to_edit_pic(void) {
                wprintf("</A>\n");
                }
        
-       wprintf("</BODY></HTML>\n");
-       wDumpContent();
+       wDumpContent(1);
        }

diff --git a/webcit/mainmenu.c b/webcit/mainmenu.c
index 7919b97bbbd932a590c8fc32c0f593a1e96cb264..7ef6322d82d50b507c71064cc6ea7def23004f2b 100644 (file)
--- a/webcit/mainmenu.c
+++ b/webcit/mainmenu.c
@@ -203,8 +203,7 @@ void display_main_menu(void) {
        printf("HTTP/1.0 200 OK\n");
        output_headers(1, "bottom");
        embed_main_menu();
-       wprintf("</BODY></HTML>\n");
-       wDumpContent();
+       wDumpContent(1);
        }
 
 
@@ -213,8 +212,7 @@ void display_advanced_menu(void) {
        output_headers(1, "bottom");
        embed_advanced_menu();
        embed_main_menu();
-       wprintf("</BODY></HTML>\n");
-       wDumpContent();
+       wDumpContent(1);
        }
 
 
@@ -247,8 +245,7 @@ void display_generic(void) {
        wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\"><BR>\n");
 
        wprintf("</FORM></CENTER>\n");
-       wprintf("</BODY></HTML>\n");
-       wDumpContent();
+       wDumpContent(1);
        }
 
 void do_generic(void) {
@@ -313,6 +310,5 @@ void do_generic(void) {
        wprintf("<HR>");
        wprintf("<A HREF=\"/display_generic\">Enter another command</A><BR>\n");
        wprintf("<A HREF=\"/display_advanced\">Return to menu</A>\n");
-       wprintf("</BODY></HTML>\n");
-       wDumpContent();
+       wDumpContent(1);
        }

diff --git a/webcit/messages.c b/webcit/messages.c
index ae57496ba05c74e4e0443c13d6fefd3d0635be39..07ebc2be4565a5ce6143ae1d43d10a6ba1db884c 100644 (file)
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -249,8 +249,7 @@ void readloop(char *oper) {
                read_message(msgarr[a], oper);
                }
 
-DONE:  wprintf("</BODY></HTML>\n");
-       wDumpContent();
+DONE:  wDumpContent(1);
        }
 
 
@@ -284,8 +283,7 @@ void post_message(void) {
                        }
                }
 
-       wprintf("</BODY></HTML>\n");
-       wDumpContent();
+       wDumpContent(1);
        }       
 
 
@@ -368,8 +366,7 @@ void display_enter(void) {
        wprintf("<TEXTAREA NAME=\"msgtext\" wrap=soft ROWS=30 COLS=80 WIDTH=80></TEXTAREA><P>\n");
 
        wprintf("</FORM></CENTER>\n");
-DONE:  wprintf("</BODY></HTML>\n");
-       wDumpContent();
+DONE:  wDumpContent(1);
        }
 
 
@@ -379,8 +376,6 @@ DONE:       wprintf("</BODY></HTML>\n");
 
 
 
-
-
 /*
  * Confirm deletion of a message
  */
@@ -409,8 +404,7 @@ void confirm_delete_msg(void) {
        wprintf("</FORM></CENTER>\n");
 
        wprintf("</CENTER>\n");
-       wprintf("</BODY></HTML>\n");
-       wDumpContent();
+       wDumpContent(1);
        }
 
 
@@ -434,8 +428,7 @@ void delete_msg(void) {
                wprintf("<EM>Message not deleted.</EM><BR>\n");
                }
 
-       wprintf("</BODY></HTML>\n");
-       wDumpContent();
+       wDumpContent(1);
        }
 
 
@@ -487,8 +480,7 @@ void confirm_move_msg(void) {
        wprintf("</FORM></CENTER>\n");
 
        wprintf("</CENTER>\n");
-       wprintf("</BODY></HTML>\n");
-       wDumpContent();
+       wDumpContent(1);
        }
 
 
@@ -512,7 +504,6 @@ void move_msg(void) {
                wprintf("<EM>Message not deleted.</EM><BR>\n");
                }
 
-       wprintf("</BODY></HTML>\n");
-       wDumpContent();
+       wDumpContent(1);
        }
 

diff --git a/webcit/netconf.c b/webcit/netconf.c
index a23a0bfd3998d721f1ea7920b1d000c473a0028b..eaf0e9606ae44e9071a64363630e0da34fa4a8f3 100644 (file)
--- a/webcit/netconf.c
+++ b/webcit/netconf.c
@@ -57,8 +57,7 @@ void display_edit_node(void) {
                wprintf("</TABLE></CENTER>\n");
                }
        
-       wprintf("<HR></BODY></HTML>\n");
-       wDumpContent();
+       wDumpContent(1);
        }
        
 
@@ -103,8 +102,7 @@ void display_netconf(void) {
                wprintf("</TABLE></CENTER>\n");
                }
        
-       wprintf("<HR></BODY></HTML>\n");
-       wDumpContent();
+       wDumpContent(1);
        }
 
 
@@ -131,8 +129,8 @@ void display_confirm_unshare(void) {
        wprintf("\">Yes</A>&nbsp;&nbsp;&nbsp;");
        wprintf("<A HREF=\"/display_edit_node&node=");
        urlescputs(node);
-       wprintf("\">No</A><BR></BODY></HTML>\n");
-       wDumpContent();
+       wprintf("\">No</A><BR>\n");
+       wDumpContent(1);
        }
 
 
@@ -154,8 +152,7 @@ void display_confirm_delete_node(void) {
        urlescputs(node);
        wprintf("\">Yes</A>&nbsp;&nbsp;&nbsp;");
        wprintf("<A HREF=\"/display_netconf\">No</A><BR>\n");
-       wprintf("</BODY></HTML>\n");
-       wDumpContent();
+       wDumpContent(1);
        }
 
 
@@ -172,8 +169,7 @@ void delete_node(void) {
                output_headers(1, "bottom");
                server_to_text();
                wprintf("<A HREF=\"/display_netconf\">Back to menu</A>\n");
-               wprintf("</BODY></HTML>\n");
-               wDumpContent();
+               wDumpContent(1);
                }
        else {
                display_error(&buf[4]);
@@ -196,8 +192,7 @@ void unshare(void) {
                output_headers(1, "bottom");
                server_to_text();
                wprintf("<A HREF=\"/display_netconf\">Back to menu</A>\n");
-               wprintf("</BODY></HTML>\n");
-               wDumpContent();
+               wDumpContent(1);
                }
        else {
                display_error(&buf[4]);
@@ -224,8 +219,8 @@ void display_add_node(void) {
        wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Add\">");
        wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">");
 
-       wprintf("</FORM></CENTER></BODY></HTML>\n");
-       wDumpContent();
+       wprintf("</FORM></CENTER>\n");
+       wDumpContent(1);
        }
 
 
@@ -247,8 +242,7 @@ void add_node(void) {
                        output_headers(1, "bottom");
                        server_to_text();
                        wprintf("<A HREF=\"/display_netconf\">Back to menu</A>\n");
-                       wprintf("</BODY></HTML>\n");
-                       wDumpContent();
+                       wDumpContent(1);
                        }
                else {
                        display_error(&buf[4]);
@@ -321,8 +315,8 @@ void display_share(void) {
        wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Share\">");
        wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">");
 
-       wprintf("</FORM></CENTER></BODY></HTML>\n");
-       wDumpContent();
+       wprintf("</FORM></CENTER>\n");
+       wDumpContent(1);
 
        /* free the list */
        while (shlist != NULL) {
@@ -354,8 +348,7 @@ void share(void) {
                        output_headers(1, "bottom");
                        server_to_text();
                        wprintf("<A HREF=\"/display_netconf\">Back to menu</A>\n");
-                       wprintf("</BODY></HTML>\n");
-                       wDumpContent();
+                       wDumpContent(1);
                        }
                else {
                        display_error(&buf[4]);

diff --git a/webcit/paging.c b/webcit/paging.c
index 1dbb3569b9d7736eb6a1097c2b9a326b57d1906a..47a5654352340672e36c3f022ae21e549645ca7e 100644 (file)
--- a/webcit/paging.c
+++ b/webcit/paging.c
@@ -56,8 +56,7 @@ void display_page(void) {
        wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\"><BR>\n");
 
        wprintf("</FORM></CENTER>\n");
-        wprintf("</BODY></HTML>\n");
-        wDumpContent();
+        wDumpContent(1);
        }
 
 /*
@@ -93,8 +92,7 @@ void page_user(void) {
                wprintf("<EM>%s</EM><BR>\n",&buf[4]);
                }
 
-        wprintf("</BODY></HTML>\n");
-        wDumpContent();
+        wDumpContent(1);
        }
 
 
@@ -124,6 +122,5 @@ void do_chat(void) {
        wprintf("<H2>Oops!</H2>Looks like your browser doesn't support Java, ");
        wprintf("so you won't be able to access Chat.  Sorry.\n");
        wprintf("</applet>\n");
-        wprintf("</BODY></HTML>\n");
-        wDumpContent();
+        wDumpContent(1);
        }

diff --git a/webcit/roomops.c b/webcit/roomops.c
index 7b1da7a04238dc373264fad532d3a1c33b26221e..7afc51959fd2254ea52f3424044107d509d4eca8 100644 (file)
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -254,8 +254,7 @@ void list_all_rooms_by_floor(void) {
                wprintf("</TD></TR>\n");
                }
        wprintf("</TABLE>\n");
-       wprintf("</BODY></HTML>\n");
-       wDumpContent();
+       wDumpContent(1);
        }
 
 
@@ -272,8 +271,7 @@ void zapped_list(void) {
        listrms("LZRM -1");
        wprintf("<BR><BR>\n");
        wprintf("Click on any room to un-zap it and goto that room.\n");
-       wprintf("</BODY></HTML>\n");
-       wDumpContent();
+       wDumpContent(1);
        }
        
 
@@ -333,8 +331,8 @@ void gotoroom(char *gname, int display_name)
                }
        if (buf[0]!='2') {
                if (display_name) {
-                       wprintf("<EM>%s</EM><BR></BODY></HTML>\n",&buf[4]);
-                       wDumpContent();
+                       wprintf("<EM>%s</EM><BR>\n",&buf[4]);
+                       wDumpContent(1);
                        }
                return;
                }
@@ -390,10 +388,7 @@ void gotoroom(char *gname, int display_name)
                wprintf("<IMG SRC=\"/static/forward.gif\" border=0></A></TD>");
                wprintf("</TR></TABLE></CENTER>\n");
 
-               if (noframes) embed_main_menu();
-
-               wprintf("</BODY></HTML>\n");
-               wDumpContent();
+               wDumpContent(1);
                }
 
        strcpy(wc_roomname, wc_roomname);
@@ -707,8 +702,7 @@ void display_editroom(void) {
        wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">");
        wprintf("</CENTER>\n");
 
-       wprintf("</FORM></HTML>\n");
-       wDumpContent();
+       wDumpContent(1);
        }
 
 
@@ -909,8 +903,8 @@ void display_entroom(void) {
        wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"OK\">");
        wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">");
        wprintf("</CENTER>\n");
-       wprintf("</FORM></HTML>\n");
-       wDumpContent();
+       wprintf("</FORM>\n");
+       wDumpContent(1);
        }
 
 
@@ -988,8 +982,8 @@ void display_private(char *rname, int req_pass)
        
        wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"OK\">");
        wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">");
-       wprintf("</FORM></HTML>\n");
-       wDumpContent();
+       wprintf("</FORM>\n");
+       wDumpContent(1);
        }
 
 /* 
@@ -1025,7 +1019,7 @@ void goto_private(void) {
         printf("HTTP/1.0 200 OK\n");
         output_headers(1, "bottom");
        wprintf("%s\n",&buf[4]);
-       wDumpContent();
+       wDumpContent(1);
        return;
        }
 
@@ -1049,8 +1043,8 @@ void display_zap(void) {
        wprintf("<FORM METHOD=\"POST\" ACTION=\"/zap\">\n");
        wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"OK\">");
        wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">");
-       wprintf("</FORM></HTML>\n");
-       wDumpContent();
+       wprintf("</FORM>\n");
+       wDumpContent(1);
        }
 
 
@@ -1115,8 +1109,8 @@ void confirm_delete_room(void) {
        wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Delete\">");
        wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">");
 
-       wprintf("</FORM></CENTER></BODY></HTML>\n");
-       wDumpContent();
+       wprintf("</FORM></CENTER>\n");
+       wDumpContent(1);
        }
 
 

diff --git a/webcit/siteconfig.c b/webcit/siteconfig.c
index ab08bc85adb030b788b07bba21d44f564372bc02..ce582e2c9756aa57f389c8ffacc03432a53e1ea1 100644 (file)
--- a/webcit/siteconfig.c
+++ b/webcit/siteconfig.c
@@ -120,8 +120,8 @@ void display_siteconfig(void) {
        wprintf("</TABLE><CENTER>");
        wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"OK\">");
        wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">\n");
-       wprintf("</CENTER></FORM></BODY></HTML>\n");
-       wDumpContent();
+       wprintf("</CENTER></FORM>\n");
+       wDumpContent(1);
 }
 
 

diff --git a/webcit/sysmsgs.c b/webcit/sysmsgs.c
index a9d735a01852635dc29cff64b2bf899b333ab6d5..7021ad16e84d5e96e213de9f4681dae5798b2c2f 100644 (file)
--- a/webcit/sysmsgs.c
+++ b/webcit/sysmsgs.c
@@ -46,8 +46,8 @@ void display_edit(char *description, char *check_cmd,
        if (buf[0] == '1') server_to_text();
        wprintf("</TEXTAREA><P>\n");
 
-       wprintf("</FORM></CENTER></BODY></HTML>\n");
-       wDumpContent();
+       wprintf("</FORM></CENTER>\n");
+       wDumpContent(1);
        }
 
 
@@ -61,7 +61,7 @@ void save_edit(char *description, char *enter_cmd, int regoto) {
                printf("HTTP/1.0 200 OK\n");
                output_headers(1, "bottom");
                wprintf("Cancelled.  %s was not saved.<BR>\n", description);
-               wDumpContent();
+               wDumpContent(1);
                return;
                }
 
@@ -81,7 +81,7 @@ void save_edit(char *description, char *enter_cmd, int regoto) {
        else {
                printf("HTTP/1.0 200 OK\n");
                output_headers(1, "bottom");
-               wprintf("%s has been saved.</BODY></HTML>\n", description);
-               wDumpContent();
+               wprintf("%s has been saved.\n", description);
+               wDumpContent(1);
                }
        }       

diff --git a/webcit/userlist.c b/webcit/userlist.c
index 8d60805edf9146c2cedbf1728d0b8488d1842104..bfa2fc70c3bb606504ebe9956830d1092603881c 100644 (file)
--- a/webcit/userlist.c
+++ b/webcit/userlist.c
@@ -90,8 +90,7 @@ void userlist(void) {
 
                }
        wprintf("</TABLE></CENTER>\n");
-DONE:   wprintf("</BODY></HTML>\n");
-        wDumpContent();
+DONE:  wDumpContent(1);
        }
 
 
@@ -133,6 +132,5 @@ void showuser(void) {
        serv_printf("RBIO %s",who);
        serv_gets(buf);
        if (buf[0]=='1') fmout(NULL);
-       wprintf("</BODY></HTML>\n");
-        wDumpContent();
+        wDumpContent(1);
        }

diff --git a/webcit/webcit.c b/webcit/webcit.c
index 77ae51b6b865aab91bbc17cfc8683446fa005028..18c5f764e47fa20d9422c7469519d72fa9dfea98 100644 (file)
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -178,9 +178,17 @@ int wContentLength(void) {
        return(len);
        }
 
-void wDumpContent(void) {
+void wDumpContent(int print_standard_html_footer) {
        struct webcontent *wptr;
 
+       if (print_standard_html_footer) {
+               if (noframes) {
+                       wprintf("<BR>");
+                       embed_main_menu();
+                       }
+               wprintf("</BODY></HTML>\n");
+               }
+
        printf("Content-type: text/html\n");
        printf("Content-length: %d\n", wContentLength());
        printf("\n");
@@ -282,7 +290,8 @@ void output_headers(int print_standard_html_head, char *target) {
                printf("Cache-Control: no-store\n");
                }
 
-       stuff_to_cookie(cookie, wc_session, wc_username, wc_password, wc_roomname);
+       stuff_to_cookie(cookie, wc_session, wc_username, wc_password,
+                       wc_roomname, noframes);
        if (print_standard_html_head==2) {
                printf("X-WebCit-Session: close\n");
                printf("Set-cookie: webcit=%s\n", unset);
@@ -446,8 +455,7 @@ void convenience_page(char *titlebarcolor, char *titlebarmsg, char *messagetext)
                embed_main_menu();
                }
 
-        wprintf("</BODY></HTML>\n");
-        wDumpContent();
+        wDumpContent(1);
        }
 
 void display_error(char *errormessage) {
@@ -535,7 +543,8 @@ void session_loop(void) {
                if (!strncasecmp(buf, "Cookie: webcit=", 15)) {
                        strcpy(cookie, &buf[15]);
                        cookie_to_stuff(cookie, NULL,
-                                       c_username, c_password, c_roomname);
+                                       c_username, c_password, c_roomname,
+                                       &noframes);
                        }
 
                if (!strncasecmp(buf, "Content-length: ", 16)) {
@@ -932,8 +941,7 @@ void session_loop(void) {
                wprintf("Variables: <BR><PRE>\n");
                dump_vars();
                wprintf("</PRE><HR>\n");
-               wprintf("</BODY></HTML>\n");
-               wDumpContent();
+               wDumpContent(1);
                }
 
        fflush(stdout);

diff --git a/webcit/webcit.h b/webcit/webcit.h
index c0aa1ba070c739561b5fc089c8b534b18c929746..90fd99807d7d09dd0b084f2f37070ecd087875b3 100644 (file)
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -77,5 +77,5 @@ extern char *upload;
 extern char floorlist[128][256];
 extern int noframes;
 
-void stuff_to_cookie(char *, int, char *, char *, char *);
-void cookie_to_stuff(char *, int *, char *, char *, char *);
+void stuff_to_cookie(char *, int, char *, char *, char *, int);
+void cookie_to_stuff(char *, int *, char *, char *, char *, int *);

diff --git a/webcit/who.c b/webcit/who.c
index 84e7d421c80bf453baadca57f36d043cd4ddaecf..03855e6d02111328898c165b7db46e4c473055b9 100644 (file)
--- a/webcit/who.c
+++ b/webcit/who.c
@@ -109,8 +109,8 @@ void whobbs(void) {
                }
        wprintf("</TABLE>\n");
        wprintf("<A HREF=\"/whobbs\">Refresh</A>\n");
-        wprintf("</CENTER></BODY></HTML>\n");
-        wDumpContent();
+        wprintf("</CENTER>\n");
+        wDumpContent(1);
        }
 
 
@@ -148,8 +148,7 @@ void terminate_session(void) {
                        bstr("which_session"));
                wprintf("Yes</A>&nbsp;&nbsp;&nbsp;");
                wprintf("<A HREF=\"/whobbs\">No</A>");
-               wprintf("</BODY></HTML>\n");
-               wDumpContent();
+               wDumpContent(1);
                }
 
        }
@@ -225,8 +224,8 @@ void edit_me(void) {
                wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">");
                wprintf("</TD></TR></TABLE>\n");
 
-               wprintf("</FORM></CENTER></BODY></HTML>\n");
-               wDumpContent();
+               wprintf("</FORM></CENTER>\n");
+               wDumpContent(1);
                }
        }