Changed the arrangement of bytes in the universe

[citadel.git] / webcit-ng / server / room_functions.c

diff --git a/webcit-ng/server/room_functions.c b/webcit-ng/server/room_functions.c
index 9e7896c5edaf7c15c09dd78fee3dac643a62becb..8d8ca3bcc5113c670c5a48161a5b630a39d1a858 100644 (file)
--- a/webcit-ng/server/room_functions.c
+++ b/webcit-ng/server/room_functions.c
@@ -111,18 +111,21 @@ void json_mailbox(struct http_transaction *h, struct ctdlsession *c) {
        ctdl_readline(c, buf, sizeof(buf));
        if (buf[0] == '1') {
                while (ctdl_readline(c, buf, sizeof(buf)), (strcmp(buf, "000"))) {
-                       utf8ify_rfc822_string(buf);
                        JsonValue *jmsg = NewJsonObject(HKEY("message"));
                        JsonObjectAppend(jmsg, NewJsonNumber(HKEY("msgnum"), extract_long(buf, 0)));
                        JsonObjectAppend(jmsg, NewJsonNumber(HKEY("time"), extract_long(buf, 1)));
                        extract_token(field, buf, 2, '|', sizeof field);
+                       utf8ify_rfc822_string(field);
                        JsonObjectAppend(jmsg, NewJsonPlainString(HKEY("author"), field, -1));
                        extract_token(field, buf, 4, '|', sizeof field);
+                       utf8ify_rfc822_string(field);
                        JsonObjectAppend(jmsg, NewJsonPlainString(HKEY("addr"), field, -1));
                        extract_token(field, buf, 5, '|', sizeof field);
+                       utf8ify_rfc822_string(field);
                        JsonObjectAppend(jmsg, NewJsonPlainString(HKEY("subject"), field, -1));
                        JsonObjectAppend(jmsg, NewJsonNumber(HKEY("msgidhash"), extract_long(buf, 6)));
                        extract_token(field, buf, 7, '|', sizeof field);
+                       utf8ify_rfc822_string(field);
                        JsonObjectAppend(jmsg, NewJsonPlainString(HKEY("references"), field, -1));
                        JsonArrayAppend(j, jmsg);               // add the message to the array
                }
@@ -262,7 +265,7 @@ void object_in_room(struct http_transaction *h, struct ctdlsession *c) {
        // A sixth component in the URL can be one of two things:
        // (1) a MIME part specifier, in which case the client wants to download that component within the message
        // (2) a content-type, in which ase the client wants us to try to render it a certain way
-       if (num_tokens(h->url, '/') == 6) {
+       if (num_tokens(h->url, '/') >= 6) {
                extract_token(buf, h->url, 5, '/', sizeof buf);
                if (!IsEmptyStr(buf)) {
                        if (!strcasecmp(buf, "json")) {
@@ -288,8 +291,7 @@ void object_in_room(struct http_transaction *h, struct ctdlsession *c) {
                return;
        }
 
-       // DOOOOOO ITTTTT!!!
-
+       // Now perform the requested operation.
        if (!strcasecmp(h->method, "DELETE")) {
                dav_delete_message(h, c, msgnum);
        }
@@ -300,15 +302,14 @@ void object_in_room(struct http_transaction *h, struct ctdlsession *c) {
                dav_put_message(h, c, unescaped_euid, msgnum);
        }
        else if (!strcasecmp(h->method, "MOVE")) {
-               do_404(h);      // FIXME write this
+               dav_move_or_copy_message(h, c, msgnum, DAV_MOVE);
        }
        else if (!strcasecmp(h->method, "COPY")) {
-               do_404(h);      // FIXME write this
+               dav_move_or_copy_message(h, c, msgnum, DAV_COPY);
        }
        else {
-               do_404(h);      // Got this far but the method made no sense?  Bummer.
+               do_404(h);              // We should never get here, but if we do, a 404 error is clean.
        }
-
 }
 
 
@@ -319,7 +320,7 @@ void report_the_room_itself(struct http_transaction *h, struct ctdlsession *c) {
                return;
        }
 
-       do_404(h);              // future implementations like CardDAV will require code paths here
+       do_404(h);                      // future implementations like CardDAV will require code paths here
 }
 
 
@@ -348,8 +349,13 @@ void propfind_the_room_itself(struct http_transaction *h, struct ctdlsession *c)
        syslog(LOG_DEBUG, "Client PROPFIND requested depth: %d", dav_depth);
        StrBuf *Buf = NewStrBuf();
 
-       StrBufAppendPrintf(Buf, "<?xml version=\"1.0\" encoding=\"utf-8\"?>"
-                          "<D:multistatus " "xmlns:D=\"DAV:\" " "xmlns:C=\"urn:ietf:params:xml:ns:caldav\"" ">");
+       StrBufAppendPrintf(Buf,
+               "<?xml version=\"1.0\" encoding=\"utf-8\"?>"
+               "<D:multistatus "
+               "xmlns:D=\"DAV:\" "
+               "xmlns:C=\"urn:ietf:params:xml:ns:caldav\""
+               ">"
+       );
 
        // Transmit the collection resource
        StrBufAppendPrintf(Buf, "<D:response>");
@@ -416,9 +422,10 @@ void propfind_the_room_itself(struct http_transaction *h, struct ctdlsession *c)
                if (msglist) {
                        int i;
                        for (i = 0; (msglist[i] > 0); ++i) {
-                               if ((i % 10) == 0)
+                               if ((i % 10) == 0) {
                                        syslog(LOG_DEBUG, "PROPFIND enumerated %d messages", i);
-                               e = NULL;       // EUID gets stored here
+                               }
+                               e = NULL;               // EUID gets stored here
                                timestamp = 0;
 
                                char cbuf[1024];
@@ -509,6 +516,7 @@ void get_the_room_itself(struct http_transaction *h, struct ctdlsession *c) {
        JsonObjectAppend(j, NewJsonNumber(HKEY("current_view"), c->room_current_view));
        JsonObjectAppend(j, NewJsonNumber(HKEY("default_view"), c->room_default_view));
        JsonObjectAppend(j, NewJsonNumber(HKEY("is_room_aide"), c->is_room_aide));
+       JsonObjectAppend(j, NewJsonNumber(HKEY("is_trash_folder"), c->is_trash_folder));
        JsonObjectAppend(j, NewJsonNumber(HKEY("can_delete_messages"), c->can_delete_messages));
        JsonObjectAppend(j, NewJsonNumber(HKEY("new_messages"), c->new_messages));
        JsonObjectAppend(j, NewJsonNumber(HKEY("total_messages"), c->total_messages));
@@ -641,7 +649,7 @@ void ctdl_r(struct http_transaction *h, struct ctdlsession *c) {
                        //      10      (int)CC->room.QRfloor           The floor number this room resides on
                        c->room_current_view = extract_int(&buf[4], 11);
                        c->room_default_view = extract_int(&buf[4], 12);
-                       //      13      (int)is_trash                   Boolean flag: 1 if this is the user's Trash folder, 0 otherwise.
+                       c->is_trash_folder  = extract_int(&buf[4], 13); // Boolean flag: 1 if this is the user's Trash folder, 0 otherwise.
                        room_flags2 = extract_long(&buf[4], 14);        // More flags associated with this room.
                        c->room_mtime = extract_long(&buf[4], 15);      // Timestamp of the last write activity in this room
 
@@ -675,7 +683,7 @@ void ctdl_r(struct http_transaction *h, struct ctdlsession *c) {
                }
                return;
        }
-       if (num_tokens(h->url, '/') == 6) {
+       if (num_tokens(h->url, '/') >= 6) {
                object_in_room(h, c);   //      /ctdl/r/roomname/object/ or possibly /ctdl/r/roomname/object/component
                return;
        }