X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fvcard_edit.c;fp=webcit%2Fvcard_edit.c;h=e9fd37a37b1f93b2e764f3aded300b93b19b2927;hb=c6aec42f213ec284e34648f3d69bcf927dccddb1;hp=d1a16d383a62ab3c83da8c935d60f9d2e4f6bad8;hpb=7beff529e758f6f0706e733901824c63bcac6d19;p=citadel.git diff --git a/webcit/vcard_edit.c b/webcit/vcard_edit.c index d1a16d383..e9fd37a37 100644 --- a/webcit/vcard_edit.c +++ b/webcit/vcard_edit.c @@ -1,3 +1,4 @@ + /* * Copyright (c) 1996-2021 by the citadel.org team * @@ -31,7 +32,7 @@ typedef enum _VCStrEnum { Base64BinaryAttachment, UnKnown, TerminateList -}VCStrEnum; +} VCStrEnum; typedef struct vcField vcField; struct vcField { ConstStr STR; @@ -42,65 +43,65 @@ struct vcField { ConstStr Name; }; -vcField VCStr_Ns [] = { - {{HKEY("last")}, FlatString, NULL, 0, 0, {HKEY("Last Name")}}, - {{HKEY("first")}, FlatString, NULL, 0, 0, {HKEY("First Name")}}, - {{HKEY("middle")}, FlatString, NULL, 0, 0, {HKEY("Middle Name")}}, - {{HKEY("prefix")}, FlatString, NULL, 0, 0, {HKEY("Prefix")}}, - {{HKEY("suffix")}, FlatString, NULL, 0, 0, {HKEY("Suffix")}}, - {{HKEY("")}, TerminateList, NULL, 0, 0, {HKEY("")}} +vcField VCStr_Ns[] = { + { { HKEY("last")}, FlatString, NULL, 0, 0, { HKEY("Last Name")} }, + { { HKEY("first")}, FlatString, NULL, 0, 0, { HKEY("First Name")} }, + { { HKEY("middle")}, FlatString, NULL, 0, 0, { HKEY("Middle Name")} }, + { { HKEY("prefix")}, FlatString, NULL, 0, 0, { HKEY("Prefix")} }, + { { HKEY("suffix")}, FlatString, NULL, 0, 0, { HKEY("Suffix")} }, + { { HKEY("")}, TerminateList, NULL, 0, 0, { HKEY("")} } }; -vcField VCStr_Addrs [] = { - {{HKEY("POBox")}, Address, NULL, 0, 0, {HKEY("PO box")}}, - {{HKEY("extadr")}, Address, NULL, 0, 0, {HKEY("Address")}}, - {{HKEY("street")}, Address, NULL, 0, 0, {HKEY("")}}, - {{HKEY("city")}, Address, NULL, 0, 0, {HKEY("City")}}, - {{HKEY("state")}, Address, NULL, 0, 0, {HKEY("State")}}, - {{HKEY("zip")}, Address, NULL, 0, 0, {HKEY("ZIP code")}}, - {{HKEY("country")}, Address, NULL, 0, 0, {HKEY("Country")}}, - {{HKEY("")}, TerminateList, NULL, 0, 0, {HKEY("")}} +vcField VCStr_Addrs[] = { + { { HKEY("POBox")}, Address, NULL, 0, 0, { HKEY("PO box")} }, + { { HKEY("extadr")}, Address, NULL, 0, 0, { HKEY("Address")} }, + { { HKEY("street")}, Address, NULL, 0, 0, { HKEY("")} }, + { { HKEY("city")}, Address, NULL, 0, 0, { HKEY("City")} }, + { { HKEY("state")}, Address, NULL, 0, 0, { HKEY("State")} }, + { { HKEY("zip")}, Address, NULL, 0, 0, { HKEY("ZIP code")} }, + { { HKEY("country")}, Address, NULL, 0, 0, { HKEY("Country")} }, + { { HKEY("")}, TerminateList, NULL, 0, 0, { HKEY("")} } }; -vcField VCStrE [] = { - {{HKEY("version")}, Number, NULL, 0, 0, {HKEY("")}}, - {{HKEY("rev")}, Number, NULL, 0, 0, {HKEY("")}}, - {{HKEY("label")}, FlatString, NULL, 0, 0, {HKEY("")}}, - {{HKEY("uid")}, FlatString, NULL, 0, 0, {HKEY("")}}, - {{HKEY("n")}, StringCluster, VCStr_Ns, 0, 0, {HKEY("")}}, /* N is name, but only if there's no FN already there */ - {{HKEY("fn")}, FlatString, NULL, 0, 0, {HKEY("")}}, /* FN (full name) is a true 'display name' field */ - {{HKEY("title")}, FlatString, NULL, 0, 0, {HKEY("Title:")}}, - {{HKEY("org")}, FlatString, NULL, 0, 0, {HKEY("Organization:")}},/* organization */ - {{HKEY("email")}, EmailAddr, NULL, 0, 0, {HKEY("E-mail:")}}, - {{HKEY("tel")}, PhoneNumber, NULL, 0, 0, {HKEY("Telephone:")}}, - {{HKEY("adr")}, StringCluster, VCStr_Addrs, 0, 0, {HKEY("Address:")}}, - {{HKEY("photo")}, Base64BinaryAttachment, NULL, 0, 0, {HKEY("Photo:")}}, - {{HKEY("tel;home")}, PhoneNumber, NULL, 0, 0, {HKEY(" (home)")}}, - {{HKEY("tel;work")}, PhoneNumber, NULL, 0, 0, {HKEY(" (work)")}}, - {{HKEY("tel;fax")}, PhoneNumber, NULL, 0, 0, {HKEY(" (fax)")}}, - {{HKEY("tel;cell")}, PhoneNumber, NULL, 0, 0, {HKEY(" (cell)")}}, - {{HKEY("email;internet")}, EmailAddr, NULL, 0, 0, {HKEY("E-mail:")}}, - {{HKEY("UNKNOWN")}, UnKnown, NULL, 0, 0, {HKEY("")}}, - {{HKEY("")}, TerminateList, NULL, 0, 0, {HKEY("")}} +vcField VCStrE[] = { + { { HKEY("version")}, Number, NULL, 0, 0, { HKEY("")} }, + { { HKEY("rev")}, Number, NULL, 0, 0, { HKEY("")} }, + { { HKEY("label")}, FlatString, NULL, 0, 0, { HKEY("")} }, + { { HKEY("uid")}, FlatString, NULL, 0, 0, { HKEY("")} }, + { { HKEY("n")}, StringCluster, VCStr_Ns, 0, 0, { HKEY("")} }, /* N is name, but only if there's no FN already there */ + { { HKEY("fn")}, FlatString, NULL, 0, 0, { HKEY("")} }, /* FN (full name) is a true 'display name' field */ + { { HKEY("title")}, FlatString, NULL, 0, 0, { HKEY("Title:")} }, + { { HKEY("org")}, FlatString, NULL, 0, 0, { HKEY("Organization:")} }, /* organization */ + { { HKEY("email")}, EmailAddr, NULL, 0, 0, { HKEY("E-mail:")} }, + { { HKEY("tel")}, PhoneNumber, NULL, 0, 0, { HKEY("Telephone:")} }, + { { HKEY("adr")}, StringCluster, VCStr_Addrs, 0, 0, { HKEY("Address:")} }, + { { HKEY("photo")}, Base64BinaryAttachment, NULL, 0, 0, { HKEY("Photo:")} }, + { { HKEY("tel;home")}, PhoneNumber, NULL, 0, 0, { HKEY(" (home)")} }, + { { HKEY("tel;work")}, PhoneNumber, NULL, 0, 0, { HKEY(" (work)")} }, + { { HKEY("tel;fax")}, PhoneNumber, NULL, 0, 0, { HKEY(" (fax)")} }, + { { HKEY("tel;cell")}, PhoneNumber, NULL, 0, 0, { HKEY(" (cell)")} }, + { { HKEY("email;internet")}, EmailAddr, NULL, 0, 0, { HKEY("E-mail:")} }, + { { HKEY("UNKNOWN")}, UnKnown, NULL, 0, 0, { HKEY("")} }, + { { HKEY("")}, TerminateList, NULL, 0, 0, { HKEY("")} } }; -ConstStr VCStr [] = { - {HKEY("")}, - {HKEY("n")}, /* N is name, but only if there's no FN already there */ - {HKEY("fn")}, /* FN (full name) is a true 'display name' field */ - {HKEY("title")}, /* title */ - {HKEY("org")}, /* organization */ - {HKEY("email")}, - {HKEY("tel")}, - {HKEY("work")}, - {HKEY("home")}, - {HKEY("cell")}, - {HKEY("adr")}, - {HKEY("photo")}, - {HKEY("version")}, - {HKEY("rev")}, - {HKEY("label")}, - {HKEY("uid")} +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") } }; /* @@ -115,7 +116,7 @@ typedef struct _addrbookent { } addrbookent; void deleteAbEnt(void *v) { - addrbookent *vc = (addrbookent*)v; + addrbookent *vc = (addrbookent *) v; DeleteHash(&vc->VC); FreeStrBuf(&vc->name); FreeStrBuf(&vc->msgNoStr); @@ -124,15 +125,14 @@ void deleteAbEnt(void *v) { HashList *DefineToToken = NULL; HashList *VCTokenToDefine = NULL; -HashList *vcNames = NULL; /* todo: fill with the name strings */ -vcField* vcfUnknown = NULL; +HashList *vcNames = NULL; /* todo: fill with the name strings */ +vcField *vcfUnknown = NULL; /****************************************************************************** * initialize vcard structure * ******************************************************************************/ -void RegisterVCardToken(vcField* vf, StrBuf *name, int inTokenCount) -{ +void RegisterVCardToken(vcField * vf, StrBuf * name, int inTokenCount) { if (vf->Type == UnKnown) { vcfUnknown = vf; } @@ -140,20 +140,16 @@ void RegisterVCardToken(vcField* vf, StrBuf *name, int inTokenCount) Put(DefineToToken, LKEY(vf->cval), vf, reference_free_handler); Put(vcNames, LKEY(vf->cval), NewStrBufPlain(CKEY(vf->Name)), HFreeStrBuf); - syslog(LOG_DEBUG, "Token: %s -> %ld, %d", - ChrPtr(name), - vf->cval, - inTokenCount); + syslog(LOG_DEBUG, "Token: %s -> %ld, %d", ChrPtr(name), vf->cval, inTokenCount); } -void autoRegisterTokens(long *enumCounter, vcField* vf, StrBuf *BaseStr, int layer, long parentCVal) -{ +void autoRegisterTokens(long *enumCounter, vcField * vf, StrBuf * BaseStr, int layer, long parentCVal) { int i = 0; StrBuf *subStr = NewStrBuf(); while (vf[i].STR.len > 0) { FlushStrBuf(subStr); - vf[i].cval = (*enumCounter) ++; + vf[i].cval = (*enumCounter)++; vf[i].parentCVal = parentCVal; StrBufAppendBuf(subStr, BaseStr, 0); if (StrLength(subStr) > 0) { @@ -167,10 +163,10 @@ void autoRegisterTokens(long *enumCounter, vcField* vf, StrBuf *BaseStr, int lay case FlatString: break; case StringCluster: - { - autoRegisterTokens(enumCounter, vf[i].Sub, subStr, 1, vf[i].cval); - } - break; + { + autoRegisterTokens(enumCounter, vf[i].Sub, subStr, 1, vf[i].cval); + } + break; case PhoneNumber: break; case EmailAddr: @@ -200,8 +196,7 @@ void autoRegisterTokens(long *enumCounter, vcField* vf, StrBuf *BaseStr, int lay * VCard template functions * ******************************************************************************/ -int preeval_vcard_item(WCTemplateToken *Token) -{ +int preeval_vcard_item(WCTemplateToken * Token) { WCTemplputParams TPP; WCTemplputParams *TP; int searchFieldNo; @@ -218,21 +213,19 @@ int preeval_vcard_item(WCTemplateToken *Token) return 1; } -void tmpl_vcard_item(StrBuf *Target, WCTemplputParams *TP) -{ +void tmpl_vcard_item(StrBuf * Target, WCTemplputParams * TP) { void *vItem; long searchFieldNo = GetTemplateTokenNumber(Target, TP, 0, 0); - addrbookent *ab = (addrbookent*) CTX(CTX_VCARD); + addrbookent *ab = (addrbookent *) CTX(CTX_VCARD); if (GetHash(ab->VC, LKEY(searchFieldNo), &vItem) && (vItem != NULL)) { - StrBufAppendTemplate(Target, TP, (StrBuf*) vItem, 1); + StrBufAppendTemplate(Target, TP, (StrBuf *) vItem, 1); } } -void tmpl_vcard_context_item(StrBuf *Target, WCTemplputParams *TP) -{ +void tmpl_vcard_context_item(StrBuf * Target, WCTemplputParams * TP) { void *vItem; - vcField *t = (vcField*) CTX(CTX_VCARD_TYPE); - addrbookent *ab = (addrbookent*) CTX(CTX_VCARD); + vcField *t = (vcField *) CTX(CTX_VCARD_TYPE); + addrbookent *ab = (addrbookent *) CTX(CTX_VCARD); if (t == NULL) { LogTemplateError(NULL, "VCard item", ERR_NAME, TP, "Missing context"); @@ -240,15 +233,13 @@ void tmpl_vcard_context_item(StrBuf *Target, WCTemplputParams *TP) } if (GetHash(ab->VC, LKEY(t->cval), &vItem) && (vItem != NULL)) { - StrBufAppendTemplate(Target, TP, (StrBuf*) vItem, 0); + 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?"); + 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) -{ +int preeval_vcard_name_str(WCTemplateToken * Token) { WCTemplputParams TPP; WCTemplputParams *TP; int searchFieldNo; @@ -259,71 +250,63 @@ int preeval_vcard_name_str(WCTemplateToken *Token) TP->Tokens = Token; searchFieldNo = GetTemplateTokenNumber(Target, TP, 0, 0); if (searchFieldNo >= VCEnumCounter) { - LogTemplateError(NULL, "VCardName", ERR_PARM1, TP, - "Invalid define"); + LogTemplateError(NULL, "VCardName", ERR_PARM1, TP, "Invalid define"); return 0; } return 1; } -void tmpl_vcard_name_str(StrBuf *Target, WCTemplputParams *TP) -{ +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); + StrBufAppendTemplate(Target, TP, (StrBuf *) vItem, 1); } else { - LogTemplateError(NULL, "VCard item type", ERR_NAME, TP, - "No i18n string for this."); + LogTemplateError(NULL, "VCard item type", ERR_NAME, TP, "No i18n string for this."); return; } } -void tmpl_vcard_msgno(StrBuf *Target, WCTemplputParams *TP) -{ - addrbookent *ab = (addrbookent*) CTX(CTX_VCARD); +void tmpl_vcard_msgno(StrBuf * Target, WCTemplputParams * TP) { + addrbookent *ab = (addrbookent *) CTX(CTX_VCARD); if (ab->msgNoStr == NULL) { ab->msgNoStr = NewStrBufPlain(NULL, 64); } StrBufPrintf(ab->msgNoStr, "%ld", ab->ab_msgnum); StrBufAppendTemplate(Target, TP, ab->msgNoStr, 0); } -void tmpl_vcard_context_name_str(StrBuf *Target, WCTemplputParams *TP) -{ +void tmpl_vcard_context_name_str(StrBuf * Target, WCTemplputParams * TP) { void *vItem; - vcField *t = (vcField*) CTX(CTX_VCARD_TYPE); + vcField *t = (vcField *) CTX(CTX_VCARD_TYPE); if (t == NULL) { - LogTemplateError(NULL, "VCard item type", ERR_NAME, TP, - "Missing context"); + 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); + StrBufAppendTemplate(Target, TP, (StrBuf *) vItem, 1); } else { - LogTemplateError(NULL, "VCard item type", ERR_NAME, TP, - "No i18n string for this."); + 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) -{ +int filter_VC_ByType(const char *key, long len, void *Context, StrBuf * Target, WCTemplputParams * TP) { long searchType; long type = 0; void *v; - vcField *vf = (vcField*) Context; + vcField *vf = (vcField *) Context; int rc = 0; memcpy(&type, key, sizeof(long)); searchType = GetTemplateTokenNumber(Target, TP, IT_ADDT_PARAM(0), 0); - + if (vf->Type == searchType) { - addrbookent *ab = (addrbookent*) CTX(CTX_VCARD); + addrbookent *ab = (addrbookent *) CTX(CTX_VCARD); if (GetHash(ab->VC, LKEY(vf->cval), &v) && v != NULL) { return 1; } @@ -331,27 +314,24 @@ int filter_VC_ByType(const char* key, long len, void *Context, StrBuf *Target, W return rc; } -HashList *getContextVcard(StrBuf *Target, WCTemplputParams *TP) -{ - vcField *vf = (vcField*) CTX(CTX_VCARD_TYPE); - addrbookent *ab = (addrbookent*) CTX(CTX_VCARD); +HashList *getContextVcard(StrBuf * Target, WCTemplputParams * TP) { + vcField *vf = (vcField *) CTX(CTX_VCARD_TYPE); + addrbookent *ab = (addrbookent *) CTX(CTX_VCARD); if ((vf == NULL) || (ab == NULL)) { - LogTemplateError(NULL, "VCard item type", ERR_NAME, TP, - "Need VCard and Vcard type in context"); - + LogTemplateError(NULL, "VCard item type", ERR_NAME, TP, "Need VCard and Vcard type in context"); + return NULL; } return ab->VC; } -int filter_VC_ByContextType(const char* key, long len, void *Context, StrBuf *Target, WCTemplputParams *TP) -{ +int filter_VC_ByContextType(const char *key, long len, void *Context, StrBuf * Target, WCTemplputParams * TP) { long searchType; - vcField *vf = (vcField*) CTX(CTX_VCARD_TYPE); + vcField *vf = (vcField *) CTX(CTX_VCARD_TYPE); memcpy(&searchType, key, sizeof(long)); - + if (vf->cval == searchType) { return 1; } @@ -360,25 +340,20 @@ int filter_VC_ByContextType(const char* key, long len, void *Context, StrBuf *Ta } } -int conditional_VC_Havetype(StrBuf *Target, WCTemplputParams *TP) -{ - addrbookent *ab = (addrbookent*) CTX(CTX_VCARD); +int conditional_VC_Havetype(StrBuf * Target, WCTemplputParams * TP) { + addrbookent *ab = (addrbookent *) CTX(CTX_VCARD); long HaveFieldType = GetTemplateTokenNumber(Target, TP, 2, 0); - int rc = 0; + int rc = 0; void *vVCitem; const char *Key; long len; HashPos *it = GetNewHashPos(ab->VC, 0); - while (GetNextHashPos(ab->VC, it, &len, &Key, &vVCitem) && - (vVCitem != NULL)) - { + while (GetNextHashPos(ab->VC, it, &len, &Key, &vVCitem) && (vVCitem != NULL)) { void *vvcField; long type = 0; memcpy(&type, Key, sizeof(long)); - if (GetHash(DefineToToken, LKEY(type), &vvcField) && - (vvcField != NULL)) - { - vcField *t = (vcField*) vvcField; + if (GetHash(DefineToToken, LKEY(type), &vvcField) && (vvcField != NULL)) { + vcField *t = (vcField *) vvcField; if (t && t->Type == HaveFieldType) { rc = 1; break; @@ -393,9 +368,8 @@ int conditional_VC_Havetype(StrBuf *Target, WCTemplputParams *TP) /* Returns 1 to suppress the "email" fields in the vCard editor, if we're editing a user's contact info. * Returns 0 to present those fields, if we're editing a vCard in an address book. */ -int conditional_VC_SuppressEmailFields(StrBuf *Target, WCTemplputParams *TP) -{ - return(atoi(bstr("suppress_email"))); +int conditional_VC_SuppressEmailFields(StrBuf * Target, WCTemplputParams * TP) { + return (atoi(bstr("suppress_email"))); } @@ -403,20 +377,18 @@ int conditional_VC_SuppressEmailFields(StrBuf *Target, WCTemplputParams *TP) * parse one VCard * ******************************************************************************/ -void PutVcardItem(HashList *thisVC, vcField *thisField, StrBuf *ThisFieldStr, int is_qp, StrBuf *Swap) -{ +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)){ + if (is_qp || (strstr(ChrPtr(ThisFieldStr), "=?") != NULL)) { FlushStrBuf(Swap); - StrBuf_RFC822_to_Utf8(Swap, ThisFieldStr, NULL, NULL); /* default charset, current charset */ + StrBuf_RFC822_to_Utf8(Swap, ThisFieldStr, NULL, NULL); /* default charset, current charset */ SwapBuffers(Swap, ThisFieldStr); FlushStrBuf(Swap); } Put(thisVC, LKEY(thisField->cval), ThisFieldStr, HFreeStrBuf); } -void parse_vcard(StrBuf *Target, struct vCard *v, HashList *VC, wc_mime_attachment *Mime) -{ +void parse_vcard(StrBuf * Target, struct vCard *v, HashList * VC, wc_mime_attachment * Mime) { StrBuf *Swap = NULL; int i, j, k; char buf[SIZ]; @@ -428,20 +400,20 @@ void parse_vcard(StrBuf *Target, struct vCard *v, HashList *VC, wc_mime_attachme StrBuf *thisVCToken; void *vField = NULL; - Swap = NewStrBuf (); + Swap = NewStrBuf(); thisname = NewStrBuf(); thisVCToken = NewStrBufPlain(NULL, 63); - for (i=0; i<(v->numprops); ++i) { + 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); - + extract_token(firsttoken, ChrPtr(thisname), 0, ';', sizeof firsttoken); ntokens = num_tokens(ChrPtr(thisname), ';'); - for (j=0, k=0; j < ntokens && k < 10; ++j) { + for (j = 0, k = 0; j < ntokens && k < 10; ++j) { len = extract_token(buf, ChrPtr(thisname), j, ';', sizeof buf); if (!strcasecmp(buf, "encoding=quoted-printable")) { is_qp = 1; @@ -457,28 +429,26 @@ void parse_vcard(StrBuf *Target, struct vCard *v, HashList *VC, wc_mime_attachme } } - vField = NULL; - if ((StrLength(thisVCToken) > 0) && - GetHash(VCTokenToDefine, SKEY(thisVCToken), &vField) && - (vField != NULL)) { - vcField *thisField = (vcField *)vField; + vField = NULL; + if ((StrLength(thisVCToken) > 0) && GetHash(VCTokenToDefine, SKEY(thisVCToken), &vField) && (vField != NULL)) { + vcField *thisField = (vcField *) vField; StrBuf *ThisFieldStr = NULL; // syslog(LOG_DEBUG, "got this token: %s, found: %s", ChrPtr(thisVCToken), thisField->STR.Key); switch (thisField->Type) { - case StringCluster: { - int j = 0; - const char *Pos = NULL; - StrBuf *thisArray = NewStrBufPlain(v->prop[i].value, -1); - StrBuf *Buf = NewStrBufPlain(NULL, StrLength(thisArray)); - while (thisField->Sub[j].STR.len > 0) { - StrBufExtract_NextToken(Buf, thisArray, &Pos, ';'); - ThisFieldStr = NewStrBufDup(Buf); - PutVcardItem(VC, &thisField->Sub[j], ThisFieldStr, is_qp, Swap); - j++; + case StringCluster:{ + int j = 0; + const char *Pos = NULL; + StrBuf *thisArray = NewStrBufPlain(v->prop[i].value, -1); + StrBuf *Buf = NewStrBufPlain(NULL, StrLength(thisArray)); + while (thisField->Sub[j].STR.len > 0) { + StrBufExtract_NextToken(Buf, thisArray, &Pos, ';'); + ThisFieldStr = NewStrBufDup(Buf); + PutVcardItem(VC, &thisField->Sub[j], ThisFieldStr, is_qp, Swap); + j++; + } + FreeStrBuf(&thisArray); + FreeStrBuf(&Buf); } - FreeStrBuf(&thisArray); - FreeStrBuf(&Buf); - } break; case Address: case FlatString: @@ -508,7 +478,7 @@ void parse_vcard(StrBuf *Target, struct vCard *v, HashList *VC, wc_mime_attachme void *pv = NULL; StrBuf *oldVal; GetHash(VC, IKEY(vcfUnknown->cval), &pv); - oldVal = (StrBuf*) pv; + oldVal = (StrBuf *) pv; if (oldVal == NULL) { oldVal = NewStrBuf(); Put(VC, IKEY(vcfUnknown->cval), oldVal, HFreeStrBuf); @@ -528,8 +498,7 @@ void parse_vcard(StrBuf *Target, struct vCard *v, HashList *VC, wc_mime_attachme FreeStrBuf(&thisVCToken); } -HashList *CtxGetVcardList(StrBuf *Target, WCTemplputParams *TP) -{ +HashList *CtxGetVcardList(StrBuf * Target, WCTemplputParams * TP) { HashList *pb = CTX(CTX_VCARD_LIST); return pb; } @@ -538,8 +507,7 @@ HashList *CtxGetVcardList(StrBuf *Target, WCTemplputParams *TP) * Extract an embedded photo from a vCard for display on the client * ******************************************************************************/ -void display_vcard_photo_img(void) -{ +void display_vcard_photo_img(void) { long msgnum = 0L; StrBuf *vcard; struct vCard *v; @@ -547,17 +515,17 @@ void display_vcard_photo_img(void) const char *contentType; msgnum = StrBufExtract_long(WC->Hdr->HR.ReqLine, 0, '/'); - - vcard = load_mimepart(msgnum,"1"); + + vcard = load_mimepart(msgnum, "1"); v = VCardLoad(vcard); - - photosrc = vcard_get_prop(v, "PHOTO", 1,0,0); + + photosrc = vcard_get_prop(v, "PHOTO", 1, 0, 0); FlushStrBuf(WC->WBuf); StrBufAppendBufPlain(WC->WBuf, photosrc, -1, 0); if (StrBufDecodeBase64(WC->WBuf) <= 0) { FlushStrBuf(WC->WBuf); - - hprintf("HTTP/1.1 500 %s\n","Unable to get photo"); + + hprintf("HTTP/1.1 500 %s\n", "Unable to get photo"); output_headers(0, 0, 0, 0, 0, 0); hprintf("Content-Type: text/plain\r\n"); begin_burst(); @@ -571,9 +539,8 @@ void display_vcard_photo_img(void) free(photosrc); } -wc_mime_attachment *load_vcard(message_summary *Msg) -{ - HashPos *it; +wc_mime_attachment *load_vcard(message_summary * Msg) { + HashPos *it; StrBuf *FoundCharset = NewStrBuf(); StrBuf *Error; void *vMime; @@ -582,7 +549,7 @@ wc_mime_attachment *load_vcard(message_summary *Msg) wc_mime_attachment *Mime; wc_mime_attachment *VCMime = NULL; - Msg->MsgBody = (wc_mime_attachment*) malloc(sizeof(wc_mime_attachment)); + Msg->MsgBody = (wc_mime_attachment *) malloc(sizeof(wc_mime_attachment)); memset(Msg->MsgBody, 0, sizeof(wc_mime_attachment)); Msg->MsgBody->msgnum = Msg->msgnum; @@ -591,15 +558,10 @@ wc_mime_attachment *load_vcard(message_summary *Msg) FreeStrBuf(&FoundCharset); /* look up the vcard... */ it = GetNewHashPos(Msg->AllAttach, 0); - while (GetNextHashPos(Msg->AllAttach, it, &len, &Key, &vMime) && - (vMime != NULL)) - { - Mime = (wc_mime_attachment*) vMime; + while (GetNextHashPos(Msg->AllAttach, it, &len, &Key, &vMime) && (vMime != NULL)) { + Mime = (wc_mime_attachment *) vMime; if ((strcmp(ChrPtr(Mime->ContentType), - "text/x-vcard") == 0) || - (strcmp(ChrPtr(Mime->ContentType), - "text/vcard") == 0)) - { + "text/x-vcard") == 0) || (strcmp(ChrPtr(Mime->ContentType), "text/vcard") == 0)) { VCMime = Mime; break; } @@ -619,11 +581,8 @@ wc_mime_attachment *load_vcard(message_summary *Msg) * and MIME part number to fetch. Or, specify -1 for the message number * to start with a blank card. */ -void do_edit_vcard(long msgnum, char *partnum, - message_summary *VCMsg, - wc_mime_attachment *VCAtt, - const char *return_to, - const char *force_room) { +void do_edit_vcard(long msgnum, char *partnum, + message_summary * VCMsg, wc_mime_attachment * VCAtt, const char *return_to, const char *force_room) { WCTemplputParams SubTP; message_summary *Msg = NULL; wc_mime_attachment *VCMime = NULL; @@ -638,9 +597,7 @@ void do_edit_vcard(long msgnum, char *partnum, safestrncpy(whatuser, "", sizeof whatuser); - if ((msgnum >= 0) || - ((VCMsg != NULL) && (VCAtt != NULL))) - { + if ((msgnum >= 0) || ((VCMsg != NULL) && (VCAtt != NULL))) { if ((VCMsg == NULL) && (VCAtt == NULL)) { Msg = (message_summary *) malloc(sizeof(message_summary)); @@ -648,12 +605,12 @@ void do_edit_vcard(long msgnum, char *partnum, Msg->msgnum = msgnum; VCMime = load_vcard(Msg); if (VCMime == NULL) { - convenience_page("770000", _("Error"), "");/*TODO: important message*/ + convenience_page("770000", _("Error"), ""); /*TODO: important message */ DestroyMessageSummary(Msg); return; DeleteHash(&ab.VC); } - + v = VCardLoad(VCMime->Data); } else { @@ -661,12 +618,12 @@ void do_edit_vcard(long msgnum, char *partnum, } parse_vcard(WC->WBuf, v, ab.VC, NULL); - - + + vcard_free(v); } - memset(&SubTP, 0, sizeof(WCTemplputParams)); + memset(&SubTP, 0, sizeof(WCTemplputParams)); { WCTemplputParams *TP = NULL; WCTemplputParams SubTP; @@ -706,7 +663,7 @@ void submit_vcard(void) { char *serialized_vcard; StrBuf *Buf; const StrBuf *ForceRoom; - HashList* postVcard; + HashList *postVcard; HashPos *it, *itSub; const char *Key; long len; @@ -715,7 +672,7 @@ void submit_vcard(void) { const StrBuf *s; const char *Pos = NULL; - if (!havebstr("ok_button")) { + if (!havebstr("ok_button")) { readloop(readnew, eUseDefault); return; } @@ -749,21 +706,19 @@ void submit_vcard(void) { if (postVcard == NULL) { AppendImportantMessage(_("An error has occurred."), -1); edit_vcard(); - return;/*/// more details*/ + return; /*/// more details */ } - + Buf = NewStrBuf(); serv_write(HKEY("ENT0 1|||4\n")); - if (!StrBuf_ServGetln(Buf) && (GetServerStatus(Buf, NULL) != 4)) - { + if (!StrBuf_ServGetln(Buf) && (GetServerStatus(Buf, NULL) != 4)) { edit_vcard(); return; } - + /* Make a vCard structure out of the data supplied in the form */ - StrBufPrintf(Buf, "begin:vcard\r\n%s\r\nend:vcard\r\n", - bstr("extrafields") - ); + StrBufPrintf(Buf, "begin:vcard\r\n%s\r\nend:vcard\r\n", bstr("extrafields") + ); v = VCardLoad(Buf); /* Start with the extra fields */ if (v == NULL) { AppendImportantMessage(_("An error has occurred."), -1); @@ -774,21 +729,17 @@ void submit_vcard(void) { SubStr = NewStrBuf(); it = GetNewHashPos(DefineToToken, 0); - while (GetNextHashPos(DefineToToken, it, &len, &Key, &pv) && - (pv != NULL)) - { + while (GetNextHashPos(DefineToToken, it, &len, &Key, &pv) && (pv != NULL)) { char buf[32]; long blen; - vcField *t = (vcField*) pv; + vcField *t = (vcField *) pv; - if (t->Sub != NULL){ + if (t->Sub != NULL) { vcField *Sub; FlushStrBuf(SubStr); itSub = GetNewHashPos(DefineToToken, 0); - while (GetNextHashPos(DefineToToken, itSub, &len, &Key, &pv) && - (pv != NULL)) - { - Sub = (vcField*) pv; + while (GetNextHashPos(DefineToToken, itSub, &len, &Key, &pv) && (pv != NULL)) { + Sub = (vcField *) pv; if (Sub->parentCVal == t->cval) { if (StrLength(SubStr) > 0) StrBufAppendBufPlain(SubStr, HKEY(";"), 0); @@ -797,7 +748,7 @@ void submit_vcard(void) { blen = snprintf(buf, sizeof(buf), "%ld", Sub->cval); s = SSubBstr(postVcard, buf, blen); - + if ((s != NULL) && (StrLength(s) > 0)) { /// todo: utf8 qp StrBufAppendBuf(SubStr, s, 0); @@ -812,7 +763,7 @@ void submit_vcard(void) { else if (t->parentCVal == 0) { blen = snprintf(buf, sizeof(buf), "%ld", t->cval); s = SSubBstr(postVcard, buf, blen); - + if ((s != NULL) && (StrLength(s) > 0)) { vcard_add_prop(v, t->STR.Key, ChrPtr(s)); } @@ -823,7 +774,7 @@ void submit_vcard(void) { s = sbstr("other_inetemail"); if (StrLength(s) > 0) { FlushStrBuf(SubStr); - while (StrBufSipLine(SubStr, s, &Pos), ((Pos!=StrBufNOTNULL) && (Pos!=NULL)) ) { + while (StrBufSipLine(SubStr, s, &Pos), ((Pos != StrBufNOTNULL) && (Pos != NULL))) { if (StrLength(SubStr) > 0) { vcard_add_prop(v, "email;internet", ChrPtr(SubStr)); } @@ -874,19 +825,13 @@ typedef struct _vcardview_struct { } vcardview_struct; -int vcard_GetParamsGetServerCall(SharedMessageStatus *Stat, - void **ViewSpecific, - long oper, - char *cmd, - long len, - char *filter, - long flen) -{ +int vcard_GetParamsGetServerCall(SharedMessageStatus * Stat, + void **ViewSpecific, long oper, char *cmd, long len, char *filter, long flen) { vcardview_struct *VS; - VS = (vcardview_struct*) malloc (sizeof(vcardview_struct)); + VS = (vcardview_struct *) malloc(sizeof(vcardview_struct)); memset(VS, 0, sizeof(vcardview_struct)); - *ViewSpecific = (void*)VS; + *ViewSpecific = (void *) VS; VS->is_singlecard = ibstr("is_singlecard"); if (VS->is_singlecard != 1) { @@ -902,20 +847,15 @@ int vcard_GetParamsGetServerCall(SharedMessageStatus *Stat, return 200; } -int vcard_LoadMsgFromServer(SharedMessageStatus *Stat, - void **ViewSpecific, - message_summary* Msg, - int is_new, - int i) -{ +int vcard_LoadMsgFromServer(SharedMessageStatus * Stat, void **ViewSpecific, message_summary * Msg, int is_new, int i) { WCTemplputParams *TP = NULL; WCTemplputParams SubTP; vcardview_struct *VS; wc_mime_attachment *VCMime = NULL; struct vCard *v; - addrbookent* abEntry; + addrbookent *abEntry; - VS = (vcardview_struct*) *ViewSpecific; + VS = (vcardview_struct *) * ViewSpecific; VCMime = load_vcard(Msg); if (VCMime == NULL) @@ -923,9 +863,10 @@ int vcard_LoadMsgFromServer(SharedMessageStatus *Stat, v = VCardLoad(VCMime->Data); - if (v == NULL) return 0; + if (v == NULL) + return 0; - abEntry = (addrbookent*) malloc(sizeof(addrbookent)); + abEntry = (addrbookent *) malloc(sizeof(addrbookent)); memset(abEntry, 0, sizeof(addrbookent)); abEntry->name = NewStrBuf(); abEntry->VC = NewHash(0, lFlathash); @@ -933,7 +874,7 @@ int vcard_LoadMsgFromServer(SharedMessageStatus *Stat, parse_vcard(WC->WBuf, v, abEntry->VC, VCMime); - memset(&SubTP, 0, sizeof(WCTemplputParams)); + memset(&SubTP, 0, sizeof(WCTemplputParams)); StackContext(TP, &SubTP, abEntry, CTX_VCARD, 0, NULL); // No, don't display the name, it just shits all over the screen @@ -948,7 +889,7 @@ int vcard_LoadMsgFromServer(SharedMessageStatus *Stat, syslog(LOG_DEBUG, "abEntry->name : %s", ChrPtr(abEntry->name)); vcard_free(v); - + Put(VS->addrbook, SKEY(abEntry->name), abEntry, deleteAbEnt); return 0; } @@ -961,7 +902,7 @@ int vcard_LoadMsgFromServer(SharedMessageStatus *Stat, * num_ab the number of the addressbook */ static int NAMESPERPAGE = 60; -void do_addrbook_view(vcardview_struct* VS) { +void do_addrbook_view(vcardview_struct * VS) { long i = 0; int num_pages = 0; int tabfirst = 0; @@ -973,8 +914,8 @@ void do_addrbook_view(vcardview_struct* VS) { WCTemplputParams *TP = NULL; WCTemplputParams SubTP; - memset(&SubTP, 0, sizeof(WCTemplputParams)); - + memset(&SubTP, 0, sizeof(WCTemplputParams)); + if (num_ab == 0) { do_template("vcard_list_empty"); return; @@ -986,13 +927,13 @@ void do_addrbook_view(vcardview_struct* VS) { num_pages = (GetCount(VS->addrbook) / NAMESPERPAGE) + 1; - tablabels = malloc(num_pages * sizeof (StrBuf *)); + tablabels = malloc(num_pages * sizeof(StrBuf *)); if (tablabels == NULL) { return; } headlines = NewHash(0, lFlathash); - for (i=0; i (num_ab - 1)) tablast = (num_ab - 1); + if (tablast > (num_ab - 1)) + tablast = (num_ab - 1); headline = NewStrBufPlain(NULL, StrLength(v1) + StrLength(v2) + 10); if (GetHashAt(VS->addrbook, tabfirst, &hklen1, &c1, &v1)) { - a1 = (addrbookent*) v1; + a1 = (addrbookent *) v1; StrBufAppendBuf(headline, a1->name, 0); StrBuf_Utf8StrCut(headline, 3); if (GetHashAt(VS->addrbook, tablast, &hklen2, &c2, &v2)) { - a2 = (addrbookent*) v2; + a2 = (addrbookent *) v2; StrBufAppendBufPlain(headline, HKEY(" - "), 0); StrBufAppendBuf(headline, a2->name, 0); StrBuf_Utf8StrCut(headline, 9); @@ -1027,17 +969,16 @@ void do_addrbook_view(vcardview_struct* VS) { UnStackContext(&SubTP); DeleteHash(&headlines); free(tablabels); - StrBufAppendBufPlain(WC->WBuf, HKEY(""), 0);/* closes: id=global */ + StrBufAppendBufPlain(WC->WBuf, HKEY(""), 0); /* closes: id=global */ } -int vcard_RenderView_or_Tail(SharedMessageStatus *Stat, void **ViewSpecific, long oper) -{ +int vcard_RenderView_or_Tail(SharedMessageStatus * Stat, void **ViewSpecific, long oper) { const StrBuf *Mime; vcardview_struct *VS; - VS = (vcardview_struct*) *ViewSpecific; + VS = (vcardview_struct *) * ViewSpecific; if (VS->is_singlecard) { read_message(WC->WBuf, HKEY("view_message"), lbstr("startmsg"), NULL, &Mime, NULL); } @@ -1047,24 +988,22 @@ int vcard_RenderView_or_Tail(SharedMessageStatus *Stat, void **ViewSpecific, lon return 0; } -int vcard_Cleanup(void **ViewSpecific) -{ +int vcard_Cleanup(void **ViewSpecific) { vcardview_struct *VS; - VS = (vcardview_struct*) *ViewSpecific; + VS = (vcardview_struct *) * ViewSpecific; wDumpContent(1); if ((VS != NULL) && (VS->addrbook != NULL)) { DeleteHash(&VS->addrbook); } - if (VS != NULL) { + if (VS != NULL) { free(VS); } return 0; } -void render_MIME_VCard(StrBuf *Target, WCTemplputParams *TP, StrBuf *FoundCharset) -{ +void render_MIME_VCard(StrBuf * Target, WCTemplputParams * TP, StrBuf * FoundCharset) { wc_mime_attachment *Mime = (wc_mime_attachment *) CTX(CTX_MIME_ATACH); if (StrLength(Mime->Data) == 0) { MimeLoadData(Mime); @@ -1074,14 +1013,14 @@ void render_MIME_VCard(StrBuf *Target, WCTemplputParams *TP, StrBuf *FoundCharse StrBuf *Buf; Buf = NewStrBuf(); + /** If it's my vCard I can edit it */ - if ( (!strcasecmp(ChrPtr(WC->CurRoom.name), USERCONFIGROOM)) - || ((StrLength(WC->CurRoom.name) > 11) && - (!strcasecmp(&(ChrPtr(WC->CurRoom.name)[11]), USERCONFIGROOM))) - || (WC->CurRoom.view == VIEW_ADDRESSBOOK) - ) { + if ((!strcasecmp(ChrPtr(WC->CurRoom.name), USERCONFIGROOM)) + || ((StrLength(WC->CurRoom.name) > 11) && (!strcasecmp(&(ChrPtr(WC->CurRoom.name)[11]), USERCONFIGROOM))) + || (WC->CurRoom.view == VIEW_ADDRESSBOOK) + ) { StrBufAppendPrintf(Buf, "", - Mime->msgnum, ChrPtr(Mime->PartNum)); + Mime->msgnum, ChrPtr(Mime->PartNum)); StrBufAppendPrintf(Buf, "[%s]", _("edit")); } @@ -1100,7 +1039,7 @@ void render_MIME_VCard(StrBuf *Target, WCTemplputParams *TP, StrBuf *FoundCharse parse_vcard(Target, v, ab.VC, Mime); - memset(&SubTP, 0, sizeof(WCTemplputParams)); + memset(&SubTP, 0, sizeof(WCTemplputParams)); StackContext(TP, &SubTP, &ab, CTX_VCARD, 0, NULL); DoTemplate(HKEY("vcard_msg_display"), Target, &SubTP); @@ -1118,28 +1057,19 @@ void render_MIME_VCard(StrBuf *Target, WCTemplputParams *TP, StrBuf *FoundCharse } -void -ServerStartModule_VCARD -(void) -{ +void ServerStartModule_VCARD(void) { } -void -ServerShutdownModule_VCARD -(void) -{ +void ServerShutdownModule_VCARD(void) { DeleteHash(&DefineToToken); DeleteHash(&vcNames); DeleteHash(&VCTokenToDefine); } -void -InitModule_VCARD -(void) -{ - StrBuf *Prefix = NewStrBufPlain(HKEY("VC:")); - DefineToToken = NewHash(1, lFlathash); - vcNames = NewHash(1, lFlathash); +void InitModule_VCARD(void) { + StrBuf *Prefix = NewStrBufPlain(HKEY("VC:")); + DefineToToken = NewHash(1, lFlathash); + vcNames = NewHash(1, lFlathash); VCTokenToDefine = NewHash(1, NULL); autoRegisterTokens(&VCEnumCounter, VCStrE, Prefix, 0, 0); FreeStrBuf(&Prefix); @@ -1151,16 +1081,9 @@ InitModule_VCARD RegisterCTX(CTX_VCARD_LIST); RegisterCTX(CTX_VCARD_TYPE); - RegisterReadLoopHandlerset( - VIEW_ADDRESSBOOK, - vcard_GetParamsGetServerCall, - NULL, - NULL, - NULL, - vcard_LoadMsgFromServer, - vcard_RenderView_or_Tail, - vcard_Cleanup, - NULL); + RegisterReadLoopHandlerset(VIEW_ADDRESSBOOK, + vcard_GetParamsGetServerCall, + NULL, NULL, NULL, vcard_LoadMsgFromServer, vcard_RenderView_or_Tail, vcard_Cleanup, NULL); RegisterIterator("MAIL:VCARDS", 0, NULL, CtxGetVcardList, NULL, NULL, CTX_VCARD, CTX_VCARD_LIST, IT_NOFLAG); @@ -1185,11 +1108,13 @@ InitModule_VCARD REGISTERTokenParamDefine(TerminateList); REGISTERTokenParamDefine(Address); - RegisterConditional("VC:HAVE:TYPE", 1, conditional_VC_Havetype, CTX_VCARD); - RegisterConditional("COND:VC:SUPPRESS_EMAIL_FIELDS", 1, conditional_VC_SuppressEmailFields, CTX_VCARD); + RegisterConditional("VC:HAVE:TYPE", 1, conditional_VC_Havetype, CTX_VCARD); + RegisterConditional("COND:VC:SUPPRESS_EMAIL_FIELDS", 1, conditional_VC_SuppressEmailFields, 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); + RegisterFilteredIterator("VC:TYPE", 1, DefineToToken, NULL, NULL, NULL, filter_VC_ByType, CTX_VCARD_TYPE, CTX_VCARD, + IT_NOFLAG); + RegisterFilteredIterator("VC:TYPE:ITEMS", 0, NULL, getContextVcard, NULL, NULL, filter_VC_ByContextType, CTX_STRBUF, + CTX_VCARD_TYPE, IT_NOFLAG); RegisterMimeRenderer(HKEY("text/x-vcard"), render_MIME_VCard, 1, 201); RegisterMimeRenderer(HKEY("text/vcard"), render_MIME_VCard, 1, 200);