-//
// Message base functions
//
// Copyright (c) 1996-2022 by the citadel.org team
// DAV delete an object in a room.
void dav_delete_message(struct http_transaction *h, struct ctdlsession *c, long msgnum) {
ctdl_delete_msgs(c, &msgnum, 1);
- h->response_code = 204;
- h->response_string = strdup("no content");
+ do_204(h);
}
// DAV move or copy an object in a room.
void dav_move_or_copy_message(struct http_transaction *h, struct ctdlsession *c, long msgnum, int move_or_copy) {
- do_404(h);
+ char target_room[ROOMNAMELEN];
+ char buf[1024];
+
+ // HTTP "Destination" header will tell us the target collection
+ char *target_collection = header_val(h, "Destination");
+ syslog(LOG_DEBUG, "dest coll: \"%s\"", target_collection);
+
+ // Translate the target WebDAV Collection name to a Citadel Room name.
+ // Note that some clients will supply a fully-qualified URL such as "http://example.com/ctdl/r/roomname/999"
+ // so we're just going to search for "/ctdl/r/" and work from there.
+ char *ctdlr = strstr(target_collection, "/ctdl/r/");
+ if (ctdlr == NULL) {
+ do_412(h); // badly formed target collection; fail out.
+ return;
+ }
+ safestrncpy(target_room, ctdlr+8, sizeof target_room);
+ char *slash = strchr(target_room, '/');
+ if (slash) {
+ *slash = 0; // lop off the "filename" we don't need it
+ }
+ unescape_input(target_room);
+ syslog(LOG_DEBUG, "dest room: \"%s\"", target_room);
+
+ // Perform the move or copy operation
+ ctdl_printf(c, "MOVE %ld|%s|%d", msgnum, target_room, move_or_copy); // Citadel Server: 0=move, 1=copy
+ ctdl_readline(c, buf, sizeof buf);
+ if (buf[0] == '2') {
+ do_204(h); // succeed (no content)
+ return;
+ }
+ do_412(h); // fail (precondition failed)
}
if (v) {
*v = 0;
++v;
- string_trim(v); // we now have a key (k) and a value (v)
+ string_trim(v); // we now have a key (k) and a value (v)
if ((!strcasecmp(k, "content-type")) // fields which can be passed from RFC822 to HTTP as-is
|| (!strcasecmp(k, "date"))
) {
long new_msgnum;
char new_euid[1024];
char response_string[1024];
+ char mime_boundary[80];
if ((h->request_body == NULL) || (h->request_body_length < 1)) {
do_404(h); // Refuse to post a null message
char *mailbcc = get_url_param(h, "mailbcc"); // Bcc:
if (!mailbcc) mailbcc = "";
+ // If there are attachments, we have to merge them into the message text.
+ char *att = get_url_param(h, "att");
+ if (att) {
+ syslog(LOG_DEBUG, "💥 There are attachments. Going multipart/mixed. <%s>", att);
+ }
+
// Mode 4 will give us metadata back after upload
ctdl_printf(c, "ENT0 1|%s||4|%s||1|%s|%s|||%s|", mailto, subj, mailcc, mailbcc, wefw);
ctdl_readline(c, buf, sizeof buf);
// Remember, ctdl_printf() appends \n on its own, so when adding a CRLF newline, only use \r
// Or for a blank line, use ctdl_write() with \r\n
+
+ // If there are attachments, open up a multipart/mixed MIME container.
+ if (att) {
+ snprintf(mime_boundary, sizeof(mime_boundary), "citadel-multipart-%x-%x", time(NULL), rand());
+ ctdl_printf(c, "MIME-Version: 1.0\r");
+ ctdl_printf(c, "Content-Type: multipart/mixed; boundary=\"%s\"\r", mime_boundary);
+ ctdl_write(c, HKEY("\r\n"));
+ ctdl_write(c, HKEY("\r\n"));
+ ctdl_printf(c, "--%s\r", mime_boundary); // start of message body
+ }
+
+ // This section
content_type = header_val(h, "Content-type");
ctdl_printf(c, "Content-type: %s\r", (content_type ? content_type : "application/octet-stream"));
ctdl_write(c, HKEY("\r\n"));
if (h->request_body[h->request_body_length] != '\n') {
ctdl_write(c, HKEY("\r\n"));
}
- ctdl_printf(c, "000");
- // Now handle the response from the Citadel server.
+ // If there are attachments, close the multipart/mixed MIME container.
+ if (att) {
+ // FIXME actually attach the attachments here.
+ ctdl_printf(c, "--%s--\r", mime_boundary);
+ }
+
+ // Done writing to the Citadel Server.
+ ctdl_printf(c, "000");
+ // Now handle the response from the Citadel Server.
n = 0;
new_msgnum = 0;
strcpy(new_euid, "");