* Buncha cosmetic changes

[citadel.git] / webcit / vcard_edit.c

diff --git a/webcit/vcard_edit.c b/webcit/vcard_edit.c
index f497730b913a34c58f18e199bb5fd5d3b9692810..65f0f3fc1c25eec7526820808ab2f51c7bd56396 100644 (file)
--- a/webcit/vcard_edit.c
+++ b/webcit/vcard_edit.c
@@ -30,12 +30,10 @@
 
 
 
-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;
-       size_t bytes = 0;
-       size_t thisblock = 0;
        struct vCard *v;
        int i;
        char *key, *value;
@@ -78,7 +76,7 @@ void edit_vcard(void) {
        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') {
@@ -95,10 +93,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') {
@@ -108,21 +103,8 @@ void edit_vcard(void) {
 
        total_len = atoi(&buf[4]);
        serialized_vcard = malloc(total_len + 1);
-       while (bytes < total_len) {
-               thisblock = 4000;
-               if ((total_len - bytes) < thisblock) thisblock = total_len - bytes;
-               sprintf(buf, "READ %d|%d", bytes, thisblock);
-               serv_puts(buf);
-               serv_gets(buf);
-               if (buf[0] == '6') {
-                       thisblock = atoi(&buf[4]);
-                       serv_read(&serialized_vcard[bytes], thisblock);
-                       bytes += thisblock;
-               }
-               else {
-                       wprintf("Error: %s<BR>\n", &buf[4]);
-               }
-       }
+
+       read_server_binary(serialized_vcard, total_len);
 
        serv_puts("CLOS");
        serv_gets(buf);
@@ -181,8 +163,9 @@ void edit_vcard(void) {
        vcard_free(v);
 
        /* Display the form */
+       do_template("beginbox_nt");
        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,17 +242,35 @@ void edit_vcard(void) {
        escputs(extrafields);
        wprintf("\">\n");
 
-       wprintf("<CENTER>\n");
-                wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"OK\">");
-                wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">");
-                wprintf("</CENTER></FORM>\n");
+       wprintf("<INPUT TYPE=\"hidden\" NAME=\"return_to\" VALUE=\"");
+       urlescputs(return_to);
+       wprintf("\">\n");
 
-        
+       wprintf("<CENTER>\n"
+               "<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"OK\">"
+               "&nbsp;"
+               "<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">"
+               "</CENTER></FORM>\n"
+       );
+       
+       do_template("endbox");
        wDumpContent(1);
 }
 
 
 
+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;
@@ -318,5 +319,13 @@ 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 if (!strcmp(bstr("return_to"), "/do_welcome")) {
+               do_welcome();
+       }
+       else {
+               readloop("readnew");
+       }
 }