X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fvcard_edit.c;h=d5369aa78e9ea1ab45ddb44f9d5a677e313bf832;hb=1b278ca1243861adba31579d1633b11c8e096271;hp=bcb79387cb43a2f25910e6edb30bfb357309a6a3;hpb=12af59f130372022695276c24333420e78ac8c45;p=citadel.git

diff --git a/webcit/vcard_edit.c b/webcit/vcard_edit.c
index bcb79387c..d5369aa78 100644
--- a/webcit/vcard_edit.c
+++ b/webcit/vcard_edit.c
@@ -1,65 +1,694 @@
+
+#include "webcit.h"
+#include "calendar.h"
+
+/*
+ * Record compare function for sorting address book indices
+ */
+int abcmp(const void *ab1, const void *ab2) {
+	return(strcasecmp(
+		(((const addrbookent *)ab1)->ab_name),
+		(((const addrbookent *)ab2)->ab_name)
+	));
+}
+
+
+/*
+ * Helper function for do_addrbook_view()
+ * Converts a name into a three-letter tab label
+ */
+void nametab(char *tabbuf, long len, char *name) {
+	stresc(tabbuf, len, name, 0, 0);
+	tabbuf[0] = toupper(tabbuf[0]);
+	tabbuf[1] = tolower(tabbuf[1]);
+	tabbuf[2] = tolower(tabbuf[2]);
+	tabbuf[3] = 0;
+}
+
+
+/*
+ * If it's an old "Firstname Lastname" style record, try to convert it.
+ */
+void lastfirst_firstlast(char *namebuf) {
+	char firstname[SIZ];
+	char lastname[SIZ];
+	int i;
+
+	if (namebuf == NULL) return;
+	if (strchr(namebuf, ';') != NULL) return;
+
+	i = num_tokens(namebuf, ' ');
+	if (i < 2) return;
+
+	extract_token(lastname, namebuf, i-1, ' ', sizeof lastname);
+	remove_token(namebuf, i-1, ' ');
+	strcpy(firstname, namebuf);
+	sprintf(namebuf, "%s; %s", lastname, firstname);
+}
+
+
+
+wc_mime_attachment *load_vcard(message_summary *Msg) 
+{
+	HashPos  *it;
+	StrBuf *FoundCharset = NewStrBuf();
+	StrBuf *Error;
+	void *vMime;
+	const char *Key;
+	long len;
+	wc_mime_attachment *Mime;
+	wc_mime_attachment *VCMime = NULL;
+
+	Msg->MsgBody =  (wc_mime_attachment*) malloc(sizeof(wc_mime_attachment));
+	memset(Msg->MsgBody, 0, sizeof(wc_mime_attachment));
+	Msg->MsgBody->msgnum = Msg->msgnum;
+
+	load_message(Msg, FoundCharset, &Error);
+
+	FreeStrBuf(&FoundCharset);
+	/* look up the vcard... */
+	it = GetNewHashPos(Msg->AllAttach, 0);
+	while (GetNextHashPos(Msg->AllAttach, it, &len, &Key, &vMime) && 
+	       (vMime != NULL)) 
+	{
+		Mime = (wc_mime_attachment*) vMime;
+		if ((strcmp(ChrPtr(Mime->ContentType),
+			   "text/x-vcard") == 0) ||
+		    (strcmp(ChrPtr(Mime->ContentType),
+			    "text/vcard") == 0))
+		{
+			VCMime = Mime;
+			break;
+		}
+	}
+	DeleteHashPos(&it);
+	if (VCMime == NULL)
+		return NULL;
+
+	MimeLoadData(VCMime);
+	return VCMime;
+}
+
+/*
+ * fetch the display name off a vCard
+ */
+void fetch_ab_name(message_summary *Msg, char **namebuf) {
+	long len;
+	int i;
+	wc_mime_attachment *VCMime = NULL;
+
+	if (namebuf == NULL) return;
+
+	VCMime = load_vcard(Msg);
+	if (VCMime == NULL)
+		return;
+
+	/* Grab the name off the card */
+	display_vcard(WC->WBuf, VCMime, 0, 0, namebuf, Msg->msgnum);
+
+	if (*namebuf != NULL) {
+		lastfirst_firstlast(*namebuf);
+		striplt(*namebuf);
+		len = strlen(*namebuf);
+		for (i=0; i<len; ++i) {
+			if ((*namebuf)[i] != ';') return;
+		}
+		free (*namebuf);
+		(*namebuf) = strdup(_("(no name)"));
+	}
+	else {
+		(*namebuf) = strdup(_("(no name)"));
+	}
+}
+
+
+
+/*
+ * Turn a vCard "n" (name) field into something displayable.
+ */
+void vcard_n_prettyize(char *name)
+{
+	char *original_name;
+	int i, j, len;
+
+	original_name = strdup(name);
+	len = strlen(original_name);
+	for (i=0; i<5; ++i) {
+		if (len > 0) {
+			if (original_name[len-1] == ' ') {
+				original_name[--len] = 0;
+			}
+			if (original_name[len-1] == ';') {
+				original_name[--len] = 0;
+			}
+		}
+	}
+	strcpy(name, "");
+	j=0;
+	for (i=0; i<len; ++i) {
+		if (original_name[i] == ';') {
+			name[j++] = ',';
+			name[j++] = ' ';			
+		}
+		else {
+			name[j++] = original_name[i];
+		}
+	}
+	name[j] = '\0';
+	free(original_name);
+}
+
+
+
+
+/*
+ * preparse a vcard name
+ * display_vcard() calls this after parsing the textual vCard into
+ * our 'struct vCard' data object.
+ * This gets called instead of display_parsed_vcard() if we are only looking
+ * to extract the person's name instead of displaying the card.
+ */
+void fetchname_parsed_vcard(struct vCard *v, char **storename) {
+	char *name;
+	char *prop;
+	char buf[SIZ];
+	int j, n, len;
+	int is_qp = 0;
+	int is_b64 = 0;
+
+	*storename = NULL;
+
+	name = vcard_get_prop(v, "n", 1, 0, 0);
+	if (name != NULL) {
+		len = strlen(name);
+		prop = vcard_get_prop(v, "n", 1, 0, 1);
+		n = num_tokens(prop, ';');
+
+		for (j=0; j<n; ++j) {
+			extract_token(buf, prop, j, ';', sizeof buf);
+			if (!strcasecmp(buf, "encoding=quoted-printable")) {
+				is_qp = 1;
+			}
+			if (!strcasecmp(buf, "encoding=base64")) {
+				is_b64 = 1;
+			}
+		}
+		if (is_qp) {
+			// %ff can become 6 bytes in utf8 
+			*storename = malloc(len * 2 + 3); 
+			j = CtdlDecodeQuotedPrintable(
+				*storename, name,
+				len);
+			(*storename)[j] = 0;
+		}
+		else if (is_b64) {
+			// ff will become one byte..
+			*storename = malloc(len + 50);
+			CtdlDecodeBase64(
+				*storename, name,
+				len);
+		}
+		else {
+			size_t len;
+
+			len = strlen (name);
+			
+			*storename = malloc(len + 3); /* \0 + eventualy missing ', '*/
+			memcpy(*storename, name, len + 1);
+		}
+		/* vcard_n_prettyize(storename); */
+	}
+
+}
+
+
+
 /*
- * $Id$
+ * html print a vcard
+ * display_vcard() calls this after parsing the textual vCard into
+ * our 'struct vCard' data object.
  *
- * Handles editing of vCard objects.
+ * 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.
+ * v		the vCard to display
+ * full		display all items of the vcard?
+ * msgnum	Citadel message pointer
  */
+void display_parsed_vcard(StrBuf *Target, struct vCard *v, int full, wc_mime_attachment *Mime)
+{
+	int i, j;
+	char buf[SIZ];
+	char *name;
+	int is_qp = 0;
+	int is_b64 = 0;
+	char *thisname, *thisvalue;
+	char firsttoken[SIZ];
+	int pass;
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <limits.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
-#include "webcit.h"
-#include "vcard.h"
+	char fullname[SIZ];
+	char title[SIZ];
+	char org[SIZ];
+	char phone[SIZ];
+	char mailto[SIZ];
+
+	strcpy(fullname, "");
+	strcpy(phone, "");
+	strcpy(mailto, "");
+	strcpy(title, "");
+	strcpy(org, "");
+
+	if (!full) {
+		StrBufAppendPrintf(Target, "<TD>");
+		name = vcard_get_prop(v, "fn", 1, 0, 0);
+		if (name != NULL) {
+			StrEscAppend(Target, NULL, name, 0, 0);
+		}
+		else if (name = vcard_get_prop(v, "n", 1, 0, 0), name != NULL) {
+			strcpy(fullname, name);
+			vcard_n_prettyize(fullname);
+			StrEscAppend(Target, NULL, fullname, 0, 0);
+		}
+		else {
+			StrBufAppendPrintf(Target, "&nbsp;");
+		}
+		StrBufAppendPrintf(Target, "</TD>");
+		return;
+	}
+
+	StrBufAppendPrintf(Target, "<div align=center>"
+		"<table bgcolor=#aaaaaa width=50%%>");
+	for (pass=1; pass<=2; ++pass) {
+
+		if (v->numprops) for (i=0; i<(v->numprops); ++i) {
+			int len;
+			thisname = strdup(v->prop[i].name);
+			extract_token(firsttoken, thisname, 0, ';', sizeof firsttoken);
+	
+			for (j=0; j<num_tokens(thisname, ';'); ++j) {
+				extract_token(buf, thisname, j, ';', sizeof buf);
+				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, ';');
+				}
+			}
+			
+			len = strlen(v->prop[i].value);
+			/* if we have some untagged QP, detect it here. */
+			if (!is_qp && (strstr(v->prop[i].value, "=?")!=NULL))
+				utf8ify_rfc822_string(&v->prop[i].value);
+
+			if (is_qp) {
+				// %ff can become 6 bytes in utf8 
+				thisvalue = malloc(len * 2 + 3); 
+				j = CtdlDecodeQuotedPrintable(
+					thisvalue, v->prop[i].value,
+					len);
+				thisvalue[j] = 0;
+			}
+			else if (is_b64) {
+				// ff will become one byte..
+				thisvalue = malloc(len + 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 (IsEmptyStr(fullname)) {
+					strcpy(fullname, thisvalue);
+					vcard_n_prettyize(fullname);
+				}
+			}
+	
+			/* FN (full name) is a true 'display name' field */
+			else if (!strcasecmp(firsttoken, "fn")) {
+				strcpy(fullname, thisvalue);
+			}
+
+			/* title */
+			else if (!strcasecmp(firsttoken, "title")) {
+				strcpy(title, thisvalue);
+			}
+	
+			/* organization */
+			else if (!strcasecmp(firsttoken, "org")) {
+				strcpy(org, thisvalue);
+			}
+	
+			else if (!strcasecmp(firsttoken, "email")) {
+				size_t len;
+				if (!IsEmptyStr(mailto)) strcat(mailto, "<br />");
+				strcat(mailto,
+					"<a href=\"display_enter"
+					"?force_room=_MAIL_?recp=");
+
+				len = strlen(mailto);
+				urlesc(&mailto[len], SIZ - len, "\"");
+				len = strlen(mailto);
+				urlesc(&mailto[len], SIZ - len,  fullname);
+				len = strlen(mailto);
+				urlesc(&mailto[len], SIZ - len, "\" <");
+				len = strlen(mailto);
+				urlesc(&mailto[len], SIZ - len, thisvalue);
+				len = strlen(mailto);
+				urlesc(&mailto[len], SIZ - len, ">");
 
+				strcat(mailto, "\">");
+				len = strlen(mailto);
+				stresc(mailto+len, SIZ - len, thisvalue, 1, 1);
+				strcat(mailto, "</A>");
+			}
+			else if (!strcasecmp(firsttoken, "tel")) {
+				if (!IsEmptyStr(phone)) strcat(phone, "<br />");
+				strcat(phone, thisvalue);
+				for (j=0; j<num_tokens(thisname, ';'); ++j) {
+					extract_token(buf, thisname, j, ';', sizeof buf);
+					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) {
+					StrBufAppendPrintf(Target, "<TR><TD>");
+					StrBufAppendPrintf(Target, _("Address:"));
+					StrBufAppendPrintf(Target, "</TD><TD>");
+					for (j=0; j<num_tokens(thisvalue, ';'); ++j) {
+						extract_token(buf, thisvalue, j, ';', sizeof buf);
+						if (!IsEmptyStr(buf)) {
+							StrEscAppend(Target, NULL, buf, 0, 0);
+							if (j<3) StrBufAppendPrintf(Target, "<br />");
+							else StrBufAppendPrintf(Target, " ");
+						}
+					}
+					StrBufAppendPrintf(Target, "</TD></TR>\n");
+				}
+			}
+			/* else if (!strcasecmp(firsttoken, "photo") && full && pass == 2) { 
+				// Only output on second pass
+				StrBufAppendPrintf(Target, "<tr><td>");
+				StrBufAppendPrintf(Target, _("Photo:"));
+				StrBufAppendPrintf(Target, "</td><td>");
+				StrBufAppendPrintf(Target, "<img src=\"/vcardphoto/%ld/\" alt=\"Contact photo\"/>",msgnum);
+				StrBufAppendPrintf(Target, "</td></tr>\n");
+			} */
+			else if (!strcasecmp(firsttoken, "version")) {
+				/* ignore */
+			}
+			else if (!strcasecmp(firsttoken, "rev")) {
+				/* ignore */
+			}
+			else if (!strcasecmp(firsttoken, "label")) {
+				/* ignore */
+			}
+			else {
 
-/* Edit the vCard component of a MIME message.  Supply the message number
+				/*** Don't show extra fields.  They're ugly.
+				if (pass == 2) {
+					StrBufAppendPrintf(Target, "<TR><TD>");
+					StrEscAppend(Target, NULL, thisname, 0, 0);
+					StrBufAppendPrintf(Target, "</TD><TD>");
+					StrEscAppend(Target, NULL, thisvalue, 0, 0);
+					StrBufAppendPrintf(Target, "</TD></TR>\n");
+				}
+				***/
+			}
+	
+			free(thisname);
+			free(thisvalue);
+		}
+	
+		if (pass == 1) {
+			StrBufAppendPrintf(Target, "<TR BGCOLOR=\"#AAAAAA\">"
+			"<TD COLSPAN=2 BGCOLOR=\"#FFFFFF\">"
+			"<IMG ALIGN=CENTER src=\"static/viewcontacts_48x.gif\">"
+			"<FONT SIZE=+1><B>");
+			StrEscAppend(Target, NULL, fullname, 0, 0);
+			StrBufAppendPrintf(Target, "</B></FONT>");
+			if (!IsEmptyStr(title)) {
+				StrBufAppendPrintf(Target, "<div align=right>");
+				StrEscAppend(Target, NULL, title, 0, 0);
+				StrBufAppendPrintf(Target, "</div>");
+			}
+			if (!IsEmptyStr(org)) {
+				StrBufAppendPrintf(Target, "<div align=right>");
+				StrEscAppend(Target, NULL, org, 0, 0);
+				StrBufAppendPrintf(Target, "</div>");
+			}
+			StrBufAppendPrintf(Target, "</TD></TR>\n");
+		
+			if (!IsEmptyStr(phone)) {
+				StrBufAppendPrintf(Target, "<tr><td>");
+				StrBufAppendPrintf(Target, _("Telephone:"));
+				StrBufAppendPrintf(Target, "</td><td>%s</td></tr>\n", phone);
+			}
+			if (!IsEmptyStr(mailto)) {
+				StrBufAppendPrintf(Target, "<tr><td>");
+				StrBufAppendPrintf(Target, _("E-mail:"));
+				StrBufAppendPrintf(Target, "</td><td>%s</td></tr>\n", mailto);
+			}
+		}
+
+	}
+
+	StrBufAppendPrintf(Target, "</table></div>\n");
+}
+
+
+
+/*
+ * Display a textual vCard
+ * (Converts to a vCard object and then calls the actual display function)
+ * Set 'full' to nonzero to display the whole card instead of a one-liner.
+ * Or, if "storename" is non-NULL, just store the person's name in that
+ * buffer instead of displaying the card at all.
+ *
+ * vcard_source	the buffer containing the vcard text
+ * alpha	Display only if name begins with this letter of the alphabet
+ * full		Display the full vCard (otherwise just the display name)
+ * storename	If not NULL, also store the display name here
+ * msgnum	Citadel message pointer
+ */
+void display_vcard(StrBuf *Target, 
+		   wc_mime_attachment *Mime, 
+		   char alpha, 
+		   int full, 
+		   char **storename, 
+		   long msgnum) 
+{
+	struct vCard *v;
+	char *name;
+	StrBuf *Buf;
+	StrBuf *Buf2;
+	char this_alpha = 0;
+
+	v = VCardLoad(Mime->Data);
+
+	if (v == NULL) return;
+
+	name = vcard_get_prop(v, "n", 1, 0, 0);
+	if (name != NULL) {
+		Buf = NewStrBufPlain(name, -1);
+		Buf2 = NewStrBufPlain(NULL, StrLength(Buf));
+		StrBuf_RFC822_to_Utf8(Buf2, Buf, WC->DefaultCharset, NULL);
+		this_alpha = ChrPtr(Buf)[0];
+		FreeStrBuf(&Buf);
+		FreeStrBuf(&Buf2);
+	}
+
+	if (storename != NULL) {
+		fetchname_parsed_vcard(v, storename);
+	}
+	else if ((alpha == 0) || 
+		 ((isalpha(alpha)) && (tolower(alpha) == tolower(this_alpha))) || 
+		 ((!isalpha(alpha)) && (!isalpha(this_alpha)))
+		) 
+	{
+		display_parsed_vcard(Target, v, full, Mime);
+	}
+
+	vcard_free(v);
+}
+
+
+
+/*
+ * Render the address book using info we gathered during the scan
+ *
+ * addrbook	the addressbook to render
+ * num_ab	the number of the addressbook
+ */
+void do_addrbook_view(addrbookent *addrbook, int num_ab) {
+	int i = 0;
+	int displayed = 0;
+	int bg = 0;
+	static int NAMESPERPAGE = 60;
+	int num_pages = 0;
+	int tabfirst = 0;
+	char tabfirst_label[64];
+	int tablast = 0;
+	char tablast_label[64];
+	char this_tablabel[64];
+	int page = 0;
+	char **tablabels;
+
+	if (num_ab == 0) {
+		wc_printf("<br /><br /><br /><div align=\"center\"><i>");
+		wc_printf(_("This address book is empty."));
+		wc_printf("</i></div>\n");
+		return;
+	}
+
+	if (num_ab > 1) {
+		qsort(addrbook, num_ab, sizeof(addrbookent), abcmp);
+	}
+
+	num_pages = (num_ab / NAMESPERPAGE) + 1;
+
+	tablabels = malloc(num_pages * sizeof (char *));
+	if (tablabels == NULL) {
+		wc_printf("<br /><br /><br /><div align=\"center\"><i>");
+		wc_printf(_("An internal error has occurred."));
+		wc_printf("</i></div>\n");
+		return;
+	}
+
+	for (i=0; i<num_pages; ++i) {
+		tabfirst = i * NAMESPERPAGE;
+		tablast = tabfirst + NAMESPERPAGE - 1;
+		if (tablast > (num_ab - 1)) tablast = (num_ab - 1);
+		nametab(tabfirst_label, 64, addrbook[tabfirst].ab_name);
+		nametab(tablast_label, 64, addrbook[tablast].ab_name);
+		sprintf(this_tablabel, "%s&nbsp;-&nbsp;%s", tabfirst_label, tablast_label);
+		tablabels[i] = strdup(this_tablabel);
+	}
+
+	tabbed_dialog(num_pages, tablabels);
+	page = (-1);
+
+	for (i=0; i<num_ab; ++i) {
+
+		if ((i / NAMESPERPAGE) != page) {	/* New tab */
+			page = (i / NAMESPERPAGE);
+			if (page > 0) {
+				wc_printf("</tr></table>\n");
+				end_tab(page-1, num_pages);
+			}
+			begin_tab(page, num_pages);
+			wc_printf("<table border=0 cellspacing=0 cellpadding=3 width=100%%>\n");
+			displayed = 0;
+		}
+
+		if ((displayed % 4) == 0) {
+			if (displayed > 0) {
+				wc_printf("</tr>\n");
+			}
+			bg = 1 - bg;
+			wc_printf("<tr bgcolor=\"#%s\">",
+				(bg ? "DDDDDD" : "FFFFFF")
+			);
+		}
+	
+		wc_printf("<td>");
+
+		wc_printf("<a href=\"readfwd?startmsg=%ld?is_singlecard=1",
+			addrbook[i].ab_msgnum);
+		wc_printf("?maxmsgs=1?is_summary=0?alpha=%s\">", bstr("alpha"));
+		vcard_n_prettyize(addrbook[i].ab_name);
+		escputs(addrbook[i].ab_name);
+		wc_printf("</a></td>\n");
+		++displayed;
+	}
+
+	/* Placeholders for empty columns at end */
+	if ((num_ab % 4) != 0) {
+		for (i=0; i<(4-(num_ab % 4)); ++i) {
+			wc_printf("<td>&nbsp;</td>");
+		}
+	}
+
+	wc_printf("</tr></table>\n");
+	end_tab((num_pages-1), num_pages);
+
+	begin_tab(num_pages, num_pages);
+	/* FIXME there ought to be something here */
+	end_tab(num_pages, num_pages);
+
+	for (i=0; i<num_pages; ++i) {
+		free(tablabels[i]);
+	}
+	free(tablabels);
+}
+
+
+
+
+/*
+ * Edit the vCard component of a MIME message.  
+ * Supply the message number
  * and MIME part number to fetch.  Or, specify -1 for the message number
  * to start with a blank card.
  */
-void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
-	char buf[SIZ];
-	char *serialized_vcard = NULL;
-	size_t total_len = 0;
+void do_edit_vcard(long msgnum, char *partnum, 
+		   message_summary *VCMsg,
+		   wc_mime_attachment *VCAtt,
+		   const char *return_to, 
+		   const char *force_room) {
+	message_summary *Msg = NULL;
+	wc_mime_attachment *VCMime = NULL;
 	struct vCard *v;
 	int i;
 	char *key, *value;
-	char whatuser[SIZ];
+	char whatuser[256];
 
-	char lastname[SIZ];
-	char firstname[SIZ];
-	char middlename[SIZ];
-	char prefix[SIZ];
-	char suffix[SIZ];
-	char pobox[SIZ];
-	char extadr[SIZ];
-	char street[SIZ];
-	char city[SIZ];
-	char state[SIZ];
-	char zipcode[SIZ];
-	char country[SIZ];
-	char hometel[SIZ];
-	char worktel[SIZ];
-	char primary_inetemail[SIZ];
+	char lastname[256];
+	char firstname[256];
+	char middlename[256];
+	char prefix[256];
+	char suffix[256];
+	char pobox[256];
+	char extadr[256];
+	char street[256];
+	char city[256];
+	char state[256];
+	char zipcode[256];
+	char country[256];
+	char hometel[256];
+	char worktel[256];
+	char faxtel[256];
+	char mobiletel[256];
+	char primary_inetemail[256];
 	char other_inetemail[SIZ];
 	char extrafields[SIZ];
-	char title[SIZ];
-	char org[SIZ];
+	char fullname[256];
+	char title[256];
+	char org[256];
 
 	lastname[0] = 0;
 	firstname[0] = 0;
@@ -75,58 +704,52 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
 	country[0] = 0;
 	hometel[0] = 0;
 	worktel[0] = 0;
+	faxtel[0] = 0;
+	mobiletel[0] = 0;
 	primary_inetemail[0] = 0;
 	other_inetemail[0] = 0;
 	title[0] = 0;
 	org[0] = 0;
 	extrafields[0] = 0;
+	fullname[0] = 0;
 
 	safestrncpy(whatuser, "", sizeof whatuser);
 
-	if (msgnum >= 0) {
-		sprintf(buf, "MSG0 %ld|1", msgnum);
-		serv_puts(buf);
-		serv_getln(buf, sizeof buf);
-		if (buf[0] != '1') {
-			convenience_page("770000", "Error", &buf[4]);
-			return;
-		}
-		while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-			if (!strncasecmp(buf, "from=", 5)) {
-				safestrncpy(whatuser, &buf[5], sizeof whatuser);
-			}
-			else if (!strncasecmp(buf, "node=", 5)) {
-				strcat(whatuser, " @ ");
-				strcat(whatuser, &buf[5]);
+	if ((msgnum >= 0) || 
+	    ((VCMsg != NULL) && (VCAtt != NULL)))
+	{
+		if ((VCMsg == NULL) && (VCAtt == NULL)) {
+
+			Msg = (message_summary *) malloc(sizeof(message_summary));
+			memset(Msg, 0, sizeof(message_summary));
+			Msg->msgnum = msgnum;
+			VCMime = load_vcard(Msg);
+			if (VCMime == NULL) {
+				convenience_page("770000", _("Error"), "");///TODO: important message
+				DestroyMessageSummary(Msg);
+				return;
 			}
+		
+			v = VCardLoad(VCMime->Data);
 		}
-	
-		sprintf(buf, "OPNA %ld|%s", msgnum, partnum);
-		serv_puts(buf);
-		serv_getln(buf, sizeof buf);
-		if (buf[0] != '2') {
-			convenience_page("770000", "Error", &buf[4]);
-			return;
+		else {
+			v = VCardLoad(VCAtt->Data);
 		}
 	
-		total_len = atoi(&buf[4]);
-		serialized_vcard = malloc(total_len + 2);
-	
-		read_server_binary(serialized_vcard, total_len);
-	
-		serv_puts("CLOS");
-		serv_getln(buf, sizeof buf);
-		serialized_vcard[total_len] = 0;
-	
-		v = vcard_load(serialized_vcard);
-		free(serialized_vcard);
-	
 		/* Populate the variables for our form */
 		i = 0;
 		while (key = vcard_get_prop(v, "", 0, i, 1), key != NULL) {
+			char prp[256];	/* property name */
+			char prm[256];	/* parameters */
+
 			value = vcard_get_prop(v, "", 0, i++, 0);
-	
-			if (!strcasecmp(key, "n")) {
+
+
+			extract_token(prp, key, 0, ';', sizeof prp);
+			safestrncpy(prm, key, sizeof prm);
+			remove_token(prm, 0, ';');
+
+			if (!strcasecmp(prp, "n")) {
 				extract_token(lastname, value, 0, ';', sizeof lastname);
 				extract_token(firstname, value, 1, ';', sizeof firstname);
 				extract_token(middlename, value, 2, ';', sizeof middlename);
@@ -134,15 +757,19 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
 				extract_token(suffix, value, 4, ';', sizeof suffix);
 			}
 
-			else if (!strcasecmp(key, "title")) {
+			else if (!strcasecmp(prp, "fn")) {
+				safestrncpy(fullname, value, sizeof fullname);
+			}
+
+			else if (!strcasecmp(prp, "title")) {
 				safestrncpy(title, value, sizeof title);
 			}
 	
-			else if (!strcasecmp(key, "org")) {
+			else if (!strcasecmp(prp, "org")) {
 				safestrncpy(org, value, sizeof org);
 			}
 	
-			else if (!strcasecmp(key, "adr")) {
+			else if (!strcasecmp(prp, "adr")) {
 				extract_token(pobox, value, 0, ';', sizeof pobox);
 				extract_token(extadr, value, 1, ';', sizeof extadr);
 				extract_token(street, value, 2, ';', sizeof street);
@@ -151,16 +778,27 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
 				extract_token(zipcode, value, 5, ';', sizeof zipcode);
 				extract_token(country, value, 6, ';', sizeof country);
 			}
-	
-			else if (!strcasecmp(key, "tel;home")) {
-				extract_token(hometel, value, 0, ';', sizeof hometel);
-			}
-	
-			else if (!strcasecmp(key, "tel;work")) {
-				extract_token(worktel, value, 0, ';', sizeof worktel);
+
+			else if (!strcasecmp(prp, "tel")) {
+
+				if (bmstrcasestr(prm, "home")) {
+					extract_token(hometel, value, 0, ';', sizeof hometel);
+				}
+				else if (bmstrcasestr(prm, "work")) {
+					extract_token(worktel, value, 0, ';', sizeof worktel);
+				}
+				else if (bmstrcasestr(prm, "fax")) {
+					extract_token(faxtel, value, 0, ';', sizeof faxtel);
+				}
+				else if (bmstrcasestr(prm, "cell")) {
+					extract_token(mobiletel, value, 0, ';', sizeof mobiletel);
+				}
+				else {	/* Missing or unknown type; put it in the home phone */
+					extract_token(hometel, value, 0, ';', sizeof hometel);
+				}
 			}
 	
-			else if (!strcasecmp(key, "email;internet")) {
+			else if ( (!strcasecmp(prp, "email")) && (bmstrcasestr(prm, "internet")) ) {
 				if (primary_inetemail[0] == 0) {
 					safestrncpy(primary_inetemail, value, sizeof primary_inetemail);
 				}
@@ -171,7 +809,10 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
 					strcat(other_inetemail, value);
 				}
 			}
-	
+
+			/* Unrecognized properties are preserved here so we don't discard them
+			 * just because the vCard was edited with WebCit.
+			 */
 			else {
 				strcat(extrafields, key);
 				strcat(extrafields, ":");
@@ -185,161 +826,251 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
 	}
 
 	/* Display the form */
-	output_headers(1, 1, 2, 0, 0, 0, 0);
-	wprintf("<div id=\"banner\">\n"
-		"<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
-		"<SPAN CLASS=\"titlebar\">"
-		"<img src=\"/static/vcard.gif\">"
-		"Edit contact information"
-		"</SPAN>"
-		"</TD></TR></TABLE>\n"
-		"</div>\n<div id=\"content\">\n"
-	);
+	output_headers(1, 1, 1, 0, 0, 0);
 
-	wprintf("<FORM METHOD=\"POST\" ACTION=\"/submit_vcard\">\n");
-	wprintf("<div id=\"fix_scrollbar_bug\">"
-		"<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
-
-	wprintf("<TABLE border=0><TR>"
-		"<TD>Prefix</TD>"
-		"<TD>First</TD>"
-		"<TD>Middle</TD>"
-		"<TD>Last</TD>"
-		"<TD>Suffix</TD></TR>\n");
-	wprintf("<TR><TD><INPUT TYPE=\"text\" NAME=\"prefix\" "
-		"VALUE=\"%s\" MAXLENGTH=\"5\" SIZE=\"5\"></TD>",
+	do_template("beginbox_1", NULL);
+	StrBufAppendBufPlain(WC->WBuf, _("Edit contact information"), -1, 0);
+	do_template("beginbox_2", NULL);
+
+	wc_printf("<form method=\"POST\" action=\"submit_vcard\">\n");
+	wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+
+	if (force_room != NULL) {
+		wc_printf("<input type=\"hidden\" name=\"force_room\" value=\"");
+		escputs(force_room);
+		wc_printf("\">\n");
+	}
+
+	wc_printf("<div class=\"fix_scrollbar_bug\">"
+		"<table class=\"vcard_edit_background\"><tr><td>\n");
+
+	wc_printf("<table border=0><tr>"
+		"<td>%s</td>"
+		"<td>%s</td>"
+		"<td>%s</td>"
+		"<td>%s</td>"
+		"<td>%s</td></tr>\n",
+		_("Prefix"), _("First Name"), _("Middle Name"), _("Last Name"), _("Suffix")
+	);
+	wc_printf("<tr><td><input type=\"text\" name=\"prefix\" "
+		"value=\"%s\" maxlength=\"5\" size=\"5\"></td>",
 		prefix);
-	wprintf("<TD><INPUT TYPE=\"text\" NAME=\"firstname\" "
-		"VALUE=\"%s\" MAXLENGTH=\"29\"></TD>",
+	wc_printf("<td><input type=\"text\" name=\"firstname\" "
+		"value=\"%s\" maxlength=\"29\"></td>",
 		firstname);
-	wprintf("<TD><INPUT TYPE=\"text\" NAME=\"middlename\" "
-		"VALUE=\"%s\" MAXLENGTH=\"29\"></TD>",
+	wc_printf("<td><input type=\"text\" name=\"middlename\" "
+		"value=\"%s\" maxlength=\"29\"></td>",
 		middlename);
-	wprintf("<TD><INPUT TYPE=\"text\" NAME=\"lastname\" "
-		"VALUE=\"%s\" MAXLENGTH=\"29\"></TD>",
+	wc_printf("<td><input type=\"text\" name=\"lastname\" "
+		"value=\"%s\" maxlength=\"29\"></td>",
 		lastname);
-	wprintf("<TD><INPUT TYPE=\"text\" NAME=\"suffix\" "
-		"VALUE=\"%s\" MAXLENGTH=\"10\" SIZE=\"10\"></TD></TR></TABLE>\n",
+	wc_printf("<td><input type=\"text\" name=\"suffix\" "
+		"value=\"%s\" maxlength=\"10\" size=\"10\"></td></tr></table>\n",
 		suffix);
 
-	wprintf("<table border=0 width=100%% bgcolor=\"#dddddd\">");
-	wprintf("<tr><td>");
+	wc_printf("<table  class=\"vcard_edit_background_alt\">");
+	wc_printf("<tr><td>");
+
+	wc_printf(_("Display name:"));
+	wc_printf("<br>"
+		"<input type=\"text\" name=\"fullname\" "
+		"value=\"%s\" maxlength=\"40\"><br><br>\n",
+		fullname
+	);
 
-	wprintf("Title:<br>"
-		"<INPUT TYPE=\"text\" NAME=\"title\" "
-		"VALUE=\"%s\" MAXLENGTH=\"40\"><br><br>\n",
+	wc_printf(_("Title:"));
+	wc_printf("<br>"
+		"<input type=\"text\" name=\"title\" "
+		"value=\"%s\" maxlength=\"40\"><br><br>\n",
 		title
 	);
 
-	wprintf("Organization:<br>"
-		"<INPUT TYPE=\"text\" NAME=\"org\" "
-		"VALUE=\"%s\" MAXLENGTH=\"40\"><br><br>\n",
+	wc_printf(_("Organization:"));
+	wc_printf("<br>"
+		"<input type=\"text\" name=\"org\" "
+		"value=\"%s\" maxlength=\"40\"><br><br>\n",
 		org
 	);
 
-	wprintf("</td><td>");
+	wc_printf("</td><td>");
 
-	wprintf("<table border=0>");
-	wprintf("<tr><td>PO box:</td><td>"
-		"<INPUT TYPE=\"text\" NAME=\"pobox\" "
-		"VALUE=\"%s\" MAXLENGTH=\"29\"></td></tr>\n",
+	wc_printf("<table border=0>");
+	wc_printf("<tr><td>");
+	wc_printf(_("PO box:"));
+	wc_printf("</td><td>"
+		"<input type=\"text\" name=\"pobox\" "
+		"value=\"%s\" maxlength=\"29\"></td></tr>\n",
 		pobox);
-	wprintf("<tr><td>Address:</td><td>"
-		"<INPUT TYPE=\"text\" NAME=\"extadr\" "
-		"VALUE=\"%s\" MAXLENGTH=\"29\"></td></tr>\n",
+	wc_printf("<tr><td>");
+	wc_printf(_("Address:"));
+	wc_printf("</td><td>"
+		"<input type=\"text\" name=\"extadr\" "
+		"value=\"%s\" maxlength=\"29\"></td></tr>\n",
 		extadr);
-	wprintf("<tr><td> </td><td>"
-		"<INPUT TYPE=\"text\" NAME=\"street\" "
-		"VALUE=\"%s\" MAXLENGTH=\"29\"></td></tr>\n",
+	wc_printf("<tr><td> </td><td>"
+		"<input type=\"text\" name=\"street\" "
+		"value=\"%s\" maxlength=\"29\"></td></tr>\n",
 		street);
-	wprintf("<tr><td>City:</td><td>"
-		"<INPUT TYPE=\"text\" NAME=\"city\" "
-		"VALUE=\"%s\" MAXLENGTH=\"29\"></td></tr>\n",
+	wc_printf("<tr><td>");
+	wc_printf(_("City:"));
+	wc_printf("</td><td>"
+		"<input type=\"text\" name=\"city\" "
+		"value=\"%s\" maxlength=\"29\"></td></tr>\n",
 		city);
-	wprintf("<tr><td>State:</td><td>"
-		"<INPUT TYPE=\"text\" NAME=\"state\" "
-		"VALUE=\"%s\" MAXLENGTH=\"2\"></td></tr>\n",
+	wc_printf("<tr><td>");
+	wc_printf(_("State:"));
+	wc_printf("</td><td>"
+		"<input type=\"text\" name=\"state\" "
+		"value=\"%s\" maxlength=\"29\"></td></tr>\n",
 		state);
-	wprintf("<tr><td>ZIP code:</td><td>"
-		"<INPUT TYPE=\"text\" NAME=\"zipcode\" "
-		"VALUE=\"%s\" MAXLENGTH=\"10\"></td></tr>\n",
+	wc_printf("<tr><td>");
+	wc_printf(_("ZIP code:"));
+	wc_printf("</td><td>"
+		"<input type=\"text\" name=\"zipcode\" "
+		"value=\"%s\" maxlength=\"10\"></td></tr>\n",
 		zipcode);
-	wprintf("<tr><td>Country:</td><td>"
-		"<INPUT TYPE=\"text\" NAME=\"country\" "
-		"VALUE=\"%s\" MAXLENGTH=\"29\" WIDTH=\"5\"></td></tr>\n",
+	wc_printf("<tr><td>");
+	wc_printf(_("Country:"));
+	wc_printf("</td><td>"
+		"<input type=\"text\" name=\"country\" "
+		"value=\"%s\" maxlength=\"29\" width=\"5\"></td></tr>\n",
 		country);
-	wprintf("</table>\n");
+	wc_printf("</table>\n");
 
-	wprintf("</table>\n");
+	wc_printf("</table>\n");
 
-	wprintf("<TABLE BORDER=0><TR><TD>Home telephone:</TD>"
-		"<TD><INPUT TYPE=\"text\" NAME=\"hometel\" "
-		"VALUE=\"%s\" MAXLENGTH=\"29\"></TD>\n",
+	wc_printf("<table border=0><tr><td>");
+	wc_printf(_("Home telephone:"));
+	wc_printf("</td>"
+		"<td><input type=\"text\" name=\"hometel\" "
+		"value=\"%s\" maxlength=\"29\"></td>\n",
 		hometel);
-	wprintf("<TD>Work telephone:</TD>"
-		"<TD><INPUT TYPE=\"text\" NAME=\"worktel\" "
-		"VALUE=\"%s\" MAXLENGTH=\"29\"></TD></TR></TABLE>\n",
+	wc_printf("<td>");
+	wc_printf(_("Work telephone:"));
+	wc_printf("</td>"
+		"<td><input type=\"text\" name=\"worktel\" "
+		"value=\"%s\" maxlength=\"29\"></td></tr>\n",
 		worktel);
+	wc_printf("<tr><td>");
+	wc_printf(_("Mobile telephone:"));
+	wc_printf("</td>"
+		"<td><input type=\"text\" name=\"mobiletel\" "
+		"value=\"%s\" maxlength=\"29\"></td>\n",
+		mobiletel);
+	wc_printf("<td>");
+	wc_printf(_("Fax number:"));
+	wc_printf("</td>"
+		"<td><input type=\"text\" name=\"faxtel\" "
+		"value=\"%s\" maxlength=\"29\"></td></tr></table>\n",
+		faxtel);
 
-	wprintf("<table border=0 width=100%% bgcolor=\"#dddddd\">");
-	wprintf("<tr><td>");
+	wc_printf("<table class=\"vcard_edit_background_alt\">");
+	wc_printf("<tr><td>");
 
-	wprintf("<TABLE border=0><TR>"
-		"<TD VALIGN=TOP>Primary Internet e-mail address<br />"
-		"<INPUT TYPE=\"text\" NAME=\"primary_inetemail\" "
-		"SIZE=40 MAXLENGTH=40 VALUE=\"");
+	wc_printf("<table border=0><TR>"
+		"<td valign=top>");
+	wc_printf(_("Primary Internet e-mail address"));
+	wc_printf("<br />"
+		"<input type=\"text\" name=\"primary_inetemail\" "
+		"size=40 maxlength=60 value=\"");
 	escputs(primary_inetemail);
-	wprintf("\"><br />"
-		"</TD><TD VALIGN=TOP>"
-		"Internet e-mail aliases<br />"
-		"<TEXTAREA NAME=\"other_inetemail\" ROWS=5 COLS=40 WIDTH=40>");
+	wc_printf("\"><br />"
+		"</td><td valign=top>");
+	wc_printf(_("Internet e-mail aliases"));
+	wc_printf("<br />"
+		"<textarea name=\"other_inetemail\" rows=5 cols=40 width=40>");
 	escputs(other_inetemail);
-	wprintf("</TEXTAREA></TD></TR></TABLE>\n");
+	wc_printf("</textarea></td></tr></table>\n");
 
-	wprintf("</td></tr></table>\n");
+	wc_printf("</td></tr></table>\n");
 
-	wprintf("<INPUT TYPE=\"hidden\" NAME=\"extrafields\" VALUE=\"");
+	wc_printf("<input type=\"hidden\" name=\"extrafields\" value=\"");
 	escputs(extrafields);
-	wprintf("\">\n");
+	wc_printf("\">\n");
 
-	wprintf("<INPUT TYPE=\"hidden\" NAME=\"return_to\" VALUE=\"");
-	urlescputs(return_to);
-	wprintf("\">\n");
+	wc_printf("<input type=\"hidden\" name=\"return_to\" value=\"");
+	escputs(return_to);
+	wc_printf("\">\n");
 
-	wprintf("<CENTER>\n"
-		"<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"OK\">"
+	wc_printf("<div class=\"buttons\">\n"
+		"<input type=\"submit\" name=\"ok_button\" value=\"%s\">"
 		"&nbsp;"
-		"<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">"
-		"</CENTER></FORM>\n"
+		"<input type=\"submit\" name=\"cancel_button\" value=\"%s\">"
+		"</div></form>\n",
+		_("Save changes"),
+		_("Cancel")
 	);
 	
-	wprintf("</td></tr></table></div>\n");
+	wc_printf("</td></tr></table>\n");
+	do_template("endbox", NULL);
 	wDumpContent(1);
+	if (Msg != NULL) {
+		DestroyMessageSummary(Msg);
+	}
 }
 
 
-
+/*
+ *  commit the edits to the citadel server
+ */
 void edit_vcard(void) {
 	long msgnum;
 	char *partnum;
 
-	msgnum = atol(bstr("msgnum"));
+	msgnum = lbstr("msgnum");
 	partnum = bstr("partnum");
-	do_edit_vcard(msgnum, partnum, "");
+	do_edit_vcard(msgnum, partnum, NULL, NULL, "", NULL);
 }
 
 
 
-
+/*
+ *  parse edited vcard from the browser
+ */
 void submit_vcard(void) {
+	wcsession *WCC = WC;
+	struct vCard *v;
+	char *serialized_vcard;
 	char buf[SIZ];
+	StrBuf *Buf;
 	int i;
 
-	if (strcmp(bstr("sc"), "OK")) { 
-		readloop("readnew");
+	if (!havebstr("ok_button")) { 
+		readloop(readnew, eUseDefault);
 		return;
 	}
 
+	if (havebstr("force_room")) {
+		if (gotoroom(sbstr("force_room")) != 200) {
+			StrBufAppendBufPlain(WCC->ImportantMsg,
+					     _("Unable to enter the room to save your message"),
+					     -1, 0);
+			StrBufAppendBufPlain(WCC->ImportantMsg,
+					     HKEY(": "), 0);
+			StrBufAppendBuf(WCC->ImportantMsg, sbstr("force_room"), 0);
+			StrBufAppendBufPlain(WCC->ImportantMsg,
+					     HKEY("; "), 0);
+					       
+			StrBufAppendBufPlain(WCC->ImportantMsg,
+					     _("Aborting."),
+					     -1, 0);
+
+			if (!strcmp(bstr("return_to"), "select_user_to_edit")) {
+				select_user_to_edit(NULL);
+			}
+			else if (!strcmp(bstr("return_to"), "do_welcome")) {
+				do_welcome();
+			}
+			else if (!IsEmptyStr(bstr("return_to"))) {
+				http_redirect(bstr("return_to"));
+			}
+			else {
+				readloop(readnew, eUseDefault);
+			}
+			return;
+		}
+	}
+
 	sprintf(buf, "ENT0 1|||4||");
 	serv_puts(buf);
 	serv_getln(buf, sizeof buf);
@@ -348,18 +1079,35 @@ void submit_vcard(void) {
 		return;
 	}
 
-	serv_puts("Content-type: text/x-vcard");
-	serv_puts("");
-	serv_puts("begin:vcard");
-	serv_printf("n:%s;%s;%s;%s;%s",
+	/* Make a vCard structure out of the data supplied in the form */
+	Buf = NewStrBuf();
+	StrBufPrintf(Buf, "begin:vcard\r\n%s\r\nend:vcard\r\n",
+		     bstr("extrafields")
+	);
+	v = VCardLoad(Buf);	/* Start with the extra fields */
+	FreeStrBuf(&Buf);
+	if (v == NULL) {
+		safestrncpy(WCC->ImportantMessage,
+			_("An error has occurred."),
+			sizeof WCC->ImportantMessage
+		);
+		edit_vcard();
+		return;
+	}
+
+	snprintf(buf, sizeof buf, "%s;%s;%s;%s;%s",
 		bstr("lastname"),
 		bstr("firstname"),
 		bstr("middlename"),
 		bstr("prefix"),
 		bstr("suffix") );
-	serv_printf("title:%s", bstr("title") );
-	serv_printf("org:%s", bstr("org") );
-	serv_printf("adr:%s;%s;%s;%s;%s;%s;%s",
+	vcard_add_prop(v, "n", buf);
+	
+	vcard_add_prop(v, "title", bstr("title"));
+	vcard_add_prop(v, "fn", bstr("fullname"));
+	vcard_add_prop(v, "org", bstr("org"));
+
+	snprintf(buf, sizeof buf, "%s;%s;%s;%s;%s;%s;%s",
 		bstr("pobox"),
 		bstr("extadr"),
 		bstr("street"),
@@ -367,28 +1115,190 @@ void submit_vcard(void) {
 		bstr("state"),
 		bstr("zipcode"),
 		bstr("country") );
-	serv_printf("tel;home:%s", bstr("hometel") );
-	serv_printf("tel;work:%s", bstr("worktel") );
+	vcard_add_prop(v, "adr", buf);
+
+	vcard_add_prop(v, "tel;home", bstr("hometel"));
+	vcard_add_prop(v, "tel;work", bstr("worktel"));
+	vcard_add_prop(v, "tel;fax", bstr("faxtel"));
+	vcard_add_prop(v, "tel;cell", bstr("mobiletel"));
+	vcard_add_prop(v, "email;internet", bstr("primary_inetemail"));
 
-	serv_printf("email;internet:%s\n", bstr("primary_inetemail"));	
 	for (i=0; i<num_tokens(bstr("other_inetemail"), '\n'); ++i) {
 		extract_token(buf, bstr("other_inetemail"), i, '\n', sizeof buf);
-		if (strlen(buf) > 0) {
-			serv_printf("email;internet:%s", buf);
+		if (!IsEmptyStr(buf)) {
+			vcard_add_prop(v, "email;internet", buf);
 		}
 	}
 
-	serv_printf("%s", bstr("extrafields") );
-	serv_puts("end:vcard");
+	serialized_vcard = vcard_serialize(v);
+	vcard_free(v);
+	if (serialized_vcard == NULL) {
+		safestrncpy(WCC->ImportantMessage,
+			_("An error has occurred."),
+			sizeof WCC->ImportantMessage
+		);
+		edit_vcard();
+		return;
+	}
+
+	serv_puts("Content-type: text/x-vcard; charset=UTF-8");
+	serv_puts("");
+	serv_printf("%s\r\n", serialized_vcard);
 	serv_puts("000");
+	free(serialized_vcard);
 
-	if (!strcmp(bstr("return_to"), "/select_user_to_edit")) {
-		select_user_to_edit(NULL, NULL);
+	if (!strcmp(bstr("return_to"), "select_user_to_edit")) {
+		select_user_to_edit(NULL);
 	}
-	else if (!strcmp(bstr("return_to"), "/do_welcome")) {
+	else if (!strcmp(bstr("return_to"), "do_welcome")) {
 		do_welcome();
 	}
+	else if (!IsEmptyStr(bstr("return_to"))) {
+		http_redirect(bstr("return_to"));
+	}
 	else {
-		readloop("readnew");
+		readloop(readnew, eUseDefault);
+	}
+}
+
+
+
+/*
+ * Extract an embedded photo from a vCard for display on the client
+ */
+void display_vcard_photo_img(void)
+{
+	long msgnum = 0L;
+	StrBuf *vcard;
+	struct vCard *v;
+	char *photosrc;
+	const char *contentType;
+	wcsession *WCC = WC;
+
+	msgnum = StrBufExtract_long(WCC->Hdr->HR.ReqLine, 0, '/');
+	
+	vcard = load_mimepart(msgnum,"1");
+	v = VCardLoad(vcard);
+	
+	photosrc = vcard_get_prop(v, "PHOTO", 1,0,0);
+	FlushStrBuf(WCC->WBuf);
+	StrBufAppendBufPlain(WCC->WBuf, photosrc, -1, 0);
+	if (StrBufDecodeBase64(WCC->WBuf) <= 0) {
+		FlushStrBuf(WCC->WBuf);
+		
+		hprintf("HTTP/1.1 500 %s\n","Unable to get photo");
+		output_headers(0, 0, 0, 0, 0, 0);
+		hprintf("Content-Type: text/plain\r\n");
+		begin_burst();
+		wc_printf(_("Could Not decode vcard photo\n"));
+		end_burst();
+		return;
+	}
+	contentType = GuessMimeType(ChrPtr(WCC->WBuf), StrLength(WCC->WBuf));
+	http_transmit_thing(contentType, 0);
+	free(v);
+	free(photosrc);
+}
+
+typedef struct _vcardview_struct {
+	long is_singlecard;
+	addrbookent *addrbook;
+	long num_ab;
+
+} vcardview_struct;
+
+int vcard_GetParamsGetServerCall(SharedMessageStatus *Stat, 
+				 void **ViewSpecific, 
+				 long oper, 
+				 char *cmd, 
+				 long len)
+{
+	vcardview_struct *VS;
+
+	VS = (vcardview_struct*) malloc (sizeof(vcardview_struct));
+	memset(VS, 0, sizeof(vcardview_struct));
+	*ViewSpecific = (void*)VS;
+
+	VS->is_singlecard = ibstr("is_singlecard");
+	if (VS->is_singlecard != 1) {
+		if (oper == do_search) {
+			snprintf(cmd, len, "MSGS SEARCH|%s", bstr("query"));
+		}
+		else {
+			strcpy(cmd, "MSGS ALL");
+		}
+		Stat->maxmsgs = 9999999;
 	}
+	return 200;
+}
+
+int vcard_LoadMsgFromServer(SharedMessageStatus *Stat, 
+			    void **ViewSpecific, 
+			    message_summary* Msg, 
+			    int is_new, 
+			    int i)
+{
+	vcardview_struct *VS;
+	char *ab_name;
+
+	VS = (vcardview_struct*) *ViewSpecific;
+
+	ab_name = NULL;
+	fetch_ab_name(Msg, &ab_name);
+	if (ab_name == NULL) 
+		return 0;
+	++VS->num_ab;
+	VS->addrbook = realloc(VS->addrbook,
+			       (sizeof(addrbookent) * VS->num_ab) );
+	safestrncpy(VS->addrbook[VS->num_ab-1].ab_name, ab_name,
+		    sizeof(VS->addrbook[VS->num_ab-1].ab_name));
+	VS->addrbook[VS->num_ab-1].ab_msgnum = Msg->msgnum;
+	free(ab_name);
+	return 0;
 }
+
+
+int vcard_RenderView_or_Tail(SharedMessageStatus *Stat, void **ViewSpecific, long oper)
+{
+	const StrBuf *Mime;
+	vcardview_struct *VS;
+
+	VS = (vcardview_struct*) *ViewSpecific;
+	if (VS->is_singlecard)
+		read_message(WC->WBuf, HKEY("view_message"), lbstr("startmsg"), NULL, &Mime);
+	else
+		do_addrbook_view(VS->addrbook, VS->num_ab);	/* Render the address book */
+	return 0;
+}
+
+int vcard_Cleanup(void **ViewSpecific)
+{
+	vcardview_struct *VS;
+
+	VS = (vcardview_struct*) *ViewSpecific;
+	wDumpContent(1);
+	if ((VS != NULL) && 
+	    (VS->addrbook != NULL))
+		free(VS->addrbook);
+	if (VS != NULL) 
+		free(VS);
+	return 0;
+}
+
+void 
+InitModule_VCARD
+(void)
+{
+	RegisterReadLoopHandlerset(
+		VIEW_ADDRESSBOOK,
+		vcard_GetParamsGetServerCall,
+		NULL,
+		NULL, 
+		vcard_LoadMsgFromServer,
+		vcard_RenderView_or_Tail,
+		vcard_Cleanup);
+	WebcitAddUrlHandler(HKEY("edit_vcard"), "", 0, edit_vcard, 0);
+	WebcitAddUrlHandler(HKEY("submit_vcard"), "", 0, submit_vcard, 0);
+	WebcitAddUrlHandler(HKEY("vcardphoto"), "", 0, display_vcard_photo_img, NEED_URL);
+}
+