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 */ ) { - wcsession *WCC = WC; char httpnow[128]; - hprintf("HTTP/1.1 200 OK\n"); + if (WC->isFailure) + hprintf("HTTP/2.2 500 Internal Server Error"); + else if (WC->Hdr->HaveRange > 1) + hprintf("HTTP/1.1 206 Partial Content\r\n"); + else + hprintf("HTTP/1.1 200 OK\r\n"); + http_datestring(httpnow, sizeof httpnow, time(NULL)); if (do_httpheaders) { - if (WCC->serv_info != NULL) + if (WC->serv_info != NULL) hprintf("Content-type: text/html; charset=utf-8\r\n" "Server: %s / %s\n" "Connection: close\r\n", PACKAGE_STRING, - ChrPtr(WCC->serv_info->serv_software)); + ChrPtr(WC->serv_info->serv_software)); else hprintf("Content-type: text/html; charset=utf-8\r\n" "Server: %s / [n/a]\n" @@ -194,24 +184,24 @@ void output_headers( int do_httpheaders, /* 1 = output HTTP headers */ if (do_htmlhead) { begin_burst(); do_template("head"); - if ( (WCC->logged_in) && (!unset_cookies) ) { + if ( (WC->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"); } } void output_custom_content_header(const char *ctype) { - hprintf("HTTP/1.1 200 OK\r\n"); - hprintf("Content-type: %s; charset=utf-8\r\n",ctype); - hprintf("Server: %s / %s\r\n", PACKAGE_STRING, ChrPtr(WC->serv_info->serv_software)); - hprintf("Connection: close\r\n"); + hprintf("HTTP/1.1 200 OK\r\n"); + hprintf("Content-type: %s; charset=utf-8\r\n",ctype); + hprintf("Server: %s / %s\r\n", PACKAGE_STRING, ChrPtr(WC->serv_info->serv_software)); + hprintf("Connection: close\r\n"); } @@ -234,12 +224,17 @@ 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)" : "")); + if (verbose) + syslog(LOG_DEBUG, "http_transmit_thing(%s)%s", content_type, ((is_static > 0) ? " (static)" : "")); output_headers(0, 0, 0, 0, 0, is_static); hprintf("Content-type: %s\r\n" @@ -251,6 +246,30 @@ void http_transmit_thing(const char *content_type, int is_static) end_burst(); } +void http_transmit_headers(const char *content_type, int is_static, long is_chunked, int is_gzip) +{ + if (verbose) + syslog(LOG_DEBUG, "http_transmit_thing(%s)%s", content_type, ((is_static > 0) ? " (static)" : "")); + output_headers(0, 0, 0, 0, 0, is_static); + + if (is_gzip) + hprintf("Content-encoding: gzip\r\n"); + + if (WC->Hdr->HaveRange) + hprintf("Accept-Ranges: bytes\r\n" + "Content-Range: bytes %ld-%ld/%ld\r\n", + WC->Hdr->RangeStart, + WC->Hdr->RangeTil, + WC->Hdr->TotalBytes); + + hprintf("Content-type: %s\r\n" + "Server: "PACKAGE_STRING"\r\n" + "%s" + "Connection: close\r\n\r\n", + content_type, + (is_chunked)?"Transfer-Encoding: chunked\r\n":""); +} + /* * Convenience functions to display a page containing only a string @@ -262,14 +281,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"); escputs(messagetext); - wc_printf("

\n"); wDumpContent(1); } @@ -311,7 +329,6 @@ void display_success(const char *successmessage) */ void authorization_required(void) { - wcsession *WCC = WC; const char *message = ""; hprintf("HTTP/1.1 401 Authorization Required\r\n"); @@ -321,14 +338,19 @@ void authorization_required(void) PACKAGE_STRING, ChrPtr(WC->serv_info->serv_software) ); hprintf("WWW-Authenticate: Basic realm=\"%s\"\r\n", ChrPtr(WC->serv_info->serv_humannode)); + + /* if this is a false cookie authentication, remove it to avoid endless loops. */ + if (StrLength(WC->Hdr->HR.RawCookie) > 0) + stuff_to_cookie(1); + hprintf("Content-Type: text/html\r\n"); begin_burst(); wc_printf("

"); wc_printf(_("Authorization Required")); wc_printf("

\r\n"); - if (WCC->ImportantMsg != NULL) { - message = ChrPtr(WCC->ImportantMsg); + if (WC->ImportantMsg != NULL) { + message = ChrPtr(WC->ImportantMsg); } wc_printf( @@ -344,9 +366,8 @@ void authorization_required(void) * Convenience functions to wrap around asynchronous ajax responses */ void begin_ajax_response(void) { - wcsession *WCC = WC; - FlushStrBuf(WCC->HBuf); + FlushStrBuf(WC->HBuf); output_headers(0, 0, 0, 0, 0, 0); hprintf("Content-type: text/html; charset=UTF-8\r\n" @@ -369,28 +390,28 @@ void end_ajax_response(void) { /* * Wraps a Citadel server command in an AJAX transaction. */ -void ajax_servcmd(void) -{ - wcsession *WCC = WC; +void ajax_servcmd(void) { int Done = 0; StrBuf *Buf; char *junk; size_t len; - syslog(LOG_DEBUG, "ajax_servcmd() g_cmd=\"%s\"", bstr("g_cmd") ); + if (verbose) { + syslog(LOG_DEBUG, "ajax_servcmd() g_cmd=\"%s\"", bstr("g_cmd") ); + } begin_ajax_response(); Buf = NewStrBuf(); serv_puts(bstr("g_cmd")); StrBuf_ServGetln(Buf); - StrBufAppendBuf(WCC->WBuf, Buf, 0); - StrBufAppendBufPlain(WCC->WBuf, HKEY("\n"), 0); + StrBufAppendBuf(WC->WBuf, Buf, 0); + StrBufAppendBufPlain(WC->WBuf, HKEY("\n"), 0); switch (GetServerStatus(Buf, NULL)) { case 8: serv_puts("\n\n000"); if ( (StrLength(Buf)==3) && !strcmp(ChrPtr(Buf), "000")) { - StrBufAppendBufPlain(WCC->WBuf, HKEY("\000"), 0); + StrBufAppendBufPlain(WC->WBuf, HKEY("\000"), 0); break; } case 1: @@ -401,8 +422,8 @@ void ajax_servcmd(void) !strcmp(ChrPtr(Buf), "000")) { Done = 1; } - StrBufAppendBuf(WCC->WBuf, Buf, 0); - StrBufAppendBufPlain(WCC->WBuf, HKEY("\n"), 0); + StrBufAppendBuf(WC->WBuf, Buf, 0); + StrBufAppendBufPlain(WC->WBuf, HKEY("\n"), 0); } break; case 4: @@ -430,7 +451,7 @@ void ajax_servcmd(void) * that page_popup() doesn't try to open it a second time. TODO: page_popup isn't with us anymore. */ if (!strncasecmp(bstr("g_cmd"), "GEXP", 4)) { - WCC->last_pager_check = time(NULL); + WC->last_pager_check = time(NULL); } FreeStrBuf(&Buf); } @@ -465,16 +486,16 @@ void seconds_since_last_gexp(void) * Save a URL destination so we can go to it later */ void push_destination(void) { - wcsession *WCC = WC; - if (!WCC) { + if (!WC) { wc_printf("no session"); return; } - FreeStrBuf(&WCC->PushedDestination); - WCC->PushedDestination = NewStrBufDup(SBSTR("url")); - syslog(9, "Push: %s", ChrPtr(WCC->PushedDestination)); + FreeStrBuf(&WC->PushedDestination); + WC->PushedDestination = NewStrBufDup(sbstr("url")); + if (verbose) + syslog(LOG_DEBUG, "Push: %s", ChrPtr(WC->PushedDestination)); wc_printf("OK"); } @@ -483,19 +504,17 @@ void push_destination(void) { * Go to the URL saved by push_destination() */ void pop_destination(void) { - wcsession *WCC = WC; - /* * If we are in the middle of a new user signup, the server may request that * we first pass through a registration screen. */ - if ((WCC) && (WCC->need_regi)) { - if ((WCC->PushedDestination != NULL) && (StrLength(WCC->PushedDestination) > 0)) { + if ((WC) && (WC->need_regi)) { + if ((WC->PushedDestination != NULL) && (StrLength(WC->PushedDestination) > 0)) { /* Registering will take us to the My Citadel Config room, so save our place */ - StrBufAppendBufPlain(WCC->PushedDestination, HKEY("?go="), 0); - StrBufUrlescAppend(WCC->PushedDestination, WCC->CurRoom.name, NULL); + StrBufAppendBufPlain(WC->PushedDestination, HKEY("?go="), 0); + StrBufUrlescAppend(WC->PushedDestination, WC->CurRoom.name, NULL); } - WCC->need_regi = 0; + WC->need_regi = 0; display_reg(1); return; } @@ -504,7 +523,7 @@ void pop_destination(void) { * Do something reasonable if we somehow ended up requesting a pop without * having first done a push. */ - if ( (!WCC) || (WCC->PushedDestination == NULL) || (StrLength(WCC->PushedDestination) == 0) ) { + if ( (!WC) || (WC->PushedDestination == NULL) || (StrLength(WC->PushedDestination) == 0) ) { do_welcome(); return; } @@ -512,43 +531,41 @@ void pop_destination(void) { /* * All righty then! We have a destination saved, so go there now. */ - syslog(9, "Pop: %s", ChrPtr(WCC->PushedDestination)); - http_redirect(ChrPtr(WCC->PushedDestination)); + if (verbose) { + syslog(LOG_DEBUG, "Pop: %s", ChrPtr(WC->PushedDestination)); + } + http_redirect(ChrPtr(WC->PushedDestination)); } - -int ReadPostData(void) -{ +int ReadPostData(void) { int rc; int urlencoded_post = 0; - wcsession *WCC = WC; StrBuf *content = NULL; - urlencoded_post = (strncasecmp(ChrPtr(WCC->Hdr->HR.ContentType), "application/x-www-form-urlencoded", 33) == 0) ; + urlencoded_post = (strncasecmp(ChrPtr(WC->Hdr->HR.ContentType), "application/x-www-form-urlencoded", 33) == 0) ; - content = NewStrBufPlain(NULL, WCC->Hdr->HR.ContentLength + 256); + content = NewStrBufPlain(NULL, WC->Hdr->HR.ContentLength + 256); - if (!urlencoded_post) - { + if (!urlencoded_post) { StrBufPrintf(content, - "Content-type: %s\n" - "Content-length: %ld\n\n", - ChrPtr(WCC->Hdr->HR.ContentType), - WCC->Hdr->HR.ContentLength); + "Content-type: %s\n" + "Content-length: %ld\n\n", + ChrPtr(WC->Hdr->HR.ContentType), + WC->Hdr->HR.ContentLength + ); } - /** Read the entire input data at once. */ - rc = client_read_to(WCC->Hdr, content, - WCC->Hdr->HR.ContentLength, - SLEEPING); - if (rc < 0) + /* Read the entire input data at once. */ + rc = client_read_to(WC->Hdr, content, WC->Hdr->HR.ContentLength, SLEEPING); + if (rc < 0) { return rc; - + } if (urlencoded_post) { ParseURLParams(content); - } else if (!strncasecmp(ChrPtr(WCC->Hdr->HR.ContentType), "multipart", 9)) { + } + else if (!strncasecmp(ChrPtr(WC->Hdr->HR.ContentType), "multipart", 9)) { char *Buf; char *BufEnd; long len; @@ -558,9 +575,10 @@ int ReadPostData(void) BufEnd = Buf + len; mime_parser(Buf, BufEnd, *upload_handler, NULL, NULL, NULL, 0); free(Buf); - } else if (WCC->Hdr->HR.ContentLength > 0) { - WCC->upload = content; - WCC->upload_length = StrLength(WCC->upload); + } + else if (WC->Hdr->HR.ContentLength > 0) { + WC->upload = content; + WC->upload_length = StrLength(WC->upload); content = NULL; } FreeStrBuf(&content); @@ -572,12 +590,11 @@ int Conditional_REST_DEPTH(StrBuf *Target, WCTemplputParams *TP) { long Depth, IsDepth; long offset = 0; - wcsession *WCC = WC; - if (WCC->Hdr->HR.Handler != NULL) + if (WC->Hdr->HR.Handler != NULL) offset ++; Depth = GetTemplateTokenNumber(Target, TP, 2, 0); - IsDepth = GetCount(WCC->Directory) + offset; + IsDepth = GetCount(WC->Directory) + offset; // LogTemplateError(Target, "bla", 1, TP, "REST_DEPTH: %ld : %ld\n", Depth, IsDepth); if (Depth < 0) { @@ -602,41 +619,39 @@ void session_loop(void) * We stuff these with the values coming from the client cookies, * so we can use them to reconnect a timed out session if we have to. */ - wcsession *WCC; - - WCC= WC; - WCC->upload_length = 0; - WCC->upload = NULL; - WCC->Hdr->nWildfireHeaders = 0; - - if (WCC->Hdr->HR.ContentLength > 0) { + WC->upload_length = 0; + WC->upload = NULL; + WC->Hdr->nWildfireHeaders = 0; + + if (WC->Hdr->HR.ContentLength > 0) { if (ReadPostData() < 0) { return; } } Buf = NewStrBuf(); - WCC->trailing_javascript = NewStrBuf(); + WC->trailing_javascript = NewStrBuf(); /* Convert base64-encoded URL's back to plain text */ - if (!strncmp(ChrPtr(WCC->Hdr->this_page), "/B64", 4)) { - StrBufCutLeft(WCC->Hdr->this_page, 4); - StrBufDecodeBase64(WCC->Hdr->this_page); - http_redirect(ChrPtr(WCC->Hdr->this_page)); + if (!strncmp(ChrPtr(WC->Hdr->this_page), "/B64", 4)) { + StrBufCutLeft(WC->Hdr->this_page, 4); + StrBufDecodeBase64(WC->Hdr->this_page); + http_redirect(ChrPtr(WC->Hdr->this_page)); goto SKIP_ALL_THIS_CRAP; } /* If there are variables in the URL, we must grab them now */ - if (WCC->Hdr->PlainArgs != NULL) - ParseURLParams(WCC->Hdr->PlainArgs); + if (WC->Hdr->PlainArgs != NULL) { + ParseURLParams(WC->Hdr->PlainArgs); + } /* If the client sent a nonce that is incorrect, kill the request. */ if (havebstr("nonce")) { - syslog(9, "Comparing supplied nonce %s to session nonce %d", - bstr("nonce"), WCC->nonce - ); - if (ibstr("nonce") != WCC->nonce) { - syslog(9, "Ignoring request with mismatched nonce."); + if (verbose) { + syslog(LOG_DEBUG, "Comparing supplied nonce %s to session nonce %d", bstr("nonce"), WC->nonce); + } + if (ibstr("nonce") != WC->nonce) { + syslog(LOG_INFO, "Ignoring request with mismatched nonce."); hprintf("HTTP/1.1 404 Security check failed\r\n"); hprintf("Content-Type: text/plain\r\n"); begin_burst(); @@ -649,7 +664,7 @@ void session_loop(void) /* * If we're not connected to a Citadel server, try to hook up the connection now. */ - if (!WCC->connected) { + if (!WC->connected) { if (GetConnected()) { hprintf("HTTP/1.1 503 Service Unavailable\r\n"); hprintf("Content-Type: text/html\r\n"); @@ -674,37 +689,37 @@ void session_loop(void) * If we're not logged in, but we have authentication data (either from * a cookie or from http-auth), try logging in to Citadel using that. */ - if ( (!WCC->logged_in) - && (StrLength(WCC->Hdr->c_username) > 0) - && (StrLength(WCC->Hdr->c_password) > 0) + if ( (!WC->logged_in) + && (StrLength(WC->Hdr->c_username) > 0) + && (StrLength(WC->Hdr->c_password) > 0) ) { long Status; FlushStrBuf(Buf); - serv_printf("USER %s", ChrPtr(WCC->Hdr->c_username)); + serv_printf("USER %s", ChrPtr(WC->Hdr->c_username)); StrBuf_ServGetln(Buf); if (GetServerStatus(Buf, &Status) == 3) { - serv_printf("PASS %s", ChrPtr(WCC->Hdr->c_password)); + serv_printf("PASS %s", ChrPtr(WC->Hdr->c_password)); StrBuf_ServGetln(Buf); if (GetServerStatus(Buf, NULL) == 2) { - become_logged_in(WCC->Hdr->c_username, - WCC->Hdr->c_password, Buf); - } else { + become_logged_in(WC->Hdr->c_username, WC->Hdr->c_password, Buf); + } + else { /* Should only display when password is wrong */ - WCC->ImportantMsg = NewStrBufPlain(ChrPtr(Buf) + 4, StrLength(Buf) - 4); + WC->ImportantMsg = NewStrBufPlain(ChrPtr(Buf) + 4, StrLength(Buf) - 4); authorization_required(); FreeStrBuf(&Buf); goto SKIP_ALL_THIS_CRAP; } } else if (Status == 541) { - WCC->logged_in = 1; + WC->logged_in = 1; } } - xhttp = (WCC->Hdr->HR.eReqType != eGET) && - (WCC->Hdr->HR.eReqType != ePOST) && - (WCC->Hdr->HR.eReqType != eHEAD); + xhttp = (WC->Hdr->HR.eReqType != eGET) && + (WC->Hdr->HR.eReqType != ePOST) && + (WC->Hdr->HR.eReqType != eHEAD); /* * If a 'go' (or 'gotofirst') parameter has been specified, attempt to goto that room @@ -712,18 +727,21 @@ void session_loop(void) */ if (havebstr("go")) { int ret; - syslog(9, "Explicit room selection: %s", bstr("go")); + if (verbose) + syslog(LOG_DEBUG, "Explicit room selection: %s", bstr("go")); ret = gotoroom(sbstr("go")); /* do quietly to avoid session output! */ if ((ret/100) != 2) { - syslog(1, "Unable to change to [%s]; Reason: %d", bstr("go"), ret); + if (verbose) + syslog(LOG_DEBUG, "Unable to change to [%s]; Reason: %d", bstr("go"), ret); } } else if (havebstr("gotofirst")) { int ret; - syslog(9, "Explicit room selection: %s", bstr("gotofirst")); + if (verbose) + syslog(LOG_DEBUG, "Explicit room selection: %s", bstr("gotofirst")); ret = gotoroom(sbstr("gotofirst")); /* do quietly to avoid session output! */ if ((ret/100) != 2) { - syslog(1, "Unable to change to [%s]; Reason: %d", bstr("gotofirst"), ret); + syslog(LOG_INFO, "Unable to change to [%s]; Reason: %d", bstr("gotofirst"), ret); } } @@ -731,33 +749,36 @@ void session_loop(void) * If we aren't in any room yet, but we have cookie data telling us where we're * supposed to be, and 'go' was not specified, then go there. */ - else if ( (StrLength(WCC->CurRoom.name) == 0) && ( (StrLength(WCC->Hdr->c_roomname) > 0) )) { + else if ( (StrLength(WC->CurRoom.name) == 0) && ( (StrLength(WC->Hdr->c_roomname) > 0) )) { int ret; - syslog(9, "We are in '%s' but cookie indicates '%s', going there...", - ChrPtr(WCC->CurRoom.name), - ChrPtr(WCC->Hdr->c_roomname) + if (verbose) + syslog(LOG_DEBUG, "We are in '%s' but cookie indicates '%s', going there...", + ChrPtr(WC->CurRoom.name), + ChrPtr(WC->Hdr->c_roomname) ); - ret = gotoroom(WCC->Hdr->c_roomname); /* do quietly to avoid session output! */ + ret = gotoroom(WC->Hdr->c_roomname); /* do quietly to avoid session output! */ if ((ret/100) != 2) { - syslog(1, "COOKIEGOTO: Unable to change to [%s]; Reason: %d", - ChrPtr(WCC->Hdr->c_roomname), ret); + if (verbose) + syslog(LOG_DEBUG, "COOKIEGOTO: Unable to change to [%s]; Reason: %d", + ChrPtr(WC->Hdr->c_roomname), ret); } } - if (WCC->Hdr->HR.Handler != NULL) { - if ( (!WCC->logged_in) - && ((WCC->Hdr->HR.Handler->Flags & ANONYMOUS) == 0) - && (WCC->serv_info->serv_supports_guest == 0) + if (WC->Hdr->HR.Handler != NULL) { + if ( (!WC->logged_in) + && ((WC->Hdr->HR.Handler->Flags & ANONYMOUS) == 0) + && (WC->serv_info != NULL) + && (WC->serv_info->serv_supports_guest == 0) ) { display_login(); } else { - if ((WCC->Hdr->HR.Handler->Flags & AJAX) != 0) { + if ((WC->Hdr->HR.Handler->Flags & AJAX) != 0) { begin_ajax_response(); } - WCC->Hdr->HR.Handler->F(); - if ((WCC->Hdr->HR.Handler->Flags & AJAX) != 0) { + WC->Hdr->HR.Handler->F(); + if ((WC->Hdr->HR.Handler->Flags & AJAX) != 0) { end_ajax_response(); } } @@ -768,7 +789,7 @@ void session_loop(void) * ordinary browser users get a nice login screen, DAV etc. requsets * are given a 401 so they can handle it appropriate. */ - if (!WCC->logged_in) { + if (!WC->logged_in) { if (xhttp) { authorization_required(); } @@ -800,16 +821,13 @@ SKIP_ALL_THIS_CRAP: * Display the appropriate landing page for this site. */ void display_default_landing_page(void) { - wcsession *WCC = WC; - - if (WCC && WCC->serv_info && WCC->serv_info->serv_supports_guest) { + if (WC && WC->serv_info && WC->serv_info->serv_supports_guest) { /* default action */ if (havebstr("go")) { - syslog(9, "Explicit room selection: %s", bstr("go")); - StrBuf *teh_room = NewStrBufPlain(bstr("go"), strlen(bstr("go"))); - smart_goto(teh_room); - FreeStrBuf(&teh_room); + if (verbose) + syslog(LOG_DEBUG, "Explicit room selection: %s", bstr("go")); + smart_goto(sbstr("go")); } else if (default_landing_page) { http_redirect(default_landing_page); @@ -845,42 +863,40 @@ int Conditional_IS_HTTPS(StrBuf *Target, WCTemplputParams *TP) void AppendImportantMessage(const char *pch, long len) { - wcsession *WCC = WC; - if (StrLength(WCC->ImportantMsg) > 0) { - StrBufAppendBufPlain(WCC->ImportantMsg, HKEY("\n"), 0); + if (StrLength(WC->ImportantMsg) > 0) { + StrBufAppendBufPlain(WC->ImportantMsg, HKEY("\n"), 0); } - StrBufAppendBufPlain(WCC->ImportantMsg, pch, len, 0); + StrBufAppendBufPlain(WC->ImportantMsg, pch, len, 0); } int ConditionalImportantMesage(StrBuf *Target, WCTemplputParams *TP) { - wcsession *WCC = WC; - if (WCC != NULL) - return (StrLength(WCC->ImportantMsg) > 0); - else + if (WC != NULL) { + return (StrLength(WC->ImportantMsg) > 0); + } + else { return 0; + } } void tmplput_importantmessage(StrBuf *Target, WCTemplputParams *TP) { - wcsession *WCC = WC; - if (WCC != NULL) { - if (StrLength(WCC->ImportantMsg) > 0) { - StrEscAppend(Target, WCC->ImportantMsg, NULL, 0, 0); - FlushStrBuf(WCC->ImportantMsg); + if (WC != NULL) { + if (StrLength(WC->ImportantMsg) > 0) { + StrBufAppendTemplate(Target, TP, WC->ImportantMsg, 0); } } } void tmplput_trailing_javascript(StrBuf *Target, WCTemplputParams *TP) { - wcsession *WCC = WC; - if (WCC != NULL) - StrBufAppendTemplate(Target, TP, WCC->trailing_javascript, 0); + if (WC != NULL) { + StrBufAppendTemplate(Target, TP, WC->trailing_javascript, 0); + } } void tmplput_csslocal(StrBuf *Target, WCTemplputParams *TP) @@ -889,10 +905,8 @@ void tmplput_csslocal(StrBuf *Target, WCTemplputParams *TP) csslocal, 0); } -void tmplput_packagestring(StrBuf *Target, WCTemplputParams *TP) -{ - StrBufAppendBufPlain(Target, - HKEY(PACKAGE_STRING), 0); +void tmplput_packagestring(StrBuf *Target, WCTemplputParams *TP) { + StrBufAppendBufPlain(Target, HKEY(PACKAGE_STRING), 0); } extern char static_local_dir[PATH_MAX]; @@ -913,12 +927,12 @@ 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); + RegisterNamespace("IMPORTANTMESSAGE", 0, 1, tmplput_importantmessage, NULL, CTX_NONE); RegisterNamespace("TRAILING_JAVASCRIPT", 0, 0, tmplput_trailing_javascript, NULL, CTX_NONE); RegisterNamespace("URL:DISPLAYNAME", 0, 1, tmplput_HANDLER_DISPLAYNAME, NULL, CTX_NONE); RegisterNamespace("PACKAGESTRING", 0, 1, tmplput_packagestring, NULL, CTX_NONE); @@ -926,11 +940,11 @@ InitModule_WEBCIT snprintf(dir, SIZ, "%s/webcit.css", static_local_dir); if (!access(dir, R_OK)) { - syslog(9, "Using local Stylesheet [%s]", dir); + syslog(LOG_INFO, "Using local Stylesheet [%s]", dir); csslocal = NewStrBufPlain(HKEY("")); } else - syslog(9, "No Site-local Stylesheet [%s] installed.", dir); + syslog(LOG_INFO, "No Site-local Stylesheet [%s] installed.", dir); } @@ -980,6 +994,10 @@ SessionDetachModule_WEBCIT else FlushStrBuf(sess->WBuf); FlushStrBuf(sess->HBuf); + if (StrLength(sess->ImportantMsg) > 0) { + FlushStrBuf(sess->ImportantMsg); + } + } void