/*
- * $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(
}
-/**
- * \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????
- */
-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("<a href=\"edit_vcard?"
- "msgnum=%ld&partnum=%s\">",
- msgnum, vcard_partnum);
- wprintf("[%s]</a>", _("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];
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(buf, "MSG0 %ld|0", Msg->msgnum); /** unfortunately we need the mime info now */
- serv_getln(buf, sizeof buf);
- if (buf[0] != '1') return;
+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;
- 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);
+ MimeLoadData(VCMime);
+ return VCMime;
+}
- if ( (!strcasecmp(mime_content_type, "text/x-vcard"))
- || (!strcasecmp(mime_content_type, "text/vcard")) ) {
- strcpy(vcard_partnum, mime_partnum);
- }
+/*
+ * 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;
- if (!IsEmptyStr(vcard_partnum)) {
- vcard_source = load_mimepart(Msg->msgnum, vcard_partnum);
- if (vcard_source != NULL) {
+ VCMime = load_vcard(Msg);
+ if (VCMime == NULL)
+ return;
- /* Grab the name off the card */
- display_vcard(WC->WBuf, vcard_source, 0, 0, namebuf, Msg->msgnum);
+ /* 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);
-/**
- * \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;
}
}
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,
(*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); */
}
-/**
- * \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) {
+void display_parsed_vcard(StrBuf *Target, struct vCard *v, int full, wc_mime_attachment *Mime)
+{
int i, j;
char buf[SIZ];
char *name;
strcpy(org, "");
if (!full) {
- StrBufAppendPrintf(Target, "<TD>");
+ StrBufAppendPrintf(Target, "<td>");
name = vcard_get_prop(v, "fn", 1, 0, 0);
if (name != NULL) {
StrEscAppend(Target, NULL, name, 0, 0);
else {
StrBufAppendPrintf(Target, " ");
}
- StrBufAppendPrintf(Target, "</TD>");
+ StrBufAppendPrintf(Target, "</td>");
return;
}
- StrBufAppendPrintf(Target, "<div align=center>"
- "<table bgcolor=#aaaaaa width=50%%>");
+ StrBufAppendPrintf(Target, "<div align=\"center\">"
+ "<table bgcolor=\"#aaaaaa\" width=\"50%%\">");
for (pass=1; pass<=2; ++pass) {
if (v->numprops) for (i=0; i<(v->numprops); ++i) {
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
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);
}
else if (!strcasecmp(firsttoken, "email")) {
size_t len;
- if (!IsEmptyStr(mailto)) strcat(mailto, "<br />");
+ if (!IsEmptyStr(mailto)) strcat(mailto, "<br>");
strcat(mailto,
"<a href=\"display_enter"
"?force_room=_MAIL_?recp=");
strcat(mailto, "</A>");
}
else if (!strcasecmp(firsttoken, "tel")) {
- if (!IsEmptyStr(phone)) strcat(phone, "<br />");
+ if (!IsEmptyStr(phone)) strcat(phone, "<br>");
strcat(phone, thisvalue);
for (j=0; j<num_tokens(thisname, ';'); ++j) {
extract_token(buf, thisname, j, ';', sizeof buf);
}
else if (!strcasecmp(firsttoken, "adr")) {
if (pass == 2) {
- StrBufAppendPrintf(Target, "<TR><TD>");
+ StrBufAppendPrintf(Target, "<tr><td>");
StrBufAppendPrintf(Target, _("Address:"));
- StrBufAppendPrintf(Target, "</TD><TD>");
+ StrBufAppendPrintf(Target, "</td><td>");
for (j=0; j<num_tokens(thisvalue, ';'); ++j) {
extract_token(buf, thisvalue, j, ';', sizeof buf);
if (!IsEmptyStr(buf)) {
StrEscAppend(Target, NULL, buf, 0, 0);
- if (j<3) StrBufAppendPrintf(Target, "<br />");
+ if (j<3) StrBufAppendPrintf(Target, "<br>");
else StrBufAppendPrintf(Target, " ");
}
}
- StrBufAppendPrintf(Target, "</TD></TR>\n");
+ StrBufAppendPrintf(Target, "</td></tr>\n");
}
}
/* else if (!strcasecmp(firsttoken, "photo") && full && pass == 2) {
}
if (pass == 1) {
- StrBufAppendPrintf(Target, "<TR BGCOLOR=\"#AAAAAA\">"
- "<TD COLSPAN=2 BGCOLOR=\"#FFFFFF\">"
- "<IMG ALIGN=CENTER src=\"static/viewcontacts_48x.gif\">"
- "<FONT SIZE=+1><B>");
+ StrBufAppendPrintf(Target, "<tr bgcolor=\"#aaaaaa\">"
+ "<td colspan=2 bgcolor=\"#ffffff\">"
+ "<img align=\"center\" src=\"static/webcit_icons/essen/32x32/contact.png\">"
+ "<font size=\"+1\"><b>");
StrEscAppend(Target, NULL, fullname, 0, 0);
- StrBufAppendPrintf(Target, "</B></FONT>");
+ StrBufAppendPrintf(Target, "</b></font>");
if (!IsEmptyStr(title)) {
- StrBufAppendPrintf(Target, "<div align=right>");
+ StrBufAppendPrintf(Target, "<div align=\"right>\"");
StrEscAppend(Target, NULL, title, 0, 0);
StrBufAppendPrintf(Target, "</div>");
}
if (!IsEmptyStr(org)) {
- StrBufAppendPrintf(Target, "<div align=right>");
+ StrBufAppendPrintf(Target, "<div align=\"right\">");
StrEscAppend(Target, NULL, org, 0, 0);
StrBufAppendPrintf(Target, "</div>");
}
- StrBufAppendPrintf(Target, "</TD></TR>\n");
+ StrBufAppendPrintf(Target, "</td></tr>\n");
if (!IsEmptyStr(phone)) {
StrBufAppendPrintf(Target, "<tr><td>");
StrBufAppendPrintf(Target, "</table></div>\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; j<num_tokens(ChrPtr(thisname), ';'); ++j) {
+ extract_token(buf, ChrPtr(thisname), j, ';', sizeof buf);
+ if (!strcasecmp(buf, "encoding=quoted-printable")) {
+ is_qp = 1;
+/* remove_token(thisname, j, ';');*/
+ }
+ if (!strcasecmp(buf, "encoding=base64")) {
+ is_b64 = 1;
+/* remove_token(thisname, j, ';');*/
+ }
+ }
+
+ /* copy over the payload into a StrBuf */
+ Val = NewStrBufPlain(v->prop[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]
+
+ 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);
-/**
- * \brief Display a textual vCard
+ 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,
- StrBuf *vcard_source,
+ wc_mime_attachment *Mime,
char alpha,
int full,
char **storename,
StrBuf *Buf2;
char this_alpha = 0;
- v = VCardLoad(vcard_source);
+ v = VCardLoad(Mime->Data);
if (v == NULL) return;
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);
-/**
- * \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;
char **tablabels;
if (num_ab == 0) {
- w
printf("<br /><br /><br /><div align=\"center\"><i>");
- wprintf(_("This address book is empty."));
- wprintf("</i></div>\n");
+ w
c_printf("<br><br><br><div align=\"center\"><i>");
+ wc_printf(_("This address book is empty."));
+ wc_printf("</i></div>\n");
return;
}
tablabels = malloc(num_pages * sizeof (char *));
if (tablabels == NULL) {
- w
printf("<br /><br /><br /><div align=\"center\"><i>");
- wprintf(_("An internal error has occurred."));
- wprintf("</i></div>\n");
+ w
c_printf("<br><br><br><div align=\"center\"><i>");
+ wc_printf(_("An internal error has occurred."));
+ wc_printf("</i></div>\n");
return;
}
if ((i / NAMESPERPAGE) != page) { /* New tab */
page = (i / NAMESPERPAGE);
if (page > 0) {
- wprintf("</tr></table>\n");
+ wc_printf("</tr></table>\n");
end_tab(page-1, num_pages);
}
begin_tab(page, num_pages);
- wprintf("<table border=0 cellspacing=0 cellpadding=3 width=100%%>\n");
+ wc_printf("<table border=\"0\" cellspacing=\"0\" cellpadding=\"3\" width=\"100%%\">\n");
displayed = 0;
}
if ((displayed % 4) == 0) {
if (displayed > 0) {
- wprintf("</tr>\n");
+ wc_printf("</tr>\n");
}
bg = 1 - bg;
- wprintf("<tr bgcolor=\"#%s\">",
- (bg ? "DDDDDD" : "FFFFFF")
+ wc_printf("<tr bgcolor=\"#%s\">",
+ (bg ? "dddddd" : "ffffff")
);
}
- wprintf("<td>");
+ wc_printf("<td>");
- wprintf("<a href=\"readfwd?startmsg=%ld?is_singlecard=1",
+ w
c_printf("<a href=\"readfwd?startmsg=%ld?is_singlecard=1",
addrbook[i].ab_msgnum);
- wprintf("?maxmsgs=1?is_summary=0?alpha=%s\">", 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("</a></td>\n");
+ wc_printf("</a></td>\n");
++displayed;
}
/* Placeholders for empty columns at end */
if ((num_ab % 4) != 0) {
for (i=0; i<(4-(num_ab % 4)); ++i) {
- wprintf("<td> </td>");
+ wc_printf("<td> </td>");
}
}
- wprintf("</tr></table>\n");
+ wc_printf("</tr></table>\n");
end_tab((num_pages-1), num_pages);
begin_tab(num_pages, num_pages);
void do_edit_vcard(long msgnum, char *partnum,
message_summary *VCMsg,
wc_mime_attachment *VCAtt,
- char *return_to,
+ const 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_ServGetlnBuffered(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"));
- do_template("beginboxx", NULL);
+ do_template("box_begin_1");
+ StrBufAppendBufPlain(WC->WBuf, _("Edit contact information"), -1, 0);
+ do_template("box_begin_2");
- wprintf("<form method=\"POST\" action=\"submit_vcard\">\n");
- wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+ wc_printf("<form method=\"POST\" action=\"submit_vcard\">\n");
+ wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
if (force_room != NULL) {
- wprintf("<input type=\"hidden\" name=\"force_room\" value=\"");
+ wc_printf("<input type=\"hidden\" name=\"force_room\" value=\"");
escputs(force_room);
- wprintf("\">\n");
+ wc_printf("\">\n");
}
- wprintf("<div class=\"fix_scrollbar_bug\">"
- "<table class=\"vcard_edit_background\"><tr><td>\n");
+ wc_printf("<table class=\"vcard_edit_background\"><tr><td>\n");
- wprintf("<table border=0><tr>"
+ wc_printf("<table border=\"0\"><tr>"
"<td>%s</td>"
"<td>%s</td>"
"<td>%s</td>"
"<td>%s</td>"
"<td>%s</td></tr>\n",
- _("Prefix"), _("First"), _("Middle"), _("Last"), _("Suffix")
+ _("Prefix"), _("First Name"), _("Middle Name"), _("Last Name"), _("Suffix")
);
- wprintf("<tr><td><input type=\"text\" name=\"prefix\" "
+ wc_printf("<tr><td><input type=\"text\" name=\"prefix\" "
"value=\"%s\" maxlength=\"5\" size=\"5\"></td>",
prefix);
- wprintf("<td><input type=\"text\" name=\"firstname\" "
+ wc_printf("<td><input type=\"text\" name=\"firstname\" "
"value=\"%s\" maxlength=\"29\"></td>",
firstname);
- wprintf("<td><input type=\"text\" name=\"middlename\" "
+ wc_printf("<td><input type=\"text\" name=\"middlename\" "
"value=\"%s\" maxlength=\"29\"></td>",
middlename);
- wprintf("<td><input type=\"text\" name=\"lastname\" "
+ wc_printf("<td><input type=\"text\" name=\"lastname\" "
"value=\"%s\" maxlength=\"29\"></td>",
lastname);
- wprintf("<td><input type=\"text\" name=\"suffix\" "
+ wc_printf("<td><input type=\"text\" name=\"suffix\" "
"value=\"%s\" maxlength=\"10\" size=\"10\"></td></tr></table>\n",
suffix);
- wprintf("<table class=\"vcard_edit_background_alt\">");
- wprintf("<tr><td>");
+ w
c_printf("<table class=\"vcard_edit_background_alt\">");
+ wc_printf("<tr><td>");
- wprintf(_("Display name:"));
- wprintf("<br>"
+ wc_printf(_("Display name:"));
+ wc_printf("<br>"
"<input type=\"text\" name=\"fullname\" "
"value=\"%s\" maxlength=\"40\"><br><br>\n",
fullname
);
- wprintf(_("Title:"));
- wprintf("<br>"
+ wc_printf(_("Title:"));
+ wc_printf("<br>"
"<input type=\"text\" name=\"title\" "
"value=\"%s\" maxlength=\"40\"><br><br>\n",
title
);
- wprintf(_("Organization:"));
- wprintf("<br>"
+ wc_printf(_("Organization:"));
+ wc_printf("<br>"
"<input type=\"text\" name=\"org\" "
"value=\"%s\" maxlength=\"40\"><br><br>\n",
org
);
- wprintf("</td><td>");
+ wc_printf("</td><td>");
- wprintf("<table border=0>");
- wprintf("<tr><td>");
- wprintf(_("PO box:"));
- wprintf("</td><td>"
+ wc_printf("<table border=\"0\">");
+ wc_printf("<tr><td>");
+ wc_printf(_("PO box:"));
+ wc_printf("</td><td>"
"<input type=\"text\" name=\"pobox\" "
"value=\"%s\" maxlength=\"29\"></td></tr>\n",
pobox);
- wprintf("<tr><td>");
- wprintf(_("Address:"));
- wprintf("</td><td>"
+ wc_printf("<tr><td>");
+ wc_printf(_("Address:"));
+ wc_printf("</td><td>"
"<input type=\"text\" name=\"extadr\" "
"value=\"%s\" maxlength=\"29\"></td></tr>\n",
extadr);
- wprintf("<tr><td> </td><td>"
+ wc_printf("<tr><td> </td><td>"
"<input type=\"text\" name=\"street\" "
"value=\"%s\" maxlength=\"29\"></td></tr>\n",
street);
- wprintf("<tr><td>");
- wprintf(_("City:"));
- wprintf("</td><td>"
+ wc_printf("<tr><td>");
+ wc_printf(_("City:"));
+ wc_printf("</td><td>"
"<input type=\"text\" name=\"city\" "
"value=\"%s\" maxlength=\"29\"></td></tr>\n",
city);
- wprintf("<tr><td>");
- wprintf(_("State:"));
- wprintf("</td><td>"
+ wc_printf("<tr><td>");
+ wc_printf(_("State:"));
+ wc_printf("</td><td>"
"<input type=\"text\" name=\"state\" "
"value=\"%s\" maxlength=\"29\"></td></tr>\n",
state);
- wprintf("<tr><td>");
- wprintf(_("ZIP code:"));
- wprintf("</td><td>"
+ wc_printf("<tr><td>");
+ wc_printf(_("ZIP code:"));
+ wc_printf("</td><td>"
"<input type=\"text\" name=\"zipcode\" "
"value=\"%s\" maxlength=\"10\"></td></tr>\n",
zipcode);
- wprintf("<tr><td>");
- wprintf(_("Country:"));
- wprintf("</td><td>"
+ wc_printf("<tr><td>");
+ wc_printf(_("Country:"));
+ wc_printf("</td><td>"
"<input type=\"text\" name=\"country\" "
"value=\"%s\" maxlength=\"29\" width=\"5\"></td></tr>\n",
country);
- wprintf("</table>\n");
+ wc_printf("</table>\n");
- wprintf("</table>\n");
+ wc_printf("</table>\n");
- wprintf("<table border=0><tr><td>");
- wprintf(_("Home telephone:"));
- wprintf("</td>"
+ w
c_printf("<table border=0><tr><td>");
+ wc_printf(_("Home telephone:"));
+ wc_printf("</td>"
"<td><input type=\"text\" name=\"hometel\" "
"value=\"%s\" maxlength=\"29\"></td>\n",
hometel);
- wprintf("<td>");
- wprintf(_("Work telephone:"));
- wprintf("</td>"
+ wc_printf("<td>");
+ wc_printf(_("Work telephone:"));
+ wc_printf("</td>"
"<td><input type=\"text\" name=\"worktel\" "
"value=\"%s\" maxlength=\"29\"></td></tr>\n",
worktel);
- wprintf("<tr><td>");
- wprintf(_("Mobile telephone:"));
- wprintf("</td>"
+ wc_printf("<tr><td>");
+ wc_printf(_("Mobile telephone:"));
+ wc_printf("</td>"
"<td><input type=\"text\" name=\"mobiletel\" "
"value=\"%s\" maxlength=\"29\"></td>\n",
mobiletel);
- wprintf("<td>");
- wprintf(_("Fax number:"));
- wprintf("</td>"
+ wc_printf("<td>");
+ wc_printf(_("Fax number:"));
+ wc_printf("</td>"
"<td><input type=\"text\" name=\"faxtel\" "
"value=\"%s\" maxlength=\"29\"></td></tr></table>\n",
faxtel);
- wprintf("<table class=\"vcard_edit_background_alt\">");
- wprintf("<tr><td>");
+ w
c_printf("<table class=\"vcard_edit_background_alt\">");
+ wc_printf("<tr><td>");
- wprintf("<table border=0><TR>"
+ w
c_printf("<table border=0><TR>"
"<td valign=top>");
- wprintf(_("Primary Internet e-mail address"));
- wprintf("<br />"
+ wc_printf(_("Primary Internet e-mail address"));
+ wc_printf("<br>"
"<input type=\"text\" name=\"primary_inetemail\" "
"size=40 maxlength=60 value=\"");
escputs(primary_inetemail);
- wprintf("\"><br />"
+ wc_printf("\"><br>"
"</td><td valign=top>");
- wprintf(_("Internet e-mail aliases"));
- wprintf("<br />"
+ wc_printf(_("Internet e-mail aliases"));
+ wc_printf("<br>"
"<textarea name=\"other_inetemail\" rows=5 cols=40 width=40>");
escputs(other_inetemail);
- wprintf("</textarea></td></tr></table>\n");
+ wc_printf("</textarea></td></tr></table>\n");
- wprintf("</td></tr></table>\n");
+ wc_printf("</td></tr></table>\n");
- wprintf("<input type=\"hidden\" name=\"extrafields\" value=\"");
+ wc_printf("<input type=\"hidden\" name=\"extrafields\" value=\"");
escputs(extrafields);
- wprintf("\">\n");
+ wc_printf("\">\n");
- wprintf("<input type=\"hidden\" name=\"return_to\" value=\"");
- urlescputs(return_to);
- wprintf("\">\n");
+ wc_printf("<input type=\"hidden\" name=\"return_to\" value=\"");
+ escputs(return_to);
+ wc_printf("\">\n");
- wprintf("<div class=\"buttons\">\n"
+ w
c_printf("<div class=\"buttons\">\n"
"<input type=\"submit\" name=\"ok_button\" value=\"%s\">"
" "
"<input type=\"submit\" name=\"cancel_button\" value=\"%s\">"
_("Cancel")
);
- wprintf("</td></tr></table>\n");
- do_template("endbox", NULL);
+ wc_printf("</td></tr></table>\n");
+ do_template("box_end");
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) {
- wcsession *WCC = WC;
struct vCard *v;
char *serialized_vcard;
char buf[SIZ];
StrBuf *Buf;
+ const StrBuf *ForceRoom;
int i;
if (!havebstr("ok_button")) {
- readloop(readnew);
+ readloop(readnew, eUseDefault);
return;
}
if (havebstr("force_room")) {
- if (gotoroom(sbstr("force_room")) != 200) {
- StrBufAppendBufPlain(WCC->ImportantMsg,
- _("Unable to enter the room to save your message"),
- -1, 0);
- StrBufAppendBufPlain(WCC->ImportantMsg,
- HKEY(": "), 0);
- StrBufAppendBuf(WCC->ImportantMsg, sbstr("force_room"), 0);
- StrBufAppendBufPlain(WCC->ImportantMsg,
- HKEY("; "), 0);
-
- StrBufAppendBufPlain(WCC->ImportantMsg,
- _("Aborting."),
- -1, 0);
- /// todo: call the master dispatcher again...
+ ForceRoom = sbstr("force_room");
+ if (gotoroom(ForceRoom) != 200) {
+ AppendImportantMessage(_("Unable to enter the room to save your message"), -1);
+ AppendImportantMessage(HKEY(": "));
+ AppendImportantMessage(SKEY(ForceRoom));
+ AppendImportantMessage(HKEY("; "));
+ AppendImportantMessage(_("Aborting."), -1);
+
if (!strcmp(bstr("return_to"), "select_user_to_edit")) {
select_user_to_edit(NULL);
}
else if (!strcmp(bstr("return_to"), "do_welcome")) {
do_welcome();
}
+ else if (!IsEmptyStr(bstr("return_to"))) {
+ http_redirect(bstr("return_to"));
+ }
else {
- readloop(readnew);
+ readloop(readnew, eUseDefault);
}
return;
}
}
- sprintf(buf, "ENT0 1|||4||");
- serv_puts(buf);
- serv_getln(buf, sizeof buf);
- if (buf[0] != '4') {
+ Buf = NewStrBuf();
+ serv_write(HKEY("ENT0 1|||4||||||1\n"));
+ if (!StrBuf_ServGetln(Buf) && (GetServerStatus(Buf, NULL) != 4))
+ {
edit_vcard();
return;
}
- /** Make a vCard structure out of the data supplied in the form */
- Buf = NewStrBuf();
+ /* Make a vCard structure out of the data supplied in the form */
StrBufPrintf(Buf, "begin:vcard\r\n%s\r\nend:vcard\r\n",
bstr("extrafields")
);
- v = VCardLoad(Buf); /** Start with the extra fields */
- FreeStrBuf(&Buf);
+ v = VCardLoad(Buf); /* Start with the extra fields */
if (v == NULL) {
- safestrncpy(WCC->ImportantMessage,
- _("An error has occurred."),
- sizeof WCC->ImportantMessage
- );
+ AppendImportantMessage(_("An error has occurred."), -1);
edit_vcard();
+ FreeStrBuf(&Buf);
return;
}
serialized_vcard = vcard_serialize(v);
vcard_free(v);
if (serialized_vcard == NULL) {
- safestrncpy(WCC->ImportantMessage,
- _("An error has occurred."),
- sizeof WCC->ImportantMessage
- );
+ AppendImportantMessage(_("An error has occurred."), -1);
edit_vcard();
+ FreeStrBuf(&Buf);
return;
}
- serv_puts("Content-type: text/x-vcard; charset=UTF-8");
- serv_puts("");
+ serv_write(HKEY("Content-type: text/x-vcard; charset=UTF-8\n"));
+ serv_write(HKEY("\n"));
serv_printf("%s\r\n", serialized_vcard);
- serv_puts("000");
+ serv_write(HKEY("000\n"));
free(serialized_vcard);
+ StrBuf_ServGetln(Buf);
+
if (!strcmp(bstr("return_to"), "select_user_to_edit")) {
select_user_to_edit(NULL);
}
else if (!strcmp(bstr("return_to"), "do_welcome")) {
do_welcome();
}
+ else if (!IsEmptyStr(bstr("return_to"))) {
+ http_redirect(bstr("return_to"));
+ }
else {
- readloop(readnew);
+ readloop(readnew, eUseDefault);
}
+ FreeStrBuf(&Buf);
}
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);
hprintf("HTTP/1.1 500 %s\n","Unable to get photo");
output_headers(0, 0, 0, 0, 0, 0);
hprintf("Content-Type: text/plain\r\n");
- wprintf(_("Could Not decode vcard photo\n"));
+ begin_burst();
+ wc_printf(_("Could Not decode vcard photo\n"));
end_burst();
return;
}
free(photosrc);
}
+typedef struct _vcardview_struct {
+ long is_singlecard;
+ addrbookent *addrbook;
+ long num_ab;
+
+} vcardview_struct;
+
+int vcard_GetParamsGetServerCall(SharedMessageStatus *Stat,
+ void **ViewSpecific,
+ long oper,
+ char *cmd,
+ long len,
+ char *filter,
+ long flen)
+{
+ vcardview_struct *VS;
+
+ VS = (vcardview_struct*) malloc (sizeof(vcardview_struct));
+ memset(VS, 0, sizeof(vcardview_struct));
+ *ViewSpecific = (void*)VS;
+
+ VS->is_singlecard = ibstr("is_singlecard");
+ if (VS->is_singlecard != 1) {
+ if (oper == do_search) {
+ snprintf(cmd, len, "MSGS SEARCH|%s", bstr("query"));
+ }
+ else {
+ strcpy(cmd, "MSGS ALL");
+ }
+ Stat->maxmsgs = 9999999;
+ }
+ return 200;
+}
+
+int vcard_LoadMsgFromServer(SharedMessageStatus *Stat,
+ void **ViewSpecific,
+ message_summary* Msg,
+ int is_new,
+ int i)
+{
+ vcardview_struct *VS;
+ char *ab_name;
+
+ VS = (vcardview_struct*) *ViewSpecific;
+
+ ab_name = NULL;
+ fetch_ab_name(Msg, &ab_name);
+ if (ab_name == NULL)
+ return 0;
+ ++VS->num_ab;
+ VS->addrbook = realloc(VS->addrbook,
+ (sizeof(addrbookent) * VS->num_ab) );
+ safestrncpy(VS->addrbook[VS->num_ab-1].ab_name, ab_name,
+ sizeof(VS->addrbook[VS->num_ab-1].ab_name));
+ VS->addrbook[VS->num_ab-1].ab_msgnum = Msg->msgnum;
+ free(ab_name);
+ return 0;
+}
+
+
+int vcard_RenderView_or_Tail(SharedMessageStatus *Stat, void **ViewSpecific, long oper)
+{
+ const StrBuf *Mime;
+ vcardview_struct *VS;
+
+ VS = (vcardview_struct*) *ViewSpecific;
+ if (VS->is_singlecard)
+ read_message(WC->WBuf, HKEY("view_message"), lbstr("startmsg"), NULL, &Mime);
+ else
+ do_addrbook_view(VS->addrbook, VS->num_ab); /* Render the address book */
+ return 0;
+}
+
+int vcard_Cleanup(void **ViewSpecific)
+{
+ vcardview_struct *VS;
+ VS = (vcardview_struct*) *ViewSpecific;
+ wDumpContent(1);
+ if ((VS != NULL) &&
+ (VS->addrbook != NULL))
+ free(VS->addrbook);
+ if (VS != NULL)
+ free(VS);
+ return 0;
+}
+
+void
+ServerStartModule_VCARD
+(void)
+{
+ VCToEnum = NewHash(0, NULL);
+
+}
+
+void
+ServerShutdownModule_VCARD
+(void)
+{
+ DeleteHash(&VCToEnum);
+}
void
InitModule_VCARD
(void)
{
- WebcitAddUrlHandler(HKEY("edit_vcard"), edit_vcard, 0);
- WebcitAddUrlHandler(HKEY("submit_vcard"), submit_vcard, 0);
- WebcitAddUrlHandler(HKEY("vcardphoto"), display_vcard_photo_img, NEED_URL);
+ RegisterReadLoopHandlerset(
+ VIEW_ADDRESSBOOK,
+ vcard_GetParamsGetServerCall,
+ NULL,
+ NULL,
+ NULL,
+ vcard_LoadMsgFromServer,
+ vcard_RenderView_or_Tail,
+ vcard_Cleanup);
+ WebcitAddUrlHandler(HKEY("edit_vcard"), "", 0, edit_vcard, 0);
+ WebcitAddUrlHandler(HKEY("submit_vcard"), "", 0, submit_vcard, 0);
+ WebcitAddUrlHandler(HKEY("vcardphoto"), "", 0, display_vcard_photo_img, NEED_URL);
+
+ Put(VCToEnum, HKEY("n"), (void*)VC_n, reference_free_handler);
+ Put(VCToEnum, HKEY("fn"), (void*)VC_fn, reference_free_handler);
+ Put(VCToEnum, HKEY("title"), (void*)VC_title, reference_free_handler);
+ Put(VCToEnum, HKEY("org"), (void*)VC_org, reference_free_handler);
+ Put(VCToEnum, HKEY("email"), (void*)VC_email, reference_free_handler);
+ Put(VCToEnum, HKEY("tel"), (void*)VC_tel, reference_free_handler);
+ Put(VCToEnum, HKEY("tel_tel"), (void*)VC_tel_tel, reference_free_handler);
+ Put(VCToEnum, HKEY("tel_work"), (void*)VC_tel_work, reference_free_handler);
+ Put(VCToEnum, HKEY("tel_home"), (void*)VC_tel_home, reference_free_handler);
+ Put(VCToEnum, HKEY("tel_cell"), (void*)VC_tel_cell, reference_free_handler);
+ Put(VCToEnum, HKEY("adr"), (void*)VC_adr, reference_free_handler);
+ Put(VCToEnum, HKEY("photo"), (void*)VC_photo, reference_free_handler);
+ Put(VCToEnum, HKEY("version"), (void*)VC_version, reference_free_handler);
+ Put(VCToEnum, HKEY("rev"), (void*)VC_rev, reference_free_handler);
+ Put(VCToEnum, HKEY("label"), (void*)VC_label, reference_free_handler);
+
+
+ RegisterNamespace("VC", 1, 2, tmplput_VCARD_ITEM, NULL, CTX_VCARD);
+
+ REGISTERTokenParamDefine(VC_n);
+ REGISTERTokenParamDefine(VC_fn);
+ REGISTERTokenParamDefine(VC_title);
+ REGISTERTokenParamDefine(VC_org);
+ REGISTERTokenParamDefine(VC_email);
+ REGISTERTokenParamDefine(VC_tel);
+ REGISTERTokenParamDefine(VC_tel_tel);
+ REGISTERTokenParamDefine(VC_tel_work);
+ REGISTERTokenParamDefine(VC_tel_home);
+ REGISTERTokenParamDefine(VC_tel_cell);
+ REGISTERTokenParamDefine(VC_adr);
+ REGISTERTokenParamDefine(VC_photo);
+ REGISTERTokenParamDefine(VC_version);
+ REGISTERTokenParamDefine(VC_rev);
+ REGISTERTokenParamDefine(VC_label);
+
}
projects / citadel.git / blobdiff