#include "child.h"
#include "mime_parser.h"
-int wc_session;
-char wc_username[256];
-char wc_password[256];
-char wc_roomname[256];
int TransactionCount = 0;
-int connected = 0;
-int logged_in = 0;
-int axlevel;
char *ExpressMessages = NULL;
-int new_mail = 0;
-int need_vali = 0;
/* This variable is set to 1 if the room banner and menubar have been
* displayed, and we need to close the <TABLE> tags.
static const char *defaulthost = DEFAULT_HOST;
static const char *defaultport = DEFAULT_PORT;
-int upload_length = 0;
-char *upload;
+struct wcsession *WC = NULL; /* FIX take this out when multithreaded */
+
void unescape_input(char *buf)
{
int a, b;
struct webcontent *wptr;
if (fake_frames) {
- wprintf("</TD></TR></TABLE></TABLE>\n");
+ 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");
fake_frames = 0;
}
wprintf(">");
else if (strbuf[a] == '&')
wprintf("&");
- else if (strbuf[a] == 34)
+ else if (strbuf[a] == '\"')
wprintf(""");
+ else if (strbuf[a] == '\'')
+ wprintf("'");
else if (strbuf[a] == LB)
wprintf("<");
else if (strbuf[a] == RB)
printf("Pragma: no-cache\n");
printf("Cache-Control: no-store\n");
}
- stuff_to_cookie(cookie, wc_session, wc_username,
- wc_password, wc_roomname);
+ stuff_to_cookie(cookie, WC->wc_session, WC->wc_username,
+ WC->wc_password, WC->wc_roomname);
if (print_standard_html_head == 2) {
printf("X-WebCit-Session: close\n");
printf("Set-cookie: webcit=%s\n", unset);
if (print_standard_html_head > 0) {
wprintf("<HTML><HEAD><TITLE>");
escputs(serv_info.serv_humannode);
- wprintf("</TITLE></HEAD>");
+ wprintf("</TITLE>\n"
+ "<META HTTP-EQUIV=\"Pragma\" CONTENT=\"no-cache\">\n"
+ "</HEAD>\n");
if (ExpressMessages != NULL) {
wprintf("<SCRIPT language=\"javascript\">\n");
wprintf("function ExpressMessage() {\n");
wprintf("\")\n");
wprintf(" }\n </SCRIPT>\n");
}
+
+
+
+ /* JavaScript key-based navigation would go here if it
+ * were finished
+ */
+
wprintf("<BODY ");
if (ExpressMessages != NULL) {
wprintf("onload=\"ExpressMessage()\" ");
if (print_standard_html_head == 1) {
- wprintf("<TABLE border=0 width=100%>"
+ wprintf("<A NAME=\"TheTop\"></A>"
+ "<TABLE border=0 width=100%>"
"<TR VALIGN=TOP><TD>");
display_menubar(0);
if (!strncasecmp(&what[strlen(what) - 4], ".gif", 4))
printf("Content-type: image/gif\n");
+ else if (!strncasecmp(&what[strlen(what) - 4], ".txt", 4))
+ printf("Content-type: text/plain\n");
else if (!strncasecmp(&what[strlen(what) - 4], ".jpg", 4))
printf("Content-type: image/jpeg\n");
else if (!strncasecmp(&what[strlen(what) - 5], ".html", 5))
fprintf(stderr, " length = %d\n", length);
if (strlen(name) > 0) {
- upload = malloc(length);
- if (upload != NULL) {
- upload_length = length;
- memcpy(upload, content, length);
+ WC->upload = malloc(length);
+ if (WC->upload != NULL) {
+ WC->upload_length = length;
+ memcpy(WC->upload, content, length);
}
}
}
strcpy(c_password, "");
strcpy(c_roomname, "");
- upload_length = 0;
- upload = NULL;
+ WC->upload_length = 0;
+ WC->upload = NULL;
if (getz(cmd) == NULL)
return;
cmd[a] = 0;
}
/*
- * If we're not connected to a Citadel server, try to hook up the
+ * If we're not WC->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.
*/
- if (!connected) {
+ if (!WC->connected) {
if (strlen(bstr("host")) > 0)
strcpy(c_host, bstr("host"));
if (strlen(bstr("port")) > 0)
strcpy(c_port, bstr("port"));
- serv_sock = connectsock(c_host, c_port, "tcp");
- connected = 1;
+ WC->serv_sock = connectsock(c_host, c_port, "tcp");
+ if (WC->serv_sock < 0) {
+ do_logout();
+ }
+
+ WC->connected = 1;
serv_gets(buf); /* get the server welcome message */
get_serv_info(browser_host, user_agent);
}
* If we're not logged in, but we have username and password cookies
* supplied by the browser, try using them to log in.
*/
- if ((!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);
if (buf[0] == '3') {
* If we don't have a current room, but a cookie specifying the
* current room is supplied, make an effort to go there.
*/
- if ((strlen(wc_roomname) == 0) && (strlen(c_roomname) > 0)) {
+ if ((strlen(WC->wc_roomname) == 0) && (strlen(c_roomname) > 0)) {
serv_printf("GOTO %s", c_roomname);
serv_gets(buf);
if (buf[0] == '2') {
- strcpy(wc_roomname, c_roomname);
+ strcpy(WC->wc_roomname, c_roomname);
}
}
if (!strcasecmp(action, "static")) {
output_static(buf);
} else if (!strcasecmp(action, "image")) {
output_image();
- } else if ((!logged_in) && (!strcasecmp(action, "login"))) {
+ } else if ((!WC->logged_in) && (!strcasecmp(action, "login"))) {
do_login();
- } else if (!logged_in) {
+ } else if (!WC->logged_in) {
display_login(NULL);
}
/* Various commands... */
} else if (!strcasecmp(action, "editinfo")) {
save_edit("Room info", "EINF 1", 1);
} else if (!strcasecmp(action, "display_editbio")) {
- sprintf(buf, "RBIO %s", wc_username);
+ sprintf(buf, "RBIO %s", WC->wc_username);
display_edit("Your bio", "NOOP", buf, "editbio");
} else if (!strcasecmp(action, "editbio")) {
save_edit("Your bio", "EBIO", 0);
} else if (!strcasecmp(action, "share")) {
share();
} else if (!strcasecmp(action, "terminate_session")) {
+ slrp_highest();
terminate_session();
} else if (!strcasecmp(action, "edit_me")) {
edit_me();
do_generic();
} else if (!strcasecmp(action, "display_menubar")) {
display_menubar(1);
- }
- /* When all else fails... */
- else {
+ } else if (!strcasecmp(action, "diagnostics")) {
printf("HTTP/1.0 200 OK\n");
output_headers(1);
wprintf("TransactionCount is %d<BR>\n", TransactionCount);
- wprintf("You're in session %d<HR>\n", wc_session);
+ wprintf("You're in session %d<HR>\n", WC->wc_session);
wprintf("Command: <BR><PRE>\n");
escputs(cmd);
wprintf("</PRE><HR>\n");
wprintf("</PRE><HR>\n");
wDumpContent(1);
}
+ /* When all else fais, display the main menu. */
+ else {
+ display_main_menu();
+ }
fflush(stdout);
if (content != NULL) {
content = NULL;
}
free_urls();
- if (upload_length > 0) {
- free(upload);
- upload_length = 0;
+ if (WC->upload_length > 0) {
+ free(WC->upload);
+ WC->upload_length = 0;
}
}
return 1;
}
- wc_session = atoi(argv[1]);
+ WC = (struct wcsession *) malloc(sizeof(struct wcsession));
+ memset(WC, 0, sizeof(struct wcsession));
+
+
+
+ WC->wc_session = atoi(argv[1]);
defaulthost = argv[2];
defaultport = argv[3];
- strcpy(wc_username, "");
- strcpy(wc_password, "");
- strcpy(wc_roomname, "");
+ strcpy(WC->wc_username, "");
+ strcpy(WC->wc_password, "");
+ strcpy(WC->wc_roomname, "");
/* Clear out serv_info and temporarily set the value of serv_humannode
* to a default value, because it'll be used in HTML page titles
projects / citadel.git / blobdiff