* Fixed a bug that caused vnotes not to display when encapsulated in multipart/altern...

[citadel.git] / webcit / notes.c

diff --git a/webcit/notes.c b/webcit/notes.c
index b84cf539f79ae357ea976201216a4ad8e5b94e2f..a8e02b04ca42577acea228288e07b81c912763e8 100644 (file)
--- a/webcit/notes.c
+++ b/webcit/notes.c
@@ -95,10 +95,9 @@ struct vnote *vnote_new_from_msg(long msgnum,int unread)
                        }
                        else {
                                phase++;
-                               
                                if ((msg4_content_length > 0)
                                    && ( !strcasecmp(msg4_content_encoding, "7bit"))
-                                   && (!strcasecmp(mime_content_type, "text/vnote"))
+                                   && (!strcasecmp(msg4_content_type, "text/vnote"))
                                ) { 
                                        vnote_inline = 1;
                                }
@@ -162,15 +161,38 @@ void write_vnote_to_server(struct vnote *v)
 {
        char buf[1024];
        char *pch;
+       char boundary[256];
+       static int seq = 0;
+
+       snprintf(boundary, sizeof boundary, "Citadel--Multipart--%s--%04x--%04x",
+               ChrPtr(WC->serv_info->serv_fqdn),
+               getpid(),
+               ++seq
+       );
 
        serv_puts("ENT0 1|||4");
        serv_getln(buf, sizeof buf);
        if (buf[0] == '4') {
+               /* Remember, serv_printf() appends an extra newline */
+               serv_printf("Content-type: multipart/alternative; "
+                       "boundary=\"%s\"\n", boundary);
+               serv_printf("This is a multipart message in MIME format.\n");
+               serv_printf("--%s", boundary);
+       
+               serv_puts("Content-type: text/plain; charset=utf-8");
+               serv_puts("Content-Transfer-Encoding: 7bit");
+               serv_puts("");
+               serv_puts(v->body);
+               serv_puts("");
+       
+               serv_printf("--%s", boundary);
                serv_puts("Content-type: text/vnote");
+               serv_puts("Content-Transfer-Encoding: 7bit");
                serv_puts("");
                pch = vnote_serialize(v);
                serv_puts(pch);
                free(pch);
+               serv_printf("--%s--", boundary);
                serv_puts("000");
        }
 }