X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fwebcit.c;h=22bd92a99f87051e8fade0f53db3c3c003ed947b;hb=fb6f6fa4ec4e3277e30d84326d48e6850822d318;hp=224a9d2208a5bc6e73785108b901999e75edc59a;hpb=f87fa1983800e3f18c4729ca0d18b2b66f3f43d3;p=citadel.git diff --git a/webcit/webcit.c b/webcit/webcit.c index 224a9d220..22bd92a99 100644 --- a/webcit/webcit.c +++ b/webcit/webcit.c @@ -133,12 +133,7 @@ void wDumpContent(int print_standard_html_footer) */ void output_headers( int do_httpheaders, /* 1 = output HTTP headers */ int do_htmlhead, /* 1 = output HTML section and opener */ - - int do_room_banner, /* 0=no, 1=yes, - * 2 = I'm going to embed my own, so don't open the - *
either. - */ - + int do_room_banner, /* 1 = include the room banner and
*/ int unset_cookies, /* 1 = session is terminating, so unset the cookies */ int suppress_check, /* 1 = suppress check for instant messages */ int cache /* 1 = allow browser to cache this page */ @@ -192,12 +187,12 @@ void output_headers( int do_httpheaders, /* 1 = output HTTP headers */ if ( (WCC->logged_in) && (!unset_cookies) ) { DoTemplate(HKEY("paging"), NULL, &NoCtx); } - if (do_room_banner == 1) { + if (do_room_banner) { tmplput_roombanner(NULL, NULL); } } - if (do_room_banner == 1) { + if (do_room_banner) { wc_printf("
\n"); } } @@ -229,11 +224,15 @@ void http_redirect(const char *whichpage) { /* - * Output a piece of content to the web browser using conformant HTTP and MIME semantics + * Output a piece of content to the web browser using conformant HTTP and MIME semantics. + * + * If this function is called, it is expected that begin_burst() has already been called + * and some sort of content has been fed into the buffer. This function will transmit a + * bunch of headers to the client. end_burst() will add some headers of its own, and then + * transmit the buffered content to the client. */ void http_transmit_thing(const char *content_type, int is_static) { - syslog(9, "http_transmit_thing(%s)%s", content_type, ((is_static > 0) ? " (static)" : "")); output_headers(0, 0, 0, 0, 0, is_static); @@ -257,14 +256,13 @@ void http_transmit_thing(const char *content_type, int is_static) void convenience_page(const char *titlebarcolor, const char *titlebarmsg, const char *messagetext) { hprintf("HTTP/1.1 200 OK\n"); - output_headers(1, 1, 2, 0, 0, 0); - wc_printf("
\n"); + output_headers(1, 1, 1, 0, 0, 0); + wc_printf("
\n"); wc_printf("
", titlebarcolor); wc_printf("%s\n", titlebarmsg); wc_printf("
\n"); wc_printf("
\n
\n"); escputs(messagetext); - wc_printf("
\n"); wDumpContent(1); }