* Worked on meeting accept/decline a little bit

[citadel.git] / webcit / vcard_edit.c

diff --git a/webcit/vcard_edit.c b/webcit/vcard_edit.c
index 58047f7b8c85d937e10f889194751fee14c22dc3..8dcd227cd4e4b78fb6a7effff1f638b32a50e23c 100644 (file)
--- a/webcit/vcard_edit.c
+++ b/webcit/vcard_edit.c
@@ -30,7 +30,7 @@
 
 
 
-void edit_vcard(void) {
+void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
        char buf[SIZ];
        char *serialized_vcard = NULL;
        size_t total_len = 0;
@@ -75,10 +75,10 @@ void edit_vcard(void) {
        inetemail[0] = 0;
        extrafields[0] = 0;
 
-       output_headers(1);
+       output_headers(3);
 
        strcpy(whatuser, "");
-       sprintf(buf, "MSG0 %s|1", bstr("msgnum") );
+       sprintf(buf, "MSG0 %ld|1", msgnum);
        serv_puts(buf);
        serv_gets(buf);
        if (buf[0] != '1') {
@@ -98,7 +98,7 @@ void edit_vcard(void) {
        total_len = atoi(&buf[4]);
 
 
-       sprintf(buf, "OPNA %s|%s", bstr("msgnum"), bstr("partnum") );
+       sprintf(buf, "OPNA %ld|%s", msgnum, partnum);
        serv_puts(buf);
        serv_gets(buf);
        if (buf[0] != '2') {
@@ -182,7 +182,7 @@ void edit_vcard(void) {
 
        /* Display the form */
        wprintf("<FORM METHOD=\"POST\" ACTION=\"/submit_vcard\">\n");
-       wprintf("<H2><IMG VALIGN=CENTER SRC=\"/static/vcard.gif\">"
+       wprintf("<H2><IMG ALIGN=CENTER SRC=\"/static/vcard.gif\">"
                "Contact information for ");
        escputs(whatuser);
        wprintf("</H2>\n");
@@ -259,6 +259,10 @@ void edit_vcard(void) {
        escputs(extrafields);
        wprintf("\">\n");
 
+       wprintf("<INPUT TYPE=\"hidden\" NAME=\"return_to\" VALUE=\"");
+       urlescputs(return_to);
+       wprintf("\">\n");
+
        wprintf("<CENTER>\n");
                 wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"OK\">");
                 wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">");
@@ -270,6 +274,18 @@ void edit_vcard(void) {
 
 
 
+void edit_vcard(void) {
+       long msgnum;
+       char *partnum;
+
+       msgnum = atol(bstr("msgnum"));
+       partnum = bstr("partnum");
+       do_edit_vcard(msgnum, partnum, "");
+}
+
+
+
+
 void submit_vcard(void) {
        char buf[SIZ];
        int i;
@@ -280,10 +296,8 @@ void submit_vcard(void) {
        }
 
        sprintf(buf, "ENT0 1|||4||");
-       fprintf(stderr, "%s\n", buf);
        serv_puts(buf);
        serv_gets(buf);
-       fprintf(stderr, "%s\n", buf);
        if (buf[0] != '4') {
                edit_vcard();
                return;
@@ -320,5 +334,10 @@ void submit_vcard(void) {
        serv_puts("end:vcard");
        serv_puts("000");
 
-       readloop("readnew");
+       if (!strcmp(bstr("return_to"), "/select_user_to_edit")) {
+               select_user_to_edit(NULL, NULL);
+       }
+       else {
+               readloop("readnew");
+       }
 }