SUBST: Dynamicaly generate contexts

[citadel.git] / webcit / webcit.c
diff --git a/webcit/webcit.c b/webcit/webcit.c

index a42f5ae83031d38d564c3347ce2b0137d47d4a08..9ec539d93159a295ab26ff3fc01ee3a69e15b297 100644 (file)
--- 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 <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");
         }
  }
@@ -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);
  
@@ -742,6 +741,7 @@ void session_loop(void)
         if (WCC->Hdr->HR.Handler != NULL) {
                 if (    (!WCC->logged_in)
                         && ((WCC->Hdr->HR.Handler->Flags & ANONYMOUS) == 0)
+                       && (WCC->serv_info != NULL)
                         && (WCC->serv_info->serv_supports_guest == 0)
                 ) {
                         display_login();
@@ -864,7 +864,6 @@ void tmplput_importantmessage(StrBuf *Target, WCTemplputParams *TP)
         if (WCC != NULL) {
                 if (StrLength(WCC->ImportantMsg) > 0) {
                         StrEscAppend(Target, WCC->ImportantMsg, NULL, 0, 0);
-                       FlushStrBuf(WCC->ImportantMsg);
                 }
         }
  }
@@ -974,6 +973,10 @@ SessionDetachModule_WEBCIT
         else
                 FlushStrBuf(sess->WBuf);
         FlushStrBuf(sess->HBuf);
+       if (StrLength(sess->ImportantMsg) > 0) {
+               FlushStrBuf(sess->ImportantMsg);
+       }
+
  }
  
  void