]> code.citadel.org Git - citadel.git/blobdiff - webcit/webcit.c
projects / citadel.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
* Removed the last couple of places where forms were submitted using
[citadel.git] / webcit / webcit.c
diff --git a/webcit/webcit.c b/webcit/webcit.c
index 5e8568cf604bb692e694644b1222267347da4231..3dc05c5fd969c8d559104c3b6060a0bd9f0dd4da 100644 (file)
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -109,7 +109,7 @@ void addurls(char *url)
                strcpy(ptr, "");
 
                u->url_data = malloc(strlen(up) + 2);
-               safestrncpy(u->url_data, up, sizeof u->url_data);
+               safestrncpy(u->url_data, up, strlen(up) + 1);
                u->url_data[b] = 0;
                unescape_input(u->url_data);
                up = ptr;
@@ -363,7 +363,7 @@ void output_headers(        int do_httpheaders,     /* 1 = output HTTP headers
        httpdate(httpnow, time(NULL));
 
        if (do_httpheaders) {
-               wprintf("Content-type: text/html\r\n"
+               wprintf("Content-type: text/html; charset=utf-8\r\n"
                        "Server: %s / %s\n"
                        "Connection: close\r\n",
                        SERVER, serv_info.serv_software
@@ -455,7 +455,7 @@ void http_redirect(char *whichpage) {
        wprintf("HTTP/1.0 302 Moved Temporarily\n");
        wprintf("Location: %s\r\n", whichpage);
        wprintf("URI: %s\r\n", whichpage);
-       wprintf("Content-type: text/html\r\n\r\n");
+       wprintf("Content-type: text/html; charset=utf-8\r\n\r\n");
        wprintf("<html><body>\n");
        wprintf("you really want to be <A HREF=\"%s\">here</A> now\n",
                whichpage);
@@ -762,7 +762,7 @@ void change_start_page(void) {
                return;
        }
 
-       set_preference("startpage", bstr("startpage"));
+       set_preference("startpage", bstr("startpage"), 1);
 
        output_headers(1, 1, 0, 0, 0, 0, 0);
        do_template("newstartpage");
@@ -817,11 +817,14 @@ void extract_action(char *actbuf, char *cmdbuf)
 
 
 void upload_handler(char *name, char *filename, char *partnum, char *disp,
-                       void *content, char *cbtype, size_t length,
-                       char *encoding, void *userdata)
+                       void *content, char *cbtype, char *cbcharset,
+                       size_t length, char *encoding, void *userdata)
 {
        struct urlcontent *u;
 
+       lprintf(9, "upload_handler() name=%s, type=%s, len=%d\n",
+               name, cbtype, length);
+
        /* Form fields */
        if ( (length > 0) && (strlen(cbtype) == 0) ) {
                u = (struct urlcontent *) malloc(sizeof(struct urlcontent));
@@ -1081,14 +1084,15 @@ void session_loop(struct httprequest *req)
 
 
        /*
-        * If this isn't a GroupDAV session, it's an ordinary browser
-        * connecting to the user interface.  Only allow GET and POST
-        * methods.
+        * Automatically send requests with any method other than GET or
+        * POST to the GroupDAV code as well.
         */
        if ((strcasecmp(method, "GET")) && (strcasecmp(method, "POST"))) {
-               wprintf("HTTP/1.1 405 Method Not Allowed\r\n");
-               groupdav_common_headers();
-               wprintf("Content-Length: 0\r\n\r\n");
+               groupdav_main(req, ContentType, /* do GroupDAV methods */
+                       ContentLength, content+body_start);
+               if (!WC->logged_in) {
+                       WC->killthis = 1;       /* If not logged in, don't */
+               }                               /* keep the session active */
                goto SKIP_ALL_THIS_CRAP;
        }
 
@@ -1165,7 +1169,9 @@ void session_loop(struct httprequest *req)
        } else if (!strcasecmp(action, "ungoto")) {
                ungoto();
        } else if (!strcasecmp(action, "dotgoto")) {
-               slrp_highest();
+               if (WC->wc_view != VIEW_MAILBOX) {      /* dotgoto acts like dotskip when we're in a mailbox view */
+                       slrp_highest();
+               }
                smart_goto(bstr("room"));
        } else if (!strcasecmp(action, "dotskip")) {
                smart_goto(bstr("room"));
@@ -1243,7 +1249,7 @@ void session_loop(struct httprequest *req)
        } else if (!strcasecmp(action, "editpic")) {
                do_graphics_upload("UIMG 1|_userpic_");
        } else if (!strcasecmp(action, "display_editroompic")) {
-               display_graphics_upload("the graphic for this room",
+               display_graphics_upload("the icon for this room",
                                        "UIMG 0|_roompic_",
                                        "/editroompic");
        } else if (!strcasecmp(action, "editroompic")) {
@@ -1257,7 +1263,7 @@ void session_loop(struct httprequest *req)
        } else if (!strcasecmp(action, "display_editfloorpic")) {
                sprintf(buf, "UIMG 0|_floorpic_|%s",
                        bstr("which_floor"));
-               display_graphics_upload("the graphic for this floor",
+               display_graphics_upload("the icon for this floor",
                                        buf,
                                        "/editfloorpic");
        } else if (!strcasecmp(action, "editfloorpic")) {
@@ -1357,6 +1363,10 @@ void session_loop(struct httprequest *req)
                save_inetconf();
        } 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, "diagnostics")) {
                output_headers(1, 1, 1, 0, 0, 0, 0);
 
Citadel server, clients, utilities