X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fvcard_edit.c;h=d5369aa78e9ea1ab45ddb44f9d5a677e313bf832;hb=f5c1330914acc193f96892efc191a32ee537dfb5;hp=ccdaba684e5bf53178b4e0dc723a941971b3f752;hpb=fe6de48992523706b2bfe7e09d5389777970d728;p=citadel.git
diff --git a/webcit/vcard_edit.c b/webcit/vcard_edit.c
index ccdaba684..d5369aa78 100644
--- a/webcit/vcard_edit.c
+++ b/webcit/vcard_edit.c
@@ -1,14 +1,9 @@
-/*
- * $Id$
- */
#include "webcit.h"
+#include "calendar.h"
-
-/**
- * \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 +13,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 +26,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];
- 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
-// 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"));
- }
-
- FreeStrBuf(&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,58 +46,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];
- StrBuf *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);
- serv_printf("MSG0 %ld|0", Msg->msgnum); /** unfortunately we need the mime info now */
- 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);
- FreeStrBuf(&vcard_source);
- }
- }
if (*namebuf != NULL) {
lastfirst_firstlast(*namebuf);
striplt(*namebuf);
@@ -169,9 +123,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)
{
@@ -208,14 +161,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;
@@ -258,7 +209,12 @@ void fetchname_parsed_vcard(struct vCard *v, char **storename) {
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); */
}
@@ -267,8 +223,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.
*
@@ -280,11 +236,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;
@@ -348,7 +305,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
@@ -369,9 +326,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);
@@ -379,17 +336,17 @@ 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);
}
@@ -525,20 +482,21 @@ void display_parsed_vcard(StrBuf *Target, struct vCard *v, int full, long msgnum
-/**
- * \brief Display a textual vCard
+/*
+ * 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,
- StrBuf *vcard_source,
+ wc_mime_attachment *Mime,
char alpha,
int full,
char **storename,
@@ -550,7 +508,7 @@ void display_vcard(StrBuf *Target,
StrBuf *Buf2;
char this_alpha = 0;
- v = VCardLoad(vcard_source);
+ v = VCardLoad(Mime->Data);
if (v == NULL) return;
@@ -567,11 +525,12 @@ 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)))
+ )
+ {
+ display_parsed_vcard(Target, v, full, Mime);
}
vcard_free(v);
@@ -579,10 +538,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;
@@ -599,9 +559,9 @@ void do_addrbook_view(addrbookent *addrbook, int num_ab) {
char **tablabels;
if (num_ab == 0) {
- wprintf("
"); + wc_printf(" | "); - wprintf("", bstr("alpha")); + wc_printf("?maxmsgs=1?is_summary=0?alpha=%s\">", bstr("alpha")); vcard_n_prettyize(addrbook[i].ab_name); escputs(addrbook[i].ab_name); - wprintf(" | \n"); + wc_printf("\n"); ++displayed; } /* Placeholders for empty columns at end */ if ((num_ab % 4) != 0) { for (i=0; i<(4-(num_ab % 4)); ++i) { - wprintf(""); + wc_printf(" | "); } } - wprintf(" |