Work on vcards
[citadel.git] / webcit / vcard_edit.c
index 248881d11b84f07ce25d1b3f9ac826b83b57594d..47c04c724a5863fa2610caa84e7ff94e14bb40eb 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;
+long VCEnumCounter = 0;
+
+typedef enum _VCStrEnum {
+       FlatString,
+       StringCluster,
+       PhoneNumber,
+       EmailAddr,
+       Street,
+       Number,
+       AliasFor,
+       Base64BinaryAttachment,
+       TerminateList
+}VCStrEnum;
+typedef struct vcField vcField;
+struct vcField {
+       ConstStr STR;
+       VCStrEnum Type;
+       vcField *Sub;
+       long cval;
+       const char *Str;
+};
+
+vcField VCStr_Ns [] = {
+       {{HKEY("last")},   FlatString,    NULL, 0, "Last Name"},
+       {{HKEY("first")},  FlatString,    NULL, 0, "First Name"},
+       {{HKEY("middle")}, FlatString,    NULL, 0, "Middle Name"},
+       {{HKEY("prefix")}, FlatString,    NULL, 0, "Prefix"},
+       {{HKEY("suffix")}, FlatString,    NULL, 0, "Suffix"},
+       {{HKEY("")},       TerminateList, NULL, 0, ""}
+};
+
+vcField VCStr_Addrs [] = {
+       {{HKEY("POBox")},    FlatString,    NULL, 0, "PO box"},
+       {{HKEY("address")},  FlatString,    NULL, 0, "Address"},
+       {{HKEY("address2")}, FlatString,    NULL, 0, ""},
+       {{HKEY("city")},     FlatString,    NULL, 0, "City"},
+       {{HKEY("state")},    FlatString,    NULL, 0, "State"},
+       {{HKEY("zip")},      FlatString,    NULL, 0, "ZIP code"},
+       {{HKEY("country")},  FlatString,    NULL, 0, "Country"},
+       {{HKEY("")},         TerminateList, NULL, 0, ""}
+};
+
+vcField VCStrE [] = {
+       {{HKEY("version")},         Number,                 NULL,        0, ""},
+       {{HKEY("rev")},             Number,                 NULL,        0, ""},
+       {{HKEY("label")},           FlatString,             NULL,        0, ""},
+       {{HKEY("uid")},             FlatString,             NULL,        0, ""},
+       {{HKEY("n")},               StringCluster,          VCStr_Ns,    0, ""}, /* N is name, but only if there's no FN already there */
+       {{HKEY("fn")},              FlatString,             NULL,        0, ""}, /* FN (full name) is a true 'display name' field */
+       {{HKEY("title")},           FlatString,             NULL,        0, "Title:"},
+       {{HKEY("org")},             FlatString,             NULL,        0, "Organization:"},/* organization */
+       {{HKEY("email")},           EmailAddr,              NULL,        0, "E-mail:"},
+       {{HKEY("tel")},             PhoneNumber,            NULL,        0, "Telephone:"},
+       {{HKEY("adr")},             StringCluster,          VCStr_Addrs, 0, "Address:"},
+       {{HKEY("photo")},           Base64BinaryAttachment, NULL,        0, "Photo:"},
+       {{HKEY("tel;home")},        PhoneNumber,            NULL,        0, " (home)"},
+       {{HKEY("tel;work")},        PhoneNumber,            NULL,        0, " (work)"},
+       {{HKEY("tel;fax")},         PhoneNumber,            NULL,        0, " (fax)"},
+       {{HKEY("tel;cell")},        PhoneNumber,            NULL,        0, " (cell)"},
+       {{HKEY("email;internet")},  EmailAddr,              NULL,        0, "E-mail:"},
+       {{HKEY("")},                TerminateList,          NULL,        0, ""}
+};
+
+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 */
+
+
+void RegisterVCardToken(vcField* vf, StrBuf *name, int inTokenCount)
+{
+       RegisterTokenParamDefine(SKEY(name), vf->cval);
+       Put(DefineToToken, LKEY(vf->cval), vf, reference_free_handler);
+
+       syslog(LOG_DEBUG, "Token: %s -> %ld, %d", 
+              ChrPtr(name),
+              vf->cval, 
+              inTokenCount);
+
+}
+
+void autoRegisterTokens(long *enumCounter, vcField* vf, StrBuf *BaseStr, int layer)
+{
+       int i = 0;
+       while (vf[i].STR.len > 0) {
+               StrBuf *subStr = NewStrBuf();
+               vf[i].cval = (*enumCounter) ++;
+               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);
+                       i++;
+                       continue;
+               }
+               break;
+               case PhoneNumber:
+                       break;
+               case EmailAddr:
+                       break;
+               case Street:
+                       break;
+               case Number:
+                       break;
+               case AliasFor:
+                       break;
+               case Base64BinaryAttachment:
+                       break;
+               case TerminateList:
+                       break;
+               }
+               RegisterVCardToken(&vf[i], subStr, i);
+               i++;
+       }
+}
+
+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);
+       }
+}
+
+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);
+       }
+}
+
+int filter_VC_ByType(const char* key, long len, void *Context, StrBuf *Target, WCTemplputParams *TP)
+{
+       long searchType;
+       long type = 0;
+       void *vvcField;
+       int rc = 0;
+
+       memcpy(type, key, sizeof(long));
+       searchType = GetTemplateTokenNumber(Target, TP, 3, 0);/// todo: which?
+       
+       if (GetHash(DefineToToken, LKEY(type), &vvcField) &&
+           (vvcField != NULL))
+       {
+               vcField *t = (vcField*) vvcField;
+               if (t && t->Type == searchType) {
+                       rc = 1; 
+               }
+       }
+       return rc;
+}
+
+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;
+}
+
 /*
  * Record compare function for sorting address book indices
  */
@@ -29,47 +291,6 @@ void nametab(char *tabbuf, long len, char *name) {
 }
 
 
-/*
- * display the adressbook overview
- */
-void display_addressbook(long msgnum, char alpha) {
-       //char buf[SIZ];
-       /* char mime_partnum[SIZ]; */
-       ///char mime_disposition[SIZ];
-       //int mime_length;
-       char vcard_partnum[SIZ];
-       StrBuf *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
-       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(ChrPtr(WC->wc_roomname), USERCONFIGROOM))
-                               || (!strcasecmp(&(ChrPtr(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"));
-                       }
-
-                       FreeStrBuf(&vcard_source);
-               }
-       }
-
-}
-
-
-
 /*
  * If it's an old "Firstname Lastname" style record, try to convert it.
  */
@@ -129,7 +350,8 @@ wc_mime_attachment *load_vcard(message_summary *Msg)
        if (VCMime == NULL)
                return NULL;
 
-       MimeLoadData(VCMime);
+       if (VCMime->Data == NULL)
+               MimeLoadData(VCMime);
        return VCMime;
 }
 
@@ -148,7 +370,7 @@ void fetch_ab_name(message_summary *Msg, char **namebuf) {
                return;
 
        /* Grab the name off the card */
-       display_vcard(WC->WBuf, VCMime->Data, 0, 0, namebuf, Msg->msgnum);
+       display_vcard(WC->WBuf, VCMime, 0, 0, namebuf, Msg->msgnum);
 
        if (*namebuf != NULL) {
                lastfirst_firstlast(*namebuf);
@@ -238,7 +460,7 @@ void fetchname_parsed_vcard(struct vCard *v, char **storename) {
                        }
                }
                if (is_qp) {
-                       // %ff can become 6 bytes in utf8 
+                       /* %ff can become 6 bytes in utf8  */
                        *storename = malloc(len * 2 + 3); 
                        j = CtdlDecodeQuotedPrintable(
                                *storename, name,
@@ -246,7 +468,7 @@ void fetchname_parsed_vcard(struct vCard *v, char **storename) {
                        (*storename)[j] = 0;
                }
                else if (is_b64) {
-                       // ff will become one byte..
+                       /* ff will become one byte.. */
                        *storename = malloc(len + 50);
                        CtdlDecodeBase64(
                                *storename, name,
@@ -284,7 +506,8 @@ void fetchname_parsed_vcard(struct vCard *v, char **storename) {
  * full                display all items of the vcard?
  * msgnum      Citadel message pointer
  */
-void display_parsed_vcard(StrBuf *Target, struct vCard *v, int full, long msgnum) {
+void display_parsed_vcard(StrBuf *Target, struct vCard *v, int full, wc_mime_attachment *Mime)
+{
        int i, j;
        char buf[SIZ];
        char *name;
@@ -307,7 +530,7 @@ void display_parsed_vcard(StrBuf *Target, struct vCard *v, int full, long msgnum
        strcpy(org, "");
 
        if (!full) {
-               StrBufAppendPrintf(Target, "<TD>");
+               StrBufAppendPrintf(Target, "<td>");
                name = vcard_get_prop(v, "fn", 1, 0, 0);
                if (name != NULL) {
                        StrEscAppend(Target, NULL, name, 0, 0);
@@ -320,12 +543,12 @@ void display_parsed_vcard(StrBuf *Target, struct vCard *v, int full, long msgnum
                else {
                        StrBufAppendPrintf(Target, "&nbsp;");
                }
-               StrBufAppendPrintf(Target, "</TD>");
+               StrBufAppendPrintf(Target, "</td>");
                return;
        }
 
-       StrBufAppendPrintf(Target, "<div align=center>"
-               "<table bgcolor=#aaaaaa width=50%%>");
+       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) {
@@ -351,7 +574,7 @@ void display_parsed_vcard(StrBuf *Target, struct vCard *v, int full, long msgnum
                                utf8ify_rfc822_string(&v->prop[i].value);
 
                        if (is_qp) {
-                               // %ff can become 6 bytes in utf8 
+                               /* %ff can become 6 bytes in utf8 */
                                thisvalue = malloc(len * 2 + 3); 
                                j = CtdlDecodeQuotedPrintable(
                                        thisvalue, v->prop[i].value,
@@ -359,7 +582,7 @@ void display_parsed_vcard(StrBuf *Target, struct vCard *v, int full, long msgnum
                                thisvalue[j] = 0;
                        }
                        else if (is_b64) {
-                               // ff will become one byte..
+                               /* ff will become one byte.. */
                                thisvalue = malloc(len + 50);
                                CtdlDecodeBase64(
                                        thisvalue, v->prop[i].value,
@@ -396,7 +619,7 @@ void display_parsed_vcard(StrBuf *Target, struct vCard *v, int full, long msgnum
        
                        else if (!strcasecmp(firsttoken, "email")) {
                                size_t len;
-                               if (!IsEmptyStr(mailto)) strcat(mailto, "<br />");
+                               if (!IsEmptyStr(mailto)) strcat(mailto, "<br>");
                                strcat(mailto,
                                        "<a href=\"display_enter"
                                        "?force_room=_MAIL_?recp=");
@@ -418,7 +641,7 @@ void display_parsed_vcard(StrBuf *Target, struct vCard *v, int full, long msgnum
                                strcat(mailto, "</A>");
                        }
                        else if (!strcasecmp(firsttoken, "tel")) {
-                               if (!IsEmptyStr(phone)) strcat(phone, "<br />");
+                               if (!IsEmptyStr(phone)) strcat(phone, "<br>");
                                strcat(phone, thisvalue);
                                for (j=0; j<num_tokens(thisname, ';'); ++j) {
                                        extract_token(buf, thisname, j, ';', sizeof buf);
@@ -439,18 +662,18 @@ 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, "<tr><td>");
                                        StrBufAppendPrintf(Target, _("Address:"));
-                                       StrBufAppendPrintf(Target, "</TD><TD>");
+                                       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 />");
+                                                       if (j<3) StrBufAppendPrintf(Target, "<br>");
                                                        else StrBufAppendPrintf(Target, " ");
                                                }
                                        }
-                                       StrBufAppendPrintf(Target, "</TD></TR>\n");
+                                       StrBufAppendPrintf(Target, "</td></tr>\n");
                                }
                        }
                        /* else if (!strcasecmp(firsttoken, "photo") && full && pass == 2) { 
@@ -488,23 +711,23 @@ void display_parsed_vcard(StrBuf *Target, struct vCard *v, int full, long msgnum
                }
        
                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>");
+                       StrBufAppendPrintf(Target, "<tr bgcolor=\"#aaaaaa\">"
+      "<td colspan=2 bgcolor=\"#ffffff\">"
+      "<img align=\"center\" src=\"static/webcit_icons/essen/32x32/contact.png\">"
+      "<font size=\"+1\"><b>");
                        StrEscAppend(Target, NULL, fullname, 0, 0);
-                       StrBufAppendPrintf(Target, "</B></FONT>");
+                       StrBufAppendPrintf(Target, "</b></font>");
                        if (!IsEmptyStr(title)) {
-                               StrBufAppendPrintf(Target, "<div align=right>");
+                               StrBufAppendPrintf(Target, "<div align=\"right>\"");
                                StrEscAppend(Target, NULL, title, 0, 0);
                                StrBufAppendPrintf(Target, "</div>");
                        }
                        if (!IsEmptyStr(org)) {
-                               StrBufAppendPrintf(Target, "<div align=right>");
+                               StrBufAppendPrintf(Target, "<div align=\"right\">");
                                StrEscAppend(Target, NULL, org, 0, 0);
                                StrBufAppendPrintf(Target, "</div>");
                        }
-                       StrBufAppendPrintf(Target, "</TD></TR>\n");
+                       StrBufAppendPrintf(Target, "</td></tr>\n");
                
                        if (!IsEmptyStr(phone)) {
                                StrBufAppendPrintf(Target, "<tr><td>");
@@ -524,6 +747,257 @@ void display_parsed_vcard(StrBuf *Target, struct vCard *v, int full, long msgnum
 }
 
 
+void PutVcardItem(vcField *thisField, HashList *thisVC, 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.
+ *
+ * Set 'full' to nonzero to display the full card, otherwise it will only
+ * show a summary line.
+ *
+ * This code is a bit ugly, so perhaps an explanation is due: we do this
+ * in two passes through the vCard fields.  On the first pass, we process
+ * fields we understand, and then render them in a pretty fashion at the
+ * end.  Then we make a second pass, outputting all the fields we don't
+ * understand in a simple two-column name/value format.
+ * v           the vCard to display
+ * full                display all items of the vcard?
+ * msgnum      Citadel message pointer
+ */
+void parse_vcard(StrBuf *Target, struct vCard *v, HashList *VC, int full, wc_mime_attachment *Mime)
+{
+       StrBuf *Val = NULL;
+       StrBuf *Swap = NULL;
+       int i, j, k;
+       char buf[20]; //SIZ];
+       int is_qp = 0;
+       int is_b64 = 0;
+       int ntokens, len;
+       StrBuf *thisname = NULL;
+       char firsttoken[20]; ///SIZ];
+       void *V;
+       HashList *thisVC;
+       StrBuf *thisVCToken;
+       void *vField = NULL;
+
+       thisVC = NewHash(1, lFlathash);
+       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 = extract_token(buf, ChrPtr(thisname), j, ';', sizeof buf);
+                       if (!strcasecmp(buf, "encoding=quoted-printable")) {
+                               is_qp = 1;
+/*                             remove_token(thisname, j, ';');*/
+                       }
+                       else if (!strcasecmp(buf, "encoding=base64")) {
+                               is_b64 = 1;
+/*                             remove_token(thisname, j, ';');*/
+                       }
+                       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++;
+                               }
+*/
+
+                       }
+               }
+
+               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(&thisField->Sub[j], thisVC, ThisFieldStr, is_qp, Swap);
+                                       j++;
+                               }
+                       }
+                               break;
+                       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(thisField, thisVC, ThisFieldStr, is_qp, Swap);
+
+                               break;
+                       case Base64BinaryAttachment:
+                       case TerminateList:
+                               break;
+                       }
+
+               }
+               /* 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"))
+                                               strcat(phone, _(" (work)"));
+                                       else if (!strcasecmp(buf, "home"))
+                                               strcat(phone, _(" (home)"));
+                                       else if (!strcasecmp(buf, "cell"))
+                                               strcat(phone, _(" (cell)"));
+                                       else {
+                                               strcat(phone, " (");
+                                               strcat(phone, buf);
+                                               strcat(phone, ")");
+                                       }
+                               }
+                       }
+
+               }
+*/
+#endif 
+               FreeStrBuf(&Val);
+               ////free(thisname);
+               /// thisname = NULL;
+       }
+
+
+       {
+               WCTemplputParams *TP = NULL;
+               WCTemplputParams SubTP;
+               FlushStrBuf(Target);
+               StackContext(TP, &SubTP, thisVC, CTX_VCARD, 0, NULL);
+               {
+                       DoTemplate(HKEY("test_vcard"), Target, &SubTP);
+               }
+               UnStackContext(&SubTP);
+       }
+       printf("%s\n", ChrPtr(Target));
+       FreeStrBuf(&thisVCToken);
+       DeleteHash(&thisVC);/// todo
+}
+
+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 new_vcard (StrBuf *Target, struct vCard *v, int full, wc_mime_attachment *Mime)
+{
+       HashList *VC;
+       WCTemplputParams SubTP;
+
+        memset(&SubTP, 0, sizeof(WCTemplputParams));    
+
+
+       VC = NewHash(0, Flathash);
+       parse_vcard(Target, v, VC, full, Mime);
+
+       SubTP.Filter.ContextType = CTX_VCARD;
+       SubTP.Context = VC;
+
+       DoTemplate(HKEY("test_vcard"), Target, &SubTP);
+       DeleteHash(&VC);
+}
+
+
 
 /*
  * Display a textual vCard
@@ -539,7 +1013,7 @@ void display_parsed_vcard(StrBuf *Target, struct vCard *v, int full, long msgnum
  * msgnum      Citadel message pointer
  */
 void display_vcard(StrBuf *Target, 
-                  StrBuf *vcard_source, 
+                  wc_mime_attachment *Mime, 
                   char alpha, 
                   int full, 
                   char **storename, 
@@ -551,7 +1025,7 @@ void display_vcard(StrBuf *Target,
        StrBuf *Buf2;
        char this_alpha = 0;
 
-       v = VCardLoad(vcard_source);
+       v = VCardLoad(Mime->Data);
 
        if (v == NULL) return;
 
@@ -568,12 +1042,17 @@ void display_vcard(StrBuf *Target,
        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)))
+               ) 
+       {
+#define XXX_XXX 1
+#ifdef XXX_XXX
+               new_vcard (Target, v, full, Mime);
+#else
+               display_parsed_vcard(Target, v, full, Mime);
+#endif         
        }
 
        vcard_free(v);
@@ -602,9 +1081,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;
        }
 
@@ -616,9 +1095,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;
        }
 
@@ -640,43 +1119,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);
@@ -703,6 +1182,7 @@ void do_edit_vcard(long msgnum, char *partnum,
                   wc_mime_attachment *VCAtt,
                   const char *return_to, 
                   const char *force_room) {
+       wcsession *WCC = WC;
        message_summary *Msg = NULL;
        wc_mime_attachment *VCMime = NULL;
        struct vCard *v;
@@ -871,170 +1351,176 @@ void do_edit_vcard(long msgnum, char *partnum,
        /* Display the form */
        output_headers(1, 1, 1, 0, 0, 0);
 
-       svput("BOXTITLE", WCS_STRING, _("Edit contact information"));
-       do_template("beginboxx", NULL);
+       do_template("box_begin_1");
+       StrBufAppendBufPlain(WC->WBuf, _("Edit contact information"), -1, 0);
+       do_template("box_begin_2");
 
-       wprintf("<form method=\"POST\" action=\"submit_vcard\">\n");
-       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+       wc_printf("<form method=\"POST\" action=\"submit_vcard\">\n");
+       wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
 
        if (force_room != NULL) {
-               wprintf("<input type=\"hidden\" name=\"force_room\" value=\"");
+               wc_printf("<input type=\"hidden\" name=\"force_room\" value=\"");
                escputs(force_room);
-               wprintf("\">\n");
+               wc_printf("\">\n");
+       }
+       else
+       {
+               wc_printf("<input type=\"hidden\" name=\"go\" value=\"");
+               StrEscAppend(WCC->WBuf, WCC->CurRoom.name, NULL, 0, 0);
+               wc_printf("\">\n");
        }
 
-       wprintf("<div class=\"fix_scrollbar_bug\">"
-               "<table class=\"vcard_edit_background\"><tr><td>\n");
+       wc_printf("<table class=\"vcard_edit_background\"><tr><td>\n");
 
-       wprintf("<table border=0><tr>"
+       wc_printf("<table border=\"0\"><tr>"
                "<td>%s</td>"
                "<td>%s</td>"
                "<td>%s</td>"
                "<td>%s</td>"
                "<td>%s</td></tr>\n",
-               _("Prefix"), _("First"), _("Middle"), _("Last"), _("Suffix")
+               _("Prefix"), _("First Name"), _("Middle Name"), _("Last Name"), _("Suffix")
        );
-       wprintf("<tr><td><input type=\"text\" name=\"prefix\" "
+       wc_printf("<tr><td><input type=\"text\" name=\"prefix\" "
                "value=\"%s\" maxlength=\"5\" size=\"5\"></td>",
                prefix);
-       wprintf("<td><input type=\"text\" name=\"firstname\" "
+       wc_printf("<td><input type=\"text\" name=\"firstname\" "
                "value=\"%s\" maxlength=\"29\"></td>",
                firstname);
-       wprintf("<td><input type=\"text\" name=\"middlename\" "
+       wc_printf("<td><input type=\"text\" name=\"middlename\" "
                "value=\"%s\" maxlength=\"29\"></td>",
                middlename);
-       wprintf("<td><input type=\"text\" name=\"lastname\" "
+       wc_printf("<td><input type=\"text\" name=\"lastname\" "
                "value=\"%s\" maxlength=\"29\"></td>",
                lastname);
-       wprintf("<td><input type=\"text\" name=\"suffix\" "
+       wc_printf("<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>");
+       wc_printf("<table  class=\"vcard_edit_background_alt\">");
+       wc_printf("<tr><td>");
 
-       wprintf(_("Display name:"));
-       wprintf("<br>"
+       wc_printf(_("Display name:"));
+       wc_printf("<br>"
                "<input type=\"text\" name=\"fullname\" "
                "value=\"%s\" maxlength=\"40\"><br><br>\n",
                fullname
        );
 
-       wprintf(_("Title:"));
-       wprintf("<br>"
+       wc_printf(_("Title:"));
+       wc_printf("<br>"
                "<input type=\"text\" name=\"title\" "
                "value=\"%s\" maxlength=\"40\"><br><br>\n",
                title
        );
 
-       wprintf(_("Organization:"));
-       wprintf("<br>"
+       wc_printf(_("Organization:"));
+       wc_printf("<br>"
                "<input type=\"text\" name=\"org\" "
                "value=\"%s\" maxlength=\"40\"><br><br>\n",
                org
        );
 
-       wprintf("</td><td>");
+       wc_printf("</td><td>");
 
-       wprintf("<table border=0>");
-       wprintf("<tr><td>");
-       wprintf(_("PO box:"));
-       wprintf("</td><td>"
+       wc_printf("<table border=\"0\">");
+       wc_printf("<tr><td>");
+       wc_printf(_("PO box:"));
+       wc_printf("</td><td>"
                "<input type=\"text\" name=\"pobox\" "
                "value=\"%s\" maxlength=\"29\"></td></tr>\n",
                pobox);
-       wprintf("<tr><td>");
-       wprintf(_("Address:"));
-       wprintf("</td><td>"
+       wc_printf("<tr><td>");
+       wc_printf(_("Address:"));
+       wc_printf("</td><td>"
                "<input type=\"text\" name=\"extadr\" "
                "value=\"%s\" maxlength=\"29\"></td></tr>\n",
                extadr);
-       wprintf("<tr><td> </td><td>"
+       wc_printf("<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>"
+       wc_printf("<tr><td>");
+       wc_printf(_("City:"));
+       wc_printf("</td><td>"
                "<input type=\"text\" name=\"city\" "
                "value=\"%s\" maxlength=\"29\"></td></tr>\n",
                city);
-       wprintf("<tr><td>");
-       wprintf(_("State:"));
-       wprintf("</td><td>"
+       wc_printf("<tr><td>");
+       wc_printf(_("State:"));
+       wc_printf("</td><td>"
                "<input type=\"text\" name=\"state\" "
                "value=\"%s\" maxlength=\"29\"></td></tr>\n",
                state);
-       wprintf("<tr><td>");
-       wprintf(_("ZIP code:"));
-       wprintf("</td><td>"
+       wc_printf("<tr><td>");
+       wc_printf(_("ZIP code:"));
+       wc_printf("</td><td>"
                "<input type=\"text\" name=\"zipcode\" "
                "value=\"%s\" maxlength=\"10\"></td></tr>\n",
                zipcode);
-       wprintf("<tr><td>");
-       wprintf(_("Country:"));
-       wprintf("</td><td>"
+       wc_printf("<tr><td>");
+       wc_printf(_("Country:"));
+       wc_printf("</td><td>"
                "<input type=\"text\" name=\"country\" "
                "value=\"%s\" maxlength=\"29\" width=\"5\"></td></tr>\n",
                country);
-       wprintf("</table>\n");
+       wc_printf("</table>\n");
 
-       wprintf("</table>\n");
+       wc_printf("</table>\n");
 
-       wprintf("<table border=0><tr><td>");
-       wprintf(_("Home telephone:"));
-       wprintf("</td>"
+       wc_printf("<table border=0><tr><td>");
+       wc_printf(_("Home telephone:"));
+       wc_printf("</td>"
                "<td><input type=\"text\" name=\"hometel\" "
                "value=\"%s\" maxlength=\"29\"></td>\n",
                hometel);
-       wprintf("<td>");
-       wprintf(_("Work telephone:"));
-       wprintf("</td>"
+       wc_printf("<td>");
+       wc_printf(_("Work telephone:"));
+       wc_printf("</td>"
                "<td><input type=\"text\" name=\"worktel\" "
                "value=\"%s\" maxlength=\"29\"></td></tr>\n",
                worktel);
-       wprintf("<tr><td>");
-       wprintf(_("Mobile telephone:"));
-       wprintf("</td>"
+       wc_printf("<tr><td>");
+       wc_printf(_("Mobile telephone:"));
+       wc_printf("</td>"
                "<td><input type=\"text\" name=\"mobiletel\" "
                "value=\"%s\" maxlength=\"29\"></td>\n",
                mobiletel);
-       wprintf("<td>");
-       wprintf(_("Fax number:"));
-       wprintf("</td>"
+       wc_printf("<td>");
+       wc_printf(_("Fax number:"));
+       wc_printf("</td>"
                "<td><input type=\"text\" name=\"faxtel\" "
                "value=\"%s\" maxlength=\"29\"></td></tr></table>\n",
                faxtel);
 
-       wprintf("<table class=\"vcard_edit_background_alt\">");
-       wprintf("<tr><td>");
+       wc_printf("<table class=\"vcard_edit_background_alt\">");
+       wc_printf("<tr><td>");
 
-       wprintf("<table border=0><TR>"
+       wc_printf("<table border=0><TR>"
                "<td valign=top>");
-       wprintf(_("Primary Internet e-mail address"));
-       wprintf("<br />"
+       wc_printf(_("Primary Internet e-mail address"));
+       wc_printf("<br>"
                "<input type=\"text\" name=\"primary_inetemail\" "
                "size=40 maxlength=60 value=\"");
        escputs(primary_inetemail);
-       wprintf("\"><br />"
+       wc_printf("\"><br>"
                "</td><td valign=top>");
-       wprintf(_("Internet e-mail aliases"));
-       wprintf("<br />"
+       wc_printf(_("Internet e-mail aliases"));
+       wc_printf("<br>"
                "<textarea name=\"other_inetemail\" rows=5 cols=40 width=40>");
        escputs(other_inetemail);
-       wprintf("</textarea></td></tr></table>\n");
+       wc_printf("</textarea></td></tr></table>\n");
 
-       wprintf("</td></tr></table>\n");
+       wc_printf("</td></tr></table>\n");
 
-       wprintf("<input type=\"hidden\" name=\"extrafields\" value=\"");
+       wc_printf("<input type=\"hidden\" name=\"extrafields\" value=\"");
        escputs(extrafields);
-       wprintf("\">\n");
+       wc_printf("\">\n");
 
-       wprintf("<input type=\"hidden\" name=\"return_to\" value=\"");
+       wc_printf("<input type=\"hidden\" name=\"return_to\" value=\"");
        escputs(return_to);
-       wprintf("\">\n");
+       wc_printf("\">\n");
 
-       wprintf("<div class=\"buttons\">\n"
+       wc_printf("<div class=\"buttons\">\n"
                "<input type=\"submit\" name=\"ok_button\" value=\"%s\">"
                "&nbsp;"
                "<input type=\"submit\" name=\"cancel_button\" value=\"%s\">"
@@ -1043,8 +1529,8 @@ void do_edit_vcard(long msgnum, char *partnum,
                _("Cancel")
        );
        
-       wprintf("</td></tr></table>\n");
-       do_template("endbox", NULL);
+       wc_printf("</td></tr></table>\n");
+       do_template("box_end");
        wDumpContent(1);
        if (Msg != NULL) {
                DestroyMessageSummary(Msg);
@@ -1070,32 +1556,26 @@ void edit_vcard(void) {
  *  parse edited vcard from the browser
  */
 void submit_vcard(void) {
-       wcsession *WCC = WC;
        struct vCard *v;
        char *serialized_vcard;
        char buf[SIZ];
        StrBuf *Buf;
+       const StrBuf *ForceRoom;
        int i;
 
        if (!havebstr("ok_button")) { 
-               readloop(readnew);
+               readloop(readnew, eUseDefault);
                return;
        }
 
        if (havebstr("force_room")) {
-               if (gotoroom(sbstr("force_room")) != 200) {
-                       StrBufAppendBufPlain(WCC->ImportantMsg,
-                                            _("Unable to enter the room to save your message"),
-                                            -1, 0);
-                       StrBufAppendBufPlain(WCC->ImportantMsg,
-                                            HKEY(": "), 0);
-                       StrBufAppendBuf(WCC->ImportantMsg, sbstr("force_room"), 0);
-                       StrBufAppendBufPlain(WCC->ImportantMsg,
-                                            HKEY("; "), 0);
-                                              
-                       StrBufAppendBufPlain(WCC->ImportantMsg,
-                                            _("Aborting."),
-                                            -1, 0);
+               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);
@@ -1107,33 +1587,29 @@ void submit_vcard(void) {
                                http_redirect(bstr("return_to"));
                        }
                        else {
-                               readloop(readnew);
+                               readloop(readnew, eUseDefault);
                        }
                        return;
                }
        }
 
-       sprintf(buf, "ENT0 1|||4||");
-       serv_puts(buf);
-       serv_getln(buf, sizeof buf);
-       if (buf[0] != '4') {
+       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 */
-       Buf = NewStrBuf();
        StrBufPrintf(Buf, "begin:vcard\r\n%s\r\nend:vcard\r\n",
                     bstr("extrafields")
        );
        v = VCardLoad(Buf);     /* Start with the extra fields */
-       FreeStrBuf(&Buf);
        if (v == NULL) {
-               safestrncpy(WCC->ImportantMessage,
-                       _("An error has occurred."),
-                       sizeof WCC->ImportantMessage
-               );
+               AppendImportantMessage(_("An error has occurred."), -1);
                edit_vcard();
+               FreeStrBuf(&Buf);
                return;
        }
 
@@ -1175,18 +1651,16 @@ void submit_vcard(void) {
        serialized_vcard = vcard_serialize(v);
        vcard_free(v);
        if (serialized_vcard == NULL) {
-               safestrncpy(WCC->ImportantMessage,
-                       _("An error has occurred."),
-                       sizeof WCC->ImportantMessage
-               );
+               AppendImportantMessage(_("An error has occurred."), -1);
                edit_vcard();
+               FreeStrBuf(&Buf);
                return;
        }
 
-       serv_puts("Content-type: text/x-vcard; charset=UTF-8");
-       serv_puts("");
+       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")) {
@@ -1199,8 +1673,9 @@ void submit_vcard(void) {
                http_redirect(bstr("return_to"));
        }
        else {
-               readloop(readnew);
+               readloop(readnew, eUseDefault);
        }
+       FreeStrBuf(&Buf);
 }
 
 
@@ -1232,7 +1707,7 @@ void display_vcard_photo_img(void)
                output_headers(0, 0, 0, 0, 0, 0);
                hprintf("Content-Type: text/plain\r\n");
                begin_burst();
-               wprintf(_("Could Not decode vcard photo\n"));
+               wc_printf(_("Could Not decode vcard photo\n"));
                end_burst();
                return;
        }
@@ -1253,7 +1728,9 @@ int vcard_GetParamsGetServerCall(SharedMessageStatus *Stat,
                                 void **ViewSpecific, 
                                 long oper, 
                                 char *cmd, 
-                                long len)
+                                long len,
+                                char *filter,
+                                long flen)
 {
        vcardview_struct *VS;
 
@@ -1318,7 +1795,7 @@ int vcard_Cleanup(void **ViewSpecific)
        vcardview_struct *VS;
 
        VS = (vcardview_struct*) *ViewSpecific;
-       end_burst();
+       wDumpContent(1);
        if ((VS != NULL) && 
            (VS->addrbook != NULL))
                free(VS->addrbook);
@@ -1327,19 +1804,94 @@ int vcard_Cleanup(void **ViewSpecific)
        return 0;
 }
 
+void 
+ServerStartModule_VCARD
+(void)
+{
+       ///VCToEnum = NewHash(0, NULL);
+
+}
+
+void 
+ServerShutdownModule_VCARD
+(void)
+{
+       /// DeleteHash(&VCToEnum);
+}
+
 void 
 InitModule_VCARD
 (void)
 {
+       RegisterCTX(CTX_VCARD);
        RegisterReadLoopHandlerset(
                VIEW_ADDRESSBOOK,
                vcard_GetParamsGetServerCall,
                NULL,
+               NULL,
+               NULL, 
                vcard_LoadMsgFromServer,
                vcard_RenderView_or_Tail,
                vcard_Cleanup);
-       WebcitAddUrlHandler(HKEY("edit_vcard"), edit_vcard, 0);
-       WebcitAddUrlHandler(HKEY("submit_vcard"), submit_vcard, 0);
-       WebcitAddUrlHandler(HKEY("vcardphoto"), display_vcard_photo_img, NEED_URL);
+       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);
+               VCTokenToDefine = NewHash(1, NULL);
+               autoRegisterTokens(&VCEnumCounter, VCStrE, Prefix, 0);
+               FreeStrBuf(&Prefix);
+       }
+       RegisterCTX(CTX_VCARD);
+       RegisterNamespace("VC:ITEM", 2, 2, tmpl_vcard_item, preeval_vcard_item, CTX_VCARD);
+       RegisterNamespace("VC:NAME", 1, 1, tmpl_vcard_name_str, preeval_vcard_name_str, CTX_VCARD);
+       REGISTERTokenParamDefine(FlatString);
+       REGISTERTokenParamDefine(StringCluster);
+       REGISTERTokenParamDefine(PhoneNumber);
+       REGISTERTokenParamDefine(EmailAddr);
+       REGISTERTokenParamDefine(Street);
+       REGISTERTokenParamDefine(Number);
+       REGISTERTokenParamDefine(AliasFor);
+       REGISTERTokenParamDefine(Base64BinaryAttachment);
+       REGISTERTokenParamDefine(TerminateList);
+
+       RegisterConditional("VC:HAVE:TYPE",      1, conditional_VC_Havetype, CTX_VCARD);
+       RegisterFilteredIterator("VC:TYPE", 1, NULL, NULL, NULL, NULL, filter_VC_ByType, CTX_STRBUF, CTX_VCARD, IT_NOFLAG);
 }