* Room info popup now uses Scriptactulous appear and fade effects

[citadel.git] / webcit / webcit.c

diff --git a/webcit/webcit.c b/webcit/webcit.c
index c8a49e6025a6343dacf60fa7ab48bd13e2d07214..ab21eaab8d9eecf51c635b02c3e1e8e87bb95fa3 100644 (file)
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -256,7 +256,6 @@ void escputs(char *strbuf)
 
 /** 
  * \brief Escape a string for feeding out as a URL.
- * Returns a pointer to a buffer that must be freed by the caller!
  * \param outbuf the output buffer
  * \param strbuf the input buffer
  */
@@ -764,9 +763,9 @@ void url_do_template(void) {
 void offer_start_page(void) {
        wprintf("<a href=\"change_start_page?startpage=");
        urlescputs(WC->this_page);
-       wprintf("\"><font size=-2 color=\"#AAAAAA\">");
+       wprintf("\">");
        wprintf(_("Make this my start page"));
-       wprintf("</font></a>");
+       wprintf("</a>");
 /*
        wprintf("<br/><a href=\"rss?room=");
        urlescputs(WC->wc_roomname);
@@ -849,8 +848,7 @@ void upload_handler(char *name, char *filename, char *partnum, char *disp,
 {
        struct urlcontent *u;
 
-       /* lprintf(9, "upload_handler() name=%s, type=%s, len=%d\n",
-               name, cbtype, length); */
+       lprintf(9, "upload_handler() name=%s, type=%s, len=%d\n", name, cbtype, length);
 
        /* Form fields */
        if ( (length > 0) && (strlen(cbtype) == 0) ) {
@@ -1128,16 +1126,13 @@ void session_loop(struct httprequest *req)
                body_start = strlen(content);
 
                /** Read the entire input data at once. */
-               client_read(WC->http_sock, &content[BytesRead+body_start],
-                       ContentLength);
+               client_read(WC->http_sock, &content[BytesRead+body_start], ContentLength);
 
-               if (!strncasecmp(ContentType,
-                             "application/x-www-form-urlencoded", 33)) {
+               if (!strncasecmp(ContentType, "application/x-www-form-urlencoded", 33)) {
                        addurls(&content[body_start]);
                } else if (!strncasecmp(ContentType, "multipart", 9)) {
                        content_end = content + ContentLength + body_start;
-                       mime_parser(content, content_end, *upload_handler,
-                                       NULL, NULL, NULL, 0);
+                       mime_parser(content, content_end, *upload_handler, NULL, NULL, NULL, 0);
                }
        } else {
                content = NULL;
@@ -1479,7 +1474,7 @@ void session_loop(struct httprequest *req)
        } else if (!strcasecmp(action, "editroom")) {
                editroom();
        } else if (!strcasecmp(action, "display_editinfo")) {
-               display_edit(_("Room info"), "EINF 0", "RINF", "/editinfo", 1);
+               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")) {
@@ -1642,6 +1637,8 @@ void session_loop(struct httprequest *req)
                recp_autocomplete(bstr("cc"));
        } else if (!strcasecmp(action, "bcc_autocomplete")) {
                recp_autocomplete(bstr("bcc"));
+       } 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")) {