X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fvcard_edit.c;h=5ec2799afcad92107e48e7f1a57aa93cac4a3470;hb=fb6f6fa4ec4e3277e30d84326d48e6850822d318;hp=2897424b0723f6f7d1968040ebaca262328747a7;hpb=e2f37ceb57dfceb0e207171842669e4dd6a46e5f;p=citadel.git diff --git a/webcit/vcard_edit.c b/webcit/vcard_edit.c index 2897424b0..5ec2799af 100644 --- a/webcit/vcard_edit.c +++ b/webcit/vcard_edit.c @@ -1,10 +1,59 @@ /* - * $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; + /* * Record compare function for sorting address book indices */ @@ -29,47 +78,6 @@ void nametab(char *tabbuf, long len, char *name) { } -/* - * display the adressbook overview - */ -void display_addressbook(long msgnum, char alpha) { - //char buf[SIZ]; - /* char mime_partnum[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 - 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); - } - } - -} - - - /* * If it's an old "Firstname Lastname" style record, try to convert it. */ @@ -148,7 +156,7 @@ void fetch_ab_name(message_summary *Msg, char **namebuf) { return; /* Grab the name off the card */ - display_vcard(WC->WBuf, VCMime->Data, 0, 0, namebuf, Msg->msgnum); + display_vcard(WC->WBuf, VCMime, 0, 0, namebuf, Msg->msgnum); if (*namebuf != NULL) { lastfirst_firstlast(*namebuf); @@ -238,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, @@ -246,7 +254,7 @@ 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, @@ -284,7 +292,8 @@ void fetchname_parsed_vcard(struct vCard *v, char **storename) { * 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; @@ -307,7 +316,7 @@ void display_parsed_vcard(StrBuf *Target, struct vCard *v, int full, long msgnum strcpy(org, ""); if (!full) { - StrBufAppendPrintf(Target, "
"); + 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(" |