#include "calendar.h"
CtxType CTX_VCARD = CTX_NONE;
-int VCEnumCounter = 0;
+CtxType CTX_VCARD_TYPE = CTX_NONE;
+long VCEnumCounter = 0;
typedef enum _VCStrEnum {
FlatString,
ConstStr STR;
VCStrEnum Type;
vcField *Sub;
- int cval;
+ long cval;
+ ConstStr Name;
};
vcField VCStr_Ns [] = {
- {{HKEY("last")}, FlatString, NULL, 0},
- {{HKEY("first")}, FlatString, NULL, 0},
- {{HKEY("middle")}, FlatString, NULL, 0},
- {{HKEY("prefix")}, FlatString, NULL, 0},
- {{HKEY("suffix")}, FlatString, NULL, 0},
- {{HKEY("")}, TerminateList, NULL, 0}
+ {{HKEY("last")}, FlatString, NULL, 0, {HKEY("Last Name")}},
+ {{HKEY("first")}, FlatString, NULL, 0, {HKEY("First Name")}},
+ {{HKEY("middle")}, FlatString, NULL, 0, {HKEY("Middle Name")}},
+ {{HKEY("prefix")}, FlatString, NULL, 0, {HKEY("Prefix")}},
+ {{HKEY("suffix")}, FlatString, NULL, 0, {HKEY("Suffix")}},
+ {{HKEY("")}, TerminateList, NULL, 0, {HKEY("")}}
};
vcField VCStr_Addrs [] = {
- {{HKEY("POBox")}, FlatString, NULL, 0},
- {{HKEY("address")}, FlatString, NULL, 0},
- {{HKEY("address2")}, FlatString, NULL, 0},
- {{HKEY("city")}, FlatString, NULL, 0},
- {{HKEY("state")}, FlatString, NULL, 0},
- {{HKEY("zip")}, FlatString, NULL, 0},
- {{HKEY("country")}, FlatString, NULL, 0},
- {{HKEY("")}, TerminateList, NULL, 0}
+ {{HKEY("POBox")}, FlatString, NULL, 0, {HKEY("PO box")}},
+ {{HKEY("address")}, FlatString, NULL, 0, {HKEY("Address")}},
+ {{HKEY("address2")}, FlatString, NULL, 0, {HKEY("")}},
+ {{HKEY("city")}, FlatString, NULL, 0, {HKEY("City")}},
+ {{HKEY("state")}, FlatString, NULL, 0, {HKEY("State")}},
+ {{HKEY("zip")}, FlatString, NULL, 0, {HKEY("ZIP code")}},
+ {{HKEY("country")}, FlatString, NULL, 0, {HKEY("Country")}},
+ {{HKEY("")}, TerminateList, NULL, 0, {HKEY("")}}
};
vcField VCStrE [] = {
- {{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 */
- {{HKEY("email")}, EmailAddr, NULL, 0},
- {{HKEY("tel")}, PhoneNumber, NULL, 0},
- {{HKEY("adr")}, StringCluster, VCStr_Addrs, 0},
- {{HKEY("photo")}, Base64BinaryAttachment, NULL, 0},
- {{HKEY("version")}, Number, NULL, 0},
- {{HKEY("rev")}, Number, NULL, 0},
- {{HKEY("label")}, FlatString, NULL, 0},
- {{HKEY("uid")}, FlatString, NULL, 0},
- {{HKEY("")}, TerminateList, NULL, 0}
+ {{HKEY("version")}, Number, NULL, 0, {HKEY("")}},
+ {{HKEY("rev")}, Number, NULL, 0, {HKEY("")}},
+ {{HKEY("label")}, FlatString, NULL, 0, {HKEY("")}},
+ {{HKEY("uid")}, FlatString, NULL, 0, {HKEY("")}},
+ {{HKEY("n")}, StringCluster, VCStr_Ns, 0, {HKEY("")}}, /* N is name, but only if there's no FN already there */
+ {{HKEY("fn")}, FlatString, NULL, 0, {HKEY("")}}, /* FN (full name) is a true 'display name' field */
+ {{HKEY("title")}, FlatString, NULL, 0, {HKEY("Title:")}},
+ {{HKEY("org")}, FlatString, NULL, 0, {HKEY("Organization:")}},/* organization */
+ {{HKEY("email")}, EmailAddr, NULL, 0, {HKEY("E-mail:")}},
+ {{HKEY("tel")}, PhoneNumber, NULL, 0, {HKEY("Telephone:")}},
+ {{HKEY("adr")}, StringCluster, VCStr_Addrs, 0, {HKEY("Address:")}},
+ {{HKEY("photo")}, Base64BinaryAttachment, NULL, 0, {HKEY("Photo:")}},
+ {{HKEY("tel;home")}, PhoneNumber, NULL, 0, {HKEY(" (home)")}},
+ {{HKEY("tel;work")}, PhoneNumber, NULL, 0, {HKEY(" (work)")}},
+ {{HKEY("tel;fax")}, PhoneNumber, NULL, 0, {HKEY(" (fax)")}},
+ {{HKEY("tel;cell")}, PhoneNumber, NULL, 0, {HKEY(" (cell)")}},
+ {{HKEY("email;internet")}, EmailAddr, NULL, 0, {HKEY("E-mail:")}},
+ {{HKEY("")}, TerminateList, NULL, 0, {HKEY("")}}
};
ConstStr VCStr [] = {
HashList *DefineToToken = NULL;
+HashList *VCTokenToDefine = NULL;
HashList *vcNames = NULL; /* todo: fill with the name strings */
-void RegisterVCardToken(vcField* vf, StrBuf *name, int enumCounter, int inTokenCount)
+
+
+void RegisterVCardToken(vcField* vf, StrBuf *name, int inTokenCount)
{
- RegisterTokenParamDefine(SKEY(name), enumCounter);
- Put(DefineToToken, LKEY(enumCounter), vf, reference_free_handler);
- syslog(LOG_DEBUG, "Token: %s -> %d, %d",
+ RegisterTokenParamDefine(SKEY(name), vf->cval);
+ Put(DefineToToken, LKEY(vf->cval), vf, reference_free_handler);
+ Put(vcNames, LKEY(vf->cval), NewStrBufPlain(CKEY(vf->Name)), HFreeStrBuf);
+
+ syslog(LOG_DEBUG, "Token: %s -> %ld, %d",
ChrPtr(name),
- enumCounter,
+ vf->cval,
inTokenCount);
}
-void autoRegisterTokens(int *enumCounter, vcField* vf, StrBuf *BaseStr)
+void autoRegisterTokens(long *enumCounter, vcField* vf, StrBuf *BaseStr, int layer)
{
int i = 0;
while (vf[i].STR.len > 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);
+ autoRegisterTokens(enumCounter, vf[i].Sub, subStr, 1);
i++;
continue;
}
case TerminateList:
break;
}
- RegisterVCardToken(&vf[i], subStr, *enumCounter, i);
+ RegisterVCardToken(&vf[i], subStr, i);
i++;
}
}
void tmpl_vcard_item(StrBuf *Target, WCTemplputParams *TP)
{
void *vItem;
- int searchFieldNo = GetTemplateTokenNumber(Target, TP, 0, 0);
+ long searchFieldNo = GetTemplateTokenNumber(Target, TP, 0, 0);
HashList *vc = (HashList*) CTX(CTX_VCARD);
- if (GetHash(vc, IKEY(searchFieldNo), &vItem) && (vItem != NULL)) {
+ if (GetHash(vc, LKEY(searchFieldNo), &vItem) && (vItem != NULL)) {
StrBufAppendTemplate(Target, TP, (StrBuf*) vItem, 1);
}
}
+void tmpl_vcard_context_item(StrBuf *Target, WCTemplputParams *TP)
+{
+ void *vItem;
+ vcField *t = (vcField*) CTX(CTX_VCARD_TYPE);
+ HashList *vc = (HashList*) CTX(CTX_VCARD);
+
+ if (t == NULL) {
+ LogTemplateError(NULL, "VCard item", ERR_NAME, TP,
+ "Missing context");
+ return;
+ }
+
+ if (GetHash(vc, LKEY(t->cval), &vItem) && (vItem != NULL)) {
+ StrBufAppendTemplate(Target, TP, (StrBuf*) vItem, 0);
+ }
+ else {
+ LogTemplateError(NULL, "VCard item", ERR_NAME, TP,
+ "Doesn't have that key - did you miss to filter in advance?");
+ }
+}
int preeval_vcard_name_str(WCTemplateToken *Token)
{
WCTemplputParams TPP;
void tmpl_vcard_name_str(StrBuf *Target, WCTemplputParams *TP)
{
void *vItem;
- int searchFieldNo = GetTemplateTokenNumber(Target, TP, 0, 0);
+ long searchFieldNo = GetTemplateTokenNumber(Target, TP, 0, 0);
/* todo: get descriptive string for this vcard type */
- if (GetHash(vcNames, IKEY(searchFieldNo), &vItem) && (vItem != NULL)) {
+ if (GetHash(vcNames, LKEY(searchFieldNo), &vItem) && (vItem != NULL)) {
StrBufAppendTemplate(Target, TP, (StrBuf*) vItem, 1);
}
+ else {
+ LogTemplateError(NULL, "VCard item type", ERR_NAME, TP,
+ "No i18n string for this.");
+ return;
+ }
+}
+
+void tmpl_vcard_context_name_str(StrBuf *Target, WCTemplputParams *TP)
+{
+ void *vItem;
+ vcField *t = (vcField*) CTX(CTX_VCARD_TYPE);
+
+ if (t == NULL) {
+ LogTemplateError(NULL, "VCard item type", ERR_NAME, TP,
+ "Missing context");
+ return;
+ }
+
+ if (GetHash(vcNames, LKEY(t->cval), &vItem) && (vItem != NULL)) {
+ StrBufAppendTemplate(Target, TP, (StrBuf*) vItem, 1);
+ }
+ else {
+ LogTemplateError(NULL, "VCard item type", ERR_NAME, TP,
+ "No i18n string for this.");
+ return;
+ }
+}
+
+int filter_VC_ByType(const char* key, long len, void *Context, StrBuf *Target, WCTemplputParams *TP)
+{
+ long searchType;
+ long type = 0;
+ void *v;
+ int rc = 0;
+ vcField *vf = (vcField*) Context;
+
+ memcpy(&type, key, sizeof(long));
+ searchType = GetTemplateTokenNumber(Target, TP, IT_ADDT_PARAM(0), 0);
+
+ if (vf->Type == searchType) {
+ HashList *vc = (HashList*) CTX(CTX_VCARD);
+ if (GetHash(vc, LKEY(vf->cval), &v) && v != NULL)
+ return 1;
+ }
+ return rc;
+}
+
+
+
+
+HashList *getContextVcard(StrBuf *Target, WCTemplputParams *TP)
+{
+ vcField *vf = (vcField*) CTX(CTX_VCARD_TYPE);
+ HashList *vc = (HashList*) CTX(CTX_VCARD);
+
+ if ((vf == NULL) || (vc == NULL)) {
+ LogTemplateError(NULL, "VCard item type", ERR_NAME, TP,
+ "Need VCard and Vcard type in context");
+
+ return NULL;
+ }
+ return vc;
}
+int filter_VC_ByContextType(const char* key, long len, void *Context, StrBuf *Target, WCTemplputParams *TP)
+{
+ long searchType;
+ vcField *vf = (vcField*) CTX(CTX_VCARD_TYPE);
+
+ memcpy(&searchType, key, sizeof(long));
+
+ if (vf->cval == searchType) {
+ return 1;
+ }
+ else {
+ return 0;
+ }
+}
-HashList *VCToEnum = NULL;
+
+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
StrBufAppendPrintf(Target, "</table></div>\n");
}
+
+void PutVcardItem(HashList *thisVC, vcField *thisField, StrBuf *ThisFieldStr, int is_qp, StrBuf *Swap)
+{
+ /* if we have some untagged QP, detect it here. */
+ if (is_qp || (strstr(ChrPtr(ThisFieldStr), "=?")!=NULL)){
+ StrBuf *b;
+ StrBuf_RFC822_to_Utf8(Swap, ThisFieldStr, NULL, NULL); /* default charset, current charset */
+ b = ThisFieldStr;
+ ThisFieldStr = Swap;
+ Swap = b;
+ FlushStrBuf(Swap);
+ }
+ Put(thisVC, LKEY(thisField->cval), ThisFieldStr, HFreeStrBuf);
+}
/*
* html print a vcard
* display_vcard() calls this after parsing the textual vCard into
int ntokens, len;
StrBuf *thisname = NULL;
char firsttoken[20]; ///SIZ];
- void *V;
+ //void *V;
+ HashList *thisVC;
+ StrBuf *thisVCToken;
+ void *vField = NULL;
+ thisVC = NewHash(0, 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);
/*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];
+ ///int evc[10];
len = extract_token(buf, ChrPtr(thisname), j, ';', sizeof buf);
if (!strcasecmp(buf, "encoding=quoted-printable")) {
/* 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(thisVC, &thisField->Sub[j], 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(thisVC, thisField, ThisFieldStr, is_qp, Swap);
+
+ break;
+ case Base64BinaryAttachment:
+ case TerminateList:
+ break;
+ }
+
+ }
/* copy over the payload into a StrBuf */
Val = NewStrBufPlain(v->prop[i].value, -1);
/// thisname = NULL;
}
+
+ {
+ WCTemplputParams *TP = NULL;
+ WCTemplputParams SubTP;
+ FlushStrBuf(Target);
+ StackContext(TP, &SubTP, thisVC, CTX_VCARD, 0, NULL);
+ {
+ DoTemplate(HKEY("vcard_msg_display"), Target, &SubTP);
+ }
+ UnStackContext(&SubTP);
+ }
+ printf("%s\n", ChrPtr(Target));
+ FreeStrBuf(&thisVCToken);
+ DeleteHash(&thisVC);/// todo
}
void tmplput_VCARD_ITEM(StrBuf *Target, WCTemplputParams *TP)
SubTP.Filter.ContextType = CTX_VCARD;
SubTP.Context = VC;
- DoTemplate(HKEY("test_vcard"), Target, &SubTP);
+ //DoTemplate(HKEY("vcard_msg_display"), Target, &SubTP);
DeleteHash(&VC);
}
((!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
+ if (ibstr("x") == 1) {
+ new_vcard (Target, v, full, Mime);
+ } else {
+ display_parsed_vcard(Target, v, full, Mime);
+ }
}
vcard_free(v);
ServerStartModule_VCARD
(void)
{
- VCToEnum = NewHash(0, NULL);
+ ///VCToEnum = NewHash(0, NULL);
}
ServerShutdownModule_VCARD
(void)
{
- DeleteHash(&VCToEnum);
+ /// DeleteHash(&VCToEnum);
}
void
(void)
{
RegisterCTX(CTX_VCARD);
+ RegisterCTX(CTX_VCARD_TYPE);
RegisterReadLoopHandlerset(
VIEW_ADDRESSBOOK,
vcard_GetParamsGetServerCall,
*/
{
- StrBuf *Prefix = NewStrBufPlain(HKEY("VC:"));
- DefineToToken = NewHash(1, lFlathash);
- autoRegisterTokens(&VCEnumCounter, VCStrE, Prefix);
+ StrBuf *Prefix = NewStrBufPlain(HKEY("VC:"));
+ DefineToToken = NewHash(1, lFlathash);
+ vcNames = 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:CTXITEM", 1, 1, tmpl_vcard_context_item, NULL, CTX_VCARD_TYPE);
RegisterNamespace("VC:NAME", 1, 1, tmpl_vcard_name_str, preeval_vcard_name_str, CTX_VCARD);
+ RegisterNamespace("VC:CTXNAME", 1, 1, tmpl_vcard_context_name_str, NULL, CTX_VCARD_TYPE);
+ REGISTERTokenParamDefine(FlatString);
+ REGISTERTokenParamDefine(StringCluster);
+ REGISTERTokenParamDefine(PhoneNumber);
+ REGISTERTokenParamDefine(EmailAddr);
+ REGISTERTokenParamDefine(Street);
+ REGISTERTokenParamDefine(Number);
+ REGISTERTokenParamDefine(AliasFor);
+ REGISTERTokenParamDefine(Base64BinaryAttachment);
+ REGISTERTokenParamDefine(TerminateList);
+
+ 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);
}