/*
- * webcit.c
+ * $Id$
*
- * This is the actual program called by the webserver. It maintains a
+ * This is the main transaction loop of the web service. It maintains a
* persistent session to the Citadel server, handling HTTP WebCit requests as
* they arrive and presenting a user interface.
*
- * $Id$
*/
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <sys/stat.h>
-#include <limits.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
#include "webcit.h"
+#include "groupdav.h"
#include "webserver.h"
#include "mime_parser.h"
hex[0] = buf[a + 1];
hex[1] = buf[a + 2];
hex[2] = 0;
+ b = 0;
sscanf(hex, "%02x", &b);
buf[a] = (char) b;
strcpy(&buf[a + 1], &buf[a + 3]);
u = (struct urlcontent *) malloc(sizeof(struct urlcontent));
u->next = WC->urlstrings;
WC->urlstrings = u;
- strcpy(u->url_key, buf);
+ safestrncpy(u->url_key, buf, sizeof u->url_key);
/* now chop that part off */
for (a = 0; a <= b; ++a)
++up;
- /* locate the & sign */
+ /* locate "&" and "?" delimiters */
ptr = up;
b = strlen(up);
for (a = 0; a < strlen(up); ++a) {
- if (!strncmp(ptr, "&", 1)) {
+ if ( (ptr[0] == '&') || (ptr[0] == '?') ) {
b = a;
break;
}
++ptr;
strcpy(ptr, "");
- u->url_data = malloc(strlen(up) + 1);
- strcpy(u->url_data, up);
+ u->url_data = malloc(strlen(up) + 2);
+ safestrncpy(u->url_data, up, strlen(up) + 1);
u->url_data[b] = 0;
unescape_input(u->url_data);
up = ptr;
}
-#ifdef WITH_ZLIB
-
-ssize_t http_write(int fd, const void *buf, size_t count) {
-
- if (WC->gzfd) {
- return gzwrite(WC->gzfd, buf, count);
- }
- else {
- return write(fd, buf, count);
- }
-
-
-}
-
-#else
-
-ssize_t http_write(int fd, const void *buf, size_t count) {
- return write(fd, buf, count);
-}
-
-#endif
-
-
-
-
void wprintf(const char *format,...)
{
va_list arg_ptr;
- char wbuf[1024];
+ char wbuf[4096];
va_start(arg_ptr, format);
- vsprintf(wbuf, format, arg_ptr);
+ vsnprintf(wbuf, sizeof wbuf, format, arg_ptr);
va_end(arg_ptr);
- http_write(WC->http_sock, wbuf, strlen(wbuf));
+ client_write(wbuf, strlen(wbuf));
}
*/
void wDumpContent(int print_standard_html_footer)
{
- if (WC->fake_frames) {
- wprintf("</TABLE>\n");
- WC->fake_frames = 0;
- }
-
if (print_standard_html_footer) {
- if (print_standard_html_footer != 2) {
- wprintf("<BR>");
- }
- wprintf("</BODY></HTML>\n");
+ wprintf("</div>\n"); /* end of "text" div */
+ do_template("trailing");
}
-
+ /* If we've been saving it all up for one big output burst,
+ * go ahead and do that now.
+ */
+ end_burst();
}
* Copy a string, escaping characters which have meaning in HTML. If
* nbsp is nonzero, spaces are converted to non-breaking spaces.
*/
-void stresc(char *target, char *strbuf, int nbsp)
+void stresc(char *target, char *strbuf, int nbsp, int nolinebreaks)
{
int a;
strcpy(target, "");
strcat(target, ">");
else if (strbuf[a] == QU)
strcat(target, "\"");
- else if ((strbuf[a] == 32) && (nbsp == 1)) {
+ else if ((strbuf[a] == 32) && (nbsp == 1))
strcat(target, " ");
- } else {
+ else if ((strbuf[a] == '\n') && (nolinebreaks))
+ strcat(target, ""); /* nothing */
+ else if ((strbuf[a] == '\r') && (nolinebreaks))
+ strcat(target, ""); /* nothing */
+ else
strncat(target, &strbuf[a], 1);
- }
}
}
-void escputs1(char *strbuf, int nbsp)
+void escputs1(char *strbuf, int nbsp, int nolinebreaks)
{
- char buf[1024];
- stresc(buf, strbuf, nbsp);
+ char *buf;
+
+ if (strbuf == NULL) return;
+ buf = malloc( (3 * strlen(strbuf)) + SIZ );
+ stresc(buf, strbuf, nbsp, nolinebreaks);
wprintf("%s", buf);
+ free(buf);
}
void escputs(char *strbuf)
{
- escputs1(strbuf, 0);
+ escputs1(strbuf, 0, 0);
}
/*
}
+/*
+ * Copy a string, escaping characters for JavaScript strings.
+ */
+void jsesc(char *target, char *strbuf)
+{
+ int a;
+ strcpy(target, "");
+
+ for (a = 0; a < strlen(strbuf); ++a) {
+ if (strbuf[a] == '<')
+ strcat(target, "[");
+ else if (strbuf[a] == '>')
+ strcat(target, "]");
+ else if (strbuf[a] == '\"')
+ strcat(target, """);
+ else if (strbuf[a] == '&')
+ strcat(target, "&;");
+ else if (strbuf[a] == '\'')
+ strcat(target, "\\'");
+ else {
+ strncat(target, &strbuf[a], 1);
+ }
+ }
+}
+void jsescputs(char *strbuf)
+{
+ char outbuf[SIZ];
+
+ jsesc(outbuf, strbuf);
+ wprintf("%s", outbuf);
+}
/*
- * Output all that important stuff that the browser will want to see
- *
- * control codes:
- *
- * Bits 0 and 1:
- * 0 = Nothing. Do not display any leading HTTP or HTML.
- * 1 = HTTP headers plus the room banner
- * 2 = HTTP headers required to terminate the session (unset cookies)
- * 3 = HTTP and HTML headers, but no room banner
- *
- * Bit 2: Set to 1 to auto-refresh page every 30 seconds
- *
- * Bit 3: suppress check for express messages
+ * Copy a string, escaping characters for message text hold
*/
-void output_headers(int controlcode)
+void msgesc(char *target, char *strbuf)
{
+ int a;
+ strcpy(target, "");
+
+ for (a = 0; a < strlen(strbuf); ++a) {
+ if (strbuf[a] == '\'')
+ strcat(target, "\\'");
+ else if (strbuf[a] == '\n')
+ strcat(target, " ");
+ else if (strbuf[a] == '\r')
+ strcat(target, " ");
+ else {
+ strncat(target, &strbuf[a], 1);
+ }
+ }
+}
+
+void msgescputs(char *strbuf) {
+ char *outbuf;
+
+ if (strbuf == NULL) return;
+ outbuf = malloc( (3 * strlen(strbuf)) + SIZ);
+ msgesc(outbuf, strbuf);
+ wprintf("%s", outbuf);
+ free(outbuf);
+}
+
+
+
+
+/*
+ * Output all that important stuff that the browser will want to see
+ */
+void output_headers( int do_httpheaders, /* 1 = output HTTP headers */
+ int do_htmlhead, /* 1 = output HTML <head> section and <body> opener */
+
+ int do_room_banner, /* 0=no, 1=yes, */
+ /* 2 = I'm going to embed my own, so don't open the */
+ /* <div id="content"> either. */
+
+ int unset_cookies, /* 1 = session is terminating, so unset the cookies */
+ int refresh30, /* 1 = automatically refresh page every 30 seconds */
+ int suppress_check, /* 1 = suppress check for instant messages */
+ int cache /* 1 = allow browser to cache this page */
+) {
char cookie[SIZ];
- int print_standard_html_head = 0;
- int refresh30 = 0;
- int suppress_check = 0;
char httpnow[SIZ];
- static int pageseq = 0;
-#ifdef WITH_ZLIB
- gzFile temp_gzfd = NULL;
-#endif
-
- print_standard_html_head = controlcode & 0x03;
- refresh30 = ((controlcode & 0x04) >> 2);
- suppress_check = ((controlcode & 0x08) >> 3);
wprintf("HTTP/1.0 200 OK\n");
-
httpdate(httpnow, time(NULL));
-#ifdef WITH_ZLIB
- if (WC->gzcompressed) {
- temp_gzfd = gzdopen(WC->http_sock, "wb9");
+ if (do_httpheaders) {
+ wprintf("Content-type: text/html; charset=utf-8\r\n"
+ "Server: %s / %s\n"
+ "Connection: close\r\n",
+ SERVER, serv_info.serv_software
+ );
}
-#endif
- if (print_standard_html_head > 0) {
- wprintf("Content-type: text/html\n");
- wprintf("Server: %s\n", SERVER);
- wprintf("Connection: close\n");
- wprintf("Pragma: no-cache\n");
- wprintf("Cache-Control: no-store\n");
-#ifdef WITH_ZLIB
- if (temp_gzfd != NULL) {
- wprintf("Content-Encoding: gzip\n");
- }
-#endif
+ if (cache) {
+ wprintf("Pragma: public\r\n"
+ "Cache-Control: max-age=3600, must-revalidate\r\n"
+ "Last-modified: %s\r\n",
+ httpnow
+ );
}
+ else {
+ wprintf("Pragma: no-cache\r\n"
+ "Cache-Control: no-store\r\n"
+ );
+ }
+
stuff_to_cookie(cookie, WC->wc_session, WC->wc_username,
WC->wc_password, WC->wc_roomname);
- if (print_standard_html_head == 2) {
- wprintf("Set-cookie: webcit=%s\n", unset);
+
+ if (unset_cookies) {
+ wprintf("Set-cookie: webcit=%s; path=/\r\n", unset);
} else {
- wprintf("Set-cookie: webcit=%s\n", cookie);
+ wprintf("Set-cookie: webcit=%s; path=/\r\n", cookie);
if (server_cookie != NULL) {
wprintf("%s\n", server_cookie);
}
}
- if (print_standard_html_head > 0) {
- wprintf("\n");
+ if (do_htmlhead) {
+ /* wprintf("\n"); */
+ begin_burst();
-#ifdef WITH_ZLIB
- if (temp_gzfd != NULL) {
- WC->gzfd = temp_gzfd;
+ if (refresh30) {
+ svprintf("REFRESHTAG", WCS_STRING, "%s",
+ "<meta http-equiv=\"refresh\" content=\"30\" />\n");
}
-#endif
-
- wprintf("<HTML><HEAD><TITLE>");
- escputs(serv_info.serv_humannode);
- wprintf("</TITLE>\n"
- "<META HTTP-EQUIV=\"Pragma\" CONTENT=\"no-cache\">\n"
- "<META HTTP-EQUIV=\"expired\" CONTENT=\"28-May-1971 18:10:00 GMT\">\n"
- "<META NAME=\"MSSmartTagsPreventParsing\" CONTENT=\"TRUE\">\n");
- if (refresh30) wprintf(
- "<META HTTP-EQUIV=\"refresh\" CONTENT=\"30\">\n");
- else wprintf(
- "<META HTTP-EQUIV=\"refresh\" CONTENT=\"500363689;\">\n");
- wprintf("</HEAD>\n");
-
- /* script for checking for pages (not always launched) */
- wprintf("<SCRIPT LANGUAGE=\"JavaScript\">\n");
- wprintf("function launch_page_popup() {\n");
- wprintf("pwin = window.open('/page_popup', 'CitaPage%d', "
- "'toolbar=no,location=no,copyhistory=no,status=no,"
- "scrollbars=yes,resizable=no,height=250,width=400');\n",
- ++pageseq);
- wprintf("}\n");
- wprintf("</SCRIPT>\n");
- /* end script */
-
- /* (JavaScript keyboard-based navigation would go here) */
-
- if (!suppress_check) if (WC->HaveExpressMessages) {
- svprintf("extrabodyparms", WCS_STRING, "%s",
- "onload=\"launch_page_popup()\" ");
- WC->HaveExpressMessages = 0;
+ else {
+ svprintf("REFRESHTAG", WCS_STRING, "%s",
+ "<meta http-equiv=\"refresh\" content=\"500363689;\" />\n");
}
- do_template("background");
- clear_local_substs();
-
- if (print_standard_html_head == 1) {
- wprintf("<A NAME=\"TheTop\"></A>");
- wprintf("<TABLE border=0 width=100%%><TR VALIGN=TOP>"
- "<TD>\n");
+ do_template("head");
+ }
- embed_room_banner(NULL);
+ /* ICONBAR */
+ if (do_htmlhead) {
- wprintf("</TD></TR><TR VALIGN=TOP><TD>\n");
-
- WC->fake_frames = 1;
+ if (WC->HaveInstantMessages) {
+ wprintf("<div id=\"page_popup\">\n");
+ page_popup();
+ wprintf("</div>\n");
+ }
+ if (strlen(WC->ImportantMessage) > 0) {
+ wprintf("<div id=\"important_message\">\n");
+ wprintf("<SPAN CLASS=\"imsg\">"
+ "%s</SPAN><br />\n", WC->ImportantMessage);
+ wprintf("</div>\n");
+ wprintf("<script type=\"text/javascript\">\n"
+ " setTimeout('hide_imsg_popup()', 2000); \n"
+ "</script>\n");
+ safestrncpy(WC->ImportantMessage, "", sizeof WC->ImportantMessage);
+ }
+ if ( (WC->logged_in) && (!unset_cookies) ) {
+ wprintf("<div id=\"iconbar\">");
+ do_iconbar();
+ wprintf("</div>\n");
}
+ if (do_room_banner == 1) {
+ wprintf("<div id=\"banner\">\n");
+ embed_room_banner(NULL, navbar_default);
+ wprintf("</div>\n");
+ }
+ }
+
+ if (do_room_banner == 1) {
+ wprintf("<div id=\"content\">\n");
}
}
/*
- *
+ * Generic function to do an HTTP redirect. Easy and fun.
*/
void http_redirect(char *whichpage) {
wprintf("HTTP/1.0 302 Moved Temporarily\n");
- wprintf("Location: %s\n", whichpage);
- wprintf("URI: %s\n", whichpage);
- wprintf("Content-type: text/html\n\n");
+ wprintf("Location: %s\r\n", whichpage);
+ wprintf("URI: %s\r\n", whichpage);
+ wprintf("Content-type: text/html; charset=utf-8\r\n\r\n");
wprintf("<html><body>\n");
wprintf("you really want to be <A HREF=\"%s\">here</A> now\n",
whichpage);
-void check_for_express_messages()
+void check_for_instant_messages()
{
char buf[SIZ];
serv_puts("NOOP");
- serv_gets(buf);
- if (buf[3] == '*') WC->HaveExpressMessages = 1;
+ serv_getln(buf, sizeof buf);
+ if (buf[3] == '*') WC->HaveInstantMessages = 1;
+}
+
+
+
+
+/*
+ * Output a piece of content to the web browser
+ */
+void http_transmit_thing(char *thing, size_t length, char *content_type,
+ int is_static) {
+
+ output_headers(0, 0, 0, 0, 0, 0, is_static);
+
+ wprintf("Content-type: %s\r\n"
+ "Server: %s\r\n"
+ "Connection: close\r\n",
+ content_type,
+ SERVER);
+
+#ifdef HAVE_ZLIB
+ /* If we can send the data out compressed, please do so. */
+ if (WC->gzip_ok) {
+ char *compressed_data = NULL;
+ uLongf compressed_len;
+
+ compressed_len = (uLongf) ((length * 101) / 100) + 100;
+ compressed_data = malloc(compressed_len);
+
+ if (compress_gzip((Bytef *) compressed_data,
+ &compressed_len,
+ (Bytef *) thing,
+ (uLongf) length, Z_BEST_SPEED) == Z_OK) {
+ wprintf("Content-encoding: gzip\r\n"
+ "Content-length: %ld\r\n"
+ "\r\n",
+ (long) compressed_len
+ );
+ client_write(compressed_data, (size_t)compressed_len);
+ free(compressed_data);
+ return;
+ }
+ }
+#endif
+
+ /* No compression ... just send it out as-is */
+ wprintf("Content-length: %ld\r\n"
+ "\r\n",
+ (long) length
+ );
+ client_write(thing, (size_t)length);
}
void output_static(char *what)
{
- char buf[4096];
+ char buf[256];
FILE *fp;
struct stat statbuf;
off_t bytes;
char *bigbuffer;
+ char content_type[128];
sprintf(buf, "static/%s", what);
fp = fopen(buf, "rb");
if (fp == NULL) {
wprintf("HTTP/1.0 404 %s\n", strerror(errno));
- wprintf("Content-Type: text/plain\n");
- wprintf("\n");
+ wprintf("Content-Type: text/plain\r\n");
+ wprintf("\r\n");
wprintf("Cannot open %s: %s\n", what, strerror(errno));
} else {
- output_headers(0);
-
if (!strncasecmp(&what[strlen(what) - 4], ".gif", 4))
- wprintf("Content-type: image/gif\n");
+ safestrncpy(content_type, "image/gif", sizeof content_type);
else if (!strncasecmp(&what[strlen(what) - 4], ".txt", 4))
- wprintf("Content-type: text/plain\n");
+ safestrncpy(content_type, "text/plain", sizeof content_type);
else if (!strncasecmp(&what[strlen(what) - 4], ".css", 4))
- wprintf("Content-type: text/css\n");
+ safestrncpy(content_type, "text/css", sizeof content_type);
else if (!strncasecmp(&what[strlen(what) - 4], ".jpg", 4))
- wprintf("Content-type: image/jpeg\n");
+ safestrncpy(content_type, "image/jpeg", sizeof content_type);
else if (!strncasecmp(&what[strlen(what) - 4], ".png", 4))
- wprintf("Content-type: image/png\n");
+ safestrncpy(content_type, "image/png", sizeof content_type);
+ else if (!strncasecmp(&what[strlen(what) - 4], ".ico", 4))
+ safestrncpy(content_type, "image/x-icon", sizeof content_type);
else if (!strncasecmp(&what[strlen(what) - 5], ".html", 5))
- wprintf("Content-type: text/html\n");
+ safestrncpy(content_type, "text/html", sizeof content_type);
+ else if (!strncasecmp(&what[strlen(what) - 4], ".htm", 4))
+ safestrncpy(content_type, "text/html", sizeof content_type);
else if (!strncasecmp(&what[strlen(what) - 4], ".wml", 4))
- wprintf("Content-type: text/vnd.wap.wml\n");
+ safestrncpy(content_type, "text/vnd.wap.wml", sizeof content_type);
else if (!strncasecmp(&what[strlen(what) - 5], ".wmls", 5))
- wprintf("Content-type: text/vnd.wap.wmlscript\n");
+ safestrncpy(content_type, "text/vnd.wap.wmlscript", sizeof content_type);
else if (!strncasecmp(&what[strlen(what) - 5], ".wmlc", 5))
- wprintf("Content-type: application/vnd.wap.wmlc\n");
+ safestrncpy(content_type, "application/vnd.wap.wmlc", sizeof content_type);
else if (!strncasecmp(&what[strlen(what) - 6], ".wmlsc", 6))
- wprintf("Content-type: application/vnd.wap.wmlscriptc\n");
+ safestrncpy(content_type, "application/vnd.wap.wmlscriptc", sizeof content_type);
else if (!strncasecmp(&what[strlen(what) - 5], ".wbmp", 5))
- wprintf("Content-type: image/vnd.wap.wbmp\n");
+ safestrncpy(content_type, "image/vnd.wap.wbmp", sizeof content_type);
+ else if (!strncasecmp(&what[strlen(what) - 3], ".js", 3))
+ safestrncpy(content_type, "text/javascript", sizeof content_type);
else
- wprintf("Content-type: application/octet-stream\n");
+ safestrncpy(content_type, "application/octet-stream", sizeof content_type);
fstat(fileno(fp), &statbuf);
bytes = statbuf.st_size;
- lprintf(3, "Static: %s, %ld bytes\n", what, bytes);
- wprintf("Content-length: %ld\n", (long) bytes);
- wprintf("\n");
- bigbuffer = malloc(bytes);
+ bigbuffer = malloc(bytes + 2);
fread(bigbuffer, bytes, 1, fp);
fclose(fp);
- http_write(WC->http_sock, bigbuffer, bytes);
+
+ http_transmit_thing(bigbuffer, (size_t)bytes, content_type, 1);
free(bigbuffer);
}
if (!strcasecmp(bstr("force_close_session"), "yes")) {
char buf[SIZ];
char *xferbuf = NULL;
off_t bytes;
- off_t thisblock;
- off_t accomplished = 0L;
- lprintf(5, "output_image() called\n");
serv_printf("OIMG %s|%s", bstr("name"), bstr("parm"));
- serv_gets(buf);
+ serv_getln(buf, sizeof buf);
if (buf[0] == '2') {
bytes = extract_long(&buf[4], 0);
- xferbuf = malloc(bytes);
+ xferbuf = malloc(bytes + 2);
/* Read it from the server */
- while (bytes > (off_t) 0) {
- thisblock = (off_t) sizeof(xferbuf);
- if (thisblock > bytes) {
- thisblock = bytes;
- }
- serv_printf("READ %ld|%ld", accomplished, thisblock);
- serv_gets(buf);
- if (buf[0] == '6') {
- thisblock = extract_long(&buf[4], 0);
- serv_read(&xferbuf[accomplished],
- (int) thisblock);
- }
- else {
- memset(&xferbuf[accomplished], 0, thisblock);
- }
- bytes = bytes - thisblock;
- accomplished += thisblock;
- }
+ read_server_binary(xferbuf, bytes);
serv_puts("CLOS");
- serv_gets(buf);
+ serv_getln(buf, sizeof buf);
- /* Now write it to the browser */
- output_headers(0);
- wprintf("Content-type: image/gif\n");
- wprintf("Content-length: %ld\n", (long) accomplished);
- wprintf("\n");
- http_write(WC->http_sock, xferbuf, accomplished);
+ /* Write it to the browser */
+ http_transmit_thing(xferbuf, (size_t)bytes, "image/gif", 0);
+ free(xferbuf);
} else {
+
+ /* Instead of an ugly 404, send a 1x1 transparent GIF
+ * when there's no such image on the server.
+ */
+ output_static("blank.gif");
+
+ /*
wprintf("HTTP/1.0 404 %s\n", &buf[4]);
- output_headers(0);
- wprintf("Content-Type: text/plain\n");
- wprintf("\n");
- wprintf("Error retrieving image: %s\n", &buf[4]);
- }
+ output_headers(0, 0, 0, 0, 0, 0, 0);
+ wprintf("Content-Type: text/plain\r\n"
+ "\r\n"
+ "Error retrieving image: %s\n",
+ &buf[4]
+ );
+ */
- if (xferbuf) {
- free(xferbuf);
}
+
+
}
/*
void output_mimepart()
{
char buf[SIZ];
- char xferbuf[4096];
off_t bytes;
- off_t thisblock;
- off_t accomplished = 0L;
char content_type[SIZ];
+ char *content = NULL;
serv_printf("OPNA %s|%s", bstr("msgnum"), bstr("partnum"));
- serv_gets(buf);
+ serv_getln(buf, sizeof buf);
if (buf[0] == '2') {
bytes = extract_long(&buf[4], 0);
- extract(content_type, &buf[4], 3);
- output_headers(0);
- wprintf("Content-type: %s\n", content_type);
- wprintf("Content-length: %ld\n", (long) bytes);
- wprintf("\n");
-
- while (bytes > (off_t) 0) {
- thisblock = (off_t) sizeof(xferbuf);
- if (thisblock > bytes) {
- thisblock = bytes;
- }
- serv_printf("READ %ld|%ld", accomplished, thisblock);
- serv_gets(buf);
- if (buf[0] == '6') {
- thisblock = extract_long(&buf[4], 0);
- serv_read(xferbuf, (int) thisblock);
- }
- else {
- memset(xferbuf, 0, thisblock);
- }
- http_write(WC->http_sock, xferbuf, thisblock);
- bytes = bytes - thisblock;
- accomplished = accomplished + thisblock;
- }
+ content = malloc(bytes + 2);
+ extract_token(content_type, &buf[4], 3, '|', sizeof content_type);
+ output_headers(0, 0, 0, 0, 0, 0, 0);
+ read_server_binary(content, bytes);
serv_puts("CLOS");
- serv_gets(buf);
+ serv_getln(buf, sizeof buf);
+ http_transmit_thing(content, bytes, content_type, 0);
+ free(content);
} else {
wprintf("HTTP/1.0 404 %s\n", &buf[4]);
- output_headers(0);
- wprintf("Content-Type: text/plain\n");
- wprintf("\n");
+ output_headers(0, 0, 0, 0, 0, 0, 0);
+ wprintf("Content-Type: text/plain\r\n");
+ wprintf("\r\n");
wprintf("Error retrieving part: %s\n", &buf[4]);
}
{
char buf[SIZ];
off_t bytes;
- off_t thisblock;
- off_t accomplished = 0L;
char content_type[SIZ];
char *content;
serv_printf("OPNA %ld|%s", msgnum, partnum);
- serv_gets(buf);
+ serv_getln(buf, sizeof buf);
if (buf[0] == '2') {
bytes = extract_long(&buf[4], 0);
- extract(content_type, &buf[4], 3);
+ extract_token(content_type, &buf[4], 3, '|', sizeof content_type);
- content = malloc(bytes + 1);
+ content = malloc(bytes + 2);
+ read_server_binary(content, bytes);
- while (bytes > (off_t) 0) {
- thisblock = bytes;
- if (thisblock > 4096L) {
- thisblock = 4096L;
- }
- if (thisblock > bytes) {
- thisblock = bytes;
- }
- serv_printf("READ %ld|%ld", accomplished, thisblock);
- serv_gets(buf);
- if (buf[0] == '6') {
- thisblock = extract_long(&buf[4], 0);
- serv_read(&content[accomplished], (int) thisblock);
- }
- else {
- memset(&content[accomplished], 0, thisblock);
- }
- bytes = bytes - thisblock;
- accomplished = accomplished + thisblock;
- }
serv_puts("CLOS");
- serv_gets(buf);
- content[accomplished] = 0; /* null terminate for good measure */
+ serv_getln(buf, sizeof buf);
+ content[bytes] = 0; /* null terminate for good measure */
return(content);
}
else {
void convenience_page(char *titlebarcolor, char *titlebarmsg, char *messagetext)
{
wprintf("HTTP/1.0 200 OK\n");
- output_headers(1);
- wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=%s><TR><TD>", titlebarcolor);
- wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
- wprintf("<B>%s</B>\n", titlebarmsg);
- wprintf("</FONT></TD></TR></TABLE><BR>\n");
+ output_headers(1, 1, 2, 0, 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");
escputs(messagetext);
- wprintf("<HR>\n");
+ wprintf("<hr />\n");
wDumpContent(1);
}
* Display a blank page.
*/
void blank_page(void) {
- output_headers(7);
+ output_headers(1, 1, 0, 0, 1, 0, 0);
wDumpContent(2);
}
+/*
+ * A template has been requested
+ */
+void url_do_template(void) {
+ do_template(bstr("template"));
+}
+
/*
wprintf("<A HREF=\"/change_start_page?startpage=");
urlescputs(WC->this_page);
wprintf("\">"
- "<FONT SIZE=-2 COLOR=#AAAAAA>Make this my start page</FONT>"
+ "<FONT SIZE=-2 COLOR=\"#AAAAAA\">Make this my start page</FONT>"
"</A>"
);
}
void change_start_page(void) {
if (bstr("startpage") == NULL) {
- display_error("startpage set to null");
+ safestrncpy(WC->ImportantMessage,
+ "startpage set to null",
+ sizeof WC->ImportantMessage);
+ display_main_menu();
return;
}
- set_preference("startpage", bstr("startpage"));
-
- output_headers(3);
- wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=000077><TR><TD>");
- wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
- wprintf("<B>New start page</B>\n");
- wprintf("</FONT></TD></TR></TABLE>\n");
-
- wprintf("<CENTER>"
- "<font size=+2>Your start page has been changed.</font>"
- "<BR><BR>\n"
- "<I>(Note: this does not change your browser's home page. "
- "It changes the page you begin on when you log on to ");
- escputs(serv_info.serv_humannode);
- wprintf(".)</I><BR><BR>"
- "<a href = \"javascript:history.back()\">Back...</a>"
- "</CENTER>");
+ set_preference("startpage", bstr("startpage"), 1);
+ output_headers(1, 1, 0, 0, 0, 0, 0);
+ do_template("newstartpage");
wDumpContent(1);
}
-void display_error(char *errormessage)
-{
- convenience_page("770000", "Error", errormessage);
-}
-
void display_success(char *successmessage)
{
convenience_page("007700", "OK", successmessage);
-void extract_action(char *actbuf, char *cmdbuf)
-{
- int i;
-
- strcpy(actbuf, cmdbuf);
- if (!strncasecmp(actbuf, "GET /", 5))
- strcpy(actbuf, &actbuf[5]);
- if (!strncasecmp(actbuf, "PUT /", 5))
- strcpy(actbuf, &actbuf[5]);
- if (!strncasecmp(actbuf, "POST /", 6))
- strcpy(actbuf, &actbuf[6]);
-
- for (i = 0; i < strlen(actbuf); ++i) {
- if (actbuf[i] == ' ') {
- actbuf[i] = 0;
- i = 0;
- }
- if (actbuf[i] == '/') {
- actbuf[i] = 0;
- i = 0;
- }
- if (actbuf[i] == '?') {
- actbuf[i] = 0;
- i = 0;
- }
- if (actbuf[i] == '&') {
- actbuf[i] = 0;
- i = 0;
- }
- }
-}
-
-
void upload_handler(char *name, char *filename, char *partnum, char *disp,
- void *content, char *cbtype, size_t length,
- char *encoding, void *userdata)
+ void *content, char *cbtype, char *cbcharset,
+ size_t length, char *encoding, void *userdata)
{
+ struct urlcontent *u;
- lprintf(5, "UPLOAD HANDLER CALLED\n");
- lprintf(5, " name = %s\n", name);
- lprintf(5, "filename = %s\n", filename);
- lprintf(5, "encoding = %s\n", encoding);
- lprintf(5, " type = %s\n", cbtype);
- lprintf(5, " length = %ld\n", (long)length);
+ lprintf(9, "upload_handler() name=%s, type=%s, len=%d\n",
+ name, cbtype, length);
- if (length > 0) {
+ /* Form fields */
+ if ( (length > 0) && (strlen(cbtype) == 0) ) {
+ u = (struct urlcontent *) malloc(sizeof(struct urlcontent));
+ u->next = WC->urlstrings;
+ WC->urlstrings = u;
+ safestrncpy(u->url_key, name, sizeof(u->url_key));
+ u->url_data = malloc(length + 1);
+ memcpy(u->url_data, content, length);
+ u->url_data[length] = 0;
+ }
+
+ /* Uploaded files */
+ if ( (length > 0) && (strlen(cbtype) > 0) ) {
WC->upload = malloc(length);
if (WC->upload != NULL) {
WC->upload_length = length;
+ safestrncpy(WC->upload_filename, filename,
+ sizeof(WC->upload_filename));
+ safestrncpy(WC->upload_content_type, cbtype,
+ sizeof(WC->upload_content_type));
memcpy(WC->upload, content, length);
}
else {
- lprintf(9, "malloc() failed: %s\n",
- strerror(errno));
+ lprintf(3, "malloc() failed: %s\n", strerror(errno));
}
}
+
}
/*
* Entry point for WebCit transaction
*/
-void session_loop(struct httprequest *req, int gzip)
+void session_loop(struct httprequest *req)
{
- char cmd[SIZ];
- char action[SIZ];
+ char cmd[1024];
+ char method[128];
+ char action[128];
+ char arg1[128];
+ char arg2[128];
+ char arg3[128];
char buf[SIZ];
int a, b;
int ContentLength = 0;
- int BytesRead;
+ int BytesRead = 0;
char ContentType[512];
- char *content;
- char *content_end;
+ char *content = NULL;
+ char *content_end = NULL;
struct httprequest *hptr;
char browser_host[SIZ];
char user_agent[SIZ];
+ int body_start = 0;
/* 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.
*/
- char c_host[SIZ];
- char c_port[SIZ];
char c_username[SIZ];
char c_password[SIZ];
char c_roomname[SIZ];
+ char c_httpauth_string[SIZ];
+ char c_httpauth_user[SIZ];
+ char c_httpauth_pass[SIZ];
char cookie[SIZ];
- strcpy(c_host, defaulthost);
- strcpy(c_port, defaultport);
- strcpy(c_username, "");
- strcpy(c_password, "");
- strcpy(c_roomname, "");
+ safestrncpy(c_username, "", sizeof c_username);
+ safestrncpy(c_password, "", sizeof c_password);
+ safestrncpy(c_roomname, "", sizeof c_roomname);
+ safestrncpy(c_httpauth_string, "", sizeof c_httpauth_string);
+ safestrncpy(c_httpauth_user, DEFAULT_HTTPAUTH_USER, sizeof c_httpauth_user);
+ safestrncpy(c_httpauth_pass, DEFAULT_HTTPAUTH_PASS, sizeof c_httpauth_pass);
WC->upload_length = 0;
WC->upload = NULL;
+ WC->vars = NULL;
WC->is_wap = 0;
- if (gzip) {
- WC->gzcompressed = 1;
- }
- else {
- WC->gzcompressed = 0;
- }
-
hptr = req;
if (hptr == NULL) return;
- strcpy(cmd, hptr->line);
+ safestrncpy(cmd, hptr->line, sizeof cmd);
hptr = hptr->next;
- extract_action(action, cmd);
+ extract_token(method, cmd, 0, ' ', sizeof method);
+
+ /* Figure out the action */
+ extract_token(action, cmd, 1, '/', sizeof action);
+ if (strstr(action, "?")) *strstr(action, "?") = 0;
+ if (strstr(action, "&")) *strstr(action, "&") = 0;
+ if (strstr(action, " ")) *strstr(action, " ") = 0;
+
+ extract_token(arg1, cmd, 2, '/', sizeof arg1);
+ if (strstr(arg1, "?")) *strstr(arg1, "?") = 0;
+ if (strstr(arg1, "&")) *strstr(arg1, "&") = 0;
+ if (strstr(arg1, " ")) *strstr(arg1, " ") = 0;
+
+ extract_token(arg2, cmd, 3, '/', sizeof arg2);
+ if (strstr(arg2, "?")) *strstr(arg2, "?") = 0;
+ if (strstr(arg2, "&")) *strstr(arg2, "&") = 0;
+ if (strstr(arg2, " ")) *strstr(arg2, " ") = 0;
+
+ extract_token(arg3, cmd, 4, '/', sizeof arg3);
+ if (strstr(arg3, "?")) *strstr(arg3, "?") = 0;
+ if (strstr(arg3, "&")) *strstr(arg3, "&") = 0;
+ if (strstr(arg3, " ")) *strstr(arg3, " ") = 0;
while (hptr != NULL) {
- strcpy(buf, hptr->line);
+ safestrncpy(buf, hptr->line, sizeof buf);
hptr = hptr->next;
if (!strncasecmp(buf, "Cookie: webcit=", 15)) {
- strcpy(cookie, &buf[15]);
+ safestrncpy(cookie, &buf[15], sizeof cookie);
cookie_to_stuff(cookie, NULL,
- c_username, c_password, c_roomname);
+ c_username, sizeof c_username,
+ c_password, sizeof c_password,
+ c_roomname, sizeof c_roomname);
+ }
+ else if (!strncasecmp(buf, "Authorization: Basic ", 21)) {
+ CtdlDecodeBase64(c_httpauth_string, &buf[21], strlen(&buf[21]));
+ extract_token(c_httpauth_user, c_httpauth_string, 0, ':', sizeof c_httpauth_user);
+ extract_token(c_httpauth_pass, c_httpauth_string, 1, ':', sizeof c_httpauth_pass);
}
else if (!strncasecmp(buf, "Content-length: ", 16)) {
ContentLength = atoi(&buf[16]);
}
if (ContentLength > 0) {
- lprintf(5, "Content length: %d\n", ContentLength);
- content = malloc(ContentLength + 1);
- memset(content, 0, ContentLength+1);
- BytesRead = 0;
-
- while (BytesRead < ContentLength) {
- a=read(WC->http_sock, &content[BytesRead],
- ContentLength - BytesRead);
- if (a <= 0) BytesRead = ContentLength;
- else BytesRead += a;
- }
+ content = malloc(ContentLength + SIZ);
+ memset(content, 0, ContentLength + SIZ);
+ sprintf(content, "Content-type: %s\n"
+ "Content-length: %d\n\n",
+ ContentType, ContentLength);
+ body_start = strlen(content);
+
+ /* Read the entire input data at once. */
+ client_read(WC->http_sock, &content[BytesRead+body_start],
+ ContentLength);
if (!strncasecmp(ContentType,
"application/x-www-form-urlencoded", 33)) {
- addurls(content);
+ addurls(&content[body_start]);
} else if (!strncasecmp(ContentType, "multipart", 9)) {
- content_end = content + ContentLength;
+ content_end = content + ContentLength + body_start;
mime_parser(content, content_end, *upload_handler,
NULL, NULL, NULL, 0);
}
}
}
+
+ /* Static content can be sent without connecting to Citadel. */
+ if (!strcasecmp(action, "static")) {
+ safestrncpy(buf, arg1, sizeof buf);
+ for (a = 0; a < strlen(buf); ++a)
+ if (isspace(buf[a]))
+ buf[a] = 0;
+ output_static(buf);
+ goto SKIP_ALL_THIS_CRAP; /* Don't try to connect */
+ }
+
/*
* If we're not connected to a Citadel server, try to hook up the
- * connection now. Preference is given to the host and port specified
- * by browser cookies, if cookies have been supplied.
+ * connection now.
*/
if (!WC->connected) {
- if (strlen(bstr("host")) > 0)
- strcpy(c_host, bstr("host"));
- if (strlen(bstr("port")) > 0)
- strcpy(c_port, bstr("port"));
-
- if (!strcasecmp(c_host, "uds")) {
+ if (!strcasecmp(ctdlhost, "uds")) {
/* unix domain socket */
- sprintf(buf, "%s/citadel.socket", c_port);
+ sprintf(buf, "%s/citadel.socket", ctdlport);
WC->serv_sock = uds_connectsock(buf);
}
else {
/* tcp socket */
- WC->serv_sock = tcp_connectsock(c_host, c_port);
+ WC->serv_sock = tcp_connectsock(ctdlhost, ctdlport);
}
if (WC->serv_sock < 0) {
}
else {
WC->connected = 1;
- serv_gets(buf); /* get the server welcome message */
+ serv_getln(buf, sizeof buf); /* get the server welcome message */
locate_host(browser_host, WC->http_sock);
get_serv_info(browser_host, user_agent);
+ if (serv_info.serv_rev_level < MINIMUM_CIT_VERSION) {
+ wprintf("You are connected to a Citadel "
+ "server running Citadel %d.%02d;\nin "
+ "order to run this version of WebCit "
+ "you must also have Citadel %d.%02d or"
+ " newer.\n\n\n",
+ serv_info.serv_rev_level / 100,
+ serv_info.serv_rev_level % 100,
+ MINIMUM_CIT_VERSION / 100,
+ MINIMUM_CIT_VERSION % 100
+ );
+ end_webcit_session();
+ goto SKIP_ALL_THIS_CRAP;
+ }
}
}
do_listsub();
goto SKIP_ALL_THIS_CRAP;
}
+#ifdef WEBCIT_WITH_CALENDAR_SERVICE
+ if (!strcasecmp(action, "freebusy")) {
+ do_freebusy(cmd);
+ goto SKIP_ALL_THIS_CRAP;
+ }
+#endif
+
+ /*
+ * If we're not logged in, but we have HTTP Authentication data,
+ * try logging in to Citadel using that.
+ */
+ if ((!WC->logged_in)
+ && (strlen(c_httpauth_user) > 0)
+ && (strlen(c_httpauth_pass) > 0)) {
+ serv_printf("USER %s", c_httpauth_user);
+ serv_getln(buf, sizeof buf);
+ if (buf[0] == '3') {
+ serv_printf("PASS %s", c_httpauth_pass);
+ serv_getln(buf, sizeof buf);
+ if (buf[0] == '2') {
+ become_logged_in(c_httpauth_user,
+ c_httpauth_pass, buf);
+ safestrncpy(WC->httpauth_user, c_httpauth_user, sizeof WC->httpauth_user);
+ safestrncpy(WC->httpauth_pass, c_httpauth_pass, sizeof WC->httpauth_pass);
+ }
+ }
+ }
+
+ /*
+ * The GroupDAV stuff relies on HTTP authentication instead of
+ * our session's authentication.
+ */
+ if (!strncasecmp(action, "groupdav", 8)) {
+ groupdav_main(req, ContentType, /* do GroupDAV methods */
+ ContentLength, content+body_start);
+ if (!WC->logged_in) {
+ WC->killthis = 1; /* If not logged in, don't */
+ } /* keep the session active */
+ goto SKIP_ALL_THIS_CRAP;
+ }
- check_for_express_messages();
+
+ /*
+ * Automatically send requests with any method other than GET or
+ * POST to the GroupDAV code as well.
+ */
+ if ((strcasecmp(method, "GET")) && (strcasecmp(method, "POST"))) {
+ groupdav_main(req, ContentType, /* do GroupDAV methods */
+ ContentLength, content+body_start);
+ if (!WC->logged_in) {
+ WC->killthis = 1; /* If not logged in, don't */
+ } /* keep the session active */
+ goto SKIP_ALL_THIS_CRAP;
+ }
/*
* If we're not logged in, but we have username and password cookies
* supplied by the browser, try using them to log in.
*/
- if ((!WC->logged_in) && (strlen(c_username) > 0) && (strlen(c_password) > 0)) {
+ if ((!WC->logged_in)
+ && (strlen(c_username) > 0)
+ && (strlen(c_password) > 0)) {
serv_printf("USER %s", c_username);
- serv_gets(buf);
+ serv_getln(buf, sizeof buf);
if (buf[0] == '3') {
serv_printf("PASS %s", c_password);
- serv_gets(buf);
+ serv_getln(buf, sizeof buf);
if (buf[0] == '2') {
become_logged_in(c_username, c_password, buf);
}
*/
if ((strlen(WC->wc_roomname) == 0) && (strlen(c_roomname) > 0)) {
serv_printf("GOTO %s", c_roomname);
- serv_gets(buf);
+ serv_getln(buf, sizeof buf);
if (buf[0] == '2') {
- strcpy(WC->wc_roomname, c_roomname);
+ safestrncpy(WC->wc_roomname, c_roomname, sizeof WC->wc_roomname);
}
}
- if (!strcasecmp(action, "static")) {
- strcpy(buf, &cmd[12]);
- for (a = 0; a < strlen(buf); ++a)
- if (isspace(buf[a]))
- buf[a] = 0;
- output_static(buf);
- } else if (!strcasecmp(action, "image")) {
+
+ /*
+ * If there are instant messages waiting, retrieve them for display.
+ */
+ check_for_instant_messages();
+
+ if (!strcasecmp(action, "image")) {
output_image();
/*
do_welcome();
} else if (!strcasecmp(action, "blank")) {
blank_page();
+ } else if (!strcasecmp(action, "do_template")) {
+ url_do_template();
+ } else if (!strcasecmp(action, "display_aide_menu")) {
+ display_aide_menu();
} else if (!strcasecmp(action, "display_main_menu")) {
display_main_menu();
- } else if (!strcasecmp(action, "whobbs")) {
- whobbs();
+ } else if (!strcasecmp(action, "who")) {
+ who();
+ } else if (!strcasecmp(action, "who_inner_html")) {
+ who_inner_html();
} else if (!strcasecmp(action, "knrooms")) {
knrooms();
} else if (!strcasecmp(action, "gotonext")) {
} else if (!strcasecmp(action, "ungoto")) {
ungoto();
} else if (!strcasecmp(action, "dotgoto")) {
- slrp_highest();
+ if (WC->wc_view != VIEW_MAILBOX) { /* dotgoto acts like dotskip when we're in a mailbox view */
+ slrp_highest();
+ }
smart_goto(bstr("room"));
} else if (!strcasecmp(action, "dotskip")) {
smart_goto(bstr("room"));
readloop("readfwd");
} else if (!strcasecmp(action, "headers")) {
readloop("headers");
+ } else if (!strcasecmp(action, "msg")) {
+ embed_message();
} else if (!strcasecmp(action, "display_enter")) {
display_enter();
} else if (!strcasecmp(action, "post")) {
post_message();
- } else if (!strcasecmp(action, "delete_msg")) {
- delete_msg();
- } else if (!strcasecmp(action, "confirm_move_msg")) {
- confirm_move_msg();
} else if (!strcasecmp(action, "move_msg")) {
move_msg();
+ } else if (!strcasecmp(action, "delete_msg")) {
+ delete_msg();
} else if (!strcasecmp(action, "userlist")) {
userlist();
} else if (!strcasecmp(action, "showuser")) {
display_entroom();
} else if (!strcasecmp(action, "entroom")) {
entroom();
+ } else if (!strcasecmp(action, "display_whok")) {
+ display_whok();
+ } else if (!strcasecmp(action, "do_invt_kick")) {
+ do_invt_kick();
} else if (!strcasecmp(action, "display_editroom")) {
display_editroom();
} else if (!strcasecmp(action, "netedit")) {
netedit();
} else if (!strcasecmp(action, "editroom")) {
editroom();
- } else if (!strcasecmp(action, "display_whok")) {
- display_whok();
} else if (!strcasecmp(action, "display_editinfo")) {
- display_edit("Room info", "EINF 0", "RINF", "/editinfo");
+ display_edit("Room info", "EINF 0", "RINF", "/editinfo", 1);
} else if (!strcasecmp(action, "editinfo")) {
save_edit("Room info", "EINF 1", 1);
} else if (!strcasecmp(action, "display_editbio")) {
sprintf(buf, "RBIO %s", WC->wc_username);
- display_edit("Your bio", "NOOP", buf, "editbio");
+ display_edit("Your bio", "NOOP", buf, "editbio", 3);
} else if (!strcasecmp(action, "editbio")) {
save_edit("Your bio", "EBIO", 0);
- } else if (!strcasecmp(action, "confirm_delete_room")) {
- confirm_delete_room();
+ } else if (!strcasecmp(action, "confirm_move_msg")) {
+ confirm_move_msg();
} else if (!strcasecmp(action, "delete_room")) {
delete_room();
} else if (!strcasecmp(action, "validate")) {
} else if (!strcasecmp(action, "editpic")) {
do_graphics_upload("UIMG 1|_userpic_");
} else if (!strcasecmp(action, "display_editroompic")) {
- display_graphics_upload("the graphic for this room",
+ display_graphics_upload("the icon for this room",
"UIMG 0|_roompic_",
"/editroompic");
} else if (!strcasecmp(action, "editroompic")) {
} else if (!strcasecmp(action, "display_editfloorpic")) {
sprintf(buf, "UIMG 0|_floorpic_|%s",
bstr("which_floor"));
- display_graphics_upload("the graphic for this floor",
+ display_graphics_upload("the icon for this floor",
buf,
"/editfloorpic");
} else if (!strcasecmp(action, "editfloorpic")) {
do_graphics_upload(buf);
} else if (!strcasecmp(action, "display_reg")) {
display_reg(0);
- } else if (!strcasecmp(action, "register")) {
- register_user();
} else if (!strcasecmp(action, "display_changepw")) {
display_changepw();
} else if (!strcasecmp(action, "changepw")) {
edit_me();
} else if (!strcasecmp(action, "display_siteconfig")) {
display_siteconfig();
- } else if (!strcasecmp(action, "page_popup")) {
- page_popup();
+ } else if (!strcasecmp(action, "chat_recv")) {
+ chat_recv();
+ } else if (!strcasecmp(action, "chat_send")) {
+ chat_send();
} else if (!strcasecmp(action, "siteconfig")) {
siteconfig();
} else if (!strcasecmp(action, "display_generic")) {
} else if (!strcasecmp(action, "select_user_to_edit")) {
select_user_to_edit(NULL, NULL);
} else if (!strcasecmp(action, "display_edituser")) {
- display_edituser(NULL);
+ display_edituser(NULL, 0);
} else if (!strcasecmp(action, "edituser")) {
edituser();
} else if (!strcasecmp(action, "create_user")) {
create_user();
} else if (!strcasecmp(action, "changeview")) {
change_view();
- } else if (!strcasecmp(action, "folders")) {
- folders();
} else if (!strcasecmp(action, "do_stuff_to_msgs")) {
do_stuff_to_msgs();
} else if (!strcasecmp(action, "change_start_page")) {
display_floorconfig(NULL);
} else if (!strcasecmp(action, "toggle_self_service")) {
toggle_self_service();
+#ifdef WEBCIT_WITH_CALENDAR_SERVICE
+ } else if (!strcasecmp(action, "display_edit_task")) {
+ display_edit_task();
+ } else if (!strcasecmp(action, "save_task")) {
+ save_task();
+ } else if (!strcasecmp(action, "display_edit_event")) {
+ display_edit_event();
+ } else if (!strcasecmp(action, "save_event")) {
+ save_event();
+ } else if (!strcasecmp(action, "respond_to_request")) {
+ respond_to_request();
+ } else if (!strcasecmp(action, "handle_rsvp")) {
+ handle_rsvp();
+#endif
} else if (!strcasecmp(action, "summary")) {
summary();
+ } else if (!strcasecmp(action, "iconbar")) {
+ do_iconbar();
+ } else if (!strcasecmp(action, "display_customize_iconbar")) {
+ display_customize_iconbar();
+ } else if (!strcasecmp(action, "commit_iconbar")) {
+ commit_iconbar();
+ } else if (!strcasecmp(action, "set_room_policy")) {
+ set_room_policy();
+ } else if (!strcasecmp(action, "display_inetconf")) {
+ display_inetconf();
+ } else if (!strcasecmp(action, "save_inetconf")) {
+ save_inetconf();
+ } else if (!strcasecmp(action, "setup_wizard")) {
+ do_setup_wizard();
+ } else if (!strcasecmp(action, "display_preferences")) {
+ display_preferences();
+ } else if (!strcasecmp(action, "set_preferences")) {
+ set_preferences();
} else if (!strcasecmp(action, "diagnostics")) {
- output_headers(1);
+ output_headers(1, 1, 1, 0, 0, 0, 0);
- wprintf("You're in session %d<HR>\n", WC->wc_session);
- wprintf("Command: <
BR><PRE>\n");
+ wprintf("You're in session %d<hr />\n", WC->wc_session);
+ wprintf("Command: <
br /><PRE>\n");
escputs(cmd);
- wprintf("</PRE><HR>\n");
- wprintf("Variables: <
BR><PRE>\n");
+ wprintf("</PRE><hr />\n");
+ wprintf("Variables: <
br /><PRE>\n");
dump_vars();
- wprintf("</PRE><HR>\n");
+ wprintf("</PRE><hr />\n");
wDumpContent(1);
}
/* When all else fais, display the main menu. */
WC->upload_length = 0;
}
-#ifdef WITH_ZLIB
- if (WC->gzfd) {
- gzclose(WC->gzfd);
- WC->gzfd = NULL;
- WC->gzcompressed = 0;
- }
-#endif
}
projects / citadel.git / blobdiff