#include "webserver.h"
-/*
- * String to unset the cookie.
- * Any date "in the past" will work, so I chose my birthday, right down to
- * the exact minute. :)
- */
-static char *unset = "; expires=28-May-1971 18:10:00 GMT";
StrBuf *csslocal = NULL;
HashList *HandlerHash = NULL;
{
WebcitHandler *Handler = (WebcitHandler*) vHandler;
FreeStrBuf(&Handler->Name);
+ FreeStrBuf(&Handler->DisplayName);
free (Handler);
-
}
void WebcitAddUrlHandler(const char * UrlString, long UrlSLen,
/*
* web-printing funcion. uses our vsnprintf wrapper
*/
-void wprintf(const char *format,...)
+void wc_printf(const char *format,...)
{
wcsession *WCC = WC;
va_list arg_ptr;
void wDumpContent(int print_standard_html_footer)
{
if (print_standard_html_footer) {
- wprintf("</div> <!-- end of 'content' div -->\n");
+ wc_printf("</div> <!-- end of 'content' div -->\n");
do_template("trailing", NULL);
}
int cache /* 1 = allow browser to cache this page */
) {
wcsession *WCC = WC;
- char cookie[1024];
char httpnow[128];
hprintf("HTTP/1.1 200 OK\n");
);
}
- if (cache < 2) {
-
- stuff_to_cookie(cookie, 1024,
- WCC->wc_session,
- WCC->wc_username,
- WCC->wc_password,
- WCC->wc_roomname,
- get_selected_language()
- );
-
- if (unset_cookies) {
- hprintf("Set-cookie: webcit=%s; path=/\r\n", unset);
- } else {
- hprintf("Set-cookie: webcit=%s; path=/\r\n", cookie);
- if (server_cookie != NULL) {
- hprintf("%s\n", server_cookie);
- }
- }
- }
+ if (cache < 2) stuff_to_cookie(unset_cookies);
if (do_htmlhead) {
begin_burst();
/* check for ImportantMessages (these display in a div overlaying the main screen) */
if (!IsEmptyStr(WCC->ImportantMessage)) {
- wprintf("<div id=\"important_message\">\n"
+ wc_printf("<div id=\"important_message\">\n"
"<span class=\"imsg\">");
StrEscAppend(WCC->WBuf, NULL, WCC->ImportantMessage, 0, 0);
- wprintf("</span><br />\n"
+ wc_printf("</span><br />\n"
"</div>\n"
);
StrBufAppendBufPlain(WCC->trailing_javascript,
WCC->ImportantMessage[0] = 0;
}
else if (StrLength(WCC->ImportantMsg) > 0) {
- wprintf("<div id=\"important_message\">\n"
+ wc_printf("<div id=\"important_message\">\n"
"<span class=\"imsg\">");
StrEscAppend(WCC->WBuf, WCC->ImportantMsg, NULL, 0, 0);
- wprintf("</span><br />\n"
+ wc_printf("</span><br />\n"
"</div>\n"
);
StrBufAppendBufPlain(WCC->trailing_javascript,
}
if (do_room_banner == 1) {
- wprintf("<div id=\"banner\">\n");
+ wc_printf("<div id=\"banner\">\n");
embed_room_banner(NULL, navbar_default);
- wprintf("</div>\n");
+ wc_printf("</div>\n");
}
}
if (do_room_banner == 1) {
- wprintf("<div id=\"content\">\n");
+ wc_printf("<div id=\"content\">\n");
}
}
hprintf("URI: %s\r\n", whichpage);
hprintf("Content-type: text/html; charset=utf-8\r\n");
begin_burst();
- wprintf("<html><body>");
- wprintf("Go <a href=\"%s\">here</A>.", whichpage);
- wprintf("</body></html>\n");
+ wc_printf("<html><body>");
+ wc_printf("Go <a href=\"%s\">here</A>.", whichpage);
+ wc_printf("</body></html>\n");
end_burst();
}
{
hprintf("HTTP/1.1 200 OK\n");
output_headers(1, 1, 2, 0, 0, 0);
- wprintf("<div id=\"banner\">\n");
- wprintf("<table width=100%% border=0 bgcolor=\"#%s\"><tr><td>", titlebarcolor);
- wprintf("<span class=\"titlebar\">%s</span>\n", titlebarmsg);
- wprintf("</td></tr></table>\n");
- wprintf("</div>\n<div id=\"content\">\n");
+ wc_printf("<div id=\"banner\">\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);
- wprintf("<hr />\n");
+ wc_printf("<hr />\n");
wDumpContent(1);
}
hprintf("WWW-Authenticate: Basic realm=\"%s\"\r\n", ChrPtr(WC->serv_info->serv_humannode));
hprintf("Content-Type: text/html\r\n");
begin_burst();
- wprintf("<h1>");
- wprintf(_("Authorization Required"));
- wprintf("</h1>\r\n");
+ wc_printf("<h1>");
+ wc_printf(_("Authorization Required"));
+ wc_printf("</h1>\r\n");
if (WCC->ImportantMsg != NULL)
else if (WCC->ImportantMessage != NULL)
message = WCC->ImportantMessage;
- wprintf(_("The resource you requested requires a valid username and password. "
+ 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();
char buf[256];
if ( (time(NULL) - WC->last_pager_check) < 30) {
- wprintf("NO\n");
+ wc_printf("NO\n");
}
else {
memset(buf, 0, 5);
serv_puts("NOOP");
serv_getln(buf, sizeof buf);
if (buf[3] == '*') {
- wprintf("YES");
+ wc_printf("YES");
}
else {
- wprintf("NO");
+ wc_printf("NO");
}
}
}
if (Floors != NULL)
{
if (GetHash(Floors, SKEY(pFloor), &vFloor))
- WCC->CurrentFloor = (floor*) vFloor;
+ WCC->CurrentFloor = (Floor*) vFloor;
}
}
}
if (ibstr("nonce") != WCC->nonce) {
lprintf(9, "Ignoring request with mismatched nonce.\n");
hprintf("HTTP/1.1 404 Security check failed\r\n");
- hprintf("Content-Type: text/plain\r\n\r\n");
+ hprintf("Content-Type: text/plain\r\n");
begin_burst();
- wprintf("Security check failed.\r\n");
+ wc_printf("Security check failed.\r\n");
end_burst();
goto SKIP_ALL_THIS_CRAP;
}
* 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.
*/
- else if ( (StrLength(WCC->wc_roomname) == 0) && ( (StrLength(WCC->Hdr->c_roomname) > 0) )) {
+ 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",
- ChrPtr(WCC->wc_roomname),
+ ChrPtr(WCC->CurRoom.name),
ChrPtr(WCC->Hdr->c_roomname)
);
ret = gotoroom(WCC->Hdr->c_roomname); /* do quietly to avoid session output! */
snprintf(dir, SIZ, "%s/webcit.css", static_local_dir);
if (!access(dir, R_OK)) {
lprintf(9, "Using local Stylesheet [%s]\n", dir);
- csslocal = NewStrBufPlain(HKEY("<link href=\"static.local/webcit.css\" rel=\"stylesheet\" type=\"text/css\">"));
+ csslocal = NewStrBufPlain(HKEY("<link href=\"static.local/webcit.css\" rel=\"stylesheet\" type=\"text/css\" />"));
}
else
lprintf(9, "No Site-local Stylesheet [%s] installed. \n", dir);