#include "webcit.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(
}
-/**
- * \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);
}
-/**
- * \brief display the adressbook overview
- * \param msgnum the citadel message number
- * \param alpha what????
+/*
+ * display the adressbook overview
*/
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];
message_summary summ;////TODO: this will leak
memset(&summ, 0, sizeof(summ));
- ///safestrncpy(summ.subj, _("(no subject)"), sizeof summ.subj);
-///Load Message headers
-// Msg =
+ // safestrncpy(summ.subj, _("(no subject)"), sizeof summ.subj);
+ // Load Message headers
if (!IsEmptyStr(vcard_partnum)) {
vcard_source = load_mimepart(msgnum, vcard_partnum);
if (vcard_source != NULL) {
- /** Display the summary line */
+ /* Display the summary line */
display_vcard(WC->WBuf, vcard_source, alpha, 0, NULL, msgnum);
- /** If it's my vCard I can edit it */
+ /* 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)
-/**
- * \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];
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) {
+
+
+wc_mime_attachment *load_vcard(message_summary *Msg)
+{
HashPos *it;
StrBuf *FoundCharset = NewStrBuf();
StrBuf *Error;
void *vMime;
const char *Key;
long len;
- int i;
wc_mime_attachment *Mime;
wc_mime_attachment *VCMime = NULL;
- if (namebuf == NULL) return;
-
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) &&
}
DeleteHashPos(&it);
if (VCMime == NULL)
- return;
+ return NULL;
MimeLoadData(VCMime);
+ return VCMime;
+}
+
+/*
+ * 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->Data, 0, 0, namebuf, Msg->msgnum);
-/**
- * \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)
{
-/**
- * \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;
-/**
- * \brief html print a vcard
+/*
+ * html print a vcard
* display_vcard() calls this after parsing the textual vCard into
* our 'struct vCard' data object.
*
* 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) {
int i, j;
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);
}
}
- /** 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);
}
-/**
- * \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,
if (storename != NULL) {
fetchname_parsed_vcard(v, storename);
}
- else if ( (alpha == 0)
- || ((isalpha(alpha)) && (tolower(alpha) == tolower(this_alpha)) )
- || ((!isalpha(alpha)) && (!isalpha(this_alpha)))
- ) {
+ else if (
+ (alpha == 0)
+ || ((isalpha(alpha)) && (tolower(alpha) == tolower(this_alpha)))
+ || ((!isalpha(alpha)) && (!isalpha(this_alpha)))
+ ) {
display_parsed_vcard(Target, v, full,msgnum);
}
-/**
- * \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;
wc_mime_attachment *VCAtt,
char *return_to,
const char *force_room) {
- StrBuf *Buf;
- char buf[SIZ];
- size_t total_len = 0;
+ message_summary *Msg = NULL;
+ wc_mime_attachment *VCMime = NULL;
struct vCard *v;
int i;
char *key, *value;
((VCMsg != NULL) && (VCAtt != NULL)))
{
if ((VCMsg == NULL) && (VCAtt == NULL)) {
- 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]);
- }
- }
- Buf = NewStrBuf();
- serv_printf(buf, "DLAT %ld|%s", msgnum, partnum);
- StrBuf_ServGetln(Buf);
- if (GetServerStatus(Buf, NULL) != 6) {
- convenience_page("770000", "Error", &(ChrPtr(Buf)[4]));
+
+ 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;
}
-
- StrBufCutLeft(Buf, 4);
- total_len = StrBufExtract_long(Buf, 0, '|');
-
- StrBuf_ServGetBLOBBuffered(Buf, total_len);
- v = VCardLoad(Buf);
+ v = VCardLoad(VCMime->Data);
}
else {
v = VCardLoad(VCAtt->Data);
}
- FreeStrBuf(&Buf);
/* Populate the variables for our form */
i = 0;
vcard_free(v);
}
- /** Display the form */
+ /* Display the form */
output_headers(1, 1, 1, 0, 0, 0);
svput("BOXTITLE", WCS_STRING, _("Edit contact information"));
wprintf("</td></tr></table>\n");
do_template("endbox", NULL);
wDumpContent(1);
+ if (Msg != NULL) {
+ DestroyMessageSummary(Msg);
+ }
}
-/**
+/*
* commit the edits to the citadel server
*/
void edit_vcard(void) {
-/**
+/*
* parse edited vcard from the browser
*/
void submit_vcard(void) {
return;
}
- /** Make a vCard structure out of the data supplied in the form */
+ /* Make a vCard structure out of the data supplied in the form */
Buf = NewStrBuf();
StrBufPrintf(Buf, "begin:vcard\r\n%s\r\nend:vcard\r\n",
bstr("extrafields")
);
- v = VCardLoad(Buf); /** Start with the extra fields */
+ v = VCardLoad(Buf); /* Start with the extra fields */
FreeStrBuf(&Buf);
if (v == NULL) {
safestrncpy(WCC->ImportantMessage,
const char *contentType;
wcsession *WCC = WC;
- msgnum = StrTol(WCC->UrlFragment2);
+ msgnum = StrBufExtract_long(WCC->Hdr->HR.ReqLine, 0, '/');
vcard = load_mimepart(msgnum,"1");
v = VCardLoad(vcard);
projects / citadel.git / blobdiff