Removed the "fix_scrollbarbug" div and all references to it.
[citadel.git] / webcit / vcard_edit.c
index 6b8e9c8789ba09824c44e2a6860b112a310a9a0f..c2bf41d47ead02572c55867f203341df14064c76 100644 (file)
@@ -1,14 +1,9 @@
-/*
- * $Id$
- */
 
 #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(
@@ -18,11 +13,9 @@ int abcmp(const void *ab1, const void *ab2) {
 }
 
 
-/**
- * \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);
@@ -33,55 +26,8 @@ void nametab(char *tabbuf, long len, char *name) {
 }
 
 
-/**
- * \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];
@@ -143,10 +89,8 @@ wc_mime_attachment *load_vcard(message_summary *Msg)
        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;
@@ -160,7 +104,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);
@@ -179,9 +123,8 @@ void fetch_ab_name(message_summary *Msg, char **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)
 {
@@ -218,14 +161,12 @@ 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;
@@ -268,7 +209,12 @@ void fetchname_parsed_vcard(struct vCard *v, char **storename) {
                                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); */
        }
@@ -277,8 +223,8 @@ void fetchname_parsed_vcard(struct vCard *v, char **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.
  *
@@ -290,11 +236,12 @@ void fetchname_parsed_vcard(struct vCard *v, char **storename) {
  * 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;
@@ -358,7 +305,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 
@@ -379,9 +326,9 @@ void display_parsed_vcard(StrBuf *Target, struct vCard *v, int full, long msgnum
                                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);
@@ -389,17 +336,17 @@ void display_parsed_vcard(StrBuf *Target, struct vCard *v, int full, long msgnum
                                }
                        }
        
-                       /** 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);
                        }
@@ -535,20 +482,21 @@ void display_parsed_vcard(StrBuf *Target, struct vCard *v, int full, long msgnum
 
 
 
-/**
- * \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, 
+                  wc_mime_attachment *Mime, 
                   char alpha, 
                   int full, 
                   char **storename, 
@@ -560,7 +508,7 @@ void display_vcard(StrBuf *Target,
        StrBuf *Buf2;
        char this_alpha = 0;
 
-       v = VCardLoad(vcard_source);
+       v = VCardLoad(Mime->Data);
 
        if (v == NULL) return;
 
@@ -577,11 +525,12 @@ void display_vcard(StrBuf *Target,
        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)))
+               ) 
+       {
+               display_parsed_vcard(Target, v, full, Mime);
        }
 
        vcard_free(v);
@@ -589,10 +538,11 @@ void display_vcard(StrBuf *Target,
 
 
 
-/**
- * \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;
@@ -609,9 +559,9 @@ void do_addrbook_view(addrbookent *addrbook, int num_ab) {
        char **tablabels;
 
        if (num_ab == 0) {
-               wprintf("<br /><br /><br /><div align=\"center\"><i>");
-               wprintf(_("This address book is empty."));
-               wprintf("</i></div>\n");
+               wc_printf("<br /><br /><br /><div align=\"center\"><i>");
+               wc_printf(_("This address book is empty."));
+               wc_printf("</i></div>\n");
                return;
        }
 
@@ -623,9 +573,9 @@ void do_addrbook_view(addrbookent *addrbook, int num_ab) {
 
        tablabels = malloc(num_pages * sizeof (char *));
        if (tablabels == NULL) {
-               wprintf("<br /><br /><br /><div align=\"center\"><i>");
-               wprintf(_("An internal error has occurred."));
-               wprintf("</i></div>\n");
+               wc_printf("<br /><br /><br /><div align=\"center\"><i>");
+               wc_printf(_("An internal error has occurred."));
+               wc_printf("</i></div>\n");
                return;
        }
 
@@ -647,43 +597,43 @@ void do_addrbook_view(addrbookent *addrbook, int num_ab) {
                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\">",
+                       wc_printf("<tr bgcolor=\"#%s\">",
                                (bg ? "DDDDDD" : "FFFFFF")
                        );
                }
        
-               wprintf("<td>");
+               wc_printf("<td>");
 
-               wprintf("<a href=\"readfwd?startmsg=%ld?is_singlecard=1",
+               wc_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>&nbsp;</td>");
+                       wc_printf("<td>&nbsp;</td>");
                }
        }
 
-       wprintf("</tr></table>\n");
+       wc_printf("</tr></table>\n");
        end_tab((num_pages-1), num_pages);
 
        begin_tab(num_pages, num_pages);
@@ -708,11 +658,10 @@ void do_addrbook_view(addrbookent *addrbook, int num_ab) {
 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;
@@ -786,7 +735,6 @@ void do_edit_vcard(long msgnum, char *partnum,
                else {
                        v = VCardLoad(VCAtt->Data);
                }
-               FreeStrBuf(&Buf);
        
                /* Populate the variables for our form */
                i = 0;
@@ -877,173 +825,173 @@ void do_edit_vcard(long msgnum, char *partnum,
                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("beginbox_1", NULL);
+       StrBufAppendBufPlain(WC->WBuf, _("Edit contact information"), -1, 0);
+       do_template("beginbox_2", NULL);
 
-       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>");
+       wc_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>"
+       wc_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>");
+       wc_printf("<table class=\"vcard_edit_background_alt\">");
+       wc_printf("<tr><td>");
 
-       wprintf("<table border=0><TR>"
+       wc_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"
+       wc_printf("<div class=\"buttons\">\n"
                "<input type=\"submit\" name=\"ok_button\" value=\"%s\">"
                "&nbsp;"
                "<input type=\"submit\" name=\"cancel_button\" value=\"%s\">"
@@ -1052,15 +1000,16 @@ void do_edit_vcard(long msgnum, char *partnum,
                _("Cancel")
        );
        
-       wprintf("</td></tr></table>\n");
+       wc_printf("</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) {
@@ -1074,7 +1023,7 @@ void edit_vcard(void) {
 
 
 
-/**
+/*
  *  parse edited vcard from the browser
  */
 void submit_vcard(void) {
@@ -1086,7 +1035,7 @@ void submit_vcard(void) {
        int i;
 
        if (!havebstr("ok_button")) { 
-               readloop(readnew);
+               readloop(readnew, eUseDefault);
                return;
        }
 
@@ -1104,15 +1053,18 @@ 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);
+                               readloop(readnew, eUseDefault);
                        }
                        return;
                }
@@ -1126,12 +1078,12 @@ void submit_vcard(void) {
                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,
@@ -1200,8 +1152,11 @@ void submit_vcard(void) {
        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);
        }
 }
 
@@ -1233,7 +1188,8 @@ void display_vcard_photo_img(void)
                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;
        }
@@ -1243,14 +1199,105 @@ void display_vcard_photo_img(void)
        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,
+               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);
 }