\n" ""); StrEscAppend(WCC->WBuf, WCC->ImportantMsg, NULL, 0, 0); @@ -238,6 +239,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); @@ -253,7 +255,7 @@ void http_redirect(const char *whichpage) { void http_transmit_thing(const char *content_type, int is_static) { - lprintf(9, "http_transmit_thing(%s)%s\n", content_type, ((is_static > 0) ? " (static)" : "")); + syslog(9, "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" @@ -314,7 +316,7 @@ void url_do_template(void) { /* * convenience function to indicate success */ -void display_success(char *successmessage) +void display_success(const char *successmessage) { convenience_page("007700", "OK", successmessage); } @@ -340,19 +342,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); - else if (WCC->ImportantMessage != NULL) - message = WCC->ImportantMessage; + } - 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 */ @@ -370,6 +373,7 @@ void begin_ajax_response(void) { begin_burst(); } + /* * print ajax response footer */ @@ -378,7 +382,6 @@ void end_ajax_response(void) { } - /* * Wraps a Citadel server command in an AJAX transaction. */ @@ -390,6 +393,7 @@ void ajax_servcmd(void) char *junk; size_t len; + syslog(LOG_DEBUG, "ajax_servcmd() g_cmd=\"%s\"", bstr("g_cmd") ); begin_ajax_response(); Buf = NewStrBuf(); serv_puts(bstr("g_cmd")); @@ -407,7 +411,8 @@ void ajax_servcmd(void) } case 1: while (!Done) { - StrBuf_ServGetln(Buf); + if (StrBuf_ServGetln(Buf) < 0) + break; if ( (StrLength(Buf)==3) && !strcmp(ChrPtr(Buf), "000")) { Done = 1; @@ -438,7 +443,7 @@ void ajax_servcmd(void) * This is kind of an ugly hack, but this is the only place it can go. * If the command was GEXP, then the instant messenger window must be * running, so reset the "last_pager_check" watchdog timer so - * that page_popup() doesn't try to open it a second time. + * 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); @@ -472,6 +477,62 @@ 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) { + wc_printf("no session"); + return; + } + + FreeStrBuf(&WCC->PushedDestination); + WCC->PushedDestination = NewStrBufDup(SBSTR("url")); + syslog(9, "Push: %s", ChrPtr(WCC->PushedDestination)); + wc_printf("OK"); +} + + +/* + * 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)) { + /* 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); + } + WCC->need_regi = 0; + display_reg(1); + return; + } + + /* + * 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) ) { + do_welcome(); + return; + } + + /* + * All righty then! We have a destination saved, so go there now. + */ + syslog(9, "Pop: %s", ChrPtr(WCC->PushedDestination)); + http_redirect(ChrPtr(WCC->PushedDestination)); +} + + int ReadPostData(void) { @@ -523,48 +584,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; - - lprintf(1, "parsing rest URL: %s\n", 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; @@ -592,7 +611,6 @@ int Conditional_REST_DEPTH(StrBuf *Target, WCTemplputParams *TP) */ void session_loop(void) { - int Flags = 0; int xhttp; StrBuf *Buf; @@ -605,10 +623,7 @@ void session_loop(void) WCC= WC; WCC->upload_length = 0; WCC->upload = NULL; - WCC->is_mobile = 0; WCC->Hdr->nWildfireHeaders = 0; - if (WCC->Hdr->HR.Handler != NULL) - Flags = WCC->Hdr->HR.Handler->Flags; /* so we can temporarily add our own... */ if (WCC->Hdr->HR.ContentLength > 0) { if (ReadPostData() < 0) { @@ -633,10 +648,11 @@ void session_loop(void) /* If the client sent a nonce that is incorrect, kill the request. */ if (havebstr("nonce")) { - lprintf(9, "Comparing supplied nonce %s to session nonce %ld\n", - bstr("nonce"), WCC->nonce); + syslog(9, "Comparing supplied nonce %s to session nonce %d", + bstr("nonce"), WCC->nonce + ); if (ibstr("nonce") != WCC->nonce) { - lprintf(9, "Ignoring request with mismatched nonce.\n"); + syslog(9, "Ignoring request with mismatched nonce."); hprintf("HTTP/1.1 404 Security check failed\r\n"); hprintf("Content-Type: text/plain\r\n"); begin_burst(); @@ -652,12 +668,19 @@ void session_loop(void) if (!WCC->connected) { if (GetConnected()) { hprintf("HTTP/1.1 503 Service Unavailable\r\n"); - hprintf("Content-Type: text/plain\r\n"); + hprintf("Content-Type: text/html\r\n"); begin_burst(); + wc_printf("503 Service Unavailable\n"); wc_printf(_("This program was unable to connect or stay " "connected to the Citadel server. Please report " "this problem to your system administrator.") ); + wc_printf("
"); + wc_printf("%s", + _("Read More...") + ); + wc_printf("\n"); end_burst(); goto SKIP_ALL_THIS_CRAP; } @@ -667,10 +690,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); @@ -700,32 +723,40 @@ void session_loop(void) (WCC->Hdr->HR.eReqType != eHEAD); /* - * If a 'gotofirst' parameter has been specified, attempt to goto that room + * If a 'go' (or 'gotofirst') parameter has been specified, attempt to goto that room * prior to doing anything else. */ - if (havebstr("gotofirst")) { + if (havebstr("go")) { + int ret; + syslog(9, "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); + } + } + else if (havebstr("gotofirst")) { int ret; + syslog(9, "Explicit room selection: %s", bstr("gotofirst")); ret = gotoroom(sbstr("gotofirst")); /* do quietly to avoid session output! */ if ((ret/100) != 2) { - lprintf(1, "GOTOFIRST: Unable to change to [%s]; Reason: %d\n", - bstr("gotofirst"), ret); + syslog(1, "Unable to change to [%s]; Reason: %d", bstr("gotofirst"), ret); } } /* * If we aren't in any room yet, but we have cookie data telling us where we're - * supposed to be, and 'gotofirst' was not specified, then go there. + * supposed to be, and 'go' was not specified, then go there. */ else if ( (StrLength(WCC->CurRoom.name) == 0) && ( (StrLength(WCC->Hdr->c_roomname) > 0) )) { int ret; - lprintf(9, "We are in '%s' but cookie indicates '%s', going there...\n", + syslog(9, "We are in '%s' but cookie indicates '%s', going there...", ChrPtr(WCC->CurRoom.name), ChrPtr(WCC->Hdr->c_roomname) ); ret = gotoroom(WCC->Hdr->c_roomname); /* do quietly to avoid session output! */ if ((ret/100) != 2) { - lprintf(1, "COOKIEGOTO: Unable to change to [%s]; Reason: %d\n", + syslog(1, "COOKIEGOTO: Unable to change to [%s]; Reason: %d", ChrPtr(WCC->Hdr->c_roomname), ret); } } @@ -738,15 +769,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. */ @@ -767,10 +796,12 @@ void session_loop(void) * Toplevel dav requests? or just a flat browser request? */ else { - if (xhttp) - groupdav_main(); - else + if (xhttp) { + dav_main(); + } + else { display_main_menu(); + } } } @@ -785,11 +816,19 @@ SKIP_ALL_THIS_CRAP: * Display the appropriate landing page for this site. */ void display_default_landing_page(void) { - if (WC->serv_info->serv_supports_guest) { - /* default action. probably revisit this. */ - StrBuf *teh_lobby = NewStrBufPlain(HKEY("_BASEROOM_")); - smart_goto(teh_lobby); - FreeStrBuf(&teh_lobby); + wcsession *WCC = WC; + + if (WCC && WCC->serv_info && WCC->serv_info->serv_supports_guest) { + /* default action */ + + if (default_landing_page) { + http_redirect(default_landing_page); + } + else { + StrBuf *teh_lobby = NewStrBufPlain(HKEY("_BASEROOM_")); + smart_goto(teh_lobby); + FreeStrBuf(&teh_lobby); + } } else { display_login(); @@ -829,8 +868,7 @@ int ConditionalImportantMesage(StrBuf *Target, WCTemplputParams *TP) { wcsession *WCC = WC; if (WCC != NULL) - return ((!IsEmptyStr(WCC->ImportantMessage)) || - (StrLength(WCC->ImportantMsg) > 0)); + return (StrLength(WCC->ImportantMsg) > 0); else return 0; } @@ -840,11 +878,7 @@ void tmplput_importantmessage(StrBuf *Target, WCTemplputParams *TP) wcsession *WCC = WC; if (WCC != NULL) { - if (!IsEmptyStr(WCC->ImportantMessage)) { - StrEscAppend(Target, NULL, WCC->ImportantMessage, 0, 0); - WCC->ImportantMessage[0] = '\0'; - } - else if (StrLength(WCC->ImportantMsg) > 0) { + if (StrLength(WCC->ImportantMsg) > 0) { StrEscAppend(Target, WCC->ImportantMsg, NULL, 0, 0); FlushStrBuf(WCC->ImportantMsg); } @@ -865,6 +899,12 @@ void tmplput_csslocal(StrBuf *Target, WCTemplputParams *TP) csslocal, 0); } +void tmplput_packagestring(StrBuf *Target, WCTemplputParams *TP) +{ + StrBufAppendBufPlain(Target, + HKEY(PACKAGE_STRING), 0); +} + extern char static_local_dir[PATH_MAX]; @@ -878,6 +918,8 @@ InitModule_WEBCIT WebcitAddUrlHandler(HKEY("sslg"), "", 0, seconds_since_last_gexp, AJAX|LOGCHATTY); WebcitAddUrlHandler(HKEY("ajax_servcmd"), "", 0, ajax_servcmd, 0); WebcitAddUrlHandler(HKEY("webcit"), "", 0, blank_page, URLNAMESPACE); + WebcitAddUrlHandler(HKEY("push"), "", 0, push_destination, AJAX); + WebcitAddUrlHandler(HKEY("pop"), "", 0, pop_destination, 0); WebcitAddUrlHandler(HKEY("401"), "", 0, authorization_required, ANONYMOUS|COOKIEUNNEEDED); RegisterConditional(HKEY("COND:IMPMSG"), 0, ConditionalImportantMesage, CTX_NONE); @@ -888,15 +930,16 @@ InitModule_WEBCIT RegisterNamespace("IMPORTANTMESSAGE", 0, 0, 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); snprintf(dir, SIZ, "%s/webcit.css", static_local_dir); if (!access(dir, R_OK)) { - lprintf(9, "Using local Stylesheet [%s]\n", dir); + syslog(9, "Using local Stylesheet [%s]", dir); csslocal = NewStrBufPlain(HKEY("")); } else - lprintf(9, "No Site-local Stylesheet [%s] installed. \n", dir); + syslog(9, "No Site-local Stylesheet [%s] installed.", dir); } @@ -955,5 +998,6 @@ SessionDestroyModule_WEBCIT FreeStrBuf(&sess->WBuf); FreeStrBuf(&sess->HBuf); FreeStrBuf(&sess->ImportantMsg); + FreeStrBuf(&sess->PushedDestination); }