Finalize vcard editing:
[citadel.git] / webcit / vcard_edit.c
index bc0ed9174a1b3ec68a987758005faa7c61072882..27ba6495b61327e0f61cd5465533d9cf30bef4e2 100644 (file)
 /*
- * $Id$
+ * Copyright (c) 1996-2012 by the citadel.org team
+ *
+ * This program is open source software.  You can redistribute it and/or
+ * modify it under the terms of the GNU General Public License, version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  */
 
 #include "webcit.h"
+#include "webserver.h"
+#include "calendar.h"
+
+CtxType CTX_VCARD = CTX_NONE;
+CtxType CTX_VCARD_TYPE = CTX_NONE;
+long VCEnumCounter = 0;
+
+typedef enum _VCStrEnum {
+       FlatString,
+       StringCluster,
+       PhoneNumber,
+       EmailAddr,
+       Address,
+       Street,
+       Number,
+       AliasFor,
+       Base64BinaryAttachment,
+       UnKnown,
+       TerminateList
+}VCStrEnum;
+typedef struct vcField vcField;
+struct vcField {
+       ConstStr STR;
+       VCStrEnum Type;
+       vcField *Sub;
+       long cval;
+       long parentCVal;
+       ConstStr Name;
+};
+
+vcField VCStr_Ns [] = {
+       {{HKEY("last")},   FlatString,    NULL, 0, 0, {HKEY("Last Name")}},
+       {{HKEY("first")},  FlatString,    NULL, 0, 0, {HKEY("First Name")}},
+       {{HKEY("middle")}, FlatString,    NULL, 0, 0, {HKEY("Middle Name")}},
+       {{HKEY("prefix")}, FlatString,    NULL, 0, 0, {HKEY("Prefix")}},
+       {{HKEY("suffix")}, FlatString,    NULL, 0, 0, {HKEY("Suffix")}},
+       {{HKEY("")},       TerminateList, NULL, 0, 0, {HKEY("")}}
+};
+
+vcField VCStr_Addrs [] = {
+       {{HKEY("POBox")},    Address,       NULL, 0, 0, {HKEY("PO box")}},
+       {{HKEY("extadr")},   Address,       NULL, 0, 0, {HKEY("Address")}},
+       {{HKEY("street")},   Address,       NULL, 0, 0, {HKEY("")}},
+       {{HKEY("city")},     Address,       NULL, 0, 0, {HKEY("City")}},
+       {{HKEY("state")},    Address,       NULL, 0, 0, {HKEY("State")}},
+       {{HKEY("zip")},      Address,       NULL, 0, 0, {HKEY("ZIP code")}},
+       {{HKEY("country")},  Address,       NULL, 0, 0, {HKEY("Country")}},
+       {{HKEY("")},         TerminateList, NULL, 0, 0, {HKEY("")}}
+};
+
+vcField VCStrE [] = {
+       {{HKEY("version")},         Number,                 NULL,        0, 0, {HKEY("")}},
+       {{HKEY("rev")},             Number,                 NULL,        0, 0, {HKEY("")}},
+       {{HKEY("label")},           FlatString,             NULL,        0, 0, {HKEY("")}},
+       {{HKEY("uid")},             FlatString,             NULL,        0, 0, {HKEY("")}},
+       {{HKEY("n")},               StringCluster,          VCStr_Ns,    0, 0, {HKEY("")}}, /* N is name, but only if there's no FN already there */
+       {{HKEY("fn")},              FlatString,             NULL,        0, 0, {HKEY("")}}, /* FN (full name) is a true 'display name' field */
+       {{HKEY("title")},           FlatString,             NULL,        0, 0, {HKEY("Title:")}},
+       {{HKEY("org")},             FlatString,             NULL,        0, 0, {HKEY("Organization:")}},/* organization */
+       {{HKEY("email")},           EmailAddr,              NULL,        0, 0, {HKEY("E-mail:")}},
+       {{HKEY("tel")},             PhoneNumber,            NULL,        0, 0, {HKEY("Telephone:")}},
+       {{HKEY("adr")},             StringCluster,          VCStr_Addrs, 0, 0, {HKEY("Address:")}},
+       {{HKEY("photo")},           Base64BinaryAttachment, NULL,        0, 0, {HKEY("Photo:")}},
+       {{HKEY("tel;home")},        PhoneNumber,            NULL,        0, 0, {HKEY(" (home)")}},
+       {{HKEY("tel;work")},        PhoneNumber,            NULL,        0, 0, {HKEY(" (work)")}},
+       {{HKEY("tel;fax")},         PhoneNumber,            NULL,        0, 0, {HKEY(" (fax)")}},
+       {{HKEY("tel;cell")},        PhoneNumber,            NULL,        0, 0, {HKEY(" (cell)")}},
+       {{HKEY("email;internet")},  EmailAddr,              NULL,        0, 0, {HKEY("E-mail:")}},
+       {{HKEY("UNKNOWN")},         UnKnown,                NULL,        0, 0, {HKEY("")}},
+       {{HKEY("")},                TerminateList,          NULL,        0, 0, {HKEY("")}}
+};
+
+ConstStr VCStr [] = {
+       {HKEY("")},
+       {HKEY("n")}, /* N is name, but only if there's no FN already there */
+       {HKEY("fn")}, /* FN (full name) is a true 'display name' field */
+       {HKEY("title")},   /* title */
+       {HKEY("org")},    /* organization */
+       {HKEY("email")},
+       {HKEY("tel")},
+       {HKEY("work")},
+       {HKEY("home")},
+       {HKEY("cell")},
+       {HKEY("adr")},
+       {HKEY("photo")},
+       {HKEY("version")},
+       {HKEY("rev")},
+       {HKEY("label")},
+       {HKEY("uid")}
+};
+
+
+HashList *DefineToToken = NULL;
+HashList *VCTokenToDefine = NULL;
+HashList *vcNames = NULL; /* todo: fill with the name strings */
+vcField* vcfUnknown = NULL;
+
+void RegisterVCardToken(vcField* vf, StrBuf *name, int inTokenCount)
+{
+       if (vf->Type == UnKnown) {
+               vcfUnknown = vf;
+       }
+       RegisterTokenParamDefine(SKEY(name), vf->cval);
+       Put(DefineToToken, LKEY(vf->cval), vf, reference_free_handler);
+       Put(vcNames, LKEY(vf->cval), NewStrBufPlain(CKEY(vf->Name)), HFreeStrBuf);
+
+       syslog(LOG_DEBUG, "Token: %s -> %ld, %d", 
+              ChrPtr(name),
+              vf->cval, 
+              inTokenCount);
+
+}
+
+void autoRegisterTokens(long *enumCounter, vcField* vf, StrBuf *BaseStr, int layer, long parentCVal)
+{
+       int i = 0;
+       StrBuf *subStr = NewStrBuf();
+       while (vf[i].STR.len > 0) {
+               FlushStrBuf(subStr);
+               vf[i].cval = (*enumCounter) ++;
+               vf[i].parentCVal = parentCVal;
+               StrBufAppendBuf(subStr, BaseStr, 0);
+               if (StrLength(subStr) > 0) {
+                       StrBufAppendBufPlain(subStr, HKEY("."), 0);
+               }
+               StrBufAppendBufPlain(subStr, CKEY(vf[i].STR), 0);
+               if (layer == 0) {
+                       Put(VCTokenToDefine, CKEY(vf[i].STR), &vf[i], reference_free_handler);
+               }
+               switch (vf[i].Type) {
+               case FlatString:
+                       break;
+               case StringCluster:
+               {
+                       autoRegisterTokens(enumCounter, vf[i].Sub, subStr, 1, vf[i].cval);
+               }
+               break;
+               case PhoneNumber:
+                       break;
+               case EmailAddr:
+                       break;
+               case Street:
+                       break;
+               case Number:
+                       break;
+               case AliasFor:
+                       break;
+               case Base64BinaryAttachment:
+                       break;
+               case TerminateList:
+                       break;
+               case Address:
+                       break;
+               case UnKnown:
+                       break;
+               }
+               RegisterVCardToken(&vf[i], subStr, i);
+               i++;
+       }
+       FreeStrBuf(&subStr);
+}
+
+int preeval_vcard_item(WCTemplateToken *Token)
+{
+       WCTemplputParams TPP;
+       WCTemplputParams *TP;
+       int searchFieldNo;
+       StrBuf *Target = NULL;
+
+       memset(&TPP, 0, sizeof(WCTemplputParams));
+       TP = &TPP;
+       TP->Tokens = Token;
+       searchFieldNo = GetTemplateTokenNumber(Target, TP, 0, 0);
+       if (searchFieldNo >= VCEnumCounter) {
+               LogTemplateError(NULL, "VCardItem", ERR_PARM1, TP,
+                                "Invalid define");
+               return 0;
+       }
+       return 1;
+}
+
+void tmpl_vcard_item(StrBuf *Target, WCTemplputParams *TP)
+{
+       void *vItem;
+       long searchFieldNo = GetTemplateTokenNumber(Target, TP, 0, 0);
+       HashList *vc = (HashList*) CTX(CTX_VCARD);
+       if (GetHash(vc, LKEY(searchFieldNo), &vItem) && (vItem != NULL)) {
+               StrBufAppendTemplate(Target, TP, (StrBuf*) vItem, 1);
+       }
+}
 
+void tmpl_vcard_context_item(StrBuf *Target, WCTemplputParams *TP)
+{
+       void *vItem;
+       vcField *t = (vcField*) CTX(CTX_VCARD_TYPE);
+       HashList *vc = (HashList*) CTX(CTX_VCARD);
+
+       if (t == NULL) {
+               LogTemplateError(NULL, "VCard item", ERR_NAME, TP,
+                                "Missing context");
+               return;
+       }
+
+       if (GetHash(vc, LKEY(t->cval), &vItem) && (vItem != NULL)) {
+               StrBufAppendTemplate(Target, TP, (StrBuf*) vItem, 0);
+       }
+       else {
+               LogTemplateError(NULL, "VCard item", ERR_NAME, TP,
+                                "Doesn't have that key - did you miss to filter in advance?");
+       }
+}
+int preeval_vcard_name_str(WCTemplateToken *Token)
+{
+       WCTemplputParams TPP;
+       WCTemplputParams *TP;
+       int searchFieldNo;
+       StrBuf *Target = NULL;
+
+       memset(&TPP, 0, sizeof(WCTemplputParams));
+       TP = &TPP;
+       TP->Tokens = Token;
+       searchFieldNo = GetTemplateTokenNumber(Target, TP, 0, 0);
+       if (searchFieldNo >= VCEnumCounter) {
+               LogTemplateError(NULL, "VCardName", ERR_PARM1, TP,
+                                "Invalid define");
+               return 0;
+       }
+       return 1;
+}
+
+void tmpl_vcard_name_str(StrBuf *Target, WCTemplputParams *TP)
+{
+       void *vItem;
+       long searchFieldNo = GetTemplateTokenNumber(Target, TP, 0, 0);
+       /* todo: get descriptive string for this vcard type */
+       if (GetHash(vcNames, LKEY(searchFieldNo), &vItem) && (vItem != NULL)) {
+               StrBufAppendTemplate(Target, TP, (StrBuf*) vItem, 1);
+       }
+       else {
+               LogTemplateError(NULL, "VCard item type", ERR_NAME, TP,
+                                "No i18n string for this.");
+               return;
+       }
+}
+
+void tmpl_vcard_context_name_str(StrBuf *Target, WCTemplputParams *TP)
+{
+       void *vItem;
+       vcField *t = (vcField*) CTX(CTX_VCARD_TYPE);
+
+       if (t == NULL) {
+               LogTemplateError(NULL, "VCard item type", ERR_NAME, TP,
+                                "Missing context");
+               return;
+       }
+       
+       if (GetHash(vcNames, LKEY(t->cval), &vItem) && (vItem != NULL)) {
+               StrBufAppendTemplate(Target, TP, (StrBuf*) vItem, 1);
+       }
+       else {
+               LogTemplateError(NULL, "VCard item type", ERR_NAME, TP,
+                                "No i18n string for this.");
+               return;
+       }
+}
+
+int filter_VC_ByType(const char* key, long len, void *Context, StrBuf *Target, WCTemplputParams *TP)
+{
+       long searchType;
+       long type = 0;
+       void *v;
+       int rc = 0;
+       vcField *vf = (vcField*) Context;
+
+       memcpy(&type, key, sizeof(long));
+       searchType = GetTemplateTokenNumber(Target, TP, IT_ADDT_PARAM(0), 0);
+       
+       if (vf->Type == searchType) {
+               HashList *vc = (HashList*) CTX(CTX_VCARD);
+               if (GetHash(vc, LKEY(vf->cval), &v) && v != NULL)
+                       return 1;
+       }
+       return rc;
+}
+
+
+
+
+HashList *getContextVcard(StrBuf *Target, WCTemplputParams *TP)
+{
+       vcField *vf = (vcField*) CTX(CTX_VCARD_TYPE);
+       HashList *vc = (HashList*) CTX(CTX_VCARD);
+
+       if ((vf == NULL) || (vc == NULL)) {
+               LogTemplateError(NULL, "VCard item type", ERR_NAME, TP,
+                                "Need VCard and Vcard type in context");
+               
+               return NULL;
+       }
+       return vc;
+}
+
+int filter_VC_ByContextType(const char* key, long len, void *Context, StrBuf *Target, WCTemplputParams *TP)
+{
+       long searchType;
+       vcField *vf = (vcField*) CTX(CTX_VCARD_TYPE);
+
+       memcpy(&searchType, key, sizeof(long));
+       
+       if (vf->cval == searchType) {
+               return 1;
+       }
+       else {
+               return 0;
+       }
+}
+
+
+int conditional_VC_Havetype(StrBuf *Target, WCTemplputParams *TP)
+{
+       HashList *vc = (HashList*) CTX(CTX_VCARD);
+       long HaveFieldType = GetTemplateTokenNumber(Target, TP, 2, 0);
+       int rc = 0;     
+       void *vVCitem;
+       const char *Key;
+       long len;
+       HashPos *it = GetNewHashPos(vc, 0);
+       while (GetNextHashPos(vc, it, &len, &Key, &vVCitem) && 
+              (vVCitem != NULL)) 
+       {
+               void *vvcField;
+               long type = 0;
+               memcpy(&type, Key, sizeof(long));
+               if (GetHash(DefineToToken, LKEY(type), &vvcField) &&
+                   (vvcField != NULL))
+               {
+                       vcField *t = (vcField*) vvcField;
+                       if (t && t->Type == HaveFieldType) {
+                               rc = 1;
+                               break;
+                       }
+               }
+       }
+       DeleteHashPos(&it);
+       return rc;
+}
 
-/**
- * \brief Record compare function for sorting address book indices
- * \param ab1 adressbook one
- * \param ab2 adressbook two
+/*
+ * Record compare function for sorting address book indices
  */
 int abcmp(const void *ab1, const void *ab2) {
        return(strcasecmp(
@@ -18,11 +369,9 @@ int abcmp(const void *ab1, const void *ab2) {
 }
 
 
-/**
- * \brief Helper function for do_addrbook_view()
+/*
+ * Helper function for do_addrbook_view()
  * Converts a name into a three-letter tab label
- * \param tabbuf the tabbuffer to add name to
- * \param name the name to add to the tabbuffer
  */
 void nametab(char *tabbuf, long len, char *name) {
        stresc(tabbuf, len, name, 0, 0);
@@ -33,55 +382,8 @@ void nametab(char *tabbuf, long len, char *name) {
 }
 
 
-/**
- * \brief display the adressbook overview
- * \param msgnum the citadel message number
- * \param alpha what????
- */
-void display_addressbook(long msgnum, char alpha) {
-       //char buf[SIZ];
-       /* char mime_partnum[SIZ]; */
-/*     char mime_filename[SIZ]; */
-/*     char mime_content_type[SIZ]; */
-       ///char mime_disposition[SIZ];
-       //int mime_length;
-       char vcard_partnum[SIZ];
-       char *vcard_source = NULL;
-       message_summary summ;////TODO: this will leak
-
-       memset(&summ, 0, sizeof(summ));
-       ///safestrncpy(summ.subj, _("(no subject)"), sizeof summ.subj);
-///Load Message headers
-//     Msg = 
-       if (!IsEmptyStr(vcard_partnum)) {
-               vcard_source = load_mimepart(msgnum, vcard_partnum);
-               if (vcard_source != NULL) {
-
-                       /** Display the summary line */
-                       display_vcard(WC->WBuf, vcard_source, alpha, 0, NULL,msgnum);
-
-                       /** If it's my vCard I can edit it */
-                       if (    (!strcasecmp(WC->wc_roomname, USERCONFIGROOM))
-                               || (!strcasecmp(&WC->wc_roomname[11], USERCONFIGROOM))
-                               || (WC->wc_view == VIEW_ADDRESSBOOK)
-                       ) {
-                               wprintf("<a href=\"edit_vcard?"
-                                       "msgnum=%ld&partnum=%s\">",
-                                       msgnum, vcard_partnum);
-                               wprintf("[%s]</a>", _("edit"));
-                       }
-
-                       free(vcard_source);
-               }
-       }
-
-}
-
-
-
-/**
- * \brief  If it's an old "Firstname Lastname" style record, try to convert it.
- * \param namebuf name to analyze, reverse if nescessary
+/*
+ * If it's an old "Firstname Lastname" style record, try to convert it.
  */
 void lastfirst_firstlast(char *namebuf) {
        char firstname[SIZ];
@@ -100,75 +402,86 @@ void lastfirst_firstlast(char *namebuf) {
        sprintf(namebuf, "%s; %s", lastname, firstname);
 }
 
-/**
- * \brief fetch what??? name
- * \param msgnum the citadel message number
- * \param namebuf where to put the name in???
- */
-void fetch_ab_name(message_summary *Msg, char *namebuf) {
-       char buf[SIZ];
-       char mime_partnum[SIZ];
-       char mime_filename[SIZ];
-       char mime_content_type[SIZ];
-       char mime_disposition[SIZ];
-       int mime_length;
-       char vcard_partnum[SIZ];
-       char *vcard_source = NULL;
-       int i, len;
-       message_summary summ;/// TODO this will lak
 
-       if (namebuf == NULL) return;
-       strcpy(namebuf, "");
-
-       memset(&summ, 0, sizeof(summ));
-       //////safestrncpy(summ.subj, "(no subject)", sizeof summ.subj);
-
-       sprintf(buf, "MSG0 %ld|0", Msg->msgnum);        /** unfortunately we need the mime info now */
-       serv_puts(buf);
-       serv_getln(buf, sizeof buf);
-       if (buf[0] != '1') return;
-
-       while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-               if (!strncasecmp(buf, "part=", 5)) {
-                       extract_token(mime_filename, &buf[5], 1, '|', sizeof mime_filename);
-                       extract_token(mime_partnum, &buf[5], 2, '|', sizeof mime_partnum);
-                       extract_token(mime_disposition, &buf[5], 3, '|', sizeof mime_disposition);
-                       extract_token(mime_content_type, &buf[5], 4, '|', sizeof mime_content_type);
-                       mime_length = extract_int(&buf[5], 5);
-
-                       if (  (!strcasecmp(mime_content_type, "text/x-vcard"))
-                          || (!strcasecmp(mime_content_type, "text/vcard")) ) {
-                               strcpy(vcard_partnum, mime_partnum);
-                       }
 
+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;
+
+       if (VCMime->Data == 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 (!IsEmptyStr(vcard_partnum)) {
-               vcard_source = load_mimepart(Msg->msgnum, vcard_partnum);
-               if (vcard_source != NULL) {
+       if (namebuf == NULL) return;
+
+       VCMime = load_vcard(Msg);
+       if (VCMime == NULL)
+               return;
 
-                       /* Grab the name off the card */
-                       display_vcard(WC->WBuf, vcard_source, 0, 0, namebuf, Msg->msgnum);
+       /* Grab the name off the card */
+       display_vcard(WC->WBuf, VCMime, 0, 0, namebuf, Msg->msgnum);
 
-                       free(vcard_source);
+       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)"));
        }
-
-       lastfirst_firstlast(namebuf);
-       striplt(namebuf);
-       len = strlen(namebuf);
-       for (i=0; i<len; ++i) {
-               if (namebuf[i] != ';') return;
+       else {
+               (*namebuf) = strdup(_("(no name)"));
        }
-       strcpy(namebuf, _("(no name)"));
 }
 
 
 
-/**
- * \brief Turn a vCard "n" (name) field into something displayable.
- * \param name the name field to convert
+/*
+ * Turn a vCard "n" (name) field into something displayable.
  */
 void vcard_n_prettyize(char *name)
 {
@@ -205,23 +518,61 @@ void vcard_n_prettyize(char *name)
 
 
 
-/**
- * \brief preparse a vcard 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.
- * \param v the vcard to retrieve the name from
- * \param storename where to put the name at
  */
-void fetchname_parsed_vcard(struct vCard *v, char *storename) {
+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;
 
-       strcpy(storename, "");
+       *storename = NULL;
 
        name = vcard_get_prop(v, "n", 1, 0, 0);
        if (name != NULL) {
-               strcpy(storename, name);
+               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); */
        }
 
@@ -229,8 +580,22 @@ void fetchname_parsed_vcard(struct vCard *v, char *storename) {
 
 
 
-/**
- * \brief html print a vcard
+
+void PutVcardItem(HashList *thisVC, vcField *thisField, StrBuf *ThisFieldStr, int is_qp, StrBuf *Swap)
+{
+       /* if we have some untagged QP, detect it here. */
+       if (is_qp || (strstr(ChrPtr(ThisFieldStr), "=?")!=NULL)){
+               StrBuf *b;
+               StrBuf_RFC822_to_Utf8(Swap, ThisFieldStr, NULL, NULL); /* default charset, current charset */
+               b = ThisFieldStr;
+               ThisFieldStr = Swap; 
+               Swap = b;
+               FlushStrBuf(Swap);
+       }
+       Put(thisVC, LKEY(thisField->cval), ThisFieldStr, HFreeStrBuf);
+}
+/*
+ * html print a vcard
  * display_vcard() calls this after parsing the textual vCard into
  * our 'struct vCard' data object.
  *
@@ -242,148 +607,172 @@ void fetchname_parsed_vcard(struct vCard *v, char *storename) {
  * 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.
- * \param v the vCard to display
- * \param full display all items of the vcard?
- * \param msgnum Citadel message pointer
+ * v           the vCard to parse
+ * msgnum      Citadel message pointer
  */
-void display_parsed_vcard(StrBuf *Target, struct vCard *v, int full, long msgnum) {
-       int i, j;
+void parse_vcard(StrBuf *Target, struct vCard *v, HashList *VC, wc_mime_attachment *Mime)
+{
+       StrBuf *Val = NULL;
+       StrBuf *Swap = NULL;
+       int i, j, k;
        char buf[SIZ];
-       char *name;
        int is_qp = 0;
        int is_b64 = 0;
-       char *thisname, *thisvalue;
+       int ntokens, len;
+       StrBuf *thisname = NULL;
        char firsttoken[SIZ];
-       int pass;
-
-       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, ';');
-                               }
-                       }
+       StrBuf *thisVCToken;
+       void *vField = NULL;
+
+       Swap = NewStrBuf ();
+       thisname = NewStrBuf();
+       thisVCToken = NewStrBufPlain(NULL, 63);
+       for (i=0; i<(v->numprops); ++i) {
+               FlushStrBuf(thisVCToken);
+               is_qp = 0;
+               is_b64 = 0;
+               syslog(LOG_DEBUG, "i: %d oneprop: %s - value: %s", i, v->prop[i].name, v->prop[i].value);
+               StrBufPlain(thisname, v->prop[i].name, -1);
+               StrBufLowerCase(thisname);
+               
+               /*len = */extract_token(firsttoken, ChrPtr(thisname), 0, ';', sizeof firsttoken);
+               ntokens = num_tokens(ChrPtr(thisname), ';');
+               for (j=0, k=0; j < ntokens && k < 10; ++j) {
+                       ///int evc[10];
                        
-                       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;
+                       len = extract_token(buf, ChrPtr(thisname), j, ';', sizeof buf);
+                       if (!strcasecmp(buf, "encoding=quoted-printable")) {
+                               is_qp = 1;
+/*                             remove_token(thisname, j, ';');*/
                        }
-                       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 if (!strcasecmp(buf, "encoding=base64")) {
+                               is_b64 = 1;
+/*                             remove_token(thisname, j, ';');*/
                        }
-                       else {
-                               thisvalue = strdup(v->prop[i].value);
+                       else{
+                               if (StrLength(thisVCToken) > 0) {
+                                       StrBufAppendBufPlain(thisVCToken, HKEY(";"), 0);
+                               }
+                               StrBufAppendBufPlain(thisVCToken, buf, len, 0);
+                               /*
+                               if (GetHash(VCToEnum, buf, len, &V))
+                               {
+                                       evc[k] = (int) V;
+
+                                       Put(VC, IKEY(evc), Val, HFreeStrBuf);
+
+                                       syslog(LOG_DEBUG, "[%ul] -> k: %d %s - %s", evc, k, buf, VCStr[evc[k]].Key);
+                                       k++;
+                               }
+*/
+
                        }
-       
-                       /** 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);
+               }
+
+               vField = NULL;  
+               if ((StrLength(thisVCToken) > 0) &&
+                   GetHash(VCTokenToDefine, SKEY(thisVCToken), &vField) && 
+                   (vField != NULL)) {
+                       vcField *thisField = (vcField *)vField;
+                       StrBuf *ThisFieldStr = NULL;
+                       syslog(LOG_DEBUG, "got this token: %s, found: %s", ChrPtr(thisVCToken), thisField->STR.Key);
+                       switch (thisField->Type) {
+                       case StringCluster: {
+                               int j = 0;
+                               const char *Pos = NULL;
+                               StrBuf *thisArray = NewStrBufPlain(v->prop[i].value, -1);
+                               StrBuf *Buf = NewStrBufPlain(NULL, StrLength(thisArray));
+                               while (thisField->Sub[j].STR.len > 0) {
+                                       StrBufExtract_NextToken(Buf, thisArray, &Pos, ';');
+                                       ThisFieldStr = NewStrBufDup(Buf);
+                                       
+                                       PutVcardItem(VC, &thisField->Sub[j], ThisFieldStr, is_qp, Swap);
+                                       j++;
                                }
+                               FreeStrBuf(&thisArray);
+                               FreeStrBuf(&Buf);
                        }
-       
-                       /** FN (full name) is a true 'display name' field */
-                       else if (!strcasecmp(firsttoken, "fn")) {
-                               strcpy(fullname, thisvalue);
+                               break;
+                       case Address:
+                       case FlatString:
+                       case PhoneNumber:
+                       case EmailAddr:
+                       case Street:
+                       case Number:
+                       case AliasFor:
+                               /* copy over the payload into a StrBuf */
+                               ThisFieldStr = NewStrBufPlain(v->prop[i].value, -1);
+                               PutVcardItem(VC, thisField, ThisFieldStr, is_qp, Swap);
+
+                               break;
+                       case Base64BinaryAttachment:
+                       case TerminateList:
+                       case UnKnown:
+                               break;
                        }
 
-                       /** title */
-                       else if (!strcasecmp(firsttoken, "title")) {
-                               strcpy(title, thisvalue);
-                       }
-       
-                       /** organization */
-                       else if (!strcasecmp(firsttoken, "org")) {
-                               strcpy(org, thisvalue);
+               }
+               else if (StrLength(thisVCToken) > 0) {
+                       /* Add it to the UNKNOWN field... */
+                       void *pv = NULL;
+                       StrBuf *oldVal;
+                       GetHash(VC, IKEY(vcfUnknown->cval), &pv);
+                       oldVal = (StrBuf*) pv;
+                       if (oldVal == NULL) {
+                               oldVal = NewStrBuf();
+                               Put(VC, IKEY(vcfUnknown->cval), oldVal, HFreeStrBuf);
                        }
-       
-                       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 {
+                               StrBufAppendBufPlain(oldVal, HKEY("\n"), 0);
                        }
-                       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);
+
+                       StrBufAppendBuf(oldVal, thisVCToken, 0);
+                       StrBufAppendBufPlain(oldVal, HKEY(":"), 0);
+                       StrBufAppendBufPlain(oldVal, v->prop[i].value, -1, 0);
+                       continue;
+               }
+
+               /* copy over the payload into a StrBuf */
+               Val = NewStrBufPlain(v->prop[i].value, -1);
+                       
+               /* if we have some untagged QP, detect it here. */
+               if (is_qp || (strstr(v->prop[i].value, "=?")!=NULL)){
+                       StrBuf *b;
+                       StrBuf_RFC822_to_Utf8(Swap, Val, NULL, NULL); /* default charset, current charset */
+                       b = Val;
+                       Val = Swap; 
+                       Swap = b;
+                       FlushStrBuf(Swap);
+               }
+               else if (is_b64) {
+                       StrBufDecodeBase64(Val);
+               }
+#if 0
+               syslog(LOG_DEBUG, "-> firsttoken: %s thisname: %s Value: [%s][%s]",
+                       firsttoken,
+                      ChrPtr(thisname),
+                       ChrPtr(Val),
+                       v->prop[i].value);
+               if (GetHash(VCToEnum, firsttoken, strlen(firsttoken), &V))
+               {
+                       eVC evc = (eVC) V;
+                       Put(VC, IKEY(evc), Val, HFreeStrBuf);
+                       syslog(LOG_DEBUG, "[%ul]\n", evc);
+                       Val = NULL;
+               }
+               else
+                       syslog(LOG_DEBUG, "[]\n");
+/*
+TODO: check for layer II
+               else 
+               {
+                       long max = num_tokens(thisname, ';');
+                       firsttoken[len] = '_';
+
+                       for (j = 0; j < max; j++) {
+//                     firsttoken[len]
+
+                               extract_token(buf, thisname, j, ';', sizeof (buf));
                                        if (!strcasecmp(buf, "tel"))
                                                strcat(phone, "");
                                        else if (!strcasecmp(buf, "work"))
@@ -399,132 +788,108 @@ void display_parsed_vcard(StrBuf *Target, struct vCard *v, int full, long msgnum
                                        }
                                }
                        }
-                       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 {
 
-                               /*** 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);
-                       }
                }
+*/
+#endif 
+               FreeStrBuf(&Val);
+       }
+       FreeStrBuf(&thisname);
+       FreeStrBuf(&Swap);
+       FreeStrBuf(&thisVCToken);
+}
 
+void tmplput_VCARD_ITEM(StrBuf *Target, WCTemplputParams *TP)
+{
+       HashList *VC = CTX(CTX_VCARD);
+       int evc;
+       void *vStr;
+
+       evc = GetTemplateTokenNumber(Target, TP, 0, -1);
+       if (evc != -1)
+       {
+               if (GetHash(VC, IKEY(evc), &vStr))
+               {
+                       StrBufAppendTemplate(Target, TP,
+                                            (StrBuf*) vStr,
+                                            1);
+               }
        }
+       
+}
+
+void display_one_vcard (StrBuf *Target, struct vCard *v, int full, wc_mime_attachment *Mime)
+{
+       HashList *VC;   WCTemplputParams SubTP;
 
-       StrBufAppendPrintf(Target, "</table></div>\n");
+        memset(&SubTP, 0, sizeof(WCTemplputParams));    
+
+
+       VC = NewHash(0, lFlathash);
+       parse_vcard(Target, v, VC, Mime);
+
+       {
+               WCTemplputParams *TP = NULL;
+               WCTemplputParams SubTP;
+               StackContext(TP, &SubTP, VC, CTX_VCARD, 0, NULL);
+
+               DoTemplate(HKEY("vcard_msg_display"), Target, &SubTP);
+               UnStackContext(&SubTP);
+       }
+       DeleteHash(&VC);
 }
 
 
 
-/**
- * \brief  Display a textual vCard
+/*
+ * 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.
- * \param vcard_source the buffer containing the vcard text
- * \param alpha what???
- * \param full should we usse all lines?
- * \param storename where to store???
- * \param msgnum Citadel message pointer
+ *
+ * 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, const char *vcard_source, char alpha, int full, char *storename, 
-       long msgnum) {
+void display_vcard(StrBuf *Target, 
+                  wc_mime_attachment *Mime, 
+                  char alpha, 
+                  int full, 
+                  char **storename, 
+                  long msgnum) 
+{
        struct vCard *v;
        char *name;
-       char buf[SIZ];
+       StrBuf *Buf;
+       StrBuf *Buf2;
        char this_alpha = 0;
 
-       v = vcard_load((char*)vcard_source); ///TODO
+       v = VCardLoad(Mime->Data);
 
        if (v == NULL) return;
 
        name = vcard_get_prop(v, "n", 1, 0, 0);
        if (name != NULL) {
-               utf8ify_rfc822_string(name);
-               strcpy(buf, name);
-               this_alpha = buf[0];
+               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,msgnum);
+       else if ((alpha == 0) || 
+                ((isalpha(alpha)) && (tolower(alpha) == tolower(this_alpha))) || 
+                ((!isalpha(alpha)) && (!isalpha(this_alpha)))
+               ) 
+       {
+               display_one_vcard (Target, v, full, Mime);
        }
 
        vcard_free(v);
@@ -532,10 +897,11 @@ void display_vcard(StrBuf *Target, const char *vcard_source, char alpha, int ful
 
 
 
-/**
- * \brief Render the address book using info we gathered during the scan
- * \param addrbook the addressbook to render
- * \param num_ab the number of the addressbook
+/*
+ * 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;
@@ -552,9 +918,9 @@ void do_addrbook_view(addrbookent *addrbook, int num_ab) {
        char **tablabels;
 
        if (num_ab == 0) {
-               wprintf("<br /><br /><br /><div align=\"center\"><i>");
-               wprintf(_("This address book is empty."));
-               wprintf("</i></div>\n");
+               wc_printf("<br><br><br><div align=\"center\"><i>");
+               wc_printf(_("This address book is empty."));
+               wc_printf("</i></div>\n");
                return;
        }
 
@@ -566,9 +932,9 @@ void do_addrbook_view(addrbookent *addrbook, int num_ab) {
 
        tablabels = malloc(num_pages * sizeof (char *));
        if (tablabels == NULL) {
-               wprintf("<br /><br /><br /><div align=\"center\"><i>");
-               wprintf(_("An internal error has occurred."));
-               wprintf("</i></div>\n");
+               wc_printf("<br><br><br><div align=\"center\"><i>");
+               wc_printf(_("An internal error has occurred."));
+               wc_printf("</i></div>\n");
                return;
        }
 
@@ -590,43 +956,43 @@ void do_addrbook_view(addrbookent *addrbook, int num_ab) {
                if ((i / NAMESPERPAGE) != page) {       /* New tab */
                        page = (i / NAMESPERPAGE);
                        if (page > 0) {
-                               wprintf("</tr></table>\n");
+                               wc_printf("</tr></table>\n");
                                end_tab(page-1, num_pages);
                        }
                        begin_tab(page, num_pages);
-                       wprintf("<table border=0 cellspacing=0 cellpadding=3 width=100%%>\n");
+                       wc_printf("<table border=\"0\" cellspacing=\"0\" cellpadding=\"3\" width=\"100%%\">\n");
                        displayed = 0;
                }
 
                if ((displayed % 4) == 0) {
                        if (displayed > 0) {
-                               wprintf("</tr>\n");
+                               wc_printf("</tr>\n");
                        }
                        bg = 1 - bg;
-                       wprintf("<tr bgcolor=\"#%s\">",
-                               (bg ? "DDDDDD" : "FFFFFF")
+                       wc_printf("<tr bgcolor=\"#%s\">",
+                               (bg ? "dddddd" : "ffffff")
                        );
                }
        
-               wprintf("<td>");
+               wc_printf("<td>");
 
-               wprintf("<a href=\"readfwd?startmsg=%ld?is_singlecard=1",
+               wc_printf("<a href=\"readfwd?startmsg=%ld?is_singlecard=1",
                        addrbook[i].ab_msgnum);
-               wprintf("?maxmsgs=1?is_summary=0?alpha=%s\">", bstr("alpha"));
+               wc_printf("?maxmsgs=1?is_summary=0?alpha=%s\">", bstr("alpha"));
                vcard_n_prettyize(addrbook[i].ab_name);
                escputs(addrbook[i].ab_name);
-               wprintf("</a></td>\n");
+               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) {
-                       wprintf("<td>&nbsp;</td>");
+                       wc_printf("<td>&nbsp;</td>");
                }
        }
 
-       wprintf("</tr></table>\n");
+       wc_printf("</tr></table>\n");
        end_tab((num_pages-1), num_pages);
 
        begin_tab(num_pages, num_pages);
@@ -648,356 +1014,72 @@ void do_addrbook_view(addrbookent *addrbook, int num_ab) {
  * 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 *force_room) {
-       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) {
+       HashList *VC;   WCTemplputParams SubTP;
+       wcsession *WCC = WC;
+       message_summary *Msg = NULL;
+       wc_mime_attachment *VCMime = NULL;
        struct vCard *v;
-       int i;
-       char *key, *value;
        char whatuser[256];
+       VC = NewHash(0, lFlathash);
 
-       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 fullname[256];
-       char title[256];
-       char org[256];
-
-       lastname[0] = 0;
-       firstname[0] = 0;
-       middlename[0] = 0;
-       prefix[0] = 0;
-       suffix[0] = 0;
-       pobox[0] = 0;
-       extadr[0] = 0;
-       street[0] = 0;
-       city[0] = 0;
-       state[0] = 0;
-       zipcode[0] = 0;
-       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;
+       /* Display the form */
+       output_headers(1, 1, 1, 0, 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, "DLAT %ld|%s", msgnum, partnum);
-               serv_puts(buf);
-               serv_getln(buf, sizeof buf);
-               if (buf[0] != '6') {
-                       convenience_page("770000", "Error", &buf[4]);
-                       return;
+               else {
+                       v = VCardLoad(VCAtt->Data);
                }
-       
-               total_len = atoi(&buf[4]);
-               serialized_vcard = malloc(total_len + 2);
-
-               serv_read(serialized_vcard, total_len);
-               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) {
-                       value = vcard_get_prop(v, "", 0, i++, 0);
-       
-                       if (!strcasecmp(key, "n")) {
-                               extract_token(lastname, value, 0, ';', sizeof lastname);
-                               extract_token(firstname, value, 1, ';', sizeof firstname);
-                               extract_token(middlename, value, 2, ';', sizeof middlename);
-                               extract_token(prefix, value, 3, ';', sizeof prefix);
-                               extract_token(suffix, value, 4, ';', sizeof suffix);
-                       }
 
-                       else if (!strcasecmp(key, "fn")) {
-                               safestrncpy(fullname, value, sizeof fullname);
-                       }
-
-                       else if (!strcasecmp(key, "title")) {
-                               safestrncpy(title, value, sizeof title);
-                       }
-       
-                       else if (!strcasecmp(key, "org")) {
-                               safestrncpy(org, value, sizeof org);
-                       }
-       
-                       else if ( (!strcasecmp(key, "adr")) || (!strncasecmp(key, "adr;", 4)) ) {
-                               extract_token(pobox, value, 0, ';', sizeof pobox);
-                               extract_token(extadr, value, 1, ';', sizeof extadr);
-                               extract_token(street, value, 2, ';', sizeof street);
-                               extract_token(city, value, 3, ';', sizeof city);
-                               extract_token(state, value, 4, ';', sizeof state);
-                               extract_token(zipcode, value, 5, ';', sizeof zipcode);
-                               extract_token(country, value, 6, ';', sizeof country);
-                       }
-       
-                       else if ( (!strcasecmp(key, "tel;home")) || (!strcasecmp(key, "tel;type=home")) ) {
-                               extract_token(hometel, value, 0, ';', sizeof hometel);
-                       }
-       
-                       else if ( (!strcasecmp(key, "tel;work")) || (!strcasecmp(key, "tel;type=work")) ) {
-                               extract_token(worktel, value, 0, ';', sizeof worktel);
-                       }
-       
-                       else if ( (!strcasecmp(key, "tel;fax")) || (!strcasecmp(key, "tel;type=fax")) ) {
-                               extract_token(faxtel, value, 0, ';', sizeof faxtel);
-                       }
-       
-                       else if ( (!strcasecmp(key, "tel;cell")) || (!strcasecmp(key, "tel;type=cell")) ) {
-                               extract_token(mobiletel, value, 0, ';', sizeof mobiletel);
-                       }
-       
-                       else if ( (!strcasecmp(key, "email;internet"))
-                            || (!strcasecmp(key, "email;type=internet")) ) {
-                               if (primary_inetemail[0] == 0) {
-                                       safestrncpy(primary_inetemail, value, sizeof primary_inetemail);
-                               }
-                               else {
-                                       if (other_inetemail[0] != 0) {
-                                               strcat(other_inetemail, "\n");
-                                       }
-                                       strcat(other_inetemail, value);
-                               }
-                       }
-       
-                       else {
-                               strcat(extrafields, key);
-                               strcat(extrafields, ":");
-                               strcat(extrafields, value);
-                               strcat(extrafields, "\n");
-                       }
+               parse_vcard(WCC->WBuf, v, VC, NULL);
        
-               }
        
                vcard_free(v);
        }
 
-       /** Display the form */
-       output_headers(1, 1, 1, 0, 0, 0);
-
-       svput("BOXTITLE", WCS_STRING, _("Edit contact information"));
-       do_template("beginboxx", NULL);
+        memset(&SubTP, 0, sizeof(WCTemplputParams));    
 
-       wprintf("<form method=\"POST\" action=\"submit_vcard\">\n");
-       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+       {
+               WCTemplputParams *TP = NULL;
+               WCTemplputParams SubTP;
+               StackContext(TP, &SubTP, VC, CTX_VCARD, 0, NULL);
 
-       if (force_room != NULL) {
-               wprintf("<input type=\"hidden\" name=\"force_room\" value=\"");
-               escputs(force_room);
-               wprintf("\">\n");
+               DoTemplate(HKEY("vcard_edit"), WCC->WBuf, &SubTP);
+               UnStackContext(&SubTP);
        }
+       DeleteHash(&VC);
 
-       wprintf("<div class=\"fix_scrollbar_bug\">"
-               "<table class=\"vcard_edit_background\"><tr><td>\n");
-
-       wprintf("<table border=0><tr>"
-               "<td>%s</td>"
-               "<td>%s</td>"
-               "<td>%s</td>"
-               "<td>%s</td>"
-               "<td>%s</td></tr>\n",
-               _("Prefix"), _("First"), _("Middle"), _("Last"), _("Suffix")
-       );
-       wprintf("<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>",
-               firstname);
-       wprintf("<td><input type=\"text\" name=\"middlename\" "
-               "value=\"%s\" maxlength=\"29\"></td>",
-               middlename);
-       wprintf("<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",
-               suffix);
-
-       wprintf("<table  class=\"vcard_edit_background_alt\">");
-       wprintf("<tr><td>");
-
-       wprintf(_("Display name:"));
-       wprintf("<br>"
-               "<input type=\"text\" name=\"fullname\" "
-               "value=\"%s\" maxlength=\"40\"><br><br>\n",
-               fullname
-       );
 
-       wprintf(_("Title:"));
-       wprintf("<br>"
-               "<input type=\"text\" name=\"title\" "
-               "value=\"%s\" maxlength=\"40\"><br><br>\n",
-               title
-       );
-
-       wprintf(_("Organization:"));
-       wprintf("<br>"
-               "<input type=\"text\" name=\"org\" "
-               "value=\"%s\" maxlength=\"40\"><br><br>\n",
-               org
-       );
-
-       wprintf("</td><td>");
-
-       wprintf("<table border=0>");
-       wprintf("<tr><td>");
-       wprintf(_("PO box:"));
-       wprintf("</td><td>"
-               "<input type=\"text\" name=\"pobox\" "
-               "value=\"%s\" maxlength=\"29\"></td></tr>\n",
-               pobox);
-       wprintf("<tr><td>");
-       wprintf(_("Address:"));
-       wprintf("</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",
-               street);
-       wprintf("<tr><td>");
-       wprintf(_("City:"));
-       wprintf("</td><td>"
-               "<input type=\"text\" name=\"city\" "
-               "value=\"%s\" maxlength=\"29\"></td></tr>\n",
-               city);
-       wprintf("<tr><td>");
-       wprintf(_("State:"));
-       wprintf("</td><td>"
-               "<input type=\"text\" name=\"state\" "
-               "value=\"%s\" maxlength=\"29\"></td></tr>\n",
-               state);
-       wprintf("<tr><td>");
-       wprintf(_("ZIP code:"));
-       wprintf("</td><td>"
-               "<input type=\"text\" name=\"zipcode\" "
-               "value=\"%s\" maxlength=\"10\"></td></tr>\n",
-               zipcode);
-       wprintf("<tr><td>");
-       wprintf(_("Country:"));
-       wprintf("</td><td>"
-               "<input type=\"text\" name=\"country\" "
-               "value=\"%s\" maxlength=\"29\" width=\"5\"></td></tr>\n",
-               country);
-       wprintf("</table>\n");
-
-       wprintf("</table>\n");
-
-       wprintf("<table border=0><tr><td>");
-       wprintf(_("Home telephone:"));
-       wprintf("</td>"
-               "<td><input type=\"text\" name=\"hometel\" "
-               "value=\"%s\" maxlength=\"29\"></td>\n",
-               hometel);
-       wprintf("<td>");
-       wprintf(_("Work telephone:"));
-       wprintf("</td>"
-               "<td><input type=\"text\" name=\"worktel\" "
-               "value=\"%s\" maxlength=\"29\"></td></tr>\n",
-               worktel);
-       wprintf("<tr><td>");
-       wprintf(_("Mobile telephone:"));
-       wprintf("</td>"
-               "<td><input type=\"text\" name=\"mobiletel\" "
-               "value=\"%s\" maxlength=\"29\"></td>\n",
-               mobiletel);
-       wprintf("<td>");
-       wprintf(_("Fax number:"));
-       wprintf("</td>"
-               "<td><input type=\"text\" name=\"faxtel\" "
-               "value=\"%s\" maxlength=\"29\"></td></tr></table>\n",
-               faxtel);
-
-       wprintf("<table class=\"vcard_edit_background_alt\">");
-       wprintf("<tr><td>");
-
-       wprintf("<table border=0><TR>"
-               "<td valign=top>");
-       wprintf(_("Primary Internet e-mail address"));
-       wprintf("<br />"
-               "<input type=\"text\" name=\"primary_inetemail\" "
-               "size=40 maxlength=60 value=\"");
-       escputs(primary_inetemail);
-       wprintf("\"><br />"
-               "</td><td valign=top>");
-       wprintf(_("Internet e-mail aliases"));
-       wprintf("<br />"
-               "<textarea name=\"other_inetemail\" rows=5 cols=40 width=40>");
-       escputs(other_inetemail);
-       wprintf("</textarea></td></tr></table>\n");
-
-       wprintf("</td></tr></table>\n");
-
-       wprintf("<input type=\"hidden\" name=\"extrafields\" value=\"");
-       escputs(extrafields);
-       wprintf("\">\n");
-
-       wprintf("<input type=\"hidden\" name=\"return_to\" value=\"");
-       urlescputs(return_to);
-       wprintf("\">\n");
-
-       wprintf("<div class=\"buttons\">\n"
-               "<input type=\"submit\" name=\"ok_button\" value=\"%s\">"
-               "&nbsp;"
-               "<input type=\"submit\" name=\"cancel_button\" value=\"%s\">"
-               "</div></form>\n",
-               _("Save changes"),
-               _("Cancel")
-       );
-       
-       wprintf("</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) {
@@ -1006,113 +1088,208 @@ void edit_vcard(void) {
 
        msgnum = lbstr("msgnum");
        partnum = bstr("partnum");
-       do_edit_vcard(msgnum, partnum, "", NULL);
+       do_edit_vcard(msgnum, partnum, NULL, NULL, "", NULL);
 }
 
 
 
-/**
+/*
  *  parse edited vcard from the browser
  */
 void submit_vcard(void) {
        struct vCard *v;
        char *serialized_vcard;
-       char buf[SIZ];
-       int i;
+       StrBuf *Buf;
+       const StrBuf *ForceRoom;
+       HashList* postVcard;
+       HashPos *it, *itSub;
+       const char *Key;
+       long len;
+       void *pv;
+       StrBuf *SubStr;
+       const StrBuf *s;
+       const char *Pos = NULL;
 
        if (!havebstr("ok_button")) { 
-               readloop(readnew);
+               readloop(readnew, eUseDefault);
                return;
        }
 
        if (havebstr("force_room")) {
-               gotoroom(bstr("force_room"));
+               ForceRoom = sbstr("force_room");
+               if (gotoroom(ForceRoom) != 200) {
+                       AppendImportantMessage(_("Unable to enter the room to save your message"), -1);
+                       AppendImportantMessage(HKEY(": "));
+                       AppendImportantMessage(SKEY(ForceRoom));
+                       AppendImportantMessage(HKEY("; "));
+                       AppendImportantMessage(_("Aborting."), -1);
+
+                       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);
-       if (buf[0] != '4') {
+       postVcard = getSubStruct(HKEY("VC"));
+       if (postVcard == NULL) {
+               AppendImportantMessage(_("An error has occurred."), -1);
+               edit_vcard();
+               return;//// more details
+       }
+       
+       Buf = NewStrBuf();
+       serv_write(HKEY("ENT0 1|||4\n"));
+       if (!StrBuf_ServGetln(Buf) && (GetServerStatus(Buf, NULL) != 4))
+       {
                edit_vcard();
                return;
        }
-
-       /** Make a vCard structure out of the data supplied in the form */
-
-       snprintf(buf, sizeof buf, "begin:vcard\r\n%s\r\nend:vcard\r\n",
-               bstr("extrafields")
+       
+       /* Make a vCard structure out of the data supplied in the form */
+       StrBufPrintf(Buf, "begin:vcard\r\n%s\r\nend:vcard\r\n",
+                    bstr("extrafields")
        );
-       v = vcard_load(buf);    /** Start with the extra fields */
+       v = VCardLoad(Buf);     /* Start with the extra fields */
        if (v == NULL) {
-               safestrncpy(WC->ImportantMessage,
-                       _("An error has occurred."),
-                       sizeof WC->ImportantMessage
-               );
+               AppendImportantMessage(_("An error has occurred."), -1);
                edit_vcard();
+               FreeStrBuf(&Buf);
                return;
        }
 
-       snprintf(buf, sizeof buf, "%s;%s;%s;%s;%s",
-               bstr("lastname"),
-               bstr("firstname"),
-               bstr("middlename"),
-               bstr("prefix"),
-               bstr("suffix") );
-       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"),
-               bstr("city"),
-               bstr("state"),
-               bstr("zipcode"),
-               bstr("country") );
-       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"));
-
-       for (i=0; i<num_tokens(bstr("other_inetemail"), '\n'); ++i) {
-               extract_token(buf, bstr("other_inetemail"), i, '\n', sizeof buf);
-               if (!IsEmptyStr(buf)) {
-                       vcard_add_prop(v, "email;internet", buf);
+       SubStr = NewStrBuf();
+       it = GetNewHashPos(DefineToToken, 0);
+       while (GetNextHashPos(DefineToToken, it, &len, &Key, &pv) && 
+              (pv != NULL)) 
+       {
+               char buf[32];
+               long blen;
+               vcField *t = (vcField*) pv;
+
+               if (t->Sub != NULL){
+                       vcField *Sub;
+                       FlushStrBuf(SubStr);
+                       itSub = GetNewHashPos(DefineToToken, 0);
+                       while (GetNextHashPos(DefineToToken, itSub, &len, &Key, &pv) && 
+                              (pv != NULL)) 
+                       {
+                               Sub = (vcField*) pv;
+                               if (Sub->parentCVal == t->cval) {
+                                       if (StrLength(SubStr) > 0)
+                                               StrBufAppendBufPlain(SubStr, HKEY(";"), 0);
+
+
+
+                                       blen = snprintf(buf, sizeof(buf), "%ld", Sub->cval);
+                                       s = SSubBstr(postVcard, buf, blen);
+                       
+                                       if ((s != NULL) && (StrLength(s) > 0)) {
+                                               /// todo: utf8 qp
+                                               StrBufAppendBuf(SubStr, s, 0);
+                                       }
+                               }
+                       }
+                       if (StrLength(SubStr) > 0) {
+                               vcard_add_prop(v, t->STR.Key, ChrPtr(SubStr));
+                       }
+                       DeleteHashPos(&itSub);
+               }
+               else if (t->parentCVal == 0) {
+                       blen = snprintf(buf, sizeof(buf), "%ld", t->cval);
+                       s = SSubBstr(postVcard, buf, blen);
+                       
+                       if ((s != NULL) && (StrLength(s) > 0)) {
+                               vcard_add_prop(v, t->STR.Key, ChrPtr(s));
+                       }
+                       /*
+                   (vvcField != NULL))
+               {
+                       vcField *t = (vcField*) vvcField;
+                       if (t->layer == 0) switch (t->Type) {
+                               break;
+                       case StringCluster:
+                       {
+                               
+                               i++;
+                               continue;
+                       }
+                       break;
+                               break;
+                       case EmailAddr:
+                               break;
+                       case Street:
+                               break;
+                       case FlatString:
+                       case PhoneNumber:
+                       case Number:
+                               break;
+                       case AliasFor:
+                               break;
+                       case Base64BinaryAttachment:
+                               break;
+                       case TerminateList:
+                               break;
+                       case Address:
+                               break;
+
+                       }
+*/
+               }
+       }
+       DeleteHashPos(&it);
+
+       s = sbstr("other_inetemail");
+       if (StrLength(s) > 0) {
+               FlushStrBuf(SubStr);
+               while (StrBufSipLine(SubStr, s, &Pos), ((Pos!=StrBufNOTNULL) && (Pos!=NULL)) ) {
+                       if (StrLength(SubStr) > 0) {
+                               vcard_add_prop(v, "email;internet", ChrPtr(SubStr));
+                       }
                }
        }
 
+       FreeStrBuf(&SubStr);
+
+
        serialized_vcard = vcard_serialize(v);
        vcard_free(v);
        if (serialized_vcard == NULL) {
-               safestrncpy(WC->ImportantMessage,
-                       _("An error has occurred."),
-                       sizeof WC->ImportantMessage
-               );
+               AppendImportantMessage(_("An error has occurred."), -1);
                edit_vcard();
+               FreeStrBuf(&Buf);
                return;
        }
 
-       serv_puts("Content-type: text/x-vcard; charset=UTF-8");
-       serv_puts("");
+       printf("%s", serialized_vcard);
+       serv_write(HKEY("Content-type: text/x-vcard; charset=UTF-8\n"));
+       serv_write(HKEY("\n"));
        serv_printf("%s\r\n", serialized_vcard);
-       serv_puts("000");
+       serv_write(HKEY("000\n"));
        free(serialized_vcard);
 
        if (!strcmp(bstr("return_to"), "select_user_to_edit")) {
-               select_user_to_edit(NULL, NULL);
+               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);
+               readloop(readnew, eUseDefault);
        }
+       FreeStrBuf(&Buf);
 }
 
 
@@ -1123,16 +1300,16 @@ void submit_vcard(void) {
 void display_vcard_photo_img(void)
 {
        long msgnum = 0L;
-       char *vcard;
+       StrBuf *vcard;
        struct vCard *v;
        char *photosrc;
        const char *contentType;
        wcsession *WCC = WC;
 
-       msgnum = StrTol(WCC->UrlFragment2);
+       msgnum = StrBufExtract_long(WCC->Hdr->HR.ReqLine, 0, '/');
        
        vcard = load_mimepart(msgnum,"1");
-       v = vcard_load(vcard);
+       v = VCardLoad(vcard);
        
        photosrc = vcard_get_prop(v, "PHOTO", 1,0,0);
        FlushStrBuf(WCC->WBuf);
@@ -1143,7 +1320,8 @@ void display_vcard_photo_img(void)
                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");
-               wprintf(_("Could Not decode vcard photo\n"));
+               begin_burst();
+               wc_printf(_("Could Not decode vcard photo\n"));
                end_burst();
                return;
        }
@@ -1153,14 +1331,190 @@ void display_vcard_photo_img(void)
        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,
+                                char *filter,
+                                long flen)
+{
+       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 
+ServerStartModule_VCARD
+(void)
+{
+       ///VCToEnum = NewHash(0, NULL);
+
+}
+
+void 
+ServerShutdownModule_VCARD
+(void)
+{
+       DeleteHash(&DefineToToken);
+       DeleteHash(&vcNames);
+       DeleteHash(&VCTokenToDefine);
+       /// DeleteHash(&VCToEnum);
+}
 
 void 
 InitModule_VCARD
 (void)
 {
-       WebcitAddUrlHandler(HKEY("edit_vcard"), edit_vcard, 0);
-       WebcitAddUrlHandler(HKEY("submit_vcard"), submit_vcard, 0);
-       WebcitAddUrlHandler(HKEY("vcardphoto"), display_vcard_photo_img, NEED_URL);
+       RegisterCTX(CTX_VCARD);
+       RegisterCTX(CTX_VCARD_TYPE);
+       RegisterReadLoopHandlerset(
+               VIEW_ADDRESSBOOK,
+               vcard_GetParamsGetServerCall,
+               NULL,
+               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);
+/*
+       Put(VCToEnum, HKEY("n"), (void*)VC_n, reference_free_handler);
+       Put(VCToEnum, HKEY("fn"), (void*)VC_fn, reference_free_handler);
+       Put(VCToEnum, HKEY("title"), (void*)VC_title, reference_free_handler);
+       Put(VCToEnum, HKEY("org"), (void*)VC_org, reference_free_handler);
+       Put(VCToEnum, HKEY("email"), (void*)VC_email, reference_free_handler);
+       Put(VCToEnum, HKEY("tel"), (void*)VC_tel, reference_free_handler);
+       Put(VCToEnum, HKEY("work"), (void*)VC_work, reference_free_handler);
+       Put(VCToEnum, HKEY("home"), (void*)VC_home, reference_free_handler);
+       Put(VCToEnum, HKEY("cell"), (void*)VC_cell, reference_free_handler);
+       Put(VCToEnum, HKEY("adr"), (void*)VC_adr, reference_free_handler);
+       Put(VCToEnum, HKEY("photo"), (void*)VC_photo, reference_free_handler);
+       Put(VCToEnum, HKEY("version"), (void*)VC_version, reference_free_handler);
+       Put(VCToEnum, HKEY("rev"), (void*)VC_rev, reference_free_handler);
+       Put(VCToEnum, HKEY("label"), (void*)VC_label, reference_free_handler);
+*/
+/*
+       RegisterNamespace("VC", 1, 2, tmplput_VCARD_ITEM, NULL, CTX_VCARD);
+
+       REGISTERTokenParamDefine(VC_n);
+       REGISTERTokenParamDefine(VC_fn);
+       REGISTERTokenParamDefine(VC_title);
+       REGISTERTokenParamDefine(VC_org);
+       REGISTERTokenParamDefine(VC_email);
+       REGISTERTokenParamDefine(VC_tel);
+       REGISTERTokenParamDefine(VC_work);
+       REGISTERTokenParamDefine(VC_home);
+       REGISTERTokenParamDefine(VC_cell);
+       REGISTERTokenParamDefine(VC_adr);
+       REGISTERTokenParamDefine(VC_photo);
+       REGISTERTokenParamDefine(VC_version);
+       REGISTERTokenParamDefine(VC_rev);
+       REGISTERTokenParamDefine(VC_label);
+*/
+
+       {
+               StrBuf *Prefix  = NewStrBufPlain(HKEY("VC:"));
+               DefineToToken   = NewHash(1, lFlathash);
+               vcNames         = NewHash(1, lFlathash);
+               VCTokenToDefine = NewHash(1, NULL);
+               autoRegisterTokens(&VCEnumCounter, VCStrE, Prefix, 0, 0);
+               FreeStrBuf(&Prefix);
+       }
+       RegisterCTX(CTX_VCARD);
+       RegisterNamespace("VC:ITEM", 2, 2, tmpl_vcard_item, preeval_vcard_item, CTX_VCARD);
+       RegisterNamespace("VC:CTXITEM", 1, 1, tmpl_vcard_context_item, NULL, CTX_VCARD_TYPE);
+       RegisterNamespace("VC:NAME", 1, 1, tmpl_vcard_name_str, preeval_vcard_name_str, CTX_VCARD);
+       RegisterNamespace("VC:CTXNAME", 1, 1, tmpl_vcard_context_name_str, NULL, CTX_VCARD_TYPE);
+       REGISTERTokenParamDefine(FlatString);
+       REGISTERTokenParamDefine(StringCluster);
+       REGISTERTokenParamDefine(PhoneNumber);
+       REGISTERTokenParamDefine(EmailAddr);
+       REGISTERTokenParamDefine(Street);
+       REGISTERTokenParamDefine(Number);
+       REGISTERTokenParamDefine(AliasFor);
+       REGISTERTokenParamDefine(Base64BinaryAttachment);
+       REGISTERTokenParamDefine(TerminateList);
+       REGISTERTokenParamDefine(Address);
+
+       RegisterConditional("VC:HAVE:TYPE",      1, conditional_VC_Havetype, CTX_VCARD);
+       RegisterFilteredIterator("VC:TYPE", 1, DefineToToken, NULL, NULL, NULL, filter_VC_ByType, CTX_VCARD_TYPE, CTX_VCARD, IT_NOFLAG);
+       RegisterFilteredIterator("VC:TYPE:ITEMS", 0, NULL, getContextVcard, NULL, NULL, filter_VC_ByContextType, CTX_STRBUF, CTX_VCARD_TYPE, IT_NOFLAG);
 }