]> code.citadel.org Git - citadel.git/blobdiff - webcit/webcit.c
* Started moving all of the global variables into a struct, to facilitate
[citadel.git] / webcit / webcit.c
index 4bbcc17fde86c81e568f94f18eaec918a7106082..10819551a92fabfbad9d91e0515dafd897dab479 100644 (file)
 #include "child.h"
 #include "mime_parser.h"
 
-int fake_frames = 0;
-
-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 noframes = 0;
+
+/* This variable is set to 1 if the room banner and menubar have been
+ * displayed, and we need to close the <TABLE> tags.
+ */
+int fake_frames = 0;
 
 struct webcontent *wlist = NULL;
 struct webcontent *wlast = NULL;
@@ -43,10 +38,10 @@ struct urlcontent *urlstrings = NULL;
 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;
@@ -199,7 +194,7 @@ int wContentLength(void)
  * calculate a Content-length: header.
  *
  * print_standard_html_footer should be set to 0 to transmit only, 1 to
- * append the main menu (if in noframes mode) and closing tags, or 2 to
+ * append the main menu and closing tags, or 2 to
  * append the closing tags only.
  */
 void wDumpContent(int print_standard_html_footer)
@@ -207,14 +202,29 @@ void wDumpContent(int print_standard_html_footer)
        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;
-               }
+       }
 
        if (print_standard_html_footer) {
-               if ((noframes) && (print_standard_html_footer != 2)) {
+               if (print_standard_html_footer != 2) {
                        wprintf("<BR>");
-                       /* embed_main_menu(); */  /* not any more */
                }
                wprintf("</BODY></HTML>\n");
        }
@@ -243,8 +253,10 @@ void escputs1(char *strbuf, int nbsp)
                        wprintf("&gt;");
                else if (strbuf[a] == '&')
                        wprintf("&amp;");
-               else if (strbuf[a] == 34)
+               else if (strbuf[a] == '\"')
                        wprintf("&quot;");
+               else if (strbuf[a] == '\'') 
+                       wprintf("&#39;");
                else if (strbuf[a] == LB)
                        wprintf("<");
                else if (strbuf[a] == RB)
@@ -331,8 +343,11 @@ char *getz(char *buf)
 /*
  * Output all that important stuff that the browser will want to see
  *
- * If print_standard_html_head is nonzero, we also get some standard HTML
- * headers.  If it's set to 2, the session is considered to be closing.
+ * print_standard_html_head values:
+ * 0 = Nothing.  Do not display any leading HTTP or HTML.
+ * 1 = HTTP headers plus the "fake frames" found in most windows.
+ * 2 = HTTP headers required to terminate the session (unset cookies)
+ * 3 = HTTP headers only.
  */
 void output_headers(int print_standard_html_head)
 {
@@ -347,8 +362,8 @@ void output_headers(int print_standard_html_head)
                printf("Pragma: no-cache\n");
                printf("Cache-Control: no-store\n");
        }
-       stuff_to_cookie(cookie, wc_session, wc_username, wc_password,
-                       wc_roomname, noframes);
+       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);
@@ -359,7 +374,9 @@ void output_headers(int print_standard_html_head)
        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");
@@ -368,6 +385,13 @@ void output_headers(int print_standard_html_head)
                        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()\" ");
@@ -377,9 +401,10 @@ void output_headers(int print_standard_html_head)
                wprintf("BACKGROUND=\"/image&name=background\" TEXT=\"#000000\" LINK=\"#004400\">\n");
        
        
-       if ((print_standard_html_head == 1) && (noframes == 1)) {
-               wprintf("<TABLE border=0 width=100%>");
-               wprintf("<TR VALIGN=TOP><TD>");
+       if (print_standard_html_head == 1) {
+               wprintf("<A NAME=\"TheTop\"></A>"
+                       "<TABLE border=0 width=100%>"
+                       "<TR VALIGN=TOP><TD>");
 
                display_menubar(0);
 
@@ -391,7 +416,6 @@ void output_headers(int print_standard_html_head)
 
                wprintf("</TD></TR><TR VALIGN=TOP><TD>\n");
                
-
                fake_frames = 1;
                }
        }
@@ -399,6 +423,17 @@ void output_headers(int print_standard_html_head)
 
 
 
+void ExpressMessageCat(char *buf) {
+       if (ExpressMessages == NULL) {
+               ExpressMessages = malloc(strlen(buf) + 4);
+               strcpy(ExpressMessages, "");
+       } else {
+               ExpressMessages = realloc(ExpressMessages,
+                       (strlen(ExpressMessages) + strlen(buf) + 4));
+       }
+       strcat(ExpressMessages, buf);
+       strcat(ExpressMessages, "\\n");
+}
 
 
 void check_for_express_messages()
@@ -409,15 +444,7 @@ void check_for_express_messages()
        serv_gets(buf);
        if (buf[0] == '1') {
                while (serv_gets(buf), strcmp(buf, "000")) {
-                       if (ExpressMessages == NULL) {
-                               ExpressMessages = malloc(strlen(buf) + 4);
-                               strcpy(ExpressMessages, "");
-                       } else {
-                               ExpressMessages = realloc(ExpressMessages,
-                                                         (strlen(ExpressMessages) + strlen(buf) + 4));
-                       }
-                       strcat(ExpressMessages, buf);
-                       strcat(ExpressMessages, "\\n");
+                       ExpressMessageCat(buf);
                }
        }
 }
@@ -448,6 +475,8 @@ void output_static(char *what)
 
                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))
@@ -528,10 +557,8 @@ void convenience_page(char *titlebarcolor, char *titlebarmsg, char *messagetext)
        wprintf("</FONT></TD></TR></TABLE><BR>\n");
        escputs(messagetext);
 
-       if (noframes) {
-               wprintf("<HR>\n");
-               embed_main_menu();
-       }
+       wprintf("<HR>\n");
+       embed_main_menu();
        wDumpContent(1);
 }
 
@@ -592,16 +619,16 @@ void upload_handler(char *name, char *filename, char *encoding,
        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);
                }
        }
 }
 
 
-void session_loop(char *browser_host)
+void session_loop(char *browser_host, char *user_agent)
 {
        char cmd[256];
        char action[256];
@@ -627,8 +654,8 @@ void session_loop(char *browser_host)
        strcpy(c_password, "");
        strcpy(c_roomname, "");
 
-       upload_length = 0;
-       upload = NULL;
+       WC->upload_length = 0;
+       WC->upload = NULL;
 
        if (getz(cmd) == NULL)
                return;
@@ -641,8 +668,7 @@ void session_loop(char *browser_host)
                if (!strncasecmp(buf, "Cookie: webcit=", 15)) {
                        strcpy(cookie, &buf[15]);
                        cookie_to_stuff(cookie, NULL,
-                                     c_username, c_password, c_roomname,
-                                       &noframes);
+                                     c_username, c_password, c_roomname);
                }
                if (!strncasecmp(buf, "Content-length: ", 16)) {
                        ContentLength = atoi(&buf[16]);
@@ -681,19 +707,23 @@ void session_loop(char *browser_host)
                        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);
+               get_serv_info(browser_host, user_agent);
        }
        check_for_express_messages();
 
@@ -701,7 +731,7 @@ void session_loop(char *browser_host)
         * 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') {
@@ -716,11 +746,11 @@ void session_loop(char *browser_host)
         * 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")) {
@@ -731,9 +761,9 @@ void session_loop(char *browser_host)
                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... */
@@ -811,7 +841,7 @@ void session_loop(char *browser_host)
        } 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);
@@ -874,6 +904,7 @@ void session_loop(char *browser_host)
        } else if (!strcasecmp(action, "share")) {
                share();
        } else if (!strcasecmp(action, "terminate_session")) {
+               slrp_highest();
                terminate_session();
        } else if (!strcasecmp(action, "edit_me")) {
                edit_me();
@@ -887,14 +918,12 @@ void session_loop(char *browser_host)
                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");
@@ -903,6 +932,10 @@ void session_loop(char *browser_host)
                wprintf("</PRE><HR>\n");
                wDumpContent(1);
        }
+       /* When all else fais, display the main menu. */
+       else {
+               display_main_menu();
+       }
 
        fflush(stdout);
        if (content != NULL) {
@@ -910,9 +943,9 @@ void session_loop(char *browser_host)
                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;
        }
 }
 
@@ -929,13 +962,18 @@ int main(int argc, char *argv[])
                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
@@ -945,12 +983,8 @@ int main(int argc, char *argv[])
 
        strcpy(browser, argv[5]);
        bd = browser_braindamage_check(browser);
-       if (bd == B_NO)
-               noframes = 1;
-       else
-               noframes = 0;
 
        while (1) {
-               session_loop(argv[4]);
+               session_loop(argv[4], browser);
        }
 }