X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fvcard_edit.c;h=9c8bd3b0c4c76b899883eb610e0df2308d633a7e;hb=4b4dc864ede7c5d8d956febe4a0afb422b78e7c4;hp=320d4322facd54edad2da145d14cf2d5e7e8a89f;hpb=6a25ee7e6476856c8f167a09f3afe71361c3e579;p=citadel.git
diff --git a/webcit/vcard_edit.c b/webcit/vcard_edit.c
index 320d4322f..9c8bd3b0c 100644
--- a/webcit/vcard_edit.c
+++ b/webcit/vcard_edit.c
@@ -1,9 +1,64 @@
/*
- * $Id$
+ * Copyright (c) 1996-2011 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 as
+ * published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#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 +84,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 +162,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 +252,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,14 +260,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); */
}
@@ -279,7 +298,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;
@@ -302,7 +322,7 @@ void display_parsed_vcard(StrBuf *Target, struct vCard *v, int full, long msgnum
strcpy(org, "");
if (!full) {
- StrBufAppendPrintf(Target, "
");
for (pass=1; pass<=2; ++pass) {
if (v->numprops) for (i=0; i<(v->numprops); ++i) {
@@ -343,7 +363,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
@@ -391,7 +411,7 @@ void display_parsed_vcard(StrBuf *Target, struct vCard *v, int full, long msgnum
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
![](\"static/viewcontacts_48x.gif\")
"
- "");
+ StrBufAppendPrintf(Target, "![](\"static/webcit_icons/essen/32x32/contact.png\"){kind=icon}
"
+ "");
StrEscAppend(Target, NULL, fullname, 0, 0);
- StrBufAppendPrintf(Target, "");
+ StrBufAppendPrintf(Target, "");
if (!IsEmptyStr(title)) {
- StrBufAppendPrintf(Target, "