#include <pthread.h>
#include <signal.h>
#include "webcit.h"
+#include "webserver.h"
+#include "mime_parser.h"
/*
* String to unset the cookie.
void addurls(char *url)
{
char *up, *ptr;
- char buf[256];
+ char buf[SIZ];
int a, b;
struct urlcontent *u;
while (strlen(up) > 0) {
/* locate the = sign */
- strncpy(buf, up, 255);
+ safestrncpy(buf, up, sizeof buf);
b = (-1);
for (a = 255; a >= 0; --a)
if (buf[a] == '=')
}
+#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;
vsprintf(wbuf, format, arg_ptr);
va_end(arg_ptr);
- write(WC->http_sock, wbuf, strlen(wbuf));
+ http_write(WC->http_sock, wbuf, strlen(wbuf));
}
void wDumpContent(int print_standard_html_footer)
{
if (WC->fake_frames) {
- wprintf("<CENTER><FONT SIZE=-1>"
- "<TABLE border=0 width=100%><TR>"
- "<TD><A HREF=\"/ungoto\">"
- "<IMG SRC=\"/static/back.gif\" BORDER=0>"
- "Ungoto</A></TD>");
- wprintf("<TD><A HREF=\"#TheTop\">"
- "<IMG SRC=\"/static/up.gif\" BORDER=0>"
- "Top of page</A></TD>");
- wprintf("<TD><A HREF=\"/display_enter\">"
- "<IMG SRC=\"/static/enter.gif\" BORDER=0>"
- "Enter a message</A></TD>");
- wprintf("<TD><A HREF=\"/gotonext\">"
- "Goto next room"
- "<IMG SRC=\"/static/forward.gif\" BORDER=0></A></TD>"
- "</TR></TABLE>"
- "</FONT>\n"
- "</TD></TR></TABLE></TABLE>\n");
+ wprintf("</TABLE>\n");
WC->fake_frames = 0;
}
}
-void escputs1(char *strbuf, int nbsp)
+/*
+ * 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)
{
int a;
+ strcpy(target, "");
for (a = 0; a < strlen(strbuf); ++a) {
if (strbuf[a] == '<')
- wprintf("<");
+ strcat(target, "<");
else if (strbuf[a] == '>')
- wprintf(">");
+ strcat(target, ">");
else if (strbuf[a] == '&')
- wprintf("&");
+ strcat(target, "&");
else if (strbuf[a] == '\"')
- wprintf(""");
+ strcat(target, """);
else if (strbuf[a] == '\'')
- wprintf("'");
+ strcat(target, "'");
else if (strbuf[a] == LB)
- wprintf("<");
+ strcat(target, "<");
else if (strbuf[a] == RB)
- wprintf(">");
+ strcat(target, ">");
else if (strbuf[a] == QU)
- wprintf("\"");
+ strcat(target, "\"");
else if ((strbuf[a] == 32) && (nbsp == 1)) {
- wprintf(" ");
+ strcat(target, " ");
} else {
- wprintf("%c", strbuf[a]);
+ strncat(target, &strbuf[a], 1);
}
}
}
+void escputs1(char *strbuf, int nbsp)
+{
+ char buf[1024];
+ stresc(buf, strbuf, nbsp);
+ wprintf("%s", buf);
+}
+
void escputs(char *strbuf)
{
escputs1(strbuf, 0);
}
-
-
-char *urlesc(char *strbuf)
+/*
+ * Escape a string for feeding out as a URL.
+ * Returns a pointer to a buffer that must be freed by the caller!
+ */
+void urlesc(char *outbuf, char *strbuf)
{
int a, b, c;
char *ec = " #&;`'|*?-~<>^()[]{}$\\";
- static char outbuf[512];
strcpy(outbuf, "");
else
sprintf(&outbuf[b], "%c", strbuf[a]);
}
- return (outbuf);
}
void urlescputs(char *strbuf)
{
- wprintf("%s", urlesc(strbuf));
+ char outbuf[SIZ];
+
+ urlesc(outbuf, strbuf);
+ wprintf("%s", outbuf);
}
*
* Bits 0 and 1:
* 0 = Nothing. Do not display any leading HTTP or HTML.
- * 1 = HTTP headers plus the "fake frames" found in most windows.
+ * 1 = HTTP headers plus the room banner
* 2 = HTTP headers required to terminate the session (unset cookies)
- * 3 = HTTP and HTML headers, but no 'fake frames'
+ * 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
*/
void output_headers(int controlcode)
{
- char cookie[256];
+ 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");
+ }
+#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
}
stuff_to_cookie(cookie, WC->wc_session, WC->wc_username,
WC->wc_password, WC->wc_roomname);
wprintf("Set-cookie: webcit=%s\n", unset);
} else {
wprintf("Set-cookie: webcit=%s\n", cookie);
+ if (server_cookie != NULL) {
+ wprintf("%s\n", server_cookie);
+ }
}
if (print_standard_html_head > 0) {
wprintf("\n");
+
+#ifdef WITH_ZLIB
+ if (temp_gzfd != NULL) {
+ WC->gzfd = temp_gzfd;
+ }
+#endif
+
wprintf("<HTML><HEAD><TITLE>");
escputs(serv_info.serv_humannode);
wprintf("</TITLE>\n"
- "<META HTTP-EQUIV=\"Expires\" CONTENT=\"0\">\n"
- "<META HTTP-EQUIV=\"Pragma\" CONTENT=\"no-cache\">\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");
- if (WC->ExpressMessages != NULL) {
- wprintf("<SCRIPT language=\"javascript\">\n");
- wprintf("function ExpressMessage() {\n");
- wprintf(" alert(\"");
- escputs(WC->ExpressMessages);
- wprintf("\")\n");
- wprintf(" }\n </SCRIPT>\n");
- }
-
-
- /* JavaScript key-based navigation would go here if it
- * were finished
- */
-
- wprintf("<BODY ");
- if (WC->ExpressMessages != NULL) {
- wprintf("onload=\"ExpressMessage()\" ");
- free(WC->ExpressMessages);
- WC->ExpressMessages = NULL;
+ /* 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;
}
- wprintf("BACKGROUND=\"/image&name=background\" TEXT=\"#000000\" LINK=\"#004400\">\n");
-
-
- if (print_standard_html_head == 1) {
- wprintf("<A NAME=\"TheTop\"></A>"
- "<TABLE border=0 width=100%>"
- "<TR VALIGN=TOP><TD VALIGN=LEFT CELLPADDING=0>");
+ do_template("background");
+ clear_local_substs();
- display_menubar(0);
+ if (print_standard_html_head == 1) {
+ wprintf("<A NAME=\"TheTop\"></A>");
- wprintf("</TD><TD VALIGN=TOP>"
- "<TABLE border=0 width=100%><TR VALIGN=TOP>"
+ wprintf("<TABLE border=0 width=100%%><TR VALIGN=TOP>"
"<TD>\n");
embed_room_banner(NULL);
}
-
-void ExpressMessageCat(char *buf) {
- if (WC->ExpressMessages == NULL) {
- WC->ExpressMessages = malloc(strlen(buf) + 4);
- strcpy(WC->ExpressMessages, "");
- } else {
- WC->ExpressMessages = realloc(WC->ExpressMessages,
- (strlen(WC->ExpressMessages) + strlen(buf) + 4));
- }
- strcat(WC->ExpressMessages, buf);
- strcat(WC->ExpressMessages, "\\n");
+/*
+ *
+ */
+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("<html><body>\n");
+ wprintf("you really want to be <A HREF=\"%s\">here</A> now\n",
+ whichpage);
+ wprintf("</body></html>\n");
}
+
void check_for_express_messages()
{
- char buf[256];
+ char buf[SIZ];
- serv_puts("PEXP");
+ serv_puts("NOOP");
serv_gets(buf);
- if (buf[0] == '1') {
- while (serv_gets(buf), strcmp(buf, "000")) {
- ExpressMessageCat(buf);
- }
- }
+ if (buf[3] == '*') WC->HaveExpressMessages = 1;
}
void output_static(char *what)
{
char buf[4096];
- long thisblock;
FILE *fp;
struct stat statbuf;
off_t bytes;
+ char *bigbuffer;
sprintf(buf, "static/%s", what);
fp = fopen(buf, "rb");
wprintf("Content-type: image/gif\n");
else if (!strncasecmp(&what[strlen(what) - 4], ".txt", 4))
wprintf("Content-type: text/plain\n");
+ else if (!strncasecmp(&what[strlen(what) - 4], ".css", 4))
+ wprintf("Content-type: text/css\n");
else if (!strncasecmp(&what[strlen(what) - 4], ".jpg", 4))
wprintf("Content-type: image/jpeg\n");
+ else if (!strncasecmp(&what[strlen(what) - 4], ".png", 4))
+ wprintf("Content-type: image/png\n");
else if (!strncasecmp(&what[strlen(what) - 5], ".html", 5))
wprintf("Content-type: text/html\n");
+ else if (!strncasecmp(&what[strlen(what) - 4], ".wml", 4))
+ wprintf("Content-type: text/vnd.wap.wml\n");
+ else if (!strncasecmp(&what[strlen(what) - 5], ".wmls", 5))
+ wprintf("Content-type: text/vnd.wap.wmlscript\n");
+ else if (!strncasecmp(&what[strlen(what) - 5], ".wmlc", 5))
+ wprintf("Content-type: application/vnd.wap.wmlc\n");
+ else if (!strncasecmp(&what[strlen(what) - 6], ".wmlsc", 6))
+ wprintf("Content-type: application/vnd.wap.wmlscriptc\n");
+ else if (!strncasecmp(&what[strlen(what) - 5], ".wbmp", 5))
+ wprintf("Content-type: image/vnd.wap.wbmp\n");
else
wprintf("Content-type: application/octet-stream\n");
fstat(fileno(fp), &statbuf);
bytes = statbuf.st_size;
- fprintf(stderr, "Static: %s, %ld bytes\n", what, bytes);
+ lprintf(3, "Static: %s, %ld bytes\n", what, bytes);
wprintf("Content-length: %ld\n", (long) bytes);
wprintf("\n");
- while (bytes > 0) {
- thisblock = sizeof(buf);
- if (thisblock > bytes) thisblock = bytes;
- fread(buf, thisblock, 1, fp);
- write(WC->http_sock, buf, thisblock);
- bytes = bytes - thisblock;
- }
+ bigbuffer = malloc(bytes);
+ fread(bigbuffer, bytes, 1, fp);
fclose(fp);
+ http_write(WC->http_sock, bigbuffer, bytes);
+ free(bigbuffer);
}
if (!strcasecmp(bstr("force_close_session"), "yes")) {
end_webcit_session();
}
}
+
/*
* When the browser requests an image file from the Citadel server,
* this function is called to transmit it.
*/
void output_image()
{
- char buf[256];
+ char buf[SIZ];
char xferbuf[4096];
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);
if (buf[0] == '2') {
while (bytes > (off_t) 0) {
thisblock = (off_t) sizeof(xferbuf);
- if (thisblock > bytes)
+ if (thisblock > bytes) {
thisblock = bytes;
+ }
serv_printf("READ %ld|%ld", accomplished, thisblock);
serv_gets(buf);
- if (buf[0] == '6')
+ if (buf[0] == '6') {
thisblock = extract_long(&buf[4], 0);
- serv_read(xferbuf, (int) thisblock);
- write(WC->http_sock, xferbuf, thisblock);
+ serv_read(xferbuf, (int) thisblock);
+ }
+ else {
+ memset(xferbuf, 0, thisblock);
+ }
+ http_write(WC->http_sock, xferbuf, thisblock);
bytes = bytes - thisblock;
accomplished = accomplished + thisblock;
}
serv_puts("CLOS");
serv_gets(buf);
} else {
- wprintf("HTTP/1.0 404 %s\n", strerror(errno));
+ 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]);
+ }
+
+}
+
+/*
+ */
+void output_mimepart()
+{
+ char buf[SIZ];
+ char xferbuf[4096];
+ off_t bytes;
+ off_t thisblock;
+ off_t accomplished = 0L;
+ char content_type[SIZ];
+
+ serv_printf("OPNA %s|%s", bstr("msgnum"), bstr("partnum"));
+ serv_gets(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;
+ }
+ serv_puts("CLOS");
+ serv_gets(buf);
+ } else {
+ wprintf("HTTP/1.0 404 %s\n", &buf[4]);
output_headers(0);
wprintf("Content-Type: text/plain\n");
wprintf("\n");
- wprintf("Error retrieving image\n");
+ wprintf("Error retrieving part: %s\n", &buf[4]);
+ }
+
+}
+
+
+/*
+ */
+char *load_mimepart(long msgnum, char *partnum)
+{
+ 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);
+ if (buf[0] == '2') {
+ bytes = extract_long(&buf[4], 0);
+ extract(content_type, &buf[4], 3);
+
+ content = malloc(bytes + 1);
+
+ 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 */
+ return(content);
+ }
+ else {
+ return(NULL);
}
}
{
wprintf("HTTP/1.0 200 OK\n");
output_headers(1);
- wprintf("<TABLE WIDTH=100% BORDER=0 BGCOLOR=%s><TR><TD>", titlebarcolor);
+ 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");
escputs(messagetext);
wprintf("<HR>\n");
- embed_main_menu();
wDumpContent(1);
}
+
+/*
+ * Display a blank page.
+ */
+void blank_page(void) {
+ output_headers(7);
+ wDumpContent(2);
+}
+
+
+
+
+/*
+ * Offer to make any page the user's "start page."
+ */
+void offer_start_page(void) {
+ wprintf("<A HREF=\"/change_start_page?startpage=");
+ urlescputs(WC->this_page);
+ wprintf("\">"
+ "<FONT SIZE=-2 COLOR=#AAAAAA>Make this my start page</FONT>"
+ "</A>"
+ );
+}
+
+
+/*
+ * Change the user's start page
+ */
+void change_start_page(void) {
+
+ if (bstr("startpage") == NULL) {
+ display_error("startpage set to null");
+ 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>");
+
+ wDumpContent(1);
+}
+
+
+
+
void display_error(char *errormessage)
{
convenience_page("770000", "Error", errormessage);
}
-void upload_handler(char *name, char *filename, char *encoding,
- void *content, char *cbtype, size_t length)
+void upload_handler(char *name, char *filename, char *partnum, char *disp,
+ void *content, char *cbtype, size_t length,
+ char *encoding, void *userdata)
{
- fprintf(stderr, "UPLOAD HANDLER CALLED\n");
- fprintf(stderr, " name = %s\n", name);
- fprintf(stderr, "filename = %s\n", filename);
- fprintf(stderr, "encoding = %s\n", encoding);
- fprintf(stderr, " type = %s\n", cbtype);
- fprintf(stderr, " length = %ld\n", (long)length);
+ 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);
- if (strlen(name) > 0) {
+ if (length > 0) {
WC->upload = malloc(length);
if (WC->upload != NULL) {
WC->upload_length = length;
memcpy(WC->upload, content, length);
}
+ else {
+ lprintf(9, "malloc() failed: %s\n",
+ strerror(errno));
+ }
}
}
+
+
/*
* Entry point for WebCit transaction
*/
-void session_loop(struct httprequest *req)
+void session_loop(struct httprequest *req, int gzip)
{
- char cmd[256];
- char action[256];
- char buf[256];
+ char cmd[SIZ];
+ char action[SIZ];
+ char buf[SIZ];
int a, b;
int ContentLength = 0;
int BytesRead;
char ContentType[512];
char *content;
+ char *content_end;
struct httprequest *hptr;
- char browser_host[256];
- char user_agent[256];
+ char browser_host[SIZ];
+ char user_agent[SIZ];
/* 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[256];
- char c_port[256];
- char c_username[256];
- char c_password[256];
- char c_roomname[256];
- char cookie[256];
+ char c_host[SIZ];
+ char c_port[SIZ];
+ char c_username[SIZ];
+ char c_password[SIZ];
+ char c_roomname[SIZ];
+ char cookie[SIZ];
strcpy(c_host, defaulthost);
strcpy(c_port, defaultport);
WC->upload_length = 0;
WC->upload = NULL;
+ WC->is_wap = 0;
+
+ if (gzip) {
+ WC->gzcompressed = 1;
+ }
+ else {
+ WC->gzcompressed = 0;
+ }
+
hptr = req;
if (hptr == NULL) return;
ContentLength = atoi(&buf[16]);
}
else if (!strncasecmp(buf, "Content-type: ", 14)) {
- strcpy(ContentType, &buf[14]);
+ safestrncpy(ContentType, &buf[14], sizeof ContentType);
}
else if (!strncasecmp(buf, "User-agent: ", 12)) {
- strcpy(user_agent, &buf[12]);
+ safestrncpy(user_agent, &buf[12], sizeof user_agent);
+ }
+ else if (!strncasecmp(buf, "Host: ", 6)) {
+ safestrncpy(WC->http_host, &buf[6], sizeof WC->http_host);
+ }
+ /* Only WAP gateways explicitly name this content-type */
+ else if (strstr(buf, "text/vnd.wap.wml")) {
+ WC->is_wap = 1;
}
}
if (ContentLength > 0) {
- fprintf(stderr, "Content length: %d\n", ContentLength);
+ lprintf(5, "Content length: %d\n", ContentLength);
content = malloc(ContentLength + 1);
memset(content, 0, ContentLength+1);
BytesRead = 0;
"application/x-www-form-urlencoded", 33)) {
addurls(content);
} else if (!strncasecmp(ContentType, "multipart", 9)) {
- mime_parser(content, ContentLength, ContentType,
- *upload_handler);
+ content_end = content + ContentLength;
+ mime_parser(content, content_end, *upload_handler,
+ NULL, NULL, NULL, 0);
}
} else {
content = NULL;
}
+ /* make a note of where we are in case the user wants to save it */
+ safestrncpy(WC->this_page, cmd, sizeof(WC->this_page));
+ remove_token(WC->this_page, 2, ' ');
+ remove_token(WC->this_page, 0, ' ');
+
/* If there are variables in the URL, we must grab them now */
- for (a = 0; a < strlen(cmd); ++a)
+ for (a = 0; a < strlen(cmd); ++a) {
if ((cmd[a] == '?') || (cmd[a] == '&')) {
for (b = a; b < strlen(cmd); ++b)
if (isspace(cmd[b]))
addurls(&cmd[a + 1]);
cmd[a] = 0;
}
+ }
+
/*
* 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
if (WC->serv_sock < 0) {
do_logout();
+ goto SKIP_ALL_THIS_CRAP;
+ }
+ else {
+ WC->connected = 1;
+ serv_gets(buf); /* get the server welcome message */
+ locate_host(browser_host, WC->http_sock);
+ get_serv_info(browser_host, user_agent);
}
+ }
- WC->connected = 1;
- serv_gets(buf); /* get the server welcome message */
- locate_host(browser_host, WC->http_sock);
- get_serv_info(browser_host, user_agent);
+ /*
+ * Functions which can be performed without logging in
+ */
+ if (!strcasecmp(action, "listsub")) {
+ do_listsub();
+ goto SKIP_ALL_THIS_CRAP;
}
+
check_for_express_messages();
/*
output_static(buf);
} else if (!strcasecmp(action, "image")) {
output_image();
+
+ /*
+ * All functions handled below this point ... make sure we log in
+ * before doing anything else!
+ */
} else if ((!WC->logged_in) && (!strcasecmp(action, "login"))) {
do_login();
} else if (!WC->logged_in) {
display_login(NULL);
}
- /* Various commands... */
+
+ /*
+ * Various commands...
+ */
else if (!strcasecmp(action, "do_welcome")) {
do_welcome();
+ } else if (!strcasecmp(action, "blank")) {
+ blank_page();
} else if (!strcasecmp(action, "display_main_menu")) {
display_main_menu();
- } else if (!strcasecmp(action, "advanced")) {
- display_advanced_menu();
} else if (!strcasecmp(action, "whobbs")) {
whobbs();
} else if (!strcasecmp(action, "knrooms")) {
- list_all_rooms_by_floor();
+ knrooms();
} else if (!strcasecmp(action, "gotonext")) {
slrp_highest();
gotonext();
} else if (!strcasecmp(action, "dotgoto")) {
slrp_highest();
smart_goto(bstr("room"));
+ } else if (!strcasecmp(action, "dotskip")) {
+ smart_goto(bstr("room"));
} else if (!strcasecmp(action, "termquit")) {
do_logout();
} else if (!strcasecmp(action, "readnew")) {
readloop("readold");
} else if (!strcasecmp(action, "readfwd")) {
readloop("readfwd");
+ } else if (!strcasecmp(action, "headers")) {
+ readloop("headers");
} else if (!strcasecmp(action, "display_enter")) {
display_enter();
} else if (!strcasecmp(action, "post")) {
post_message();
- } else if (!strcasecmp(action, "confirm_delete_msg")) {
- confirm_delete_msg();
} else if (!strcasecmp(action, "delete_msg")) {
delete_msg();
} else if (!strcasecmp(action, "confirm_move_msg")) {
entroom();
} 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");
} else if (!strcasecmp(action, "editinfo")) {
"/editroompic");
} else if (!strcasecmp(action, "editroompic")) {
do_graphics_upload("UIMG 1|_roompic_");
- } else if (!strcasecmp(action, "select_floor_to_edit_pic")) {
- select_floor_to_edit_pic();
+ } else if (!strcasecmp(action, "delete_floor")) {
+ delete_floor();
+ } else if (!strcasecmp(action, "rename_floor")) {
+ rename_floor();
+ } else if (!strcasecmp(action, "create_floor")) {
+ create_floor();
} else if (!strcasecmp(action, "display_editfloorpic")) {
sprintf(buf, "UIMG 0|_floorpic_|%s",
bstr("which_floor"));
changepw();
} else if (!strcasecmp(action, "display_edit_node")) {
display_edit_node();
+ } else if (!strcasecmp(action, "edit_node")) {
+ edit_node();
} else if (!strcasecmp(action, "display_netconf")) {
display_netconf();
- } else if (!strcasecmp(action, "display_confirm_unshare")) {
- display_confirm_unshare();
} else if (!strcasecmp(action, "display_confirm_delete_node")) {
display_confirm_delete_node();
} else if (!strcasecmp(action, "delete_node")) {
delete_node();
- } else if (!strcasecmp(action, "unshare")) {
- unshare();
} else if (!strcasecmp(action, "display_add_node")) {
display_add_node();
} else if (!strcasecmp(action, "add_node")) {
add_node();
- } else if (!strcasecmp(action, "display_share")) {
- display_share();
- } else if (!strcasecmp(action, "share")) {
- share();
} else if (!strcasecmp(action, "terminate_session")) {
slrp_highest();
terminate_session();
edit_me();
} else if (!strcasecmp(action, "display_siteconfig")) {
display_siteconfig();
+ } else if (!strcasecmp(action, "page_popup")) {
+ page_popup();
} else if (!strcasecmp(action, "siteconfig")) {
siteconfig();
} else if (!strcasecmp(action, "display_generic")) {
do_generic();
} else if (!strcasecmp(action, "display_menubar")) {
display_menubar(1);
+ } else if (!strcasecmp(action, "output_mimepart")) {
+ output_mimepart();
+ } else if (!strcasecmp(action, "edit_vcard")) {
+ edit_vcard();
+ } else if (!strcasecmp(action, "submit_vcard")) {
+ submit_vcard();
+ } else if (!strcasecmp(action, "select_user_to_edit")) {
+ select_user_to_edit(NULL, NULL);
+ } else if (!strcasecmp(action, "display_edituser")) {
+ display_edituser(NULL);
+ } 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")) {
+ change_start_page();
+ } else if (!strcasecmp(action, "display_floorconfig")) {
+ display_floorconfig(NULL);
+ } else if (!strcasecmp(action, "toggle_self_service")) {
+ toggle_self_service();
+ } else if (!strcasecmp(action, "summary")) {
+ summary();
} else if (!strcasecmp(action, "diagnostics")) {
output_headers(1);
display_main_menu();
}
+SKIP_ALL_THIS_CRAP:
fflush(stdout);
if (content != NULL) {
free(content);
free(WC->upload);
WC->upload_length = 0;
}
+
+#ifdef WITH_ZLIB
+ if (WC->gzfd) {
+ gzclose(WC->gzfd);
+ WC->gzfd = NULL;
+ WC->gzcompressed = 0;
+ }
+#endif
}
projects / citadel.git / blobdiff