* Buncha cosmetic changes

[citadel.git] / webcit / vcard_edit.c

diff --git a/webcit/vcard_edit.c b/webcit/vcard_edit.c
index 1c156cce461e5ac82f252508ab51ebb81479db6f..65f0f3fc1c25eec7526820808ab2f51c7bd56396 100644 (file)
--- a/webcit/vcard_edit.c
+++ b/webcit/vcard_edit.c
@@ -34,8 +34,6 @@ 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;
@@ -95,9 +93,6 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
                }
        }
 
-       total_len = atoi(&buf[4]);
-
-
        sprintf(buf, "OPNA %ld|%s", msgnum, partnum);
        serv_puts(buf);
        serv_gets(buf);
@@ -108,21 +103,8 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
 
        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 do_edit_vcard(long msgnum, char *partnum, char *return_to) {
        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");
@@ -263,12 +246,14 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
        urlescputs(return_to);
        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("<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);
 }
 
@@ -335,7 +320,10 @@ void submit_vcard(void) {
        serv_puts("000");
 
        if (!strcmp(bstr("return_to"), "/select_user_to_edit")) {
-               select_user_to_edit(NULL);
+               select_user_to_edit(NULL, NULL);
+       }
+       else if (!strcmp(bstr("return_to"), "/do_welcome")) {
+               do_welcome();
        }
        else {
                readloop("readnew");