Cleanup vcard rendering code
[citadel.git] / webcit / vcard_edit.c
index c8a22ebb6b25ffc916ae8761dfa3141bb88079a0..0807f4862372aa98c74dbec221514532b6482774 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.
  */
-/**
- * \defgroup vCardEdit Handles on-screen editing of vCard objects.
- * \ingroup VCards
- */
-/*@{*/
+
 #include "webcit.h"
+#include "webserver.h"
+#include "calendar.h"
 
-/**
- * \brief 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.
- * \param msgnum number of the item on the citadel server
- * \param partnum what???
- * \param return_to where to go back in the browser after edit ????
+CtxType CTX_VCARD = CTX_NONE;
+CtxType CTX_VCARD_LIST = 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")}
+};
+
+/*
+ * Address book entry (keep it short and sweet, it's just a quickie lookup
+ * which we can use to get to the real meat and bones later)
  */
-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;
-       struct vCard *v;
-       int i;
-       char *key, *value;
-       char whatuser[256];
+typedef struct _addrbookent {
+       StrBuf *name;
+       HashList *VC;
+       long ab_msgnum;         /* message number of address book entry */
+       StrBuf *msgNoStr;
+} addrbookent;
+
+void deleteAbEnt(void *v) {
+       addrbookent *vc = (addrbookent*)v;
+       DeleteHash(&vc->VC);
+       FreeStrBuf(&vc->name);
+       FreeStrBuf(&vc->msgNoStr);
+       free(vc);
+}
 
-       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;
+HashList *DefineToToken = NULL;
+HashList *VCTokenToDefine = NULL;
+HashList *vcNames = NULL; /* todo: fill with the name strings */
+vcField* vcfUnknown = NULL;
 
-       safestrncpy(whatuser, "", sizeof whatuser);
+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);
 
-       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;
+       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);
                }
-               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]);
-                       }
+               StrBufAppendBufPlain(subStr, CKEY(vf[i].STR), 0);
+               if (layer == 0) {
+                       Put(VCTokenToDefine, CKEY(vf[i].STR), &vf[i], reference_free_handler);
                }
-       
-               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;
+               switch (vf[i].Type) {
+               case FlatString:
+                       break;
+               case StringCluster:
+               {
+                       autoRegisterTokens(enumCounter, vf[i].Sub, subStr, 1, vf[i].cval);
                }
-       
-               total_len = atoi(&buf[4]);
-               serialized_vcard = malloc(total_len + 2);
+               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);
+}
 
-               serv_read(serialized_vcard, total_len);
-               serialized_vcard[total_len] = 0;
-       
-               v = vcard_load(serialized_vcard);
-               free(serialized_vcard);
+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);
+       addrbookent *ab = (addrbookent*) CTX(CTX_VCARD);
+       if (GetHash(ab->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);
+       addrbookent *ab = (addrbookent*) CTX(CTX_VCARD);
+
+       if (t == NULL) {
+               LogTemplateError(NULL, "VCard item", ERR_NAME, TP,
+                                "Missing context");
+               return;
+       }
+
+       if (GetHash(ab->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_msgno(StrBuf *Target, WCTemplputParams *TP)
+{
+       addrbookent *ab = (addrbookent*) CTX(CTX_VCARD);
+       if (ab->msgNoStr == NULL) {
+               ab->msgNoStr = NewStrBufPlain(NULL, 64);
+       }
+       StrBufPrintf(ab->msgNoStr, "%ld", ab->ab_msgnum);
+       StrBufAppendTemplate(Target, TP, ab->msgNoStr, 0);
+}
+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;
+       }
        
-               /* 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 (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 (!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);
-                       }
+       if (vf->Type == searchType) {
+               addrbookent *ab = (addrbookent*) CTX(CTX_VCARD);
+               if (GetHash(ab->VC, LKEY(vf->cval), &v) && v != NULL)
+                       return 1;
+       }
+       return rc;
+}
 
-                       else if (!strcasecmp(key, "fn")) {
-                               safestrncpy(fullname, value, sizeof fullname);
-                       }
 
-                       else if (!strcasecmp(key, "title")) {
-                               safestrncpy(title, value, sizeof title);
-                       }
+
+
+HashList *getContextVcard(StrBuf *Target, WCTemplputParams *TP)
+{
+       vcField *vf = (vcField*) CTX(CTX_VCARD_TYPE);
+       addrbookent *ab = (addrbookent*) CTX(CTX_VCARD);
+
+       if ((vf == NULL) || (ab == NULL)) {
+               LogTemplateError(NULL, "VCard item type", ERR_NAME, TP,
+                                "Need VCard and Vcard type in context");
+               
+               return NULL;
+       }
+       return ab->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));
        
-                       else if (!strcasecmp(key, "org")) {
-                               safestrncpy(org, value, sizeof org);
+       if (vf->cval == searchType) {
+               return 1;
+       }
+       else {
+               return 0;
+       }
+}
+
+
+int conditional_VC_Havetype(StrBuf *Target, WCTemplputParams *TP)
+{
+       addrbookent *ab = (addrbookent*) CTX(CTX_VCARD);
+       long HaveFieldType = GetTemplateTokenNumber(Target, TP, 2, 0);
+       int rc = 0;     
+       void *vVCitem;
+       const char *Key;
+       long len;
+       HashPos *it = GetNewHashPos(ab->VC, 0);
+       while (GetNextHashPos(ab->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;
                        }
-       
-                       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);
+               }
+       }
+       DeleteHashPos(&it);
+       return rc;
+}
+
+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;
+}
+
+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)){
+               FlushStrBuf(Swap);
+               StrBuf_RFC822_to_Utf8(Swap, ThisFieldStr, NULL, NULL); /* default charset, current charset */
+               SwapBuffers(Swap, ThisFieldStr);
+               FlushStrBuf(Swap);
+       }
+       Put(thisVC, LKEY(thisField->cval), ThisFieldStr, HFreeStrBuf);
+}
+
+void parse_vcard(StrBuf *Target, struct vCard *v, HashList *VC, wc_mime_attachment *Mime)
+{
+       StrBuf *Swap = NULL;
+       int i, j, k;
+       char buf[SIZ];
+       int is_qp = 0;
+       int is_b64 = 0;
+       int ntokens, len;
+       StrBuf *thisname = NULL;
+       char firsttoken[SIZ];
+       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) {
+                       len = extract_token(buf, ChrPtr(thisname), j, ';', sizeof buf);
+                       if (!strcasecmp(buf, "encoding=quoted-printable")) {
+                               is_qp = 1;
                        }
-       
-                       else if ( (!strcasecmp(key, "tel;home")) || (!strcasecmp(key, "tel;type=home")) ) {
-                               extract_token(hometel, value, 0, ';', sizeof hometel);
+                       else if (!strcasecmp(buf, "encoding=base64")) {
+                               is_b64 = 1;
                        }
-       
-                       else if ( (!strcasecmp(key, "tel;work")) || (!strcasecmp(key, "tel;type=work")) ) {
-                               extract_token(worktel, value, 0, ';', sizeof worktel);
+                       else{
+                               if (StrLength(thisVCToken) > 0) {
+                                       StrBufAppendBufPlain(thisVCToken, HKEY(";"), 0);
+                               }
+                               StrBufAppendBufPlain(thisVCToken, buf, len, 0);
                        }
-       
-                       else if ( (!strcasecmp(key, "tel;fax")) || (!strcasecmp(key, "tel;type=fax")) ) {
-                               extract_token(faxtel, value, 0, ';', sizeof faxtel);
+               }
+
+               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);
                        }
-       
-                       else if ( (!strcasecmp(key, "tel;cell")) || (!strcasecmp(key, "tel;type=cell")) ) {
-                               extract_token(mobiletel, value, 0, ';', sizeof mobiletel);
+                               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:
+                               ThisFieldStr = NewStrBufPlain(v->prop[i].value, -1);
+                               StrBufDecodeBase64(ThisFieldStr);
+                               PutVcardItem(VC, thisField, ThisFieldStr, is_qp, Swap);
+                               break;
+                       case TerminateList:
+                       case UnKnown:
+                               break;
                        }
-       
-                       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 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 {
-                               strcat(extrafields, key);
-                               strcat(extrafields, ":");
-                               strcat(extrafields, value);
-                               strcat(extrafields, "\n");
+                               StrBufAppendBufPlain(oldVal, HKEY("\n"), 0);
                        }
-       
+
+                       StrBufAppendBuf(oldVal, thisVCToken, 0);
+                       StrBufAppendBufPlain(oldVal, HKEY(":"), 0);
+                       StrBufAppendBufPlain(oldVal, v->prop[i].value, -1, 0);
+                       continue;
+               }
+       }
+       FreeStrBuf(&thisname);
+       FreeStrBuf(&Swap);
+       FreeStrBuf(&thisVCToken);
+}
+
+void tmplput_VCARD_ITEM(StrBuf *Target, WCTemplputParams *TP)
+{
+       addrbookent *ab = CTX(CTX_VCARD);
+       int evc;
+       void *vStr;
+
+       evc = GetTemplateTokenNumber(Target, TP, 0, -1);
+       if (evc != -1)
+       {
+               if (GetHash(ab->VC, IKEY(evc), &vStr))
+               {
+                       StrBufAppendTemplate(Target, TP,
+                                            (StrBuf*) vStr,
+                                            1);
                }
+       }
        
-               vcard_free(v);
+}
+
+HashList *CtxGetVcardList(StrBuf *Target, WCTemplputParams *TP)
+{
+       HashList *pb = CTX(CTX_VCARD_LIST);
+       return pb;
+}
+
+void display_one_vcard (StrBuf *Target, addrbookent *ab, const char *tp_name, size_t tp_name_len)
+{
+       WCTemplputParams *TP = NULL;
+       WCTemplputParams SubTP;
+
+        memset(&SubTP, 0, sizeof(WCTemplputParams));    
+       StackContext(TP, &SubTP, ab, CTX_VCARD, 0, NULL);
+
+       DoTemplate(tp_name, tp_name_len, Target, &SubTP);
+       UnStackContext(&SubTP);
+}
+
+/*
+ * 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);
+}
 
-       /** Display the form */
+/*
+ * 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, 
+                  message_summary *VCMsg,
+                  wc_mime_attachment *VCAtt,
+                  const char *return_to, 
+                  const char *force_room) {
+       WCTemplputParams SubTP;
+       wcsession *WCC = WC;
+       message_summary *Msg = NULL;
+       wc_mime_attachment *VCMime = NULL;
+       struct vCard *v;
+       char whatuser[256];
+       addrbookent ab;
+
+       memset(&ab, 0, sizeof(addrbookent));
+       ab.VC = NewHash(0, lFlathash);
+       /* Display the form */
        output_headers(1, 1, 1, 0, 0, 0);
 
-       svput("BOXTITLE", WCS_STRING, _("Edit contact information"));
-       do_template("beginbox", NULL);
+       safestrncpy(whatuser, "", sizeof whatuser);
 
-       wprintf("<form method=\"POST\" action=\"submit_vcard\">\n");
-       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+       if ((msgnum >= 0) || 
+           ((VCMsg != NULL) && (VCAtt != NULL)))
+       {
+               if ((VCMsg == NULL) && (VCAtt == NULL)) {
 
-       if (force_room != NULL) {
-               wprintf("<input type=\"hidden\" name=\"force_room\" value=\"");
-               escputs(force_room);
-               wprintf("\">\n");
+                       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;
+                               DeleteHash(&ab.VC);
+                       }
+               
+                       v = VCardLoad(VCMime->Data);
+               }
+               else {
+                       v = VCardLoad(VCAtt->Data);
+               }
+
+               parse_vcard(WCC->WBuf, v, ab.VC, NULL);
+       
+       
+               vcard_free(v);
        }
 
-       wprintf("<div class=\"fix_scrollbar_bug\">"
-               "<table class=\"vcard_edit_background\"><tr><td>\n");
+        memset(&SubTP, 0, sizeof(WCTemplputParams));    
+       {
+               WCTemplputParams *TP = NULL;
+               WCTemplputParams SubTP;
 
-       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
-       );
+               StackContext(TP, &SubTP, &ab, CTX_VCARD, 0, NULL);
 
-       wprintf(_("Title:"));
-       wprintf("<br>"
-               "<input type=\"text\" name=\"title\" "
-               "value=\"%s\" maxlength=\"40\"><br><br>\n",
-               title
-       );
+               DoTemplate(HKEY("vcard_edit"), WCC->WBuf, &SubTP);
+               UnStackContext(&SubTP);
+       }
+       DeleteHash(&ab.VC);
 
-       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);
+       }
 }
 
 
-/**
- * \brief commit the edits to the citadel server
+/*
+ *  commit the edits to the citadel server
  */
 void edit_vcard(void) {
        long msgnum;
@@ -375,123 +711,490 @@ void edit_vcard(void) {
 
        msgnum = lbstr("msgnum");
        partnum = bstr("partnum");
-       do_edit_vcard(msgnum, partnum, "", NULL);
+       do_edit_vcard(msgnum, partnum, NULL, NULL, "", NULL);
 }
 
-
-
-/**
- * \brief parse edited vcard from the browser
+/*
+ *  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));
+                       }
+               }
+       }
+       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);
 }
 
 
 
+typedef struct _vcardview_struct {
+       long is_singlecard;
+       HashList *addrbook;
+
+} 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) {
+               VS->addrbook = NewHash(0, NULL);
+               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;
+       wc_mime_attachment *VCMime = NULL;
+       struct vCard *v;
+       addrbookent* abEntry;
+
+       VS = (vcardview_struct*) *ViewSpecific;
+
+       VCMime = load_vcard(Msg);
+       if (VCMime == NULL)
+               return 0;
+
+       v = VCardLoad(VCMime->Data);
+
+       if (v == NULL) return 0;
+
+       abEntry = (addrbookent*) malloc(sizeof(addrbookent));
+       memset(abEntry, 0, sizeof(addrbookent));
+       abEntry->name = NewStrBuf();
+       abEntry->VC = NewHash(0, lFlathash);
+       abEntry->ab_msgnum = Msg->msgnum;
+       parse_vcard(WC->WBuf, v, abEntry->VC, VCMime);
+
+       display_one_vcard(abEntry->name, abEntry, HKEY("vcard_list_name"));
+
+       if (StrLength(abEntry->name) == 0) {
+               StrBufPlain(abEntry->name, _("(no name)"), -1);
+       }
+
+       vcard_free(v);
+       
+       Put(VS->addrbook, SKEY(abEntry->name), abEntry, deleteAbEnt);
+       return 0;
+}
+
+
+/*
+ * Render the address book using info we gathered during the scan
+ *
+ * addrbook    the addressbook to render
+ * num_ab      the number of the addressbook
+ */
+static int NAMESPERPAGE = 60;
+void do_addrbook_view(vcardview_struct* VS) {
+       long i = 0;
+       int num_pages = 0;
+       int tabfirst = 0;
+       int tablast = 0;
+       StrBuf **tablabels;
+       int num_ab = GetCount(VS->addrbook);
+       HashList *headlines;
+       wcsession *WCC = WC;
+
+       WCTemplputParams *TP = NULL;
+       WCTemplputParams SubTP;
+
+        memset(&SubTP, 0, sizeof(WCTemplputParams));    
+       
+       if (num_ab == 0) {
+               do_template("vcard_list_empty");
+               return;
+       }
+
+       if (num_ab > 1) {
+               ///SortByHashKey(VS->addrbook, 0);
+       }
+
+       num_pages = (GetCount(VS->addrbook) / NAMESPERPAGE) + 1;
+
+       tablabels = malloc(num_pages * sizeof (StrBuf *));
+       if (tablabels == NULL) {
+               return;
+       }
+
+       headlines = NewHash(0, lFlathash);
+       for (i=0; i<num_pages; ++i) {
+               void *v1 = NULL;
+               void *v2 = NULL;
+               long hklen1, hklen2;
+               const char *c1, *c2;
+               StrBuf *headline;
+               addrbookent *a1, *a2;
+
+               tabfirst = i * NAMESPERPAGE;
+               tablast = tabfirst + NAMESPERPAGE - 1;
+               if (tablast > (num_ab - 1)) tablast = (num_ab - 1);
+
+               headline = NewStrBufPlain(NULL, StrLength(v1) + StrLength(v2) + 10);
+               if (GetHashAt(VS->addrbook, tabfirst, &hklen1, &c1, &v1)) {
+                       a1 = (addrbookent*) v1;
+                       StrBufAppendBuf(headline, a1->name, 0);
+
+                       if (GetHashAt(VS->addrbook, tablast, &hklen2, &c2, &v2)) {
+
+                               a2 = (addrbookent*) v2;
+                               StrBufAppendBufPlain(headline, HKEY(" - "), 0);
+                               StrBufAppendBuf(headline, a2->name, 0);
+                       }
+               }
+               tablabels[i] = headline;
+               Put(headlines, LKEY(i), headline, HFreeStrBuf);
+       }
+       StrTabbedDialog(WC->WBuf, num_pages, tablabels);
+       StackContext(TP, &SubTP, VS->addrbook, CTX_VCARD_LIST, 0, NULL);
+
+       DoTemplate(HKEY("vcard_list"), WCC->WBuf, &SubTP);
+       UnStackContext(&SubTP);
+       /* Placeholders for empty columns at end */
+       if ((num_ab % 4) != 0) {
+               for (i=0; i<(4-(num_ab % 4)); ++i) {
+                       do_template("vcard_list_cell_end");
+               }
+       }
+       
+       do_template("vcard_list_section_end");
+       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);
+
+       DeleteHash(&headlines);
+       free(tablabels);
+       wDumpContent(1);
+}
+
+
+
+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);   /* 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))
+               DeleteHash(&VS->addrbook);
+       if (VS != NULL) 
+               free(VS);
+
+       return 0;
+}
+
+void render_MIME_VCard(StrBuf *Target, WCTemplputParams *TP, StrBuf *FoundCharset)
+{
+       wc_mime_attachment *Mime = (wc_mime_attachment *) CTX(CTX_MIME_ATACH);
+       wcsession *WCC = WC;
+       if (StrLength(Mime->Data) == 0)
+               MimeLoadData(Mime);
+       if (StrLength(Mime->Data) > 0) {
+               struct vCard *v;
+               StrBuf *Buf;
+
+               Buf = NewStrBuf();
+               /** If it's my vCard I can edit it */
+               if (    (!strcasecmp(ChrPtr(WCC->CurRoom.name), USERCONFIGROOM))
+                       || ((StrLength(WCC->CurRoom.name) > 11) &&
+                           (!strcasecmp(&(ChrPtr(WCC->CurRoom.name)[11]), USERCONFIGROOM)))
+                       || (WCC->CurRoom.view == VIEW_ADDRESSBOOK)
+                       ) {
+                       StrBufAppendPrintf(Buf, "<a href=\"edit_vcard?msgnum=%ld?partnum=%s\">",
+                               Mime->msgnum, ChrPtr(Mime->PartNum));
+                       StrBufAppendPrintf(Buf, "[%s]</a>", _("edit"));
+               }
+
+               /* In all cases, display the full card */
+
+               v = VCardLoad(Mime->Data);
+
+               if (v != NULL) {
+                       addrbookent ab;
+                       memset(&ab, 0, sizeof(addrbookent));
+
+                       ab.VC = NewHash(0, lFlathash);
+                       ab.ab_msgnum = Mime->msgnum;
+
+                       parse_vcard(Target, v, ab.VC, Mime);
+                       display_one_vcard (Target, &ab, HKEY("vcard_msg_display"));
+                       DeleteHash(&ab.VC);
+                       vcard_free(v);
+
+               }
+               else {
+                       StrBufPlain(Buf, _("failed to load vcard"), -1);
+               }
+               FreeStrBuf(&Mime->Data);
+               Mime->Data = Buf;
+       }
+
+}
+
 void 
-InitModule_VCARD
+ServerStartModule_VCARD
 (void)
 {
-       WebcitAddUrlHandler(HKEY("edit_vcard"), edit_vcard, 0);
-       WebcitAddUrlHandler(HKEY("submit_vcard"), submit_vcard, 0);
 }
 
-/*@}*/
+void 
+ServerShutdownModule_VCARD
+(void)
+{
+       DeleteHash(&DefineToToken);
+       DeleteHash(&vcNames);
+       DeleteHash(&VCTokenToDefine);
+}
+
+void 
+InitModule_VCARD
+(void)
+{
+       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);
+
+       REGISTERTokenParamDefine(NAMESPERPAGE);
+
+
+       RegisterCTX(CTX_VCARD);
+       RegisterCTX(CTX_VCARD_LIST);
+       RegisterCTX(CTX_VCARD_TYPE);
+
+       RegisterReadLoopHandlerset(
+               VIEW_ADDRESSBOOK,
+               vcard_GetParamsGetServerCall,
+               NULL,
+               NULL,
+               NULL, 
+               vcard_LoadMsgFromServer,
+               vcard_RenderView_or_Tail,
+               vcard_Cleanup);
+
+       RegisterIterator("MAIL:VCARDS", 0, NULL, CtxGetVcardList, NULL, NULL, CTX_VCARD, CTX_VCARD_LIST, IT_NOFLAG);
+
+
+       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);
+
+       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:MSGNO", 0, 1, tmpl_vcard_msgno, NULL, 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);
+
+       RegisterMimeRenderer(HKEY("text/x-vcard"), render_MIME_VCard, 1, 201);
+       RegisterMimeRenderer(HKEY("text/vcard"), render_MIME_VCard, 1, 200);
+}