]> code.citadel.org Git - citadel.git/blobdiff - webcit/webcit.c
First of several required additions of 'go=' to wiki links
[citadel.git] / webcit / webcit.c
index 224a9d2208a5bc6e73785108b901999e75edc59a..f067d446bf6581549aae5356578e2d7b9ee224a4 100644 (file)
@@ -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 <head> section and <body> opener */
-
-                       int do_room_banner,     /* 0=no, 1=yes,                              
-                                                * 2 = I'm going to embed my own, so don't open the 
-                                                *     <div id="content"> either.                  
-                                                */
-
+                       int do_room_banner,     /* 1 = include the room banner and <div id="content"></div> */
                        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("<div id=\"content\">\n");
        }
 }
@@ -257,14 +252,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("<div id=\"banner\">\n");
+       output_headers(1, 1, 1, 0, 0, 0);
+       wc_printf("<div id=\"room_banner_override\">\n");
        wc_printf("<table width=100%% border=0 bgcolor=\"#%s\"><tr><td>", titlebarcolor);
        wc_printf("<span class=\"titlebar\">%s</span>\n", titlebarmsg);
        wc_printf("</td></tr></table>\n");
        wc_printf("</div>\n<div id=\"content\">\n");
        escputs(messagetext);
-
        wc_printf("<hr />\n");
        wDumpContent(1);
 }