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 */ @@ -200,40 +184,24 @@ void output_headers( int do_httpheaders, /* 1 = output HTTP headers */ if (do_htmlhead) { begin_burst(); do_template("head"); - - /* check for ImportantMessages (these display in a div overlaying the main screen) */ - if (StrLength(WCC->ImportantMsg) > 0) { - wc_printf("

\n" - ""); - StrEscAppend(WCC->WBuf, WCC->ImportantMsg, NULL, 0, 0); - wc_printf("
\n" - "

\n" - ); - StrBufAppendBufPlain(WCC->trailing_javascript, - HKEY("setTimeout('hide_imsg_popup()', 5000); \n"), - 0 - ); - FlushStrBuf(WCC->ImportantMsg); - } 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"); } } 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"); } @@ -245,6 +213,7 @@ void http_redirect(const char *whichpage) { hprintf("Location: %s\r\n", whichpage); hprintf("URI: %s\r\n", whichpage); hprintf("Content-type: text/html; charset=utf-8\r\n"); + stuff_to_cookie(0); begin_burst(); wc_printf(""); wc_printf("Go here.", whichpage); @@ -255,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); @@ -283,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"); escputs(messagetext); - wc_printf("

\n"); wDumpContent(1); } @@ -347,17 +319,20 @@ void authorization_required(void) wc_printf("

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

\r\n"); - - if (WCC->ImportantMsg != NULL) + if (WCC->ImportantMsg != NULL) { message = ChrPtr(WCC->ImportantMsg); + } - wc_printf(_("The resource you requested requires a valid username and password. " - "You could not be logged in: %s\n"), message); + wc_printf( + _("The resource you requested requires a valid username and password. " + "You could not be logged in: %s\n"), + message + ); wDumpContent(0); - end_webcit_session(); } + /* * Convenience functions to wrap around asynchronous ajax responses */ @@ -375,6 +350,7 @@ void begin_ajax_response(void) { begin_burst(); } + /* * print ajax response footer */ @@ -383,7 +359,6 @@ void end_ajax_response(void) { } - /* * Wraps a Citadel server command in an AJAX transaction. */ @@ -496,6 +471,7 @@ void push_destination(void) { wc_printf("OK"); } + /* * Go to the URL saved by push_destination() */ @@ -585,48 +561,6 @@ int ReadPostData(void) } -void ParseREST_URL(void) -{ - StrBuf *Buf; - StrBuf *pFloor = NULL; - wcsession *WCC = WC; - long i = 0; - const char *pCh = NULL; - HashList *Floors; - void *vFloor; - - syslog(1, "parsing rest URL: %s", ChrPtr(WCC->Hdr->HR.ReqLine)); - - WCC->Directory = NewHash(1, Flathash); - WCC->CurrentFloor = NULL; - - Buf = NewStrBuf(); - while (StrBufExtract_NextToken(Buf, WCC->Hdr->HR.ReqLine, &pCh, '/') >= 0) - { - if (StrLength(Buf) != 0) { - /* ignore empty path segments */ - StrBufUnescape(Buf, 1); - Put(WCC->Directory, IKEY(i), Buf, HFreeStrBuf); - if (i==0) - pFloor = Buf; - Buf = NewStrBuf(); - } - i++; - } - - FreeStrBuf(&Buf); - if (pFloor != NULL) - { - Floors = GetFloorListHash(NULL, NULL); - - if (Floors != NULL) - { - if (GetHash(WCC->FloorsByName, SKEY(pFloor), &vFloor)) - WCC->CurrentFloor = (Floor*) vFloor; - } - } -} - int Conditional_REST_DEPTH(StrBuf *Target, WCTemplputParams *TP) { long Depth, IsDepth; @@ -733,10 +667,10 @@ 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 ( (!WCC->logged_in) + && (StrLength(WCC->Hdr->c_username) > 0) + && (StrLength(WCC->Hdr->c_password) > 0) + ) { long Status; FlushStrBuf(Buf); @@ -812,15 +746,13 @@ void session_loop(void) display_login(); } else { -/* - if ((WCC->Hdr->HR.Handler->Flags & PARSE_REST_URL) != 0) - ParseREST_URL(); -*/ - if ((WCC->Hdr->HR.Handler->Flags & AJAX) != 0) + if ((WCC->Hdr->HR.Handler->Flags & AJAX) != 0) { begin_ajax_response(); + } WCC->Hdr->HR.Handler->F(); - if ((WCC->Hdr->HR.Handler->Flags & AJAX) != 0) + if ((WCC->Hdr->HR.Handler->Flags & AJAX) != 0) { end_ajax_response(); + } } } /* When all else fails, display the default landing page or a main menu. */ @@ -841,10 +773,12 @@ void session_loop(void) * Toplevel dav requests? or just a flat browser request? */ else { - if (xhttp) + if (xhttp) { dav_main(); - else + } + else { display_main_menu(); + } } } @@ -864,7 +798,13 @@ void display_default_landing_page(void) { if (WCC && WCC->serv_info && WCC->serv_info->serv_supports_guest) { /* default action */ - if (default_landing_page) { + 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); + } + else if (default_landing_page) { http_redirect(default_landing_page); } else { @@ -957,6 +897,7 @@ InitModule_WEBCIT { char dir[SIZ]; WebcitAddUrlHandler(HKEY("blank"), "", 0, blank_page, ANONYMOUS|COOKIEUNNEEDED|ISSTATIC); + WebcitAddUrlHandler(HKEY("landing"), "", 0, display_default_landing_page, ANONYMOUS|COOKIEUNNEEDED); WebcitAddUrlHandler(HKEY("do_template"), "", 0, url_do_template, ANONYMOUS); WebcitAddUrlHandler(HKEY("sslg"), "", 0, seconds_since_last_gexp, AJAX|LOGCHATTY); WebcitAddUrlHandler(HKEY("ajax_servcmd"), "", 0, ajax_servcmd, 0);