X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fvcard_edit.c;h=47c04c724a5863fa2610caa84e7ff94e14bb40eb;hb=12419374c8266f3855a119e3676a38ec812fc158;hp=11a059b87ff557ab743fe8a5f5c4695e848a67d8;hpb=72015d547deb7e4632f70ad8dcae2d56ed8bfcca;p=citadel.git
diff --git a/webcit/vcard_edit.c b/webcit/vcard_edit.c
index 11a059b87..47c04c724 100644
--- a/webcit/vcard_edit.c
+++ b/webcit/vcard_edit.c
@@ -1,10 +1,272 @@
/*
- * $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("",
- msgnum, vcard_partnum);
- wprintf("[%s]", _("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, "
");
+ StrBufAppendPrintf(Target, " | ");
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, " ");
}
- StrBufAppendPrintf(Target, " | ");
+ StrBufAppendPrintf(Target, "");
return;
}
- StrBufAppendPrintf(Target, ""
- "
");
+ StrBufAppendPrintf(Target, ""
+ "
");
for (pass=1; pass<=2; ++pass) {
if (v->numprops) for (i=0; i<(v->numprops); ++i) {
@@ -348,10 +571,10 @@ void display_parsed_vcard(StrBuf *Target, struct vCard *v, int full, long msgnum
len = strlen(v->prop[i].value);
/* if we have some untagged QP, detect it here. */
if (!is_qp && (strstr(v->prop[i].value, "=?")!=NULL))
- utf8ify_rfc822_string(v->prop[i].value);
+ 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, "
");
+ if (!IsEmptyStr(mailto)) strcat(mailto, "
");
strcat(mailto,
"");
}
else if (!strcasecmp(firsttoken, "tel")) {
- if (!IsEmptyStr(phone)) strcat(phone, "
");
+ if (!IsEmptyStr(phone)) strcat(phone, "
");
strcat(phone, thisvalue);
for (j=0; j");
+ StrBufAppendPrintf(Target, " | ");
StrBufAppendPrintf(Target, _("Address:"));
- StrBufAppendPrintf(Target, " | ");
+ StrBufAppendPrintf(Target, " | ");
for (j=0; j");
+ if (j<3) StrBufAppendPrintf(Target, " ");
else StrBufAppendPrintf(Target, " ");
}
}
- StrBufAppendPrintf(Target, " |
\n");
+ StrBufAppendPrintf(Target, "\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, ""
- ""
- ""
- "");
+ StrBufAppendPrintf(Target, ""
+ ""
+ ""
+ "");
StrEscAppend(Target, NULL, fullname, 0, 0);
- StrBufAppendPrintf(Target, "");
+ StrBufAppendPrintf(Target, "");
if (!IsEmptyStr(title)) {
- StrBufAppendPrintf(Target, "");
+ StrBufAppendPrintf(Target, " \"");
StrEscAppend(Target, NULL, title, 0, 0);
StrBufAppendPrintf(Target, " ");
}
if (!IsEmptyStr(org)) {
- StrBufAppendPrintf(Target, " ");
+ StrBufAppendPrintf(Target, " ");
StrEscAppend(Target, NULL, org, 0, 0);
StrBufAppendPrintf(Target, " ");
}
- StrBufAppendPrintf(Target, " | \n");
+ StrBufAppendPrintf(Target, " |
\n");
if (!IsEmptyStr(phone)) {
StrBufAppendPrintf(Target, "");
@@ -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("
");
- wprintf(_("This address book is empty."));
- wprintf(" \n");
+ wc_printf("
");
+ wc_printf(_("This address book is empty."));
+ wc_printf(" \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("
");
- wprintf(_("An internal error has occurred."));
- wprintf(" \n");
+ wc_printf("
");
+ wc_printf(_("An internal error has occurred."));
+ wc_printf(" \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(" |
\n");
+ wc_printf("
\n");
end_tab(page-1, num_pages);
}
begin_tab(page, num_pages);
- wprintf("
\n");
+ wc_printf("\n");
+ wc_printf("
\n");
end_tab((num_pages-1), num_pages);
begin_tab(num_pages, num_pages);
@@ -701,8 +1180,9 @@ void do_addrbook_view(addrbookent *addrbook, int num_ab) {
void do_edit_vcard(long msgnum, char *partnum,
message_summary *VCMsg,
wc_mime_attachment *VCAtt,
- char *return_to,
+ 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("