]> code.citadel.org Git - citadel.git/blobdiff - webcit/messages.c
* Added "|END" to the session cookie before base64-ing it. This fixes a
[citadel.git] / webcit / messages.c
index c90b1f9d5d8db95b28577d8b63d02e2c40523c88..fc02aa1835b7a59fdb2728df52d6f59eb2ecede7 100644 (file)
@@ -114,15 +114,35 @@ void fetchname_parsed_vcard(struct vCard *v, char *storename) {
  *
  * Set 'full' to nonzero to display the full card, otherwise it will only
  * show a summary line.
+ *
+ * This code is a bit ugly, so perhaps an explanation is due: we do this
+ * in two passes through the vCard fields.  On the first pass, we process
+ * fields we understand, and then render them in a pretty fashion at the
+ * end.  Then we make a second pass, outputting all the fields we don't
+ * understand in a simple two-column name/value format.
  */
 void display_parsed_vcard(struct vCard *v, int full) {
        int i, j;
        char buf[SIZ];
        char *name;
+       int is_qp = 0;
+       int is_b64 = 0;
+       char *thisname, *thisvalue;
+       char firsttoken[SIZ];
+       int pass;
+
+       char displayname[SIZ];
+       char phone[SIZ];
+       char mailto[SIZ];
+
+       strcpy(displayname, "");
+       strcpy(phone, "");
+       strcpy(mailto, "");
 
        if (!full) {
                wprintf("<TD>");
-               name = vcard_get_prop(v, "n", 1, 0, 0);
+               name = vcard_get_prop(v, "fn", 1, 0, 0);
+               if (name == NULL) name = vcard_get_prop(v, "n", 1, 0, 0);
                if (name != NULL) {
                        strcpy(buf, name);
                        escputs(buf);
@@ -135,54 +155,138 @@ void display_parsed_vcard(struct vCard *v, int full) {
        }
 
        wprintf("<TABLE bgcolor=#888888>");
-       if (v->numprops) for (i=0; i<(v->numprops); ++i) {
-               if (!strcasecmp(v->prop[i].name, "n")) {
-                       wprintf("<TR BGCOLOR=\"#AAAAAA\">"
-                       "<TD BGCOLOR=\"#FFFFFF\">"
-                       "<IMG ALIGN=CENTER SRC=\"/static/vcard.gif\"></TD>"
-                       "<TD><FONT SIZE=+1><B>");
-                       escputs(v->prop[i].value);
-                       wprintf("</B></FONT></TD></TR>\n");
-               }
-               else if (!strcasecmp(v->prop[i].name, "email;internet")) {
-                       wprintf("<TR><TD>Internet e-mail:</TD>"
-                               "<TD><A HREF=\"mailto:");
-                       urlescputs(v->prop[i].value);
-                       wprintf("\">");
-                       escputs(v->prop[i].value);
-                       wprintf("</A></TD></TR>\n");
-               }
-               else if (!strcasecmp(v->prop[i].name, "adr")) {
-                       wprintf("<TR><TD>Address:</TD><TD>");
-                       for (j=0; j<num_tokens(v->prop[i].value, ';'); ++j) {
-                               extract_token(buf, v->prop[i].value, j, ';');
-                               if (strlen(buf) > 0) {
-                                       escputs(buf);
-                                       wprintf("<BR>");
+       for (pass=1; pass<=2; ++pass) {
+
+               if (v->numprops) for (i=0; i<(v->numprops); ++i) {
+
+                       thisname = strdup(v->prop[i].name);
+                       extract_token(firsttoken, thisname, 0, ';');
+       
+                       for (j=0; j<num_tokens(thisname, ';'); ++j) {
+                               extract_token(buf, thisname, j, ';');
+                               if (!strcasecmp(buf, "encoding=quoted-printable")) {
+                                       is_qp = 1;
+                                       remove_token(thisname, j, ';');
+                               }
+                               if (!strcasecmp(buf, "encoding=base64")) {
+                                       is_b64 = 1;
+                                       remove_token(thisname, j, ';');
                                }
                        }
-                       wprintf("</TD></TR>\n");
-               }
-               else if (!strncasecmp(v->prop[i].name, "tel;", 4)) {
-                       wprintf("<TR><TD>%s telephone:</TD><TD>",
-                               &v->prop[i].name[4]);
-                       for (j=0; j<num_tokens(v->prop[i].value, ';'); ++j) {
-                               extract_token(buf, v->prop[i].value, j, ';');
-                               if (strlen(buf) > 0) {
-                                       escputs(buf);
-                                       wprintf("<BR>");
+       
+                       if (is_qp) {
+                               thisvalue = malloc(strlen(v->prop[i].value) + 50);
+                               j = CtdlDecodeQuotedPrintable(
+                                       thisvalue, v->prop[i].value,
+                                       strlen(v->prop[i].value) );
+                               thisvalue[j] = 0;
+                       }
+                       else if (is_b64) {
+                               thisvalue = malloc(strlen(v->prop[i].value) + 50);
+                               CtdlDecodeBase64(
+                                       thisvalue, v->prop[i].value,
+                                       strlen(v->prop[i].value) );
+                       }
+                       else {
+                               thisvalue = strdup(v->prop[i].value);
+                       }
+       
+                       /*** Various fields we may encounter ***/
+       
+                       /* N is name, but only if there's no FN already there */
+                       if (!strcasecmp(firsttoken, "n")) {
+                               if (strlen(displayname) == 0) {
+                                       strcpy(displayname, thisvalue);
+                               }
+                       }
+       
+                       /* FN (full name) is a true 'display name' field */
+                       else if (!strcasecmp(firsttoken, "fn")) {
+                               strcpy(displayname, thisvalue);
+                       }
+       
+                       else if (!strcasecmp(firsttoken, "email")) {
+                               if (strlen(mailto) > 0) strcat(mailto, "<BR>");
+                               strcat(mailto,
+                                       "<A HREF=\"/display_enter"
+                                       "?force_room=_MAIL_&recp=");
+                               urlesc(&mailto[strlen(mailto)], thisvalue);
+                               strcat(mailto, "\">");
+                               urlesc(&mailto[strlen(mailto)], thisvalue);
+                               strcat(mailto, "</A>");
+                       }
+                       else if (!strcasecmp(firsttoken, "tel")) {
+                               if (strlen(phone) > 0) strcat(phone, "<BR>");
+                               strcat(phone, thisvalue);
+                               for (j=0; j<num_tokens(thisname, ';'); ++j) {
+                                       extract_token(buf, thisname, j, ';');
+                                       if (!strcasecmp(buf, "tel"))
+                                               strcat(phone, "");
+                                       else if (!strcasecmp(buf, "work"))
+                                               strcat(phone, " (work)");
+                                       else if (!strcasecmp(buf, "home"))
+                                               strcat(phone, " (home)");
+                                       else if (!strcasecmp(buf, "cell"))
+                                               strcat(phone, " (cell)");
+                                       else {
+                                               strcat(phone, " (");
+                                               strcat(phone, buf);
+                                               strcat(phone, ")");
+                                       }
+                               }
+                       }
+                       else if (!strcasecmp(firsttoken, "adr")) {
+                               if (pass == 2) {
+                                       wprintf("<TR><TD>Address:</TD><TD>");
+                                       for (j=0; j<num_tokens(thisvalue, ';'); ++j) {
+                                               extract_token(buf, thisvalue, j, ';');
+                                               if (strlen(buf) > 0) {
+                                                       escputs(buf);
+                                                       wprintf("<BR>");
+                                               }
+                                       }
+                                       wprintf("</TD></TR>\n");
+                               }
+                       }
+                       else if (!strcasecmp(firsttoken, "version")) {
+                               /* ignore */
+                       }
+                       else if (!strcasecmp(firsttoken, "rev")) {
+                               /* ignore */
+                       }
+                       else if (!strcasecmp(firsttoken, "label")) {
+                               /* ignore */
+                       }
+                       else {
+                               if (pass == 2) {
+                                       wprintf("<TR><TD>");
+                                       escputs(thisname);
+                                       wprintf("</TD><TD>");
+                                       escputs(thisvalue);
+                                       wprintf("</TD></TR>\n");
                                }
                        }
-                       wprintf("</TD></TR>\n");
+       
+                       free(thisname);
+                       free(thisvalue);
                }
-               else {
-                       wprintf("<TR><TD>");
-                       escputs(v->prop[i].name);
-                       wprintf("</TD><TD>");
-                       escputs(v->prop[i].value);
-                       wprintf("</TD></TR>\n");
+       
+               if (pass == 1) {
+                       wprintf("<TR BGCOLOR=\"#AAAAAA\">"
+                       "<TD COLSPAN=2 BGCOLOR=\"#FFFFFF\">"
+                       "<IMG ALIGN=CENTER SRC=\"/static/vcard.gif\">"
+                       "<FONT SIZE=+1><B>");
+                       escputs(displayname);
+                       wprintf("</B></FONT></TD></TR>\n");
+               
+                       if (strlen(phone) > 0)
+                               wprintf("<TR><TD>Telephone:</TD><TD>%s</TD></TR>\n", phone);
+                       if (strlen(mailto) > 0)
+                               wprintf("<TR><TD>E-mail:</TD><TD>%s</TD></TR>\n", mailto);
                }
+
        }
+
        wprintf("</TABLE>\n");
 }
 
@@ -264,6 +368,11 @@ void read_message(long msgnum) {
                return;
        }
 
+       /* begin everythingamundo table */
+       wprintf("<table width=100% border=1 cellspacing=0 "
+               "cellpadding=0><TR><TD>\n");
+
+       /* begin message header table */
        wprintf("<TABLE WIDTH=100%% BORDER=0 CELLSPACING=0 "
                "CELLPADDING=1 BGCOLOR=\"#CCCCCC\"><TR><TD>\n");
 
@@ -438,7 +547,7 @@ void read_message(long msgnum) {
 
        /* Begin body */
        wprintf("<TABLE BORDER=0 WIDTH=100%% BGCOLOR=#FFFFFF "
-               "CELLPADDING=0 CELLSPACING=0><TR><TD>");
+               "CELLPADDING=1 CELLSPACING=0><TR><TD>");
 
        /* 
         * Learn the content type
@@ -537,6 +646,9 @@ void read_message(long msgnum) {
 
 ENDBODY:
        wprintf("</TD></TR></TABLE>\n");
+
+       /* end everythingamundo table */
+       wprintf("</TD></TR></TABLE><BR>\n");
 }
 
 
@@ -794,8 +906,9 @@ void do_addrbook_view(struct addrbookent *addrbook, int num_ab) {
                }
 
                wprintf("<TD>");
-               wprintf("<A HREF=\"/readfwd?startmsg=%ld", addrbook[i].ab_msgnum);
-               wprintf("&maxmsgs=1&summary=0\">");
+               wprintf("<A HREF=\"/readfwd?startmsg=%ld&is_singlecard=1",
+                       addrbook[i].ab_msgnum);
+               wprintf("&maxmsgs=1&summary=0&alpha=%s\">", bstr("alpha"));
                escputs(addrbook[i].ab_name);
                wprintf("</A></TD>\n");
        }
@@ -843,6 +956,7 @@ void readloop(char *oper)
        int num_displayed = 0;
        int is_summary = 0;
        int is_addressbook = 0;
+       int is_singlecard = 0;
        int is_calendar = 0;
        int is_tasks = 0;
        int remaining_messages;
@@ -879,10 +993,17 @@ void readloop(char *oper)
                strcpy(cmd, "MSGS ALL");
                maxmsgs = 32767;
        }
+
        if ((WC->wc_view == 2) && (maxmsgs > 1)) {
                is_addressbook = 1;
                strcpy(cmd, "MSGS ALL");
                maxmsgs = 32767;
+       }
+
+       is_singlecard = atoi(bstr("is_singlecard"));
+
+       /* Display the letter indices across the top */
+       if ((is_addressbook) || (is_singlecard)) {
                if (strlen(bstr("alpha")) == 0) {
                        alpha = 'a';
                }
@@ -891,19 +1012,27 @@ void readloop(char *oper)
                        alpha = buf[0];
                }
 
-               for (i='a'; i<='z'; ++i) {
-                       if (i == alpha) wprintf("<FONT SIZE=+2>"
-                                               "%c</FONT>\n", toupper(i));
+               for (i='1'; i<='z'; ++i) if ((i=='1')||(islower(i))) {
+                       if ((i != alpha) || (is_singlecard)) {
+                               wprintf("<A HREF=\"/readfwd?alpha=%c\">", i);
+                       }
+                       if (i == alpha) wprintf("<FONT SIZE=+2>");
+                       if (isalpha(i)) {
+                               wprintf("%c", toupper(i));
+                       }
                        else {
-                               wprintf("<A HREF=\"/readfwd?alpha=%c\">"
-                                       "%c</A>\n", i, toupper(i));
+                               wprintf("(other)");
+                       }
+                       if (i == alpha) wprintf("</FONT>");
+                       if ((i != alpha) || (is_singlecard)) {
+                               wprintf("</A>\n");
                        }
                        wprintf("&nbsp;");
                }
-               if (!isalpha(alpha)) wprintf("<FONT SIZE=+2>(other)</FONT>\n");
-               else wprintf("<A HREF=\"/readfwd?alpha=1\">(other)</A>\n");
+
                wprintf("<HR width=100%%>\n");
        }
+
        if (WC->wc_view == 3) {         /* calendar */
                is_calendar = 1;
                strcpy(cmd, "MSGS ALL");
@@ -1030,7 +1159,7 @@ void readloop(char *oper)
 
        /* If we're only looking at one message, do a prev/next thing */
        if (num_displayed == 1) {
-          if ((!is_tasks) && (!is_calendar) && (!is_addressbook)) {
+          if ((!is_tasks) && (!is_calendar) && (!is_addressbook) && (!is_singlecard)) {
 
                wprintf("<CENTER>"
                        "<TABLE BORDER=0 WIDTH=100%% BGCOLOR=\"#DDDDDD\"><TR><TD>"
@@ -1080,7 +1209,7 @@ void readloop(char *oper)
         * messages, then display the selector bar
         */
        if (num_displayed > 1) {
-          if ((!is_tasks) && (!is_calendar) && (!is_addressbook)) {
+          if ((!is_tasks) && (!is_calendar) && (!is_addressbook) && (!is_singlecard)) {
                wprintf("<CENTER>"
                        "<TABLE BORDER=0 WIDTH=100%% BGCOLOR=\"#DDDDDD\"><TR><TD>"
                        "Reading #%d-%d of %d messages.</TD>\n"
@@ -1164,6 +1293,11 @@ void post_mime_to_server(void) {
        struct wc_attachment *att;
        char *encoded;
        size_t encoded_length;
+       int is_html = 0;
+
+       if (!strcasecmp(bstr("msg_format"), "html")) {
+               is_html = 1;
+       }
        
        /* If there are attachments, we have to do multipart/mixed */
        if (WC->first_attachment != NULL) {
@@ -1186,7 +1320,15 @@ void post_mime_to_server(void) {
 
        serv_puts("Content-type: text/html");
        serv_puts("");
-       text_to_server(bstr("msgtext"), 1);
+       serv_puts("<HTML><BODY>\n");
+       if (is_html) {
+               text_to_server(bstr("msgtext"), 0);
+       }
+       else {
+               text_to_server(bstr("msgtext"), 1);
+       }
+       serv_puts("</BODY></HTML>\n");
+       
 
        if (is_multipart) {
 
@@ -1308,6 +1450,15 @@ void display_enter(void)
                gotoroom(bstr("force_room"), 0);
        }
 
+       /* Are we perhaps in an address book view?  If so, then an "enter
+        * message" command really means "add new entry."
+        */
+       if (WC->wc_view == 2) {
+               do_edit_vcard(-1, "", "");
+               return;
+       }
+
+       /* Otherwise proceed normally */
        output_headers(1);
        sprintf(buf, "ENT0 0|%s|0|0", bstr("recp"));
        serv_puts(buf);
@@ -1331,13 +1482,13 @@ void display_enter(void)
        now = time(NULL);
        fmt_date(buf, now);
        strcat(&buf[strlen(buf)], " <I>from</I> ");
-       stresc(&buf[strlen(buf)], WC->wc_username, 1);
+       stresc(&buf[strlen(buf)], WC->wc_username, 1, 1);
        if (strlen(bstr("recp")) > 0) {
                strcat(&buf[strlen(buf)], " <I>to</I> ");
-               stresc(&buf[strlen(buf)], bstr("recp"), 1);
+               stresc(&buf[strlen(buf)], bstr("recp"), 1, 1);
        }
        strcat(&buf[strlen(buf)], " <I>in</I> ");
-       stresc(&buf[strlen(buf)], WC->wc_roomname, 1);
+       stresc(&buf[strlen(buf)], WC->wc_roomname, 1, 1);
        svprintf("BOXTITLE", WCS_STRING, buf);
        do_template("beginbox");
 
@@ -1345,25 +1496,56 @@ void display_enter(void)
 
        wprintf("<FORM ENCTYPE=\"multipart/form-data\" "
                "METHOD=\"POST\" ACTION=\"/post\" "
-               "NAME=\"enterform\">\n");
+               "NAME=\"enterform\""
+               "onSubmit=\"return submitForm();\""
+               ">\n");
        wprintf("<INPUT TYPE=\"hidden\" NAME=\"recp\" VALUE=\"%s\">\n",
                bstr("recp"));
        wprintf("<INPUT TYPE=\"hidden\" NAME=\"postseq\" VALUE=\"%ld\">\n",
                now);
-       wprintf("<IMG SRC=\"static/enter.gif\" ALIGN=MIDDLE ALT=\" \" "
-               "onLoad=\"document.enterform.msgtext.focus();\" >");
+       wprintf("<IMG SRC=\"static/enter.gif\" ALIGN=MIDDLE ALT=\" \">");
+               /* "onLoad=\"document.enterform.msgtext.focus();\" " */
        wprintf("<FONT SIZE=-1>Subject (optional):</FONT>"
                "<INPUT TYPE=\"text\" NAME=\"subject\" VALUE=\"");
        escputs(bstr("subject"));
        wprintf("\" MAXLENGTH=70>"
-               "&nbsp;&nbsp;&nbsp;"
-               "<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Save message\">"
+               "&nbsp;"
+       );
+
+       wprintf("<INPUT TYPE=\"radio\" NAME=\"msg_format\"");
+       if (!strcasecmp(bstr("msg_format"), "text")) wprintf("CHECKED ");
+       wprintf("VALUE=\"text\">text&nbsp;\n");
+
+       wprintf("<INPUT TYPE=\"radio\" NAME=\"msg_format\"");
+       if (strcasecmp(bstr("msg_format"), "text")) wprintf("CHECKED ");
+       wprintf("VALUE=\"html\">HTML&nbsp;\n");
+
+       wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Save message\">"
                "<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\"><BR>\n");
 
+       wprintf("<SCRIPT language=\"JavaScript\" type=\"text/javascript\" "
+               "src=\"static/richtext.js\"></SCRIPT>\n"
+               "<SCRIPT language=\"JavaScript\" type=\"text/javascript\">\n"
+               "function submitForm() { \n"
+               "  updateRTE('msgtext'); \n"
+               "  return true; \n"
+               "} \n"
+               "  \n"
+               "initRTE(\"static/\", \"static/\", \"\"); \n"
+               "</script> \n"
+               "<noscript>JAVASCRIPT MUST BE ENABLED.</noscript> \n"
+               "<SCRIPT language=\"javascript\" type=\"text/javascript\"> \n"
+               "writeRichText('msgtext', '");
+       msgescputs(bstr("msgtext"));
+       wprintf("', '100%%', 200, true, false); \n"
+               "</script> \n");
+
+/*
        wprintf("<TEXTAREA NAME=\"msgtext\" wrap=soft ROWS=25 COLS=80 "
                "WIDTH=80>");
        escputs(bstr("msgtext"));
        wprintf("</TEXTAREA><BR>\n");
+*/
 
        /* Enumerate any attachments which are already in place... */
        for (att = WC->first_attachment; att != NULL; att = att->next) {
@@ -1375,7 +1557,8 @@ void display_enter(void)
        }
 
        /* Now offer the ability to attach additional files... */
-       wprintf("Attach file: <input NAME=\"attachfile\" "
+       wprintf("&nbsp;&nbsp;&nbsp;"
+               "Attach file: <input NAME=\"attachfile\" "
                "SIZE=48 TYPE=\"file\">\n&nbsp;&nbsp;"
                "<input type=\"submit\" name=\"attach\" value=\"Add\">\n");