X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fvcard_edit.c;h=5ec2799afcad92107e48e7f1a57aa93cac4a3470;hb=fb6f6fa4ec4e3277e30d84326d48e6850822d318;hp=ef96784deb06b8ffd82a61d81a3c73a9b2cdd9c5;hpb=9a6990a557e1b7a71414046fb991c9f2611122f9;p=citadel.git
diff --git a/webcit/vcard_edit.c b/webcit/vcard_edit.c
index ef96784de..5ec2799af 100644
--- a/webcit/vcard_edit.c
+++ b/webcit/vcard_edit.c
@@ -1,14 +1,61 @@
/*
- * $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"
+
+
+
+ConstStr VCStr [] = {
+ {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("tel_tel")},
+ {HKEY("tel_work")},
+ {HKEY("tel_home")},
+ {HKEY("tel_cell")},
+ {HKEY("adr")},
+ {HKEY("photo")},
+ {HKEY("version")},
+ {HKEY("rev")},
+ {HKEY("label")}
+};
+
+typedef enum _eVC{
+ VC_n,
+ VC_fn,
+ VC_title,
+ VC_org,
+ VC_email,
+ VC_tel,
+ VC_tel_tel,
+ VC_tel_work,
+ VC_tel_home,
+ VC_tel_cell,
+ VC_adr,
+ VC_photo,
+ VC_version,
+ VC_rev,
+ VC_label
+} eVC;
+
+HashList *VCToEnum = NULL;
-
-/**
- * \brief Record compare function for sorting address book indices
- * \param ab1 adressbook one
- * \param ab2 adressbook two
+/*
+ * Record compare function for sorting address book indices
*/
int abcmp(const void *ab1, const void *ab2) {
return(strcasecmp(
@@ -18,11 +65,9 @@ int abcmp(const void *ab1, const void *ab2) {
}
-/**
- * \brief Helper function for do_addrbook_view()
+/*
+ * Helper function for do_addrbook_view()
* Converts a name into a three-letter tab label
- * \param tabbuf the tabbuffer to add name to
- * \param name the name to add to the tabbuffer
*/
void nametab(char *tabbuf, long len, char *name) {
stresc(tabbuf, len, name, 0, 0);
@@ -33,55 +78,8 @@ void nametab(char *tabbuf, long len, char *name) {
}
-/**
- * \brief display the adressbook overview
- * \param msgnum the citadel message number
- * \param alpha what????
- */
-void display_addressbook(long msgnum, char alpha) {
- //char buf[SIZ];
- /* char mime_partnum[SIZ]; */
-/* char mime_filename[SIZ]; */
-/* char mime_content_type[SIZ]; */
- ///char mime_disposition[SIZ];
- //int mime_length;
- char vcard_partnum[SIZ];
- char *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
-// Msg =
- 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"));
- }
-
- free(vcard_source);
- }
- }
-
-}
-
-
-
-/**
- * \brief If it's an old "Firstname Lastname" style record, try to convert it.
- * \param namebuf name to analyze, reverse if nescessary
+/*
+ * If it's an old "Firstname Lastname" style record, try to convert it.
*/
void lastfirst_firstlast(char *namebuf) {
char firstname[SIZ];
@@ -100,59 +98,66 @@ void lastfirst_firstlast(char *namebuf) {
sprintf(namebuf, "%s; %s", lastname, firstname);
}
-/**
- * \brief fetch what??? name
- * \param msgnum the citadel message number
- * \param namebuf where to put the name in???
- */
-void fetch_ab_name(message_summary *Msg, char **namebuf) {
- char buf[SIZ];
- char mime_partnum[SIZ];
- char mime_filename[SIZ];
- char mime_content_type[SIZ];
- char mime_disposition[SIZ];
- int mime_length;
- char vcard_partnum[SIZ];
- char *vcard_source = NULL;
- int i, len;
- message_summary summ;/// TODO this will lak
-
- if (namebuf == NULL) return;
- memset(&summ, 0, sizeof(summ));
- //////safestrncpy(summ.subj, "(no subject)", sizeof summ.subj);
-
- sprintf(buf, "MSG0 %ld|0", Msg->msgnum); /** unfortunately we need the mime info now */
- serv_puts(buf);
- serv_getln(buf, sizeof buf);
- if (buf[0] != '1') return;
-
- while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
- if (!strncasecmp(buf, "part=", 5)) {
- extract_token(mime_filename, &buf[5], 1, '|', sizeof mime_filename);
- extract_token(mime_partnum, &buf[5], 2, '|', sizeof mime_partnum);
- extract_token(mime_disposition, &buf[5], 3, '|', sizeof mime_disposition);
- extract_token(mime_content_type, &buf[5], 4, '|', sizeof mime_content_type);
- mime_length = extract_int(&buf[5], 5);
-
- if ( (!strcasecmp(mime_content_type, "text/x-vcard"))
- || (!strcasecmp(mime_content_type, "text/vcard")) ) {
- strcpy(vcard_partnum, mime_partnum);
- }
+wc_mime_attachment *load_vcard(message_summary *Msg)
+{
+ HashPos *it;
+ StrBuf *FoundCharset = NewStrBuf();
+ StrBuf *Error;
+ void *vMime;
+ const char *Key;
+ long len;
+ wc_mime_attachment *Mime;
+ wc_mime_attachment *VCMime = NULL;
+
+ Msg->MsgBody = (wc_mime_attachment*) malloc(sizeof(wc_mime_attachment));
+ memset(Msg->MsgBody, 0, sizeof(wc_mime_attachment));
+ Msg->MsgBody->msgnum = Msg->msgnum;
+
+ load_message(Msg, FoundCharset, &Error);
+
+ 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;
+ if ((strcmp(ChrPtr(Mime->ContentType),
+ "text/x-vcard") == 0) ||
+ (strcmp(ChrPtr(Mime->ContentType),
+ "text/vcard") == 0))
+ {
+ VCMime = Mime;
+ break;
}
}
+ DeleteHashPos(&it);
+ if (VCMime == NULL)
+ return NULL;
- if (!IsEmptyStr(vcard_partnum)) {
- vcard_source = load_mimepart(Msg->msgnum, vcard_partnum);
- if (vcard_source != NULL) {
+ MimeLoadData(VCMime);
+ return VCMime;
+}
- /* Grab the name off the card */
- display_vcard(WC->WBuf, vcard_source, 0, 0, namebuf, Msg->msgnum);
+/*
+ * fetch the display name off a vCard
+ */
+void fetch_ab_name(message_summary *Msg, char **namebuf) {
+ long len;
+ int i;
+ wc_mime_attachment *VCMime = NULL;
+
+ if (namebuf == NULL) return;
+
+ VCMime = load_vcard(Msg);
+ if (VCMime == NULL)
+ return;
+
+ /* Grab the name off the card */
+ display_vcard(WC->WBuf, VCMime, 0, 0, namebuf, Msg->msgnum);
- free(vcard_source);
- }
- }
if (*namebuf != NULL) {
lastfirst_firstlast(*namebuf);
striplt(*namebuf);
@@ -170,9 +175,8 @@ void fetch_ab_name(message_summary *Msg, char **namebuf) {
-/**
- * \brief Turn a vCard "n" (name) field into something displayable.
- * \param name the name field to convert
+/*
+ * Turn a vCard "n" (name) field into something displayable.
*/
void vcard_n_prettyize(char *name)
{
@@ -209,14 +213,12 @@ void vcard_n_prettyize(char *name)
-/**
- * \brief preparse a vcard name
+/*
+ * preparse a vcard name
* display_vcard() calls this after parsing the textual vCard into
* our 'struct vCard' data object.
* This gets called instead of display_parsed_vcard() if we are only looking
* to extract the person's name instead of displaying the card.
- * \param v the vcard to retrieve the name from
- * \param storename where to put the name at
*/
void fetchname_parsed_vcard(struct vCard *v, char **storename) {
char *name;
@@ -244,7 +246,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,
@@ -252,14 +254,19 @@ 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,
len);
}
else {
- *storename = strdup(name);
+ size_t len;
+
+ len = strlen (name);
+
+ *storename = malloc(len + 3); /* \0 + eventualy missing ', '*/
+ memcpy(*storename, name, len + 1);
}
/* vcard_n_prettyize(storename); */
}
@@ -268,8 +275,8 @@ void fetchname_parsed_vcard(struct vCard *v, char **storename) {
-/**
- * \brief html print a vcard
+/*
+ * html print a vcard
* display_vcard() calls this after parsing the textual vCard into
* our 'struct vCard' data object.
*
@@ -281,11 +288,12 @@ void fetchname_parsed_vcard(struct vCard *v, char **storename) {
* 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.
- * \param v the vCard to display
- * \param full display all items of the vcard?
- * \param msgnum Citadel message pointer
+ * v the vCard to display
+ * 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;
@@ -308,7 +316,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);
@@ -321,12 +329,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) {
@@ -349,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
@@ -370,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);
@@ -380,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) {
@@ -489,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, "");
@@ -524,22 +532,177 @@ 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]
-/**
- * \brief Display a textual vCard
+ 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;
+ }
+
+}
+
+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,
+ wc_mime_attachment *Mime,
char alpha,
int full,
char **storename,
@@ -551,7 +714,7 @@ void display_vcard(StrBuf *Target,
StrBuf *Buf2;
char this_alpha = 0;
- v = vcard_load((char*)vcard_source); ///TODO
+ v = VCardLoad(Mime->Data);
if (v == NULL) return;
@@ -568,11 +731,16 @@ 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)))
+ )
+ {
+#ifdef XXX_XXX
+ new_vcard (Target, v, full, Mime);
+#else
+ display_parsed_vcard(Target, v, full, Mime);
+#endif
}
vcard_free(v);
@@ -580,10 +748,11 @@ void display_vcard(StrBuf *Target,
-/**
- * \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;
@@ -600,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;
}
@@ -614,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;
}
@@ -638,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);
@@ -696,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;
@@ -753,49 +925,36 @@ 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) {
- value = vcard_get_prop(v, "", 0, i++, 0);
-
char prp[256]; /* property name */
char prm[256]; /* parameters */
+ value = vcard_get_prop(v, "", 0, i++, 0);
+
+
extract_token(prp, key, 0, ';', sizeof prp);
safestrncpy(prm, key, sizeof prm);
remove_token(prm, 0, ';');
@@ -876,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("