"
- "
");
+ StrBufAppendPrintf(Target, ""
+ "
");
for (pass=1; pass<=2; ++pass) {
if (v->numprops) for (i=0; i<(v->numprops); ++i) {
@@ -310,7 +357,7 @@ 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
@@ -331,9 +378,9 @@ void display_parsed_vcard(StrBuf *Target, struct vCard *v, int full, long msgnum
thisvalue = strdup(v->prop[i].value);
}
- /** Various fields we may encounter ***/
+ /* Various fields we may encounter ***/
- /** N is name, but only if there's no FN already there */
+ /* N is name, but only if there's no FN already there */
if (!strcasecmp(firsttoken, "n")) {
if (IsEmptyStr(fullname)) {
strcpy(fullname, thisvalue);
@@ -341,24 +388,24 @@ void display_parsed_vcard(StrBuf *Target, struct vCard *v, int full, long msgnum
}
}
- /** FN (full name) is a true 'display name' field */
+ /* FN (full name) is a true 'display name' field */
else if (!strcasecmp(firsttoken, "fn")) {
strcpy(fullname, thisvalue);
}
- /** title */
+ /* title */
else if (!strcasecmp(firsttoken, "title")) {
strcpy(title, thisvalue);
}
- /** organization */
+ /* organization */
else if (!strcasecmp(firsttoken, "org")) {
strcpy(org, thisvalue);
}
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) {
@@ -450,23 +497,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, "");
@@ -485,46 +532,215 @@ void display_parsed_vcard(StrBuf *Target, struct vCard *v, int full, long msgnum
StrBufAppendPrintf(Target, " |
\n");
}
+/*
+ * 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;
+ char buf[SIZ];
+ int is_qp = 0;
+ int is_b64 = 0;
+ StrBuf *thisname = NULL;
+ char firsttoken[SIZ];
+ void *V;
+
+ Swap = NewStrBuf ();
+ thisname = NewStrBuf();
+ for (i=0; i<(v->numprops); ++i) {
+ is_qp = 0;
+ is_b64 = 0;
+ StrBufPlain(thisname, v->prop[i].name, -1);
+ StrBufLowerCase(thisname);
+
+ /*len = */extract_token(firsttoken, ChrPtr(thisname), 0, ';', sizeof firsttoken);
+
+ for (j=0; jprop[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);
+ }
+ syslog(1, "%s [%s][%s]",
+ firsttoken,
+ ChrPtr(Val),
+ v->prop[i].value);
+ if (GetHash(VCToEnum, firsttoken, strlen(firsttoken), &V))
+ {
+ eVC evc = (eVC) V;
+ Put(VC, IKEY(evc), Val, HFreeStrBuf);
+ syslog(1, "[%ul]\n", evc);
+ Val = NULL;
+ }
+ else
+ syslog(1, "[]\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, ")");
+ }
+ }
+ }
+
+ }
+*/
+
+ FreeStrBuf(&Val);
+ free(thisname);
+ thisname = NULL;
+ }
-/**
- * \brief Display a textual vCard
+}
+
+void tmplput_VCARD_ITEM(StrBuf *Target, WCTemplputParams *TP)
+{
+ HashList *VC = CTX;
+ eVC 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
* (Converts to a vCard object and then calls the actual display function)
* Set 'full' to nonzero to display the whole card instead of a one-liner.
* Or, if "storename" is non-NULL, just store the person's name in that
* buffer instead of displaying the card at all.
- * \param vcard_source the buffer containing the vcard text
- * \param alpha what???
- * \param full should we usse all lines?
- * \param storename where to store???
- * \param msgnum Citadel message pointer
+ *
+ * vcard_source the buffer containing the vcard text
+ * alpha Display only if name begins with this letter of the alphabet
+ * full Display the full vCard (otherwise just the display name)
+ * storename If not NULL, also store the display name here
+ * msgnum Citadel message pointer
*/
-void display_vcard(StrBuf *Target, const char *vcard_source, char alpha, int full, char *storename,
- long msgnum) {
+void display_vcard(StrBuf *Target,
+ wc_mime_attachment *Mime,
+ char alpha,
+ int full,
+ char **storename,
+ long msgnum)
+{
struct vCard *v;
char *name;
- char buf[SIZ];
+ StrBuf *Buf;
+ StrBuf *Buf2;
char this_alpha = 0;
- v = vcard_load((char*)vcard_source); ///TODO
+ v = VCardLoad(Mime->Data);
if (v == NULL) return;
name = vcard_get_prop(v, "n", 1, 0, 0);
if (name != NULL) {
- utf8ify_rfc822_string(name);
- strcpy(buf, name);
- this_alpha = buf[0];
+ Buf = NewStrBufPlain(name, -1);
+ Buf2 = NewStrBufPlain(NULL, StrLength(Buf));
+ StrBuf_RFC822_to_Utf8(Buf2, Buf, WC->DefaultCharset, NULL);
+ this_alpha = ChrPtr(Buf)[0];
+ FreeStrBuf(&Buf);
+ FreeStrBuf(&Buf2);
}
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)))
+ )
+ {
+#ifdef XXX_XXX
+ new_vcard (Target, v, full, Mime);
+#else
+ display_parsed_vcard(Target, v, full, Mime);
+#endif
}
vcard_free(v);
@@ -532,10 +748,11 @@ void display_vcard(StrBuf *Target, const char *vcard_source, char alpha, int ful
-/**
- * \brief Render the address book using info we gathered during the scan
- * \param addrbook the addressbook to render
- * \param num_ab the number of the addressbook
+/*
+ * Render the address book using info we gathered during the scan
+ *
+ * addrbook the addressbook to render
+ * num_ab the number of the addressbook
*/
void do_addrbook_view(addrbookent *addrbook, int num_ab) {
int i = 0;
@@ -552,9 +769,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;
}
@@ -566,9 +783,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;
}
@@ -590,43 +807,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);
@@ -648,10 +865,13 @@ void do_addrbook_view(addrbookent *addrbook, int num_ab) {
* 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, char *return_to, const char *force_room) {
- char buf[SIZ];
- char *serialized_vcard = NULL;
- size_t total_len = 0;
+void do_edit_vcard(long msgnum, char *partnum,
+ message_summary *VCMsg,
+ wc_mime_attachment *VCAtt,
+ const char *return_to,
+ const char *force_room) {
+ message_summary *Msg = NULL;
+ wc_mime_attachment *VCMime = NULL;
struct vCard *v;
int i;
char *key, *value;
@@ -705,47 +925,41 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to, const char *forc
safestrncpy(whatuser, "", sizeof whatuser);
- if (msgnum >= 0) {
- sprintf(buf, "MSG0 %ld|1", msgnum);
- serv_puts(buf);
- serv_getln(buf, sizeof buf);
- if (buf[0] != '1') {
- convenience_page("770000", _("Error"), &buf[4]);
- return;
- }
- while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
- if (!strncasecmp(buf, "from=", 5)) {
- safestrncpy(whatuser, &buf[5], sizeof whatuser);
- }
- else if (!strncasecmp(buf, "node=", 5)) {
- strcat(whatuser, " @ ");
- strcat(whatuser, &buf[5]);
+ if ((msgnum >= 0) ||
+ ((VCMsg != NULL) && (VCAtt != NULL)))
+ {
+ if ((VCMsg == NULL) && (VCAtt == NULL)) {
+
+ Msg = (message_summary *) malloc(sizeof(message_summary));
+ memset(Msg, 0, sizeof(message_summary));
+ Msg->msgnum = msgnum;
+ VCMime = load_vcard(Msg);
+ if (VCMime == NULL) {
+ convenience_page("770000", _("Error"), "");///TODO: important message
+ DestroyMessageSummary(Msg);
+ return;
}
+
+ v = VCardLoad(VCMime->Data);
}
-
- sprintf(buf, "DLAT %ld|%s", msgnum, partnum);
- serv_puts(buf);
- serv_getln(buf, sizeof buf);
- if (buf[0] != '6') {
- convenience_page("770000", "Error", &buf[4]);
- return;
+ else {
+ v = VCardLoad(VCAtt->Data);
}
- total_len = atoi(&buf[4]);
- serialized_vcard = malloc(total_len + 2);
-
- serv_read(serialized_vcard, total_len);
- serialized_vcard[total_len] = 0;
-
- v = vcard_load(serialized_vcard);
- free(serialized_vcard);
-
/* Populate the variables for our form */
i = 0;
while (key = vcard_get_prop(v, "", 0, i, 1), key != NULL) {
+ char prp[256]; /* property name */
+ char prm[256]; /* parameters */
+
value = vcard_get_prop(v, "", 0, i++, 0);
-
- if (!strcasecmp(key, "n")) {
+
+
+ extract_token(prp, key, 0, ';', sizeof prp);
+ safestrncpy(prm, key, sizeof prm);
+ remove_token(prm, 0, ';');
+
+ if (!strcasecmp(prp, "n")) {
extract_token(lastname, value, 0, ';', sizeof lastname);
extract_token(firstname, value, 1, ';', sizeof firstname);
extract_token(middlename, value, 2, ';', sizeof middlename);
@@ -753,19 +967,19 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to, const char *forc
extract_token(suffix, value, 4, ';', sizeof suffix);
}
- else if (!strcasecmp(key, "fn")) {
+ else if (!strcasecmp(prp, "fn")) {
safestrncpy(fullname, value, sizeof fullname);
}
- else if (!strcasecmp(key, "title")) {
+ else if (!strcasecmp(prp, "title")) {
safestrncpy(title, value, sizeof title);
}
- else if (!strcasecmp(key, "org")) {
+ else if (!strcasecmp(prp, "org")) {
safestrncpy(org, value, sizeof org);
}
- else if ( (!strcasecmp(key, "adr")) || (!strncasecmp(key, "adr;", 4)) ) {
+ else if (!strcasecmp(prp, "adr")) {
extract_token(pobox, value, 0, ';', sizeof pobox);
extract_token(extadr, value, 1, ';', sizeof extadr);
extract_token(street, value, 2, ';', sizeof street);
@@ -774,25 +988,27 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to, const char *forc
extract_token(zipcode, value, 5, ';', sizeof zipcode);
extract_token(country, value, 6, ';', sizeof country);
}
-
- else if ( (!strcasecmp(key, "tel;home")) || (!strcasecmp(key, "tel;type=home")) ) {
- extract_token(hometel, value, 0, ';', sizeof hometel);
- }
-
- else if ( (!strcasecmp(key, "tel;work")) || (!strcasecmp(key, "tel;type=work")) ) {
- extract_token(worktel, value, 0, ';', sizeof worktel);
- }
-
- else if ( (!strcasecmp(key, "tel;fax")) || (!strcasecmp(key, "tel;type=fax")) ) {
- extract_token(faxtel, value, 0, ';', sizeof faxtel);
- }
-
- else if ( (!strcasecmp(key, "tel;cell")) || (!strcasecmp(key, "tel;type=cell")) ) {
- extract_token(mobiletel, value, 0, ';', sizeof mobiletel);
+
+ else if (!strcasecmp(prp, "tel")) {
+
+ if (bmstrcasestr(prm, "home")) {
+ extract_token(hometel, value, 0, ';', sizeof hometel);
+ }
+ else if (bmstrcasestr(prm, "work")) {
+ extract_token(worktel, value, 0, ';', sizeof worktel);
+ }
+ else if (bmstrcasestr(prm, "fax")) {
+ extract_token(faxtel, value, 0, ';', sizeof faxtel);
+ }
+ else if (bmstrcasestr(prm, "cell")) {
+ extract_token(mobiletel, value, 0, ';', sizeof mobiletel);
+ }
+ else { /* Missing or unknown type; put it in the home phone */
+ extract_token(hometel, value, 0, ';', sizeof hometel);
+ }
}
- else if ( (!strcasecmp(key, "email;internet"))
- || (!strcasecmp(key, "email;type=internet")) ) {
+ else if ( (!strcasecmp(prp, "email")) && (bmstrcasestr(prm, "internet")) ) {
if (primary_inetemail[0] == 0) {
safestrncpy(primary_inetemail, value, sizeof primary_inetemail);
}
@@ -803,7 +1019,10 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to, const char *forc
strcat(other_inetemail, value);
}
}
-
+
+ /* Unrecognized properties are preserved here so we don't discard them
+ * just because the vCard was edited with WebCit.
+ */
else {
strcat(extrafields, key);
strcat(extrafields, ":");
@@ -816,173 +1035,173 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to, const char *forc
vcard_free(v);
}
- /** Display the form */
+ /* 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("