* use SmashStrBuf where apropriate

[citadel.git] / webcit / vcard_edit.c

diff --git a/webcit/vcard_edit.c b/webcit/vcard_edit.c
index 320d4322facd54edad2da145d14cf2d5e7e8a89f..248881d11b84f07ce25d1b3f9ac826b83b57594d 100644 (file)
--- a/webcit/vcard_edit.c
+++ b/webcit/vcard_edit.c
@@ -3,7 +3,7 @@
  */
 
 #include "webcit.h"
-
+#include "calendar.h"
 
 /*
  * Record compare function for sorting address book indices
@@ -253,7 +253,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); */
        }
@@ -343,7 +348,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 
@@ -696,7 +701,7 @@ 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;
@@ -1026,7 +1031,7 @@ void do_edit_vcard(long msgnum, char *partnum,
        wprintf("\">\n");
 
        wprintf("<input type=\"hidden\" name=\"return_to\" value=\"");
-       urlescputs(return_to);
+       escputs(return_to);
        wprintf("\">\n");
 
        wprintf("<div class=\"buttons\">\n"
@@ -1091,13 +1096,16 @@ 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);
                        }
@@ -1187,6 +1195,9 @@ 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);
        }
@@ -1220,6 +1231,7 @@ 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");
+               begin_burst();
                wprintf(_("Could Not decode vcard photo\n"));
                end_burst();
                return;
@@ -1230,12 +1242,102 @@ 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;
+       end_burst();
+       if ((VS != NULL) && 
+           (VS->addrbook != NULL))
+               free(VS->addrbook);
+       if (VS != NULL) 
+               free(VS);
+       return 0;
+}
 
 void 
 InitModule_VCARD
 (void)
 {
+       RegisterReadLoopHandlerset(
+               VIEW_ADDRESSBOOK,
+               vcard_GetParamsGetServerCall,
+               NULL,
+               vcard_LoadMsgFromServer,
+               vcard_RenderView_or_Tail,
+               vcard_Cleanup);
        WebcitAddUrlHandler(HKEY("edit_vcard"), edit_vcard, 0);
        WebcitAddUrlHandler(HKEY("submit_vcard"), submit_vcard, 0);
        WebcitAddUrlHandler(HKEY("vcardphoto"), display_vcard_photo_img, NEED_URL);