* copy daves great handler script and modify it to fit the simpler needs of webcit.
[citadel.git] / webcit / webcit.c
index cd9e08103cbfbe3227341b57986e6f83df074914..2660b3d2f0c883ae68a6b348cc162f337309e083 100644 (file)
@@ -22,8 +22,10 @@ static char *unset = "; expires=28-May-1971 18:10:00 GMT";
 
 HashList *HandlerHash = NULL;
 
-
-void WebcitAddUrlHandler(const char * UrlString, long UrlSLen, WebcitHandlerFunc F, int IsAjax)
+void WebcitAddUrlHandler(const char * UrlString, 
+                        long UrlSLen, 
+                        WebcitHandlerFunc F, 
+                        long Flags)
 {
        WebcitHandler *NewHandler;
 
@@ -32,8 +34,7 @@ void WebcitAddUrlHandler(const char * UrlString, long UrlSLen, WebcitHandlerFunc
        
        NewHandler = (WebcitHandler*) malloc(sizeof(WebcitHandler));
        NewHandler->F = F;
-       NewHandler->IsAjax = IsAjax;
-
+       NewHandler->Flags = Flags;
        Put(HandlerHash, UrlString, UrlSLen, NewHandler, NULL);
 }
 
@@ -93,25 +94,23 @@ void free_url(void *U)
 /*
  * Extract variables from the URL.
  */
-void addurls(char *url)
+void addurls(char *url, long ulen)
 {
        char *aptr, *bptr, *eptr;
        char *up;
-       char buf[SIZ] = "";
-       int len, n, keylen;
+       char *buf;
+       int len, keylen;
        urlcontent *u;
        struct wcsession *WCC = WC;
 
        if (WCC->urlstrings == NULL)
                WCC->urlstrings = NewHash(1, NULL);
-       eptr = buf + sizeof (buf);
-       up = url;
-       /** locate the = sign */
-       n = safestrncpy(buf, up, sizeof buf);
-       if (n < 0) /* hm, we exceeded the buffer... hmmm what to do now? */
-               n = -n;
+       buf = (char*) malloc (ulen + 1);
+       memcpy(buf, url, ulen);
+       buf[ulen] = '\0';
+       eptr = buf + ulen;
        up = buf;
-       while (!IsEmptyStr(up)) {
+       while ((up < eptr) && (!IsEmptyStr(up))) {
                aptr = up;
                while ((aptr < eptr) && (*aptr != '\0') && (*aptr != '='))
                        aptr++;
@@ -141,10 +140,11 @@ void addurls(char *url)
                u->url_data[u->url_data_size] = '\0';
                up = bptr;
                ++up;
-/* uncomment the following line to see each parameter in the log
+#ifdef DEBUG_URLSTRINGS
                lprintf(9, "%s = [%ld]  %s\n", u->url_key, u->url_data_size, u->url_data); 
-*/
+#endif
        }
+       free(buf);
 }
 
 /*
@@ -576,9 +576,8 @@ void msgesc(char *target, size_t tlen, char *strbuf)
        *tptr = '\0';
 }
 
-/**
- * \brief print a string to the client after cleaning it with msgesc() and stresc()
- * \param strbuf string to be printed
+/*
+ * print a string to the client after cleaning it with msgesc() and stresc()
  */
 void msgescputs1( char *strbuf)
 {
@@ -597,9 +596,8 @@ void msgescputs1( char *strbuf)
        free(outbuf2);
 }
 
-/**
- * \brief print a string to the client after cleaning it with msgesc()
- * \param strbuf string to be printed
+/*
+ * print a string to the client after cleaning it with msgesc()
  */
 void msgescputs(char *strbuf) {
        char *outbuf;
@@ -646,10 +644,17 @@ void output_headers(      int do_httpheaders,     /* 1 = output HTTP headers
        }
 
        if (cache) {
+               char httpTomorow[128];
+
+               http_datestring(httpTomorow, sizeof httpTomorow, 
+                               time(NULL) + 60 * 60 * 24 * 2);
+
                wprintf("Pragma: public\r\n"
                        "Cache-Control: max-age=3600, must-revalidate\r\n"
-                       "Last-modified: %s\r\n",
-                       httpnow
+                       "Last-modified: %s\r\n"
+                       "Expires: %s\r\n",
+                       httpnow,
+                       httpTomorow
                );
        }
        else {
@@ -674,7 +679,7 @@ void output_headers(        int do_httpheaders,     /* 1 = output HTTP headers
        if (do_htmlhead) {
                begin_burst();
                if (!access("static.local/webcit.css", R_OK)) {
-                       svprintf("CSSLOCAL", WCS_STRING,
+                       svprintf(HKEY("CSSLOCAL"), WCS_STRING,
                           "<link href=\"static.local/webcit.css\" rel=\"stylesheet\" type=\"text/css\">"
                        );
                }
@@ -722,7 +727,7 @@ void output_headers(        int do_httpheaders,     /* 1 = output HTTP headers
 /*
  * Generic function to do an HTTP redirect.  Easy and fun.
  */
-void http_redirect(char *whichpage) {
+void http_redirect(const char *whichpage) {
        wprintf("HTTP/1.1 302 Moved Temporarily\n");
        wprintf("Location: %s\r\n", whichpage);
        wprintf("URI: %s\r\n", whichpage);
@@ -781,20 +786,20 @@ void http_transmit_thing(char *thing, size_t length, const char *content_type,
        client_write(thing, (size_t)length);
 }
 
-/**
- * \brief print menu box like used in the floor view or admin interface.
+/*
+ * print menu box like used in the floor view or admin interface.
  * This function takes pair of strings as va_args, 
- * \param Title Title string of the box
- * \param Class CSS Class for the box
- * \param nLines How many string pairs should we print? (URL, UrlText)
- * \param ... Pairs of URL Strings and their Names
+ * Title       Title string of the box
+ * Class       CSS Class for the box
+ * nLines      How many string pairs should we print? (URL, UrlText)
+ * ...         Pairs of URL Strings and their Names
  */
 void print_menu_box(char* Title, char *Class, int nLines, ...)
 {
        va_list arg_list;
        long i;
        
-       svprintf("BOXTITLE", WCS_STRING, Title);
+       svput("BOXTITLE", WCS_STRING, Title);
        do_template("beginbox");
        
        wprintf("<ul class=\"%s\">", Class);
@@ -816,9 +821,8 @@ void print_menu_box(char* Title, char *Class, int nLines, ...)
 }
 
 
-/**
- * \brief dump out static pages from disk
- * \param what the file urs to print
+/*
+ * dump out static pages from disk
  */
 void output_static(char *what)
 {
@@ -882,8 +886,8 @@ void output_static(char *what)
        }
 }
 
-/**
- * \brief When the browser requests an image file from the Citadel server,
+/*
+ * When the browser requests an image file from the Citadel server,
  * this function is called to transmit it.
  */
 void output_image()
@@ -920,7 +924,7 @@ void output_image()
        } 
 
        
-       /**
+       /*
         * Instead of an ugly 404, send a 1x1 transparent GIF
         * when there's no such image on the server.
         */
@@ -929,16 +933,51 @@ void output_image()
        output_static(blank_gif);
 }
 
-/**
- * \brief Generic function to output an arbitrary MIME part from an arbitrary
- *        message number on the server.
+/*
+ * Extract an embedded photo from a vCard for display on the client
+ */
+void display_vcard_photo_img(void)
+{
+       long msgnum = 0L;
+       char *vcard;
+       struct vCard *v;
+       char *xferbuf;
+    char *photosrc;
+       int decoded;
+       const char *contentType;
+
+       msgnum = StrTol(WC->UrlFragment1);
+       
+       vcard = load_mimepart(msgnum,"1");
+       v = vcard_load(vcard);
+       
+       photosrc = vcard_get_prop(v, "PHOTO", 1,0,0);
+       xferbuf = malloc(strlen(photosrc));
+       if (xferbuf == NULL) {
+               lprintf(5, "xferbuf malloc failed\n");
+               return;
+       }
+       memset(xferbuf, 1, SIZ);
+       decoded = CtdlDecodeBase64(
+               xferbuf,
+               photosrc,
+               strlen(photosrc));
+       contentType = GuessMimeType(xferbuf, decoded);
+       http_transmit_thing(xferbuf, decoded, contentType, 0);
+       free(v);
+       free(photosrc);
+       free(xferbuf);
+}
+
+/*
+ * Generic function to output an arbitrary MIME part from an arbitrary
+ * message number on the server.
  *
- * \param msgnum               Number of the item on the citadel server
- * \param partnum              The MIME part to be output
- * \param force_download       Nonzero to force set the Content-Type: header
- *                              to "application/octet-stream"
+ * msgnum              Number of the item on the citadel server
+ * partnum             The MIME part to be output
+ * force_download      Nonzero to force set the Content-Type: header to "application/octet-stream"
  */
-void mimepart(char *msgnum, char *partnum, int force_download)
+void mimepart(const char *msgnum, const char *partnum, int force_download)
 {
        char buf[256];
        off_t bytes;
@@ -973,10 +1012,8 @@ void mimepart(char *msgnum, char *partnum, int force_download)
 }
 
 
-/**
- * \brief Read any MIME part of a message, from the server, into memory.
- * \param msgnum number of the message on the citadel server
- * \param partnum the MIME part to be loaded
+/*
+ * Read any MIME part of a message, from the server, into memory.
  */
 char *load_mimepart(long msgnum, char *partnum)
 {
@@ -1004,11 +1041,12 @@ char *load_mimepart(long msgnum, char *partnum)
 }
 
 
-/**
- * \brief Convenience functions to display a page containing only a string
- * \param titlebarcolor color of the titlebar of the frame
- * \param titlebarmsg text to display in the title bar
- * \param messagetext body of the box
+/*
+ * Convenience functions to display a page containing only a string
+ *
+ * titlebarcolor       color of the titlebar of the frame
+ * titlebarmsg         text to display in the title bar
+ * messagetext         body of the box
  */
 void convenience_page(char *titlebarcolor, char *titlebarmsg, char *messagetext)
 {
@@ -1026,8 +1064,8 @@ void convenience_page(char *titlebarcolor, char *titlebarmsg, char *messagetext)
 }
 
 
-/**
- * \brief Display a blank page.
+/*
+ * Display a blank page.
  */
 void blank_page(void) {
        output_headers(1, 1, 0, 0, 0, 0);
@@ -1035,8 +1073,8 @@ void blank_page(void) {
 }
 
 
-/**
- * \brief A template has been requested
+/*
+ * A template has been requested
  */
 void url_do_template(void) {
        do_template(bstr("template"));
@@ -1044,8 +1082,8 @@ void url_do_template(void) {
 
 
 
-/**
- * \brief Offer to make any page the user's "start page."
+/*
+ * Offer to make any page the user's "start page."
  */
 void offer_start_page(void) {
        wprintf("<a href=\"change_start_page?startpage=");
@@ -1063,8 +1101,8 @@ void offer_start_page(void) {
 }
 
 
-/**
- * \brief Change the user's start page
+/*
+ * Change the user's start page
  */
 void change_start_page(void) {
 
@@ -1076,7 +1114,7 @@ void change_start_page(void) {
                return;
        }
 
-       set_preference("startpage", bstr("startpage"), 1);
+       set_preference("startpage", NewStrBufPlain(bstr("startpage"), -1), 1);
 
        output_headers(1, 1, 0, 0, 0, 0);
        do_template("newstartpage");
@@ -1085,9 +1123,8 @@ void change_start_page(void) {
 
 
 
-/**
- * \brief convenience function to indicate success
- * \param successmessage the mesage itself
+/*
+ * convenience function to indicate success
  */
 void display_success(char *successmessage)
 {
@@ -1095,15 +1132,14 @@ void display_success(char *successmessage)
 }
 
 
-/**
- * \brief Authorization required page 
+/*
+ * Authorization required page 
  * This is probably temporary and should be revisited 
- * \param message message to put in header
-*/
+ */
 void authorization_required(const char *message)
 {
        wprintf("HTTP/1.1 401 Authorization Required\r\n");
-       wprintf("WWW-Authenticate: Basic realm=\"\"\r\n", serv_info.serv_humannode);
+       wprintf("WWW-Authenticate: Basic realm=\"%s\"\r\n", serv_info.serv_humannode);
        wprintf("Content-Type: text/html\r\n\r\n");
        wprintf("<h1>");
        wprintf(_("Authorization Required"));
@@ -1113,30 +1149,30 @@ void authorization_required(const char *message)
        wDumpContent(0);
 }
 
-/**
- * \brief This function is called by the MIME parser to handle data uploaded by
- *        the browser.  Form data, uploaded files, and the data from HTTP PUT
- *        operations (such as those found in GroupDAV) all arrive this way.
+/*
+ * This function is called by the MIME parser to handle data uploaded by
+ * the browser.  Form data, uploaded files, and the data from HTTP PUT
+ * operations (such as those found in GroupDAV) all arrive this way.
  *
- * \param name Name of the item being uploaded
- * \param filename Filename of the item being uploaded
- * \param partnum MIME part identifier (not needed)
- * \param disp MIME content disposition (not needed)
- * \param content The actual data
- * \param cbtype MIME content-type
- * \param cbcharset Character set
- * \param length Content length
- * \param encoding MIME encoding type (not needed)
- * \param userdata Not used here
+ * name                Name of the item being uploaded
+ * filename    Filename of the item being uploaded
+ * partnum     MIME part identifier (not needed)
+ * disp                MIME content disposition (not needed)
+ * content     The actual data
+ * cbtype      MIME content-type
+ * cbcharset   Character set
+ * length      Content length
+ * encoding    MIME encoding type (not needed)
+ * userdata    Not used here
  */
 void upload_handler(char *name, char *filename, char *partnum, char *disp,
                        void *content, char *cbtype, char *cbcharset,
                        size_t length, char *encoding, void *userdata)
 {
        urlcontent *u;
-/*
+#ifdef DEBUG_URLSTRINGS
        lprintf(9, "upload_handler() name=%s, type=%s, len=%d\n", name, cbtype, length);
-*/
+#endif
        if (WC->urlstrings == NULL)
                WC->urlstrings = NewHash(1, NULL);
 
@@ -1150,8 +1186,9 @@ void upload_handler(char *name, char *filename, char *partnum, char *disp,
                memcpy(u->url_data, content, length);
                u->url_data[length] = 0;
                Put(WC->urlstrings, u->url_key, strlen(u->url_key), u, free_url);
-
-/*             lprintf(9, "Key: <%s> len: [%ld] Data: <%s>\n", u->url_key, u->url_data_size, u->url_data);*/
+#ifdef DEBUG_URLSTRINGS
+               lprintf(9, "Key: <%s> len: [%ld] Data: <%s>\n", u->url_key, u->url_data_size, u->url_data);
+#endif
        }
 
        /** Uploaded files */
@@ -1172,8 +1209,8 @@ void upload_handler(char *name, char *filename, char *partnum, char *disp,
 
 }
 
-/**
- * \brief Convenience functions to wrap around asynchronous ajax responses
+/*
+ * Convenience functions to wrap around asynchronous ajax responses
  */
 void begin_ajax_response(void) {
         output_headers(0, 0, 0, 0, 0, 0);
@@ -1189,16 +1226,16 @@ void begin_ajax_response(void) {
         begin_burst();
 }
 
-/**
- * \brief print ajax response footer 
+/*
+ * print ajax response footer 
  */
 void end_ajax_response(void) {
         wprintf("\r\n");
         wDumpContent(0);
 }
 
-/**
- * \brief Wraps a Citadel server command in an AJAX transaction.
+/*
+ * Wraps a Citadel server command in an AJAX transaction.
  */
 void ajax_servcmd(void)
 {
@@ -1242,7 +1279,7 @@ void ajax_servcmd(void)
 
        end_ajax_response();
        
-       /**
+       /*
         * This is kind of an ugly hack, but this is the only place it can go.
         * If the command was GEXP, then the instant messenger window must be
         * running, so reset the "last_pager_check" watchdog timer so
@@ -1254,8 +1291,8 @@ void ajax_servcmd(void)
 }
 
 
-/**
- * \brief Helper function for the asynchronous check to see if we need
+/*
+ * Helper function for the asynchronous check to see if we need
  * to open the instant messenger window.
  */
 void seconds_since_last_gexp(void)
@@ -1279,11 +1316,23 @@ void seconds_since_last_gexp(void)
        end_ajax_response();
 }
 
+/**
+ * \brief Detects a 'mobile' user agent 
+ */
+int is_mobile_ua(char *user_agent) {
+       if (strstr(user_agent,"iPhone OS") != NULL) {
+               return 1;
+       } else if (strstr(user_agent,"Windows CE") != NULL) {
+               return 1;
+       } else if (strstr(user_agent,"SymbianOS") != NULL) {
+               return 1;
+       }
+       return 0;
+}
 
 
-
-/**
- * \brief Entry point for WebCit transaction
+/*
+ * Entry point for WebCit transaction
  */
 void session_loop(struct httprequest *req)
 {
@@ -1297,7 +1346,6 @@ void session_loop(struct httprequest *req)
        char pathname[1024];
        int a, b, nBackDots, nEmpty;
        int ContentLength = 0;
-       int BytesRead = 0;
        char ContentType[512];
        char *content = NULL;
        char *content_end = NULL;
@@ -1308,7 +1356,7 @@ void session_loop(struct httprequest *req)
        int is_static = 0;
        int n_static = 0;
        int len = 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.
         */
@@ -1319,6 +1367,7 @@ void session_loop(struct httprequest *req)
        char c_httpauth_user[SIZ];
        char c_httpauth_pass[SIZ];
        char cookie[SIZ];
+       struct wcsession *WCC = WC;
 
        safestrncpy(c_username, "", sizeof c_username);
        safestrncpy(c_password, "", sizeof c_password);
@@ -1328,10 +1377,9 @@ void session_loop(struct httprequest *req)
        safestrncpy(c_httpauth_pass, DEFAULT_HTTPAUTH_PASS, sizeof c_httpauth_pass);
        strcpy(browser_host, "");
 
-       WC->upload_length = 0;
-       WC->upload = NULL;
-       WC->vars = NULL;
-       WC->is_wap = 0;
+       WCC->upload_length = 0;
+       WCC->upload = NULL;
+       WCC->is_mobile = 0;
 
        hptr = req;
        if (hptr == NULL) return;
@@ -1389,15 +1437,18 @@ void session_loop(struct httprequest *req)
                }
                else if (!strncasecmp(buf, "User-agent: ", 12)) {
                        safestrncpy(user_agent, &buf[12], sizeof user_agent);
+                       if (is_mobile_ua(&buf[12])) {
+                               WCC->is_mobile = 1;
+                       }
                }
                else if (!strncasecmp(buf, "X-Forwarded-Host: ", 18)) {
                        if (follow_xff) {
-                               safestrncpy(WC->http_host, &buf[18], sizeof WC->http_host);
+                               safestrncpy(WCC->http_host, &buf[18], sizeof WCC->http_host);
                        }
                }
                else if (!strncasecmp(buf, "Host: ", 6)) {
-                       if (IsEmptyStr(WC->http_host)) {
-                               safestrncpy(WC->http_host, &buf[6], sizeof WC->http_host);
+                       if (IsEmptyStr(WCC->http_host)) {
+                               safestrncpy(WCC->http_host, &buf[6], sizeof WCC->http_host);
                        }
                }
                else if (!strncasecmp(buf, "X-Forwarded-For: ", 17)) {
@@ -1407,25 +1458,24 @@ void session_loop(struct httprequest *req)
                        }
                        striplt(browser_host);
                }
-               /** Only WAP gateways explicitly name this content-type */
-               else if (strstr(buf, "text/vnd.wap.wml")) {
-                       WC->is_wap = 1;
-               }
        }
 
        if (ContentLength > 0) {
-               content = malloc(ContentLength + SIZ);
-               memset(content, 0, ContentLength + SIZ);
-               snprintf(content,  ContentLength + SIZ, "Content-type: %s\n"
+               int BuffSize;
+
+               BuffSize = ContentLength + SIZ;
+               content = malloc(BuffSize);
+               memset(content, 0, BuffSize);
+               snprintf(content,  BuffSize, "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);
+               client_read(WCC->http_sock, &content[body_start], ContentLength);
 
                if (!strncasecmp(ContentType, "application/x-www-form-urlencoded", 33)) {
-                       addurls(&content[body_start]);
+                       addurls(&content[body_start], ContentLength);
                } else if (!strncasecmp(ContentType, "multipart", 9)) {
                        content_end = content + ContentLength + body_start;
                        mime_parser(content, content_end, *upload_handler, NULL, NULL, NULL, 0);
@@ -1434,12 +1484,12 @@ void session_loop(struct httprequest *req)
                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, ' ');
+       /* make a note of where we are in case the user wants to save it */
+       safestrncpy(WCC->this_page, cmd, sizeof(WCC->this_page));
+       remove_token(WCC->this_page, 2, ' ');
+       remove_token(WCC->this_page, 0, ' ');
 
-       /** If there are variables in the URL, we must grab them now */
+       /* If there are variables in the URL, we must grab them now */
        len = strlen(cmd);
        for (a = 0; a < len; ++a) {
                if ((cmd[a] == '?') || (cmd[a] == '&')) {
@@ -1449,13 +1499,13 @@ void session_loop(struct httprequest *req)
                                        len = b - 1;
                                }
                        }
-                       addurls(&cmd[a + 1]);
+                       addurls(&cmd[a + 1], len - a);
                        cmd[a] = 0;
                        len = a - 1;
                }
        }
 
-       /** If it's a "force 404" situation then display the error and bail. */
+       /* If it's a "force 404" situation then display the error and bail. */
        if (!strcmp(action, "404")) {
                wprintf("HTTP/1.1 404 Not found\r\n");
                wprintf("Content-Type: text/plain\r\n");
@@ -1464,7 +1514,7 @@ void session_loop(struct httprequest *req)
                goto SKIP_ALL_THIS_CRAP;
        }
 
-       /** Static content can be sent without connecting to Citadel. */
+       /* Static content can be sent without connecting to Citadel. */
        is_static = 0;
        for (a=0; a<ndirs; ++a) {
                if (!strcasecmp(action, (char*)static_content_dirs[a])) { /* map web to disk location */
@@ -1504,8 +1554,8 @@ void session_loop(struct httprequest *req)
        /* If the client sent a nonce that is incorrect, kill the request. */
        if (strlen(bstr("nonce")) > 0) {
                lprintf(9, "Comparing supplied nonce %s to session nonce %ld\n", 
-                       bstr("nonce"), WC->nonce);
-               if (ibstr("nonce") != WC->nonce) {
+                       bstr("nonce"), WCC->nonce);
+               if (ibstr("nonce") != WCC->nonce) {
                        lprintf(9, "Ignoring request with mismatched nonce.\n");
                        wprintf("HTTP/1.1 404 Security check failed\r\n");
                        wprintf("Content-Type: text/plain\r\n");
@@ -1515,27 +1565,27 @@ void session_loop(struct httprequest *req)
                }
        }
 
-       /**
+       /*
         * If we're not connected to a Citadel server, try to hook up the
         * connection now.
         */
-       if (!WC->connected) {
+       if (!WCC->connected) {
                if (!strcasecmp(ctdlhost, "uds")) {
                        /* unix domain socket */
                        snprintf(buf, SIZ, "%s/citadel.socket", ctdlport);
-                       WC->serv_sock = uds_connectsock(buf);
+                       WCC->serv_sock = uds_connectsock(buf);
                }
                else {
                        /* tcp socket */
-                       WC->serv_sock = tcp_connectsock(ctdlhost, ctdlport);
+                       WCC->serv_sock = tcp_connectsock(ctdlhost, ctdlport);
                }
 
-               if (WC->serv_sock < 0) {
+               if (WCC->serv_sock < 0) {
                        do_logout();
                        goto SKIP_ALL_THIS_CRAP;
                }
                else {
-                       WC->connected = 1;
+                       WCC->connected = 1;
                        serv_getln(buf, sizeof buf);    /** get the server welcome message */
 
                        /**
@@ -1545,7 +1595,7 @@ void session_loop(struct httprequest *req)
                         * and such a header has already turned up something.
                         */
                        if ( (!follow_xff) || (strlen(browser_host) == 0) ) {
-                               locate_host(browser_host, WC->http_sock);
+                               locate_host(browser_host, WCC->http_sock);
                        }
 
                        get_serv_info(browser_host, user_agent);
@@ -1566,7 +1616,7 @@ void session_loop(struct httprequest *req)
                }
        }
 
-       /**
+       /*
         * Functions which can be performed without logging in
         */
        if (!strcasecmp(action, "listsub")) {
@@ -1578,11 +1628,11 @@ void session_loop(struct httprequest *req)
                goto SKIP_ALL_THIS_CRAP;
        }
 
-       /**
+       /*
         * If we're not logged in, but we have HTTP Authentication data,
         * try logging in to Citadel using that.
         */
-       if ((!WC->logged_in)
+       if ((!WCC->logged_in)
           && (strlen(c_httpauth_user) > 0)
           && (strlen(c_httpauth_pass) > 0)) {
                serv_printf("USER %s", c_httpauth_user);
@@ -1593,17 +1643,17 @@ void session_loop(struct httprequest *req)
                        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);
+                               safestrncpy(WCC->httpauth_user, c_httpauth_user, sizeof WCC->httpauth_user);
+                               safestrncpy(WCC->httpauth_pass, c_httpauth_pass, sizeof WCC->httpauth_pass);
                        } else {
-                               /** Should only display when password is wrong */
+                               /* Should only display when password is wrong */
                                authorization_required(&buf[4]);
                                goto SKIP_ALL_THIS_CRAP;
                        }
                }
        }
 
-       /** This needs to run early */
+       /* This needs to run early */
 #ifdef TECH_PREVIEW
        if (!strcasecmp(action, "rss")) {
                display_rss(bstr("room"), request_method);
@@ -1611,38 +1661,38 @@ void session_loop(struct httprequest *req)
        }
 #endif
 
-       /** 
+       /* 
         * 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 */
+               if (!WCC->logged_in) {
+                       WCC->killthis = 1;      /* If not logged in, don't */
                }                               /* keep the session active */
                goto SKIP_ALL_THIS_CRAP;
        }
 
 
-       /**
+       /*
         * Automatically send requests with any method other than GET or
         * POST to the GroupDAV code as well.
         */
        if ((strcasecmp(request_method, "GET")) && (strcasecmp(request_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 */
+               if (!WCC->logged_in) {
+                       WCC->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)
+       if ((!WCC->logged_in)
           && (!IsEmptyStr(c_username))
           && (!IsEmptyStr(c_password))) {
                serv_printf("USER %s", c_username);
@@ -1655,15 +1705,15 @@ void session_loop(struct httprequest *req)
                        }
                }
        }
-       /**
+       /*
         * If we don't have a current room, but a cookie specifying the
         * current room is supplied, make an effort to go there.
         */
-       if ((IsEmptyStr(WC->wc_roomname)) && (!IsEmptyStr(c_roomname))) {
+       if ((IsEmptyStr(WCC->wc_roomname)) && (!IsEmptyStr(c_roomname))) {
                serv_printf("GOTO %s", c_roomname);
                serv_getln(buf, sizeof buf);
                if (buf[0] == '2') {
-                       safestrncpy(WC->wc_roomname, c_roomname, sizeof WC->wc_roomname);
+                       safestrncpy(WCC->wc_roomname, c_roomname, sizeof WCC->wc_roomname);
                }
        }
 
@@ -1671,376 +1721,39 @@ void session_loop(struct httprequest *req)
                output_image();
        } else if (!strcasecmp(action, "display_mime_icon")) {
                display_mime_icon();
-
-               /**
-                * 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...
-        */
-
        else {
                void *vHandler;
                WebcitHandler *Handler;
-
+               
                GetHash(HandlerHash, action, strlen(action) /* TODO*/, &vHandler),
                        Handler = (WebcitHandler*) vHandler;
                if (Handler != NULL) {
-                       if (Handler->IsAjax)
-                               begin_ajax_response();
-                       Handler->F();
-                       if (Handler->IsAjax)
-                               end_ajax_response();
-               }
-               
-
-       else if (!strcasecmp(action, "do_welcome")) {
-               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, "server_shutdown")) {
-               display_shutdown();
-       } else if (!strcasecmp(action, "display_main_menu")) {
-               display_main_menu();
-       } else if (!strcasecmp(action, "who")) {
-               who();
-       } else if (!strcasecmp(action, "sslg")) {
-               seconds_since_last_gexp();
-       } else if (!strcasecmp(action, "who_inner_html")) {
-               begin_ajax_response();
-               who_inner_div();
-               end_ajax_response();
-       } else if (!strcasecmp(action, "wholist_section")) {
-               begin_ajax_response();
-               wholist_section();
-               end_ajax_response();
-       } else if (!strcasecmp(action, "new_messages_html")) {
-               begin_ajax_response();
-               new_messages_section();
-               end_ajax_response();
-       } else if (!strcasecmp(action, "tasks_inner_html")) {
-               begin_ajax_response();
-               tasks_section();
-               end_ajax_response();
-       } else if (!strcasecmp(action, "calendar_inner_html")) {
-               begin_ajax_response();
-               calendar_section();
-               end_ajax_response();
-       } else if (!strcasecmp(action, "mini_calendar")) {
-               begin_ajax_response();
-               ajax_mini_calendar();
-               end_ajax_response();
-       } else if (!strcasecmp(action, "iconbar_ajax_menu")) {
-               begin_ajax_response();
-               do_iconbar();
-               end_ajax_response();
-       } else if (!strcasecmp(action, "iconbar_ajax_rooms")) {
-               begin_ajax_response();
-               do_iconbar_roomlist();
-               end_ajax_response();
-       } else if (!strcasecmp(action, "knrooms")) {
-               knrooms();
-       } else if (!strcasecmp(action, "gotonext")) {
-               slrp_highest();
-               gotonext();
-       } else if (!strcasecmp(action, "skip")) {
-               gotonext();
-       } else if (!strcasecmp(action, "ungoto")) {
-               ungoto();
-       } else if (!strcasecmp(action, "dotgoto")) {
-               if (WC->wc_view != VIEW_MAILBOX) {      /* dotgoto acts like dotskip when we're in a mailbox view */
-                       slrp_highest();
+                       if (!WCC->logged_in && ((Handler->Flags & ANONYMOUS) == 0)) {
+                               display_login(NULL);
+                       }
+                       else {
+                               if((Handler->Flags & NEED_URL)) {
+                                       if (WCC->UrlFragment1 == NULL)
+                                               WCC->UrlFragment1 = NewStrBuf();
+                                       if (WCC->UrlFragment2 == NULL)
+                                               WCC->UrlFragment2 = NewStrBuf();
+                                       StrBufPrintf(WCC->UrlFragment1, "%s", index[1]);
+                                       StrBufPrintf(WCC->UrlFragment2, "%s", index[2]);
+                               }
+                               if ((Handler->Flags & AJAX) != 0)
+                                       begin_ajax_response();
+                               Handler->F();
+                               if ((Handler->Flags & AJAX) != 0)
+                                       end_ajax_response();
+                       }
                }
-               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("readnew");
-       } else if (!strcasecmp(action, "readold")) {
-               readloop("readold");
-       } else if (!strcasecmp(action, "readfwd")) {
-               readloop("readfwd");
-       } else if (!strcasecmp(action, "headers")) {
-               readloop("headers");
-       } else if (!strcasecmp(action, "do_search")) {
-               readloop("do_search");
-       } else if (!strcasecmp(action, "msg")) {
-               embed_message(index[1]);
-       } else if (!strcasecmp(action, "printmsg")) {
-               print_message(index[1]);
-       } else if (!strcasecmp(action, "msgheaders")) {
-               display_headers(index[1]);
-       } else if (!strcasecmp(action, "wiki")) {
-               display_wiki_page();
-       } else if (!strcasecmp(action, "display_enter")) {
-               display_enter();
-       } else if (!strcasecmp(action, "post")) {
-               post_message();
-       } 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")) {
-               showuser();
-       } else if (!strcasecmp(action, "display_page")) {
-               display_page();
-       } else if (!strcasecmp(action, "page_user")) {
-               page_user();
-       } else if (!strcasecmp(action, "chat")) {
-               do_chat();
-       } else if (!strcasecmp(action, "display_private")) {
-               display_private("", 0);
-       } else if (!strcasecmp(action, "goto_private")) {
-               goto_private();
-       } else if (!strcasecmp(action, "zapped_list")) {
-               zapped_list();
-       } else if (!strcasecmp(action, "display_zap")) {
-               display_zap();
-       } else if (!strcasecmp(action, "zap")) {
-               zap();
-       } else if (!strcasecmp(action, "display_entroom")) {
-               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_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")) {
-               snprintf(buf, SIZ, "RBIO %s", WC->wc_fullname);
-               display_edit(_("Your bio"), "NOOP", buf, "editbio", 3);
-       } else if (!strcasecmp(action, "editbio")) {
-               save_edit(_("Your bio"), "EBIO", 0);
-       } else if (!strcasecmp(action, "confirm_move_msg")) {
-               confirm_move_msg();
-       } else if (!strcasecmp(action, "delete_room")) {
-               delete_room();
-       } else if (!strcasecmp(action, "validate")) {
-               validate();
-               /* The users photo display / upload facility */
-       } else if (!strcasecmp(action, "display_editpic")) {
-               display_graphics_upload(_("your photo"),
-                                       "_userpic_",
-                                       "editpic");
-       } else if (!strcasecmp(action, "editpic")) {
-               do_graphics_upload("_userpic_");
-                /* room picture dispay / upload facility */
-       } else if (!strcasecmp(action, "display_editroompic")) {
-               display_graphics_upload(_("the icon for this room"),
-                                       "_roompic_",
-                                       "editroompic");
-       } else if (!strcasecmp(action, "editroompic")) {
-               do_graphics_upload("_roompic_");
-               /* the greetingpage hello pic */
-       } else if (!strcasecmp(action, "display_edithello")) {
-               display_graphics_upload(_("the Greetingpicture for the login prompt"),
-                                       "hello",
-                                       "edithellopic");
-       } else if (!strcasecmp(action, "edithellopic")) {
-               do_graphics_upload("hello");
-               /* the logoff banner */
-       } else if (!strcasecmp(action, "display_editgoodbyepic")) {
-               display_graphics_upload(_("the Logoff banner picture"),
-                                       "UIMG 0|%s|goodbuye",
-                                       "editgoodbuyepic");
-       } else if (!strcasecmp(action, "editgoodbuyepic")) {
-               do_graphics_upload("UIMG 1|%s|goodbuye");
-
-       } 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")) {
-               snprintf(buf, SIZ, "UIMG 0|_floorpic_|%s",
-                       bstr("which_floor"));
-               display_graphics_upload(_("the icon for this floor"),
-                                       buf,
-                                       "editfloorpic");
-       } else if (!strcasecmp(action, "editfloorpic")) {
-               snprintf(buf, SIZ, "UIMG 1|_floorpic_|%s",
-                       bstr("which_floor"));
-               do_graphics_upload(buf);
-       } else if (!strcasecmp(action, "display_reg")) {
-               display_reg(0);
-       } else if (!strcasecmp(action, "display_changepw")) {
-               display_changepw();
-       } else if (!strcasecmp(action, "changepw")) {
-               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_delete_node")) {
-               display_confirm_delete_node();
-       } else if (!strcasecmp(action, "delete_node")) {
-               delete_node();
-       } else if (!strcasecmp(action, "display_add_node")) {
-               display_add_node();
-       } else if (!strcasecmp(action, "terminate_session")) {
-               slrp_highest();
-               terminate_session();
-       } else if (!strcasecmp(action, "edit_me")) {
-               edit_me();
-       } else if (!strcasecmp(action, "display_siteconfig")) {
-               display_siteconfig();
-       } 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")) {
-               display_generic();
-       } else if (!strcasecmp(action, "do_generic")) {
-               do_generic();
-       } else if (!strcasecmp(action, "ajax_servcmd")) {
-               ajax_servcmd();
-       } else if (!strcasecmp(action, "display_menubar")) {
-               display_menubar(1);
-       } else if (!strcasecmp(action, "mimepart")) {
-               mimepart(index[1], index[2], 0);
-       } else if (!strcasecmp(action, "mimepart_download")) {
-               mimepart(index[1], index[2], 1);
-       } 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, 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, "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, "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();
-       } else if (!strcasecmp(action, "summary")) {
-               summary();
-       } else if (!strcasecmp(action, "summary_inner_div")) {
-               begin_ajax_response();
-               summary_inner_div();
-               end_ajax_response();
-       } 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, "display_smtpqueue")) {
-               display_smtpqueue();
-       } else if (!strcasecmp(action, "display_smtpqueue_inner_div")) {
-               display_smtpqueue_inner_div();
-       } else if (!strcasecmp(action, "display_sieve")) {
-               display_sieve();
-       } else if (!strcasecmp(action, "save_sieve")) {
-               save_sieve();
-       } else if (!strcasecmp(action, "display_pushemail")) {
-               display_pushemail();
-       } else if (!strcasecmp(action, "save_pushemail")) {
-               save_pushemail();
-       } else if (!strcasecmp(action, "display_add_remove_scripts")) {
-               display_add_remove_scripts(NULL);
-       } else if (!strcasecmp(action, "create_script")) {
-               create_script();
-       } else if (!strcasecmp(action, "delete_script")) {
-               delete_script();
-       } 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, "recp_autocomplete")) {
-               recp_autocomplete(bstr("recp"));
-       } else if (!strcasecmp(action, "cc_autocomplete")) {
-               recp_autocomplete(bstr("cc"));
-       } else if (!strcasecmp(action, "bcc_autocomplete")) {
-               recp_autocomplete(bstr("bcc"));
-       } else if (!strcasecmp(action, "display_address_book_middle_div")) {
-               display_address_book_middle_div();
-       } else if (!strcasecmp(action, "display_address_book_inner_div")) {
-               display_address_book_inner_div();
-       } else if (!strcasecmp(action, "set_floordiv_expanded")) {
-               set_floordiv_expanded(index[1]);
-       } else if (!strcasecmp(action, "diagnostics")) {
-               output_headers(1, 1, 1, 0, 0, 0);
-               wprintf("Session: %d<hr />\n", WC->wc_session);
-               wprintf("Command: <br /><PRE>\n");
-               escputs(cmd);
-               wprintf("</PRE><hr />\n");
-               wprintf("Variables: <br /><PRE>\n");
-               dump_vars();
-               wprintf("</PRE><hr />\n");
-               wDumpContent(1);
-       } else if (!strcasecmp(action, "updatenote")) {
-               updatenote();
-       } else if (!strcasecmp(action, "ajax_update_note")) {
-               ajax_update_note();
-       } else if (!strcasecmp(action, "display_room_directory")) {
-               display_room_directory();
-       } else if (!strcasecmp(action, "display_pictureview")) {
-               display_pictureview();
-       } else if (!strcasecmp(action, "download_file")) {
-               download_file(index[1]);
-       } else if (!strcasecmp(action, "upload_file")) {
-               upload_file();
-       }
-
-       /** When all else fais, display the main menu. */
+       /* When all else fais, display the main menu. */
        else {
-               display_main_menu();
+               if (!WCC->logged_in) 
+                       display_login(NULL);
+               else
+                       display_main_menu();
        }
 }
 SKIP_ALL_THIS_CRAP:
@@ -2050,15 +1763,15 @@ SKIP_ALL_THIS_CRAP:
                content = NULL;
        }
        free_urls();
-       if (WC->upload_length > 0) {
-               free(WC->upload);
-               WC->upload_length = 0;
+       if (WCC->upload_length > 0) {
+               free(WCC->upload);
+               WCC->upload_length = 0;
        }
 }
 
-/**
- * \brief Replacement for sleep() that uses select() in order to avoid SIGALRM
- * \param seconds how many seconds should we sleep?
+
+/*
+ * Replacement for sleep() that uses select() in order to avoid SIGALRM
  */
 void sleeeeeeeeeep(int seconds)
 {
@@ -2069,5 +1782,45 @@ void sleeeeeeeeeep(int seconds)
        select(0, NULL, NULL, NULL, &tv);
 }
 
+void diagnostics(void)
+{
+       output_headers(1, 1, 1, 0, 0, 0);
+       wprintf("Session: %d<hr />\n", WC->wc_session);
+       wprintf("Command: <br /><PRE>\n");
+       escputs(WC->UrlFragment1);
+       wprintf("<br />\n");
+       escputs(WC->UrlFragment2);
+       wprintf("</PRE><hr />\n");
+       wprintf("Variables: <br /><PRE>\n");
+       dump_vars();
+       wprintf("</PRE><hr />\n");
+       wDumpContent(1);
+}
+
+void view_mimepart(void) {
+       mimepart(ChrPtr(WC->UrlFragment1),
+                ChrPtr(WC->UrlFragment2),
+                0);
+}
+
+void download_mimepart(void) {
+       mimepart(ChrPtr(WC->UrlFragment1),
+                ChrPtr(WC->UrlFragment2),
+                1);
+}
 
-/*@}*/
+void 
+InitModule_WEBCIT
+(void)
+{
+       WebcitAddUrlHandler(HKEY("blank"), blank_page, ANONYMOUS);
+       WebcitAddUrlHandler(HKEY("do_template"), url_do_template, ANONYMOUS);
+       WebcitAddUrlHandler(HKEY("sslg"), seconds_since_last_gexp, AJAX);
+       WebcitAddUrlHandler(HKEY("ajax_servcmd"), ajax_servcmd, 0);
+       WebcitAddUrlHandler(HKEY("change_start_page"), change_start_page, 0);
+       WebcitAddUrlHandler(HKEY("toggle_self_service"), toggle_self_service, 0);
+       WebcitAddUrlHandler(HKEY("vcardphoto"), display_vcard_photo_img, NEED_URL);
+       WebcitAddUrlHandler(HKEY("mimepart"), view_mimepart, NEED_URL);
+       WebcitAddUrlHandler(HKEY("mimepart_download"), download_mimepart, NEED_URL);
+       WebcitAddUrlHandler(HKEY("diagnostics"), diagnostics, NEED_URL);
+}