* Started prettying up the vCard display.

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index d2b84937d66cffa0e30b3e0907e055016a34dd51..b070c06132668aa231c4a1ea184384d4d69ee6c0 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,7 @@
 $Log$
+Revision 500.27  2003/10/09 03:17:02  ajc
+* Started prettying up the vCard display.
+
 Revision 500.26  2003/10/08 02:33:49  ajc
 * Begin work on better handling of vCard display
 
@@ -1588,3 +1591,4 @@ Sun Dec  6 19:50:55 EST 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
 
 1998-12-03 Nathan Bryant <bryant@cs.usm.maine.edu>
        * webserver.c: warning fix
+

diff --git a/webcit/messages.c b/webcit/messages.c
index af6067775172c266e83abc1aed3a89deb639310c..c81b4d5e0f72974a73ccab33d73bfb9152a29c95 100644 (file)
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -119,12 +119,22 @@ 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 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);
@@ -140,42 +150,84 @@ void display_parsed_vcard(struct vCard *v, int full) {
        if (v->numprops) for (i=0; i<(v->numprops); ++i) {
 
                thisname = strdup(v->prop[i].name);
-               thisvalue = strdup(v->prop[i].value);
 
-               /* FIXME handle base64 and qp encodings here */
+               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, ';');
+                       }
+               }
 
-               if (!strcasecmp(thisname, "n")) {
-                       wprintf("<TR BGCOLOR=\"#AAAAAA\">"
-                       "<TD BGCOLOR=\"#FFFFFF\">"
-                       "<IMG ALIGN=CENTER SRC=\"/static/vcard.gif\"></TD>"
-                       "<TD><FONT SIZE=+1><B>");
-                       escputs(thisvalue);
-                       wprintf("</B></FONT></TD></TR>\n");
+               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(thisname, "n")
+                  || (!strncasecmp(thisname, "n;", 2)) ) {
+                       if (strlen(displayname) == 0) {
+                               strcpy(displayname, thisvalue);
+                       }
                }
-               else if (!strcasecmp(thisname, "email;internet")) {
-                       wprintf("<TR><TD>Internet e-mail:</TD>"
-                               "<TD>"
+
+               /* FN (full name) is a true 'display name' field */
+               else if (!strcasecmp(thisname, "fn")
+                  || (!strncasecmp(thisname, "fn;", 3)) ) {
+                       strcpy(displayname, thisvalue);
+               }
+
+               else if (!strncasecmp(thisname, "email", 5)) {
+                       if (strlen(mailto) > 0) strcat(mailto, "<BR>");
+                       strcat(mailto,
                                "<A HREF=\"/display_enter"
                                "?force_room=_MAIL_&recp=");
-                       urlescputs(thisvalue);
-                       wprintf("\">");
-                       escputs(thisvalue);
-                       wprintf("</A></TD></TR>\n");
+                       urlesc(&mailto[strlen(mailto)], thisvalue);
+                       strcat(mailto, "\">");
+                       urlesc(&mailto[strlen(mailto)], thisvalue);
+                       strcat(mailto, "</A>");
                }
-               else if (!strcasecmp(thisname, "adr")) {
-                       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>");
+               else if (!strncasecmp(thisname, "tel;", 4)) {
+                       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, ")");
                                }
                        }
-                       wprintf("</TD></TR>\n");
                }
-               else if (!strncasecmp(thisname, "tel;", 4)) {
-                       wprintf("<TR><TD>%s telephone:</TD><TD>",
-                               &thisname[4]);
+               else if (!strcasecmp(thisname, "adr")) {
+                       wprintf("<TR><TD>Address:</TD><TD>");
                        for (j=0; j<num_tokens(thisvalue, ';'); ++j) {
                                extract_token(buf, thisvalue, j, ';');
                                if (strlen(buf) > 0) {
@@ -197,6 +249,19 @@ void display_parsed_vcard(struct vCard *v, int full) {
                free(thisvalue);
 
        }
+
+       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");
 }
 

diff --git a/webcit/webcit.h b/webcit/webcit.h
index 7ba7b9493bc8d2e913dd9111fc1b9efd2c495ff1..ac7a2bbf0876180fe61277313bf4c9dfedffe341 100644 (file)
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -425,3 +425,4 @@ void unescape_input(char *buf);
 void do_iconbar(void);
 void display_customize_iconbar(void);
 void commit_iconbar(void);
+int CtdlDecodeQuotedPrintable(char *decoded, char *encoded, int sourcelen);