* auth.c: shrink the margins on the login screen so the user sees something

[citadel.git] / webcit / vcard_edit.c

diff --git a/webcit/vcard_edit.c b/webcit/vcard_edit.c
index 1eec8b339a13bc04d86523a5d1847c988bd070c8..fb18a33e417f86b8db157ed4e2a1a03f70f931c3 100644 (file)
--- a/webcit/vcard_edit.c
+++ b/webcit/vcard_edit.c
@@ -1,9 +1,8 @@
 /*
- * vcard_edit.c
+ * $Id$
  *
  * Handles editing of vCard objects.
  *
- * $Id$
  */
 
 #include <ctype.h>
@@ -56,7 +55,8 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
        char country[SIZ];
        char hometel[SIZ];
        char worktel[SIZ];
-       char inetemail[SIZ];
+       char primary_inetemail[SIZ];
+       char other_inetemail[SIZ];
        char extrafields[SIZ];
 
        lastname[0] = 0;
@@ -73,11 +73,10 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
        country[0] = 0;
        hometel[0] = 0;
        worktel[0] = 0;
-       inetemail[0] = 0;
+       primary_inetemail[0] = 0;
+       other_inetemail[0] = 0;
        extrafields[0] = 0;
 
-       output_headers(3);
-
        strcpy(whatuser, "");
 
        if (msgnum >= 0) {
@@ -85,7 +84,7 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
                serv_puts(buf);
                serv_gets(buf);
                if (buf[0] != '1') {
-                       wDumpContent(1);
+                       convenience_page("770000", "Error", &buf[4]);
                        return;
                }
                while (serv_gets(buf), strcmp(buf, "000")) {
@@ -102,18 +101,18 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
                serv_puts(buf);
                serv_gets(buf);
                if (buf[0] != '2') {
-                       wDumpContent(1);
+                       convenience_page("770000", "Error", &buf[4]);
                        return;
                }
        
                total_len = atoi(&buf[4]);
-               serialized_vcard = malloc(total_len + 1);
+               serialized_vcard = malloc(total_len + 2);
        
                read_server_binary(serialized_vcard, total_len);
        
                serv_puts("CLOS");
                serv_gets(buf);
-               serialized_vcard[total_len + 1] = 0;
+               serialized_vcard[total_len] = 0;
        
                v = vcard_load(serialized_vcard);
                free(serialized_vcard);
@@ -150,10 +149,15 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
                        }
        
                        else if (!strcasecmp(key, "email;internet")) {
-                               if (inetemail[0] != 0) {
-                                       strcat(inetemail, "\n");
+                               if (primary_inetemail[0] == 0) {
+                                       strcpy(primary_inetemail, value);
+                               }
+                               else {
+                                       if (other_inetemail[0] != 0) {
+                                               strcat(other_inetemail, "\n");
+                                       }
+                                       strcat(other_inetemail, value);
                                }
-                               strcat(inetemail, value);
                        }
        
                        else {
@@ -169,12 +173,22 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
        }
 
        /* Display the form */
-       do_template("beginbox_nt");
-       wprintf("<FORM METHOD=\"POST\" ACTION=\"/submit_vcard\">\n");
-       wprintf("<H2><IMG ALIGN=CENTER SRC=\"/static/vcard.gif\">"
-               "Contact information for ");
+       output_headers(1, 1, 2, 0, 0, 0, 0);
+       wprintf("<div id=\"banner\">\n"
+               "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
+               "<SPAN CLASS=\"titlebar\">"
+               "<img src=\"/static/vcard.gif\">"
+               "Contact information for "
+       );
        escputs(whatuser);
-       wprintf("</H2>\n");
+       wprintf("</SPAN>"
+               "</TD></TR></TABLE>\n"
+               "</div>\n<div id=\"content\">\n"
+       );
+
+       wprintf("<FORM METHOD=\"POST\" ACTION=\"/submit_vcard\">\n");
+       wprintf("<div id=\"fix_scrollbar_bug\">"
+               "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
 
        wprintf("<TABLE border=0><TR>"
                "<TD>Prefix</TD>"
@@ -236,13 +250,17 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
                "VALUE=\"%s\" MAXLENGTH=\"29\"></TD></TR></TABLE>\n",
                worktel);
 
-       wprintf("<TABLE border=0><TR><TD>Internet e-mail addresses:<BR>"
-               "<FONT size=-2>For addresses in the Citadel directory, "
-               "the topmost address will be used in outgoing mail."
-               "</FONT></TD><TD>"
-               "<TEXTAREA NAME=\"inetemail\" ROWS=5 COLS=40 WIDTH=40>");
-       escputs(inetemail);
-       wprintf("</TEXTAREA></TD></TR></TABLE><BR>\n");
+       wprintf("<br /><TABLE border=0><TR>"
+               "<TD VALIGN=TOP>Primary Internet e-mail address<br />"
+               "<INPUT TYPE=\"text\" NAME=\"primary_inetemail\" "
+               "SIZE=40 MAXLENGTH=40 VALUE=\"");
+       escputs(primary_inetemail);
+       wprintf("\"><br />"
+               "</TD><TD VALIGN=TOP>"
+               "Internet e-mail aliases<br />"
+               "<TEXTAREA NAME=\"other_inetemail\" ROWS=5 COLS=40 WIDTH=40>");
+       escputs(other_inetemail);
+       wprintf("</TEXTAREA></TD></TR></TABLE><br />\n");
 
        wprintf("<INPUT TYPE=\"hidden\" NAME=\"extrafields\" VALUE=\"");
        escputs(extrafields);
@@ -259,7 +277,7 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
                "</CENTER></FORM>\n"
        );
        
-       do_template("endbox");
+       wprintf("</td></tr></table></div>\n");
        wDumpContent(1);
 }
 
@@ -313,9 +331,10 @@ void submit_vcard(void) {
                bstr("country") );
        serv_printf("tel;home:%s", bstr("hometel") );
        serv_printf("tel;work:%s", bstr("worktel") );
-       
-       for (i=0; i<num_tokens(bstr("inetemail"), '\n'); ++i) {
-               extract_token(buf, bstr("inetemail"), i, '\n');
+
+       serv_printf("email;internet:%s\n", bstr("primary_inetemail"));  
+       for (i=0; i<num_tokens(bstr("other_inetemail"), '\n'); ++i) {
+               extract_token(buf, bstr("other_inetemail"), i, '\n');
                if (strlen(buf) > 0) {
                        serv_printf("email;internet:%s", buf);
                }