Multipart/alternative (possibly nested inside multipart/mixed)

[citadel.git] / webcit / messages.c

diff --git a/webcit/messages.c b/webcit/messages.c
index 8ecc80eae35de1179c707ec9dfd05fd49f445eb1..f22d0f16d9ab0b99a317de6bc42a08d72b526eee 100644 (file)
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -2346,7 +2346,7 @@ void readloop(char *oper)
         * new messages.
         */
        strcpy(old_msgs, "");
-       if (is_summary) {
+       if ((is_summary) || (WCC->wc_default_view == VIEW_CALENDAR)){
                serv_puts("GTSN");
                serv_getln(buf, sizeof buf);
                if (buf[0] == '2') {
@@ -2358,7 +2358,7 @@ void readloop(char *oper)
 
        if (WCC->wc_default_view == VIEW_CALENDAR) {            /**< calendar */
                is_calendar = 1;
-               strcpy(cmd, "MSGS ALL");
+               strcpy(cmd, "MSGS ALL|||1");
                maxmsgs = 32767;
        }
        if (WCC->wc_default_view == VIEW_TASKS) {               /**< tasks */
@@ -2395,7 +2395,7 @@ void readloop(char *oper)
                goto DONE;
        }
 
-       if (is_summary) {
+       if ((is_summary) || (WCC->wc_default_view == VIEW_CALENDAR)){
                for (a = 0; a < nummsgs; ++a) {
                        /** Are you a new message, or an old message? */
                        if (is_summary) {
@@ -2638,13 +2638,13 @@ void readloop(char *oper)
                                addrbook[num_ab-1].ab_msgnum = WCC->msgarr[a];
                        }
                        else if (is_calendar) {
-                               display_calendar(WCC->msgarr[a]);
+                               display_calendar(WCC->msgarr[a], WCC->summ[a].is_new);
                        }
                        else if (is_tasks) {
-                               display_task(WCC->msgarr[a]);
+                               display_task(WCC->msgarr[a], WCC->summ[a].is_new);
                        }
                        else if (is_notes) {
-                               display_note(WCC->msgarr[a]);
+                               display_note(WCC->msgarr[a], WCC->summ[a].is_new);
                        }
                        else {
                                if (displayed_msgs == NULL) {
@@ -2850,13 +2850,26 @@ DONE:
  * ... this is where the actual message gets transmitted to the server.
  */
 void post_mime_to_server(void) {
-       char boundary[SIZ];
+       char top_boundary[SIZ];
+       char alt_boundary[SIZ];
        int is_multipart = 0;
        static int seq = 0;
        struct wc_attachment *att;
        char *encoded;
        size_t encoded_length;
        size_t encoded_strlen;
+       char *txtmail = NULL;
+
+       sprintf(top_boundary, "Citadel--Multipart--%s--%04x--%04x",
+               serv_info.serv_fqdn,
+               getpid(),
+               ++seq
+       );
+       sprintf(alt_boundary, "Citadel--Multipart--%s--%04x--%04x",
+               serv_info.serv_fqdn,
+               getpid(),
+               ++seq
+       );
 
        /** RFC2045 requires this, and some clients look for it... */
        serv_puts("MIME-Version: 1.0");
@@ -2868,25 +2881,43 @@ void post_mime_to_server(void) {
        }
 
        if (is_multipart) {
-               sprintf(boundary, "Citadel--Multipart--%s--%04x--%04x",
-                       serv_info.serv_fqdn,
-                       getpid(),
-                       ++seq
-               );
-
                /** Remember, serv_printf() appends an extra newline */
                serv_printf("Content-type: multipart/mixed; "
-                       "boundary=\"%s\"\n", boundary);
+                       "boundary=\"%s\"\n", top_boundary);
                serv_printf("This is a multipart message in MIME format.\n");
-               serv_printf("--%s", boundary);
+               serv_printf("--%s", top_boundary);
        }
 
+
+
+       /* Remember, serv_printf() appends an extra newline */
+       serv_printf("Content-type: multipart/alternative; "
+               "boundary=\"%s\"\n", alt_boundary);
+       serv_printf("This is a multipart message in MIME format.\n");
+       serv_printf("--%s", alt_boundary);
+
+       serv_puts("Content-type: text/plain; charset=utf-8");
+       serv_puts("Content-Transfer-Encoding: quoted-printable");
+       serv_puts("");
+       txtmail = html_to_ascii(bstr("msgtext"), 0, 80, 0);
+        text_to_server_qp(txtmail);     /** Transmit message in quoted-printable encoding */
+        free(txtmail);
+
+       serv_printf("--%s", alt_boundary);
+
        serv_puts("Content-type: text/html; charset=utf-8");
        serv_puts("Content-Transfer-Encoding: quoted-printable");
        serv_puts("");
        serv_puts("<html><body>\r\n");
        text_to_server_qp(bstr("msgtext"));     /** Transmit message in quoted-printable encoding */
        serv_puts("</body></html>\r\n");
+
+
+       serv_printf("--%s--", alt_boundary);
+
+
+
+
        
        if (is_multipart) {
 
@@ -2898,7 +2929,7 @@ void post_mime_to_server(void) {
                        if (encoded == NULL) break;
                        encoded_strlen = CtdlEncodeBase64(encoded, att->data, att->length, 1);
 
-                       serv_printf("--%s", boundary);
+                       serv_printf("--%s", top_boundary);
                        serv_printf("Content-type: %s", att->content_type);
                        serv_printf("Content-disposition: attachment; "
                                "filename=\"%s\"", att->filename);
@@ -2909,7 +2940,7 @@ void post_mime_to_server(void) {
                        serv_puts("");
                        free(encoded);
                }
-               serv_printf("--%s--", boundary);
+               serv_printf("--%s--", top_boundary);
        }
 
        serv_puts("000");