/*
- * $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"
+CtxType CTX_VCARD = CTX_NONE;
+
+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
*/
if (VCMime == NULL)
return NULL;
- MimeLoadData(VCMime);
+ if (VCMime->Data == NULL)
+ MimeLoadData(VCMime);
return VCMime;
}
}
}
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,
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) {
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(LOG_DEBUG, "%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(LOG_DEBUG, "[%ul]\n", evc);
+ Val = NULL;
+ }
+ else
+ syslog(LOG_DEBUG, "[]\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(CTX_VCARD);
+ 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);
+
+ SubTP.Filter.ContextType = CTX_VCARD;
+ SubTP.Context = VC;
+
+ DoTemplate(HKEY("test_vcard"), Target, &SubTP);
+ DeleteHash(&VC);
+}
+
/*
((!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);
char **tablabels;
if (num_ab == 0) {
- wc_printf("<br /><br /><br /><div align=\"center\"><i>");
+ wc_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) {
- wc_printf("<br /><br /><br /><div align=\"center\"><i>");
+ wc_printf("<br><br><br><div align=\"center\"><i>");
wc_printf(_("An internal error has occurred."));
wc_printf("</i></div>\n");
return;
end_tab(page-1, num_pages);
}
begin_tab(page, num_pages);
- wc_printf("<table border=0 cellspacing=0 cellpadding=3 width=100%%>\n");
+ wc_printf("<table border=\"0\" cellspacing=\"0\" cellpadding=\"3\" width=\"100%%\">\n");
displayed = 0;
}
}
bg = 1 - bg;
wc_printf("<tr bgcolor=\"#%s\">",
- (bg ? "DDDDDD" : "FFFFFF")
+ (bg ? "dddddd" : "ffffff")
);
}
wc_mime_attachment *VCAtt,
const char *return_to,
const char *force_room) {
+ wcsession *WCC = WC;
message_summary *Msg = NULL;
wc_mime_attachment *VCMime = NULL;
struct vCard *v;
/* Display the form */
output_headers(1, 1, 1, 0, 0, 0);
- do_template("beginbox_1", NULL);
+ do_template("box_begin_1");
StrBufAppendBufPlain(WC->WBuf, _("Edit contact information"), -1, 0);
- do_template("beginbox_2", NULL);
+ do_template("box_begin_2");
wc_printf("<form method=\"POST\" action=\"submit_vcard\">\n");
wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
escputs(force_room);
wc_printf("\">\n");
}
+ else
+ {
+ wc_printf("<input type=\"hidden\" name=\"go\" value=\"");
+ StrEscAppend(WCC->WBuf, WCC->CurRoom.name, NULL, 0, 0);
+ wc_printf("\">\n");
+ }
- wc_printf("<div class=\"fix_scrollbar_bug\">"
- "<table class=\"vcard_edit_background\"><tr><td>\n");
+ wc_printf("<table class=\"vcard_edit_background\"><tr><td>\n");
- wc_printf("<table border=0><tr>"
+ wc_printf("<table border=\"0\"><tr>"
"<td>%s</td>"
"<td>%s</td>"
"<td>%s</td>"
wc_printf("</td><td>");
- wc_printf("<table border=0>");
+ wc_printf("<table border=\"0\">");
wc_printf("<tr><td>");
wc_printf(_("PO box:"));
wc_printf("</td><td>"
wc_printf("<table border=0><TR>"
"<td valign=top>");
wc_printf(_("Primary Internet e-mail address"));
- wc_printf("<br />"
+ wc_printf("<br>"
"<input type=\"text\" name=\"primary_inetemail\" "
"size=40 maxlength=60 value=\"");
escputs(primary_inetemail);
- wc_printf("\"><br />"
+ wc_printf("\"><br>"
"</td><td valign=top>");
wc_printf(_("Internet e-mail aliases"));
- wc_printf("<br />"
+ wc_printf("<br>"
"<textarea name=\"other_inetemail\" rows=5 cols=40 width=40>");
escputs(other_inetemail);
wc_printf("</textarea></td></tr></table>\n");
);
wc_printf("</td></tr></table>\n");
- do_template("endbox", NULL);
+ do_template("box_end");
wDumpContent(1);
if (Msg != NULL) {
DestroyMessageSummary(Msg);
* 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")) {
}
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);
+ 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);
}
}
- 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\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();
StrBufPrintf(Buf, "begin:vcard\r\n%s\r\nend:vcard\r\n",
bstr("extrafields")
);
v = VCardLoad(Buf); /* Start with the extra fields */
- FreeStrBuf(&Buf);
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);
if (!strcmp(bstr("return_to"), "select_user_to_edit")) {
else {
readloop(readnew, eUseDefault);
}
+ FreeStrBuf(&Buf);
}
void **ViewSpecific,
long oper,
char *cmd,
- long len)
+ long len,
+ char *filter,
+ long flen)
{
vcardview_struct *VS;
return 0;
}
+void
+ServerStartModule_VCARD
+(void)
+{
+ VCToEnum = NewHash(0, NULL);
+
+}
+
+void
+ServerShutdownModule_VCARD
+(void)
+{
+ DeleteHash(&VCToEnum);
+}
+
void
InitModule_VCARD
(void)
{
+ RegisterCTX(CTX_VCARD);
RegisterReadLoopHandlerset(
VIEW_ADDRESSBOOK,
vcard_GetParamsGetServerCall,
NULL,
+ NULL,
NULL,
vcard_LoadMsgFromServer,
vcard_RenderView_or_Tail,
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);
+
}