TEMPLATING: add possibility to stack another context inbetween conditional tags

[citadel.git] / webcit / webcit.c

diff --git a/webcit/webcit.c b/webcit/webcit.c
index f067d446bf6581549aae5356578e2d7b9ee224a4..78d08f18172f79c3768c52fb03235e44c5a9d7ad 100644 (file)
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -224,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);
 
@@ -737,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();
@@ -859,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);
                }
        }
 }
@@ -902,9 +906,9 @@ InitModule_WEBCIT
        WebcitAddUrlHandler(HKEY("pop"), "", 0, pop_destination, 0);
 
        WebcitAddUrlHandler(HKEY("401"), "", 0, authorization_required, ANONYMOUS|COOKIEUNNEEDED);
-       RegisterConditional(HKEY("COND:IMPMSG"), 0, ConditionalImportantMesage, CTX_NONE);
-       RegisterConditional(HKEY("COND:REST:DEPTH"), 0, Conditional_REST_DEPTH, CTX_NONE);
-       RegisterConditional(HKEY("COND:IS_HTTPS"), 0, Conditional_IS_HTTPS, CTX_NONE);
+       RegisterConditional("COND:IMPMSG", 0, ConditionalImportantMesage, CTX_NONE);
+       RegisterConditional("COND:REST:DEPTH", 0, Conditional_REST_DEPTH, CTX_NONE);
+       RegisterConditional("COND:IS_HTTPS", 0, Conditional_IS_HTTPS, CTX_NONE);
 
        RegisterNamespace("CSSLOCAL", 0, 0, tmplput_csslocal, NULL, CTX_NONE);
        RegisterNamespace("IMPORTANTMESSAGE", 0, 0, tmplput_importantmessage, NULL, CTX_NONE);
@@ -969,6 +973,10 @@ SessionDetachModule_WEBCIT
        else
                FlushStrBuf(sess->WBuf);
        FlushStrBuf(sess->HBuf);
+       if (StrLength(sess->ImportantMsg) > 0) {
+               FlushStrBuf(sess->ImportantMsg);
+       }
+
 }
 
 void