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

[citadel.git] / webcit / webcit.c

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);