* Made the frames stuff less dependent on the HTML TARGET= directive

          and more dependent on the HTTP Window-target: directive.

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index d339a0e157ab2ba46e341ab5af67743a91628815..3f3cb1f1679304cfe2e03a168102a53efd04be0f 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,3 +1,7 @@
+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.
+
 Sat Jan 23 19:36:10 EST 1999 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
        * Brought over the new room listing code and <G>oto heuristics
          from the main Citadel tree, to pay attention to floor/room ordering

diff --git a/webcit/auth.c b/webcit/auth.c
index 66ae1803d03ea6239048e3f342762415eec6bad2..69d7f8c98cf8c77490a84b07d65927672b1b006f 100644 (file)
--- a/webcit/auth.c
+++ b/webcit/auth.c
@@ -34,7 +34,7 @@ void display_login(char *mesg) {
        char buf[256];
 
        printf("HTTP/1.0 200 OK\n");
-       output_headers(1);
+       output_headers(1, "_top");
 
        /* Da banner */
        wprintf("<CENTER><TABLE border=0 width=100%><TR><TD>\n");
@@ -167,7 +167,7 @@ void do_login(void) {
 
 void do_welcome(void) {
        printf("HTTP/1.0 200 OK\n");
-       output_headers(1);
+       output_headers(1, "bottom");
        wprintf("<CENTER><H1>");
        escputs(wc_username);
        wprintf("</H1>\n");
@@ -192,7 +192,7 @@ void do_logout(void) {
        strcpy(wc_roomname, "");
 
        printf("HTTP/1.0 200 OK\n");
-       output_headers(2);      /* note the "2" which causes cookies to be unset */
+       output_headers(2, "_top");      /* note "2" causes cookies to be unset */
 
        wprintf("<CENTER>");    
        serv_puts("MESG goodbye");
@@ -222,7 +222,7 @@ void validate(void) {
        int a;
 
        printf("HTTP/1.0 200 OK\n");
-       output_headers(1);
+       output_headers(1, "bottom");
 
        strcpy(buf,bstr("user"));
        if (strlen(buf)>0) if (strlen(bstr("axlevel"))>0) {
@@ -293,7 +293,7 @@ void display_reg(int during_login) {
        int a;
 
        printf("HTTP/1.0 200 OK\n");
-       output_headers(1);
+       output_headers(1, "bottom");
 
         wprintf("<TABLE WIDTH=100% BORDER=0 BGCOLOR=007700><TR><TD>");
         wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
@@ -391,7 +391,7 @@ void display_changepw(void) {
        char buf[256];
 
        printf("HTTP/1.0 200 OK\n");
-       output_headers(1);
+       output_headers(1, "bottom");
 
         wprintf("<TABLE WIDTH=100% BORDER=0 BGCOLOR=770000><TR><TD>");
         wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");

diff --git a/webcit/child.h b/webcit/child.h
index 3e0f840149f86b39c4726ccb1f60398e2604c56b..59eed7e42a4eb32262e74746f6e23c22750dfd33 100644 (file)
--- a/webcit/child.h
+++ b/webcit/child.h
@@ -26,7 +26,7 @@ void serv_printf(const char *format, ...);
 char *bstr(char *key);
 char *urlesc(char *);
 void urlescputs(char *);
-void output_headers(int);
+void output_headers(int, char *);
 void wprintf(const char *format, ...);
 void extract(char *dest, char *source, int parmnum);
 int extract_int(char *source, int parmnum);

diff --git a/webcit/graphics.c b/webcit/graphics.c
index e92af89b1bae26f87a4499604de67ecc46f7db02..633b09f36766541cc8a335e6457b3fe5bbef3bb1 100644 (file)
--- a/webcit/graphics.c
+++ b/webcit/graphics.c
@@ -20,7 +20,7 @@ void display_graphics_upload(char *description, char *check_cmd, char *uplurl) {
                }
 
        printf("HTTP/1.0 200 OK\n");
-       output_headers(1);
+       output_headers(1, "bottom");
         wprintf("<TABLE WIDTH=100% BORDER=0 BGCOLOR=770000><TR><TD>");
         wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
         wprintf("<B>Set/change %s</B>\n", description);
@@ -94,7 +94,7 @@ void select_floor_to_edit_pic(void) {
        int a;
 
        printf("HTTP/1.0 200 OK\n");
-       output_headers(1);
+       output_headers(1, "bottom");
 
         wprintf("<TABLE WIDTH=100% BORDER=0 BGCOLOR=770000><TR><TD>");
         wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");

diff --git a/webcit/mainmenu.c b/webcit/mainmenu.c
index c1c0c13f5fedd538218ef5117a7f9d095a607e15..7919b97bbbd932a590c8fc32c0f593a1e96cb264 100644 (file)
--- a/webcit/mainmenu.c
+++ b/webcit/mainmenu.c
@@ -26,16 +26,16 @@ void embed_main_menu(void) {
        wprintf("List known rooms</B></A><BR>\n");
        wprintf("Where can I go from here?</LI>\n");
        
-       wprintf("<LI><B><A HREF=\"/gotonext\" TARGET=\"top\">\n");
+       wprintf("<LI><B><A HREF=\"/gotonext\">\n");
        wprintf("Goto next room</B></A><BR>\n");
        wprintf("...with <EM>unread</EM> messages</LI>\n");
        
-       wprintf("<LI><B><A HREF=\"/skip\" TARGET=\"top\">\n");
+       wprintf("<LI><B><A HREF=\"/skip\">\n");
        wprintf("Skip to next room</B></A><BR>\n");
        wprintf("(come back here later)</LI>\n");
        
        if ( (strlen(ugname)>0) && (strcasecmp(ugname,wc_roomname)) ) {
-               wprintf("<LI><B><A HREF=\"/ungoto\" TARGET=\"top\">\n");
+               wprintf("<LI><B><A HREF=\"/ungoto\">\n");
                wprintf("Ungoto</B></A><BR>\n");
                wprintf("(oops! Back to %s)</LI>\n",ugname);
                }
@@ -67,7 +67,7 @@ void embed_main_menu(void) {
        wprintf("<LI><B><A HREF=\"/advanced\">\n");
        wprintf("Advanced options</B></A><BR>...and maintenance</LI>\n");
 
-       wprintf("<LI><B><A HREF=\"/termquit\" TARGET=\"_top\">\n");
+       wprintf("<LI><B><A HREF=\"/termquit\">\n");
        wprintf("Log off</B></A><BR>Bye!</LI>\n");
        wprintf("</UL>\n");
 
@@ -201,7 +201,7 @@ wprintf("</FONT></TD></TR></TABLE>\n");
  */
 void display_main_menu(void) {
        printf("HTTP/1.0 200 OK\n");
-       output_headers(1);
+       output_headers(1, "bottom");
        embed_main_menu();
        wprintf("</BODY></HTML>\n");
        wDumpContent();
@@ -210,7 +210,7 @@ void display_main_menu(void) {
 
 void display_advanced_menu(void) {
        printf("HTTP/1.0 200 OK\n");
-       output_headers(1);
+       output_headers(1, "bottom");
        embed_advanced_menu();
        embed_main_menu();
        wprintf("</BODY></HTML>\n");
@@ -223,7 +223,7 @@ void display_advanced_menu(void) {
  */
 void display_generic(void) {
        printf("HTTP/1.0 200 OK\n");
-       output_headers(1);
+       output_headers(1, "bottom");
        
        wprintf("<TABLE WIDTH=100% BORDER=0 BGCOLOR=770077><TR><TD>");
        wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
@@ -266,7 +266,7 @@ void do_generic(void) {
        serv_gets(buf);
 
        printf("HTTP/1.0 200 OK\n");
-       output_headers(1);
+       output_headers(1, "bottom");
        wprintf("<TABLE WIDTH=100% BORDER=0 BGCOLOR=770077><TR><TD>");
        wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
        wprintf("<B>Server command results</B>\n");

diff --git a/webcit/messages.c b/webcit/messages.c
index d1e0530f734ef829efdf3c09d327efc650ffd8a8..ae57496ba05c74e4e0443c13d6fefd3d0635be39 100644 (file)
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -214,8 +214,7 @@ void readloop(char *oper) {
        int nummsgs;
 
        printf("HTTP/1.0 200 OK\n");
-       printf("Window-target: bottom\n");
-       output_headers(1);
+       output_headers(1, "bottom");
 
        wprintf("<CENTER><B>%s - ",wc_roomname);
        if (!strcmp(oper,"readnew")) {
@@ -264,7 +263,7 @@ void post_message(void) {
        char buf[256];
 
        printf("HTTP/1.0 200 OK\n");
-       output_headers(1);
+       output_headers(1, "bottom");
 
        strcpy(buf, bstr("sc"));
        if (strcasecmp(buf, "Save message")) {
@@ -326,7 +325,7 @@ void display_enter(void) {
        struct tm *tm;
 
        printf("HTTP/1.0 200 OK\n");
-       output_headers(1);
+       output_headers(1, "bottom");
 
        sprintf(buf,"ENT0 0|%s|0|0",bstr("recp"));
        serv_puts(buf);
@@ -391,7 +390,7 @@ void confirm_delete_msg(void) {
        msgid = atol(bstr("msgid"));
        
        printf("HTTP/1.0 200 OK\n");
-       output_headers(1);
+       output_headers(1, "bottom");
 
        wprintf("<TABLE WIDTH=100% BORDER=0 BGCOLOR=770000><TR><TD>");
        wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
@@ -423,7 +422,7 @@ void delete_msg(void) {
        msgid = atol(bstr("msgid"));
 
        printf("HTTP/1.0 200 OK\n");
-       output_headers(1);
+       output_headers(1, "bottom");
 
        if (!strcasecmp(bstr("yesno"), "Yes")) {
                sprintf(buf, "DELE %ld", msgid);
@@ -453,7 +452,7 @@ void confirm_move_msg(void) {
        msgid = atol(bstr("msgid"));
        
        printf("HTTP/1.0 200 OK\n");
-       output_headers(1);
+       output_headers(1, "bottom");
 
        wprintf("<TABLE WIDTH=100% BORDER=0 BGCOLOR=770000><TR><TD>");
        wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
@@ -501,7 +500,7 @@ void move_msg(void) {
        msgid = atol(bstr("msgid"));
 
        printf("HTTP/1.0 200 OK\n");
-       output_headers(1);
+       output_headers(1, "bottom");
 
        if (!strcasecmp(bstr("yesno"), "Move")) {
                sprintf(buf, "MOVE %ld|%s", msgid, bstr("target_room"));

diff --git a/webcit/netconf.c b/webcit/netconf.c
index 6fc58dbabac1f5173dd988285bd6047b190984cc..a23a0bfd3998d721f1ea7920b1d000c473a0028b 100644 (file)
--- a/webcit/netconf.c
+++ b/webcit/netconf.c
@@ -22,7 +22,7 @@ void display_edit_node(void) {
        strcpy(node, bstr("node"));
 
        printf("HTTP/1.0 200 OK\n");
-       output_headers(1);
+       output_headers(1, "bottom");
        wprintf("<TABLE WIDTH=100% BORDER=0 BGCOLOR=000077><TR><TD>");
        wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
        wprintf("<B>Edit share list for ");
@@ -68,7 +68,7 @@ void display_netconf(void) {
        char node[256];
 
        printf("HTTP/1.0 200 OK\n");
-       output_headers(1);
+       output_headers(1, "bottom");
        wprintf("<TABLE WIDTH=100% BORDER=0 BGCOLOR=770000><TR><TD>");
        wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
        wprintf("<B>Network configuration</B>\n");
@@ -113,7 +113,7 @@ void display_confirm_unshare(void) {
        char sroom[256];
 
        printf("HTTP/1.0 200 OK\n");
-       output_headers(1);
+       output_headers(1, "bottom");
        wprintf("<TABLE WIDTH=100% BORDER=0 BGCOLOR=770000><TR><TD>");
        wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
        wprintf("<B>Confirm unshare</B>\n");
@@ -140,7 +140,7 @@ void display_confirm_delete_node(void) {
        char node[256];
 
        printf("HTTP/1.0 200 OK\n");
-       output_headers(1);
+       output_headers(1, "bottom");
        wprintf("<TABLE WIDTH=100% BORDER=0 BGCOLOR=770000><TR><TD>");
        wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
        wprintf("<B>Confirm delete</B>\n");
@@ -169,7 +169,7 @@ void delete_node(void) {
        serv_gets(buf);
        if (buf[0]=='1') {
                printf("HTTP/1.0 200 OK\n");
-               output_headers(1);
+               output_headers(1, "bottom");
                server_to_text();
                wprintf("<A HREF=\"/display_netconf\">Back to menu</A>\n");
                wprintf("</BODY></HTML>\n");
@@ -193,7 +193,7 @@ void unshare(void) {
        serv_gets(buf);
        if (buf[0]=='1') {
                printf("HTTP/1.0 200 OK\n");
-               output_headers(1);
+               output_headers(1, "bottom");
                server_to_text();
                wprintf("<A HREF=\"/display_netconf\">Back to menu</A>\n");
                wprintf("</BODY></HTML>\n");
@@ -209,7 +209,7 @@ void unshare(void) {
 void display_add_node(void) {
        
        printf("HTTP/1.0 200 OK\n");
-       output_headers(1);
+       output_headers(1, "bottom");
        wprintf("<TABLE WIDTH=100% BORDER=0 BGCOLOR=007700><TR><TD>");
        wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
        wprintf("<B>Add a new node</B>\n");
@@ -244,7 +244,7 @@ void add_node(void) {
                serv_gets(buf);
                if (buf[0]=='1') {
                        printf("HTTP/1.0 200 OK\n");
-                       output_headers(1);
+                       output_headers(1, "bottom");
                        server_to_text();
                        wprintf("<A HREF=\"/display_netconf\">Back to menu</A>\n");
                        wprintf("</BODY></HTML>\n");
@@ -270,7 +270,7 @@ void display_share(void) {
        strcpy(node, bstr("node"));
 
        printf("HTTP/1.0 200 OK\n");
-       output_headers(1);      
+       output_headers(1, "bottom");
        wprintf("<TABLE WIDTH=100% BORDER=0 BGCOLOR=007700><TR><TD>");
        wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
        wprintf("<B>Add a shared room</B>\n");
@@ -351,7 +351,7 @@ void share(void) {
                serv_gets(buf);
                if (buf[0]=='1') {
                        printf("HTTP/1.0 200 OK\n");
-                       output_headers(1);
+                       output_headers(1, "bottom");
                        server_to_text();
                        wprintf("<A HREF=\"/display_netconf\">Back to menu</A>\n");
                        wprintf("</BODY></HTML>\n");

diff --git a/webcit/paging.c b/webcit/paging.c
index e40f44f042e74f87a9cf806913421d858b120078..1dbb3569b9d7736eb6a1097c2b9a326b57d1906a 100644 (file)
--- a/webcit/paging.c
+++ b/webcit/paging.c
@@ -20,7 +20,7 @@ void display_page(void) {
        char user[256];
 
         printf("HTTP/1.0 200 OK\n");
-        output_headers(1);
+        output_headers(1, "bottom");
 
         wprintf("<TABLE WIDTH=100% BORDER=0 BGCOLOR=007700><TR><TD>");
         wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
@@ -70,7 +70,7 @@ void page_user(void) {
        char buf[256];
        
         printf("HTTP/1.0 200 OK\n");
-        output_headers(1);
+        output_headers(1, "bottom");
 
        strcpy(recp,bstr("recp"));
        strcpy(msgtext,bstr("msgtext"));
@@ -105,7 +105,7 @@ void page_user(void) {
 void do_chat(void) {
 
         printf("HTTP/1.0 200 OK\n");
-        output_headers(1);
+        output_headers(1, "bottom");
 
         wprintf("<TABLE WIDTH=100% BORDER=0 BGCOLOR=000077><TR><TD>");
         wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");

diff --git a/webcit/roomops.c b/webcit/roomops.c
index cfc9adbae10d8f56a6fc8cc94b09dbe5654947dd..7ca1113d797c0f6c7bc635b01948378fd03e066b 100644 (file)
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -113,7 +113,7 @@ void room_tree_list(struct roomlisting *rp) {
 
        wprintf("<A HREF=\"/dotgoto&room=");
        urlescputs(rmname);
-       wprintf("\" TARGET=\"top\">");
+       wprintf("\">");
        escputs1(rmname,1);
        if ((f & QR_DIRECTORY) && (f & QR_NETWORK)) wprintf("}");
        else if (f & QR_DIRECTORY) wprintf("]");
@@ -217,7 +217,7 @@ void list_all_rooms_by_floor(void) {
        load_floorlist();
 
         printf("HTTP/1.0 200 OK\n");
-        output_headers(1);
+        output_headers(1, "bottom");
 
        wprintf("<TABLE width=100% border><TR><TH>Floor</TH>");
        wprintf("<TH>Rooms with new messages</TH>");
@@ -264,7 +264,7 @@ void list_all_rooms_by_floor(void) {
  */
 void zapped_list(void) {
         printf("HTTP/1.0 200 OK\n");
-        output_headers(1);
+        output_headers(1, "bottom");
         wprintf("<TABLE WIDTH=100% BORDER=0 BGCOLOR=770000><TR><TD>");
         wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
         wprintf("<B>Zapped (forgotten) rooms</B>\n");
@@ -308,8 +308,7 @@ void gotoroom(char *gname, int display_name)
 
        if (display_name) {
                printf("HTTP/1.0 200 OK\n");
-               printf("Window-target: top\n");
-               output_headers(0);
+               output_headers(0, "top");
                wprintf("<HTML><HEAD></HEAD>\n<BODY ");
        
                /* automatically fire up a read-new-msgs in the bottom frame */
@@ -582,7 +581,7 @@ void display_editroom(void) {
 
 
         printf("HTTP/1.0 200 OK\n");
-        output_headers(1);
+        output_headers(1, "bottom");
 
         wprintf("<TABLE WIDTH=100% BORDER=0 BGCOLOR=000077><TR><TD>");
         wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
@@ -875,7 +874,7 @@ void display_entroom(void) {
                }
 
         printf("HTTP/1.0 200 OK\n");
-        output_headers(1);
+        output_headers(1, "bottom");
 
         wprintf("<TABLE WIDTH=100% BORDER=0 BGCOLOR=000077><TR><TD>");
         wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
@@ -954,7 +953,7 @@ void display_private(char *rname, int req_pass)
 {
 
         printf("HTTP/1.0 200 OK\n");
-        output_headers(1);
+        output_headers(1, "bottom");
 
         wprintf("<TABLE WIDTH=100% BORDER=0 BGCOLOR=770000><TR><TD>");
         wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
@@ -1020,7 +1019,7 @@ void goto_private(void) {
                }
 
         printf("HTTP/1.0 200 OK\n");
-        output_headers(1);
+        output_headers(1, "bottom");
        wprintf("%s\n",&buf[4]);
        wDumpContent();
        return;
@@ -1032,7 +1031,7 @@ void goto_private(void) {
  */
 void display_zap(void) {
         printf("HTTP/1.0 200 OK\n");
-        output_headers(1);
+        output_headers(1, "bottom");
        
         wprintf("<TABLE WIDTH=100% BORDER=0 BGCOLOR=770000><TR><TD>");
         wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
@@ -1096,7 +1095,7 @@ void confirm_delete_room(void) {
                }
 
        printf("HTTP/1.0 200 OK\n");
-       output_headers(1);
+       output_headers(1, "bottom");
        wprintf("<TABLE WIDTH=100% BORDER=0 BGCOLOR=770000><TR><TD>");
        wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
        wprintf("<B>Confirm deletion of room</B>\n");

diff --git a/webcit/siteconfig.c b/webcit/siteconfig.c
index 41c9261986374edc91eaf5f858055a8fc7a922f9..ab08bc85adb030b788b07bba21d44f564372bc02 100644 (file)
--- a/webcit/siteconfig.c
+++ b/webcit/siteconfig.c
@@ -26,7 +26,7 @@ void display_siteconfig(void) {
        }
 
        printf("HTTP/1.0 200 OK\n");
-       output_headers(1);
+       output_headers(1, "bottom");
 
         wprintf("<TABLE WIDTH=100% BORDER=0 BGCOLOR=007700><TR><TD>");
         wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"<B>Site configuration");

diff --git a/webcit/sysmsgs.c b/webcit/sysmsgs.c
index 739b53fdb5423ae6b122b3999313e426ae253ec8..a9d735a01852635dc29cff64b2bf899b333ab6d5 100644 (file)
--- a/webcit/sysmsgs.c
+++ b/webcit/sysmsgs.c
@@ -24,7 +24,7 @@ void display_edit(char *description, char *check_cmd,
                }
 
         printf("HTTP/1.0 200 OK\n");
-       output_headers(1);
+       output_headers(1, "bottom");
 
         wprintf("<TABLE WIDTH=100% BORDER=0 BGCOLOR=007700><TR><TD>");
         wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
@@ -59,7 +59,7 @@ void save_edit(char *description, char *enter_cmd, int regoto) {
 
        if (strcmp(bstr("sc"),"Save")) {
                printf("HTTP/1.0 200 OK\n");
-               output_headers(1);
+               output_headers(1, "bottom");
                wprintf("Cancelled.  %s was not saved.<BR>\n", description);
                wDumpContent();
                return;
@@ -80,7 +80,7 @@ void save_edit(char *description, char *enter_cmd, int regoto) {
                }
        else {
                printf("HTTP/1.0 200 OK\n");
-               output_headers(1);
+               output_headers(1, "bottom");
                wprintf("%s has been saved.</BODY></HTML>\n", description);
                wDumpContent();
                }

diff --git a/webcit/userlist.c b/webcit/userlist.c
index f5c5ac6c88d38721f785580c93910ef92a8a9a4c..8d60805edf9146c2cedbf1728d0b8488d1842104 100644 (file)
--- a/webcit/userlist.c
+++ b/webcit/userlist.c
@@ -37,7 +37,7 @@ void userlist(void) {
 
 
         printf("HTTP/1.0 200 OK\n");
-        output_headers(1);
+        output_headers(1, "bottom");
 
        serv_puts("LIST");
        serv_gets(buf);
@@ -104,7 +104,7 @@ void showuser(void) {
        int have_pic;
 
         printf("HTTP/1.0 200 OK\n");
-        output_headers(1);
+        output_headers(1, "bottom");
 
 
         wprintf("<TABLE WIDTH=100% BORDER=0 BGCOLOR=007700><TR><TD>");

diff --git a/webcit/webcit.c b/webcit/webcit.c
index 5a7b65ce884e997eda9c3bf2b09b72c24df04081..b82dd2d81795e16dac28faee10cda97ce3792cd6 100644 (file)
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -31,6 +31,7 @@ int connected = 0;
 int logged_in = 0;
 int axlevel;
 char *ExpressMessages = NULL;
+int noframes = 0;
 
 struct webcontent *wlist = NULL;
 struct webcontent *wlast = NULL;
@@ -263,13 +264,19 @@ void getz(char *buf) {
  * If print_standard_html_head is nonzero, we also get some standard HTML
  * headers.  If it's set to 2, the session is considered to be closing.
  */
-void output_headers(int print_standard_html_head) {
+void output_headers(int print_standard_html_head, char *target) {
 
        static char *unset = "; expires=28-May-1971 18:10:00 GMT";
        char cookie[256];
 
        printf("Server: %s\n", SERVER);
        printf("Connection: close\n");
+
+       if ( (strlen(target)>0) && (noframes == 0) ) {
+               printf("Window-target: %s\n", target);
+               }
+
+
        if (print_standard_html_head > 0) {
                printf("Pragma: no-cache\n");
                printf("Cache-Control: no-store\n");
@@ -344,7 +351,7 @@ void output_static(char *what) {
        fp = fopen(buf, "rb");
        if (fp == NULL) {
                printf("HTTP/1.0 404 %s\n", strerror(errno));
-               output_headers(0);
+               output_headers(0, "");
                printf("Content-Type: text/plain\n");
                sprintf(buf, "%s: %s\n", what, strerror(errno));
                printf("Content-length: %d\n", strlen(buf));
@@ -353,7 +360,7 @@ void output_static(char *what) {
                }
        else {
                printf("HTTP/1.0 200 OK\n");
-               output_headers(0);
+               output_headers(0, "");
 
                if (!strncasecmp(&what[strlen(what)-4], ".gif", 4))
                        printf("Content-type: image/gif\n");
@@ -389,7 +396,7 @@ void output_image() {
        if (buf[0]=='2') {
                bytes = extract_long(&buf[4], 0);
                printf("HTTP/1.0 200 OK\n");
-               output_headers(0);
+               output_headers(0, "");
                printf("Content-type: image/gif\n");
                printf("Content-length: %ld\n", bytes);
                printf("\n");
@@ -411,7 +418,7 @@ void output_image() {
                }
        else {
                printf("HTTP/1.0 404 %s\n", strerror(errno));
-               output_headers(0);
+               output_headers(0, "");
                printf("Content-Type: text/plain\n");
                sprintf(buf, "Error retrieving image\n");
                printf("Content-length: %d\n", strlen(buf));
@@ -427,7 +434,7 @@ void output_image() {
  */
 void convenience_page(char *titlebarcolor, char *titlebarmsg, char *messagetext) {
         printf("HTTP/1.0 200 OK\n");
-        output_headers(1);
+        output_headers(1, "bottom");
         wprintf("<TABLE WIDTH=100% BORDER=0 BGCOLOR=%s><TR><TD>", titlebarcolor);
         wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
         wprintf("<B>%s</B>\n", titlebarmsg);
@@ -909,7 +916,7 @@ void session_loop(void) {
        /* When all else fails... */
        else {
                printf("HTTP/1.0 200 OK\n");
-               output_headers(1);
+               output_headers(1, "");
        
                wprintf("TransactionCount is %d<BR>\n", TransactionCount);
                wprintf("You're in session %d<HR>\n", wc_session);

diff --git a/webcit/webcit.h b/webcit/webcit.h
index 38a40045a8b9a9e847a78660685d437c81973d65..c0aa1ba070c739561b5fc089c8b534b18c929746 100644 (file)
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -75,6 +75,7 @@ extern char *axdefs[];
 extern int upload_length;
 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 *);

diff --git a/webcit/who.c b/webcit/who.c
index 0798af57cc5d365b77d6658ad0f0bd32a97128f3..84e7d421c80bf453baadca57f36d043cd4ddaecf 100644 (file)
--- a/webcit/who.c
+++ b/webcit/who.c
@@ -31,7 +31,7 @@ void whobbs(void) {
        int foundit;
 
         printf("HTTP/1.0 200 OK\n");
-        output_headers(1);
+        output_headers(1, "bottom");
 
         wprintf("<TABLE WIDTH=100% BORDER=0 BGCOLOR=007700><TR><TD>");
         wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"<B>Users currently on ");
@@ -130,7 +130,7 @@ void terminate_session(void) {
 
        else {
                printf("HTTP/1.0 200 OK\n");
-               output_headers(1);
+               output_headers(1, "bottom");
                wprintf("<TABLE WIDTH=100% BORDER=0 BGCOLOR=770000><TR><TD>");
                wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"<B>Confirm session termination");
                wprintf("</B></FONT></TD></TR></TABLE>\n");
@@ -163,7 +163,7 @@ void edit_me(void) {
        char buf[256];
 
        printf("HTTP/1.0 200 OK\n");
-       output_headers(1);
+       output_headers(1, "bottom");
 
        if (!strcasecmp(bstr("sc"), "Change room name")) {
                serv_printf("RCHG %s", bstr("fake_roomname"));