* persistent session to the Citadel server, handling HTTP WebCit requests as
* they arrive and presenting a user interface.
*
- * Copyright (c) 1996-2011 by the citadel.org team
+ * Copyright (c) 1996-2012 by the citadel.org team
*
* This program is open source software. You can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * modify it under the terms of the GNU General Public License, version 3.
*/
#define SHOW_ME_VAPPEND_PRINTF
HashList *HandlerHash = NULL;
void stuff_to_cookie(int unset_cookie);
-int GetConnected(void);
+extern int GetConnected(void);
void PutRequestLocalMem(void *Data, DeleteHashDataFunc DeleteIt)
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("<div id=\"important_message\">\n"
- "<span class=\"imsg\">");
- StrEscAppend(WCC->WBuf, WCC->ImportantMsg, NULL, 0, 0);
- wc_printf("</span><br>\n"
- "</div>\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) {
tmplput_roombanner(NULL, NULL);
}
}
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");
}
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("<html><body>");
wc_printf("Go <a href=\"%s\">here</A>.", whichpage);
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("<div id=\"banner\">\n");
+ output_headers(1, 1, 1, 0, 0, 0);
+ wc_printf("<div id=\"room_banner_override\">\n");
wc_printf("<table width=100%% border=0 bgcolor=\"#%s\"><tr><td>", titlebarcolor);
wc_printf("<span class=\"titlebar\">%s</span>\n", titlebarmsg);
wc_printf("</td></tr></table>\n");
wc_printf("</div>\n<div id=\"content\">\n");
escputs(messagetext);
-
wc_printf("<hr />\n");
wDumpContent(1);
}
message
);
wDumpContent(0);
- end_webcit_session();
}
+
/*
* Convenience functions to wrap around asynchronous ajax responses
*/
begin_burst();
}
+
/*
* print ajax response footer
*/
}
-
/*
* Wraps a Citadel server command in an AJAX transaction.
*/
wc_printf("OK");
}
+
/*
* Go to the URL saved by push_destination()
*/
return 1;
}
-#if 0
-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;
- }
- }
-}
-#endif
int Conditional_REST_DEPTH(StrBuf *Target, WCTemplputParams *TP)
{
* 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);
display_login();
}
else {
-#if 0
- if ((WCC->Hdr->HR.Handler->Flags & PARSE_REST_URL) != 0)
- ParseREST_URL();
-#endif
- 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. */
* Toplevel dav requests? or just a flat browser request?
*/
else {
- if (xhttp)
+ if (xhttp) {
dav_main();
- else
+ }
+ else {
display_main_menu();
+ }
}
}
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 {
{
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);