*/
#include "webcit.h"
+#include "calendar.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];
return VCMime;
}
-/**
- * \brief fetch what??? name
- * \param msgnum the citadel message number
- * \param namebuf where to put the name in???
+/*
+ * fetch the display name off a vCard
*/
void fetch_ab_name(message_summary *Msg, char **namebuf) {
long len;
-/**
- * \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;
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) {
int i, j;
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);
}
-/**
- * \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;
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) {
message_summary *Msg = NULL;
wc_mime_attachment *VCMime = NULL;
- StrBuf *Buf;
struct vCard *v;
int i;
char *key, *value;
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("\">\n");
wprintf("<input type=\"hidden\" name=\"return_to\" value=\"");
- urlescputs(return_to);
+ escputs(return_to);
wprintf("\">\n");
wprintf("<div class=\"buttons\">\n"
wprintf("</td></tr></table>\n");
do_template("endbox", NULL);
wDumpContent(1);
- if (Msg != NULL)
+ 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) {
StrBufAppendBufPlain(WCC->ImportantMsg,
_("Aborting."),
-1, 0);
- /// todo: call the master dispatcher again...
+
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);
}
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,
else if (!strcmp(bstr("return_to"), "do_welcome")) {
do_welcome();
}
+ else if (!IsEmptyStr(bstr("return_to"))) {
+ http_redirect(bstr("return_to"));
+ }
else {
readloop(readnew);
}
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");
+ begin_burst();
wprintf(_("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)
+{
+ 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
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,
+ 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);
}
projects / citadel.git / blobdiff