* Removed all of the absolute URL's.

[citadel.git] / webcit / vcard_edit.c

diff --git a/webcit/vcard_edit.c b/webcit/vcard_edit.c
index 079cbcddaafacaf6f33e8f10db4264b8ebad1106..e9ac011b1856b5a237f8820e975e6e8d41822e1c 100644 (file)
--- a/webcit/vcard_edit.c
+++ b/webcit/vcard_edit.c
@@ -1,33 +1,13 @@
 /*
  * $Id$
  *
- * Handles editing of vCard objects.
+ * Handles on-screen editing of vCard objects.
  *
  */
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <limits.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
 #include "webcit.h"
 #include "vcard.h"
 
-
 /* Edit the vCard component of a MIME message.  Supply the message number
  * and MIME part number to fetch.  Or, specify -1 for the message number
  * to start with a blank card.
@@ -39,27 +19,28 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
        struct vCard *v;
        int i;
        char *key, *value;
-       char whatuser[SIZ];
-
-       char lastname[SIZ];
-       char firstname[SIZ];
-       char middlename[SIZ];
-       char prefix[SIZ];
-       char suffix[SIZ];
-       char pobox[SIZ];
-       char extadr[SIZ];
-       char street[SIZ];
-       char city[SIZ];
-       char state[SIZ];
-       char zipcode[SIZ];
-       char country[SIZ];
-       char hometel[SIZ];
-       char worktel[SIZ];
-       char primary_inetemail[SIZ];
+       char whatuser[256];
+
+       char lastname[256];
+       char firstname[256];
+       char middlename[256];
+       char prefix[256];
+       char suffix[256];
+       char pobox[256];
+       char extadr[256];
+       char street[256];
+       char city[256];
+       char state[256];
+       char zipcode[256];
+       char country[256];
+       char hometel[256];
+       char worktel[256];
+       char primary_inetemail[256];
        char other_inetemail[SIZ];
        char extrafields[SIZ];
-       char title[SIZ];
-       char org[SIZ];
+       char displayname[256];
+       char title[256];
+       char org[256];
 
        lastname[0] = 0;
        firstname[0] = 0;
@@ -88,7 +69,7 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
                serv_puts(buf);
                serv_getln(buf, sizeof buf);
                if (buf[0] != '1') {
-                       convenience_page("770000", "Error", &buf[4]);
+                       convenience_page("770000", _("Error"), &buf[4]);
                        return;
                }
                while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
@@ -134,6 +115,10 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
                                extract_token(suffix, value, 4, ';', sizeof suffix);
                        }
 
+                       else if (!strcasecmp(key, "fn")) {
+                               safestrncpy(displayname, value, sizeof displayname);
+                       }
+
                        else if (!strcasecmp(key, "title")) {
                                safestrncpy(title, value, sizeof title);
                        }
@@ -185,27 +170,29 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
        }
 
        /* Display the form */
-       output_headers(1, 1, 2, 0, 0, 0, 0);
+       output_headers(1, 1, 2, 0, 0, 0);
        wprintf("<div id=\"banner\">\n"
                "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
                "<SPAN CLASS=\"titlebar\">"
-               "<img src=\"/static/savecontact_48x.gif\">"
-               "Edit contact information"
-               "</SPAN>"
+               "<img src=\"static/savecontact_48x.gif\">");
+       wprintf(_("Edit contact information"));
+       wprintf("</SPAN>"
                "</TD></TR></TABLE>\n"
                "</div>\n<div id=\"content\">\n"
        );
 
-       wprintf("<FORM METHOD=\"POST\" ACTION=\"/submit_vcard\">\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>"
-               "<TD>First</TD>"
-               "<TD>Middle</TD>"
-               "<TD>Last</TD>"
-               "<TD>Suffix</TD></TR>\n");
+               "<TD>%s</TD>"
+               "<TD>%s</TD>"
+               "<TD>%s</TD>"
+               "<TD>%s</TD>"
+               "<TD>%s</TD></TR>\n",
+               _("Prefix"), _("First"), _("Middle"), _("Last"), _("Suffix")
+       );
        wprintf("<TR><TD><INPUT TYPE=\"text\" NAME=\"prefix\" "
                "VALUE=\"%s\" MAXLENGTH=\"5\" SIZE=\"5\"></TD>",
                prefix);
@@ -225,13 +212,22 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
        wprintf("<table border=0 width=100%% bgcolor=\"#dddddd\">");
        wprintf("<tr><td>");
 
-       wprintf("Title:<br>"
+       wprintf(_("Display name:"));
+       wprintf("<br>"
+               "<INPUT TYPE=\"text\" NAME=\"displayname\" "
+               "VALUE=\"%s\" MAXLENGTH=\"40\"><br><br>\n",
+               displayname
+       );
+
+       wprintf(_("Title:"));
+       wprintf("<br>"
                "<INPUT TYPE=\"text\" NAME=\"title\" "
                "VALUE=\"%s\" MAXLENGTH=\"40\"><br><br>\n",
                title
        );
 
-       wprintf("Organization:<br>"
+       wprintf(_("Organization:"));
+       wprintf("<br>"
                "<INPUT TYPE=\"text\" NAME=\"org\" "
                "VALUE=\"%s\" MAXLENGTH=\"40\"><br><br>\n",
                org
@@ -240,11 +236,15 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
        wprintf("</td><td>");
 
        wprintf("<table border=0>");
-       wprintf("<tr><td>PO box:</td><td>"
+       wprintf("<tr><td>");
+       wprintf(_("PO box:"));
+       wprintf("</td><td>"
                "<INPUT TYPE=\"text\" NAME=\"pobox\" "
                "VALUE=\"%s\" MAXLENGTH=\"29\"></td></tr>\n",
                pobox);
-       wprintf("<tr><td>Address:</td><td>"
+       wprintf("<tr><td>");
+       wprintf(_("Address:"));
+       wprintf("</td><td>"
                "<INPUT TYPE=\"text\" NAME=\"extadr\" "
                "VALUE=\"%s\" MAXLENGTH=\"29\"></td></tr>\n",
                extadr);
@@ -252,19 +252,27 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
                "<INPUT TYPE=\"text\" NAME=\"street\" "
                "VALUE=\"%s\" MAXLENGTH=\"29\"></td></tr>\n",
                street);
-       wprintf("<tr><td>City:</td><td>"
+       wprintf("<tr><td>");
+       wprintf(_("City:"));
+       wprintf("</td><td>"
                "<INPUT TYPE=\"text\" NAME=\"city\" "
                "VALUE=\"%s\" MAXLENGTH=\"29\"></td></tr>\n",
                city);
-       wprintf("<tr><td>State:</td><td>"
+       wprintf("<tr><td>");
+       wprintf(_("State:"));
+       wprintf("</td><td>"
                "<INPUT TYPE=\"text\" NAME=\"state\" "
                "VALUE=\"%s\" MAXLENGTH=\"2\"></td></tr>\n",
                state);
-       wprintf("<tr><td>ZIP code:</td><td>"
+       wprintf("<tr><td>");
+       wprintf(_("ZIP code:"));
+       wprintf("</td><td>"
                "<INPUT TYPE=\"text\" NAME=\"zipcode\" "
                "VALUE=\"%s\" MAXLENGTH=\"10\"></td></tr>\n",
                zipcode);
-       wprintf("<tr><td>Country:</td><td>"
+       wprintf("<tr><td>");
+       wprintf(_("Country:"));
+       wprintf("</td><td>"
                "<INPUT TYPE=\"text\" NAME=\"country\" "
                "VALUE=\"%s\" MAXLENGTH=\"29\" WIDTH=\"5\"></td></tr>\n",
                country);
@@ -272,11 +280,15 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
 
        wprintf("</table>\n");
 
-       wprintf("<TABLE BORDER=0><TR><TD>Home telephone:</TD>"
+       wprintf("<TABLE BORDER=0><TR><TD>");
+       wprintf(_("Home telephone:"));
+       wprintf("</TD>"
                "<TD><INPUT TYPE=\"text\" NAME=\"hometel\" "
                "VALUE=\"%s\" MAXLENGTH=\"29\"></TD>\n",
                hometel);
-       wprintf("<TD>Work telephone:</TD>"
+       wprintf("<TD>");
+       wprintf(_("Work telephone:"));
+       wprintf("</TD>"
                "<TD><INPUT TYPE=\"text\" NAME=\"worktel\" "
                "VALUE=\"%s\" MAXLENGTH=\"29\"></TD></TR></TABLE>\n",
                worktel);
@@ -285,13 +297,16 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
        wprintf("<tr><td>");
 
        wprintf("<TABLE border=0><TR>"
-               "<TD VALIGN=TOP>Primary Internet e-mail address<br />"
+               "<TD VALIGN=TOP>");
+       wprintf(_("Primary Internet e-mail address"));
+       wprintf("<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 />"
+               "</TD><TD VALIGN=TOP>");
+       wprintf(_("Internet e-mail aliases"));
+       wprintf("<br />"
                "<TEXTAREA NAME=\"other_inetemail\" ROWS=5 COLS=40 WIDTH=40>");
        escputs(other_inetemail);
        wprintf("</TEXTAREA></TD></TR></TABLE>\n");
@@ -307,10 +322,12 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
        wprintf("\">\n");
 
        wprintf("<CENTER>\n"
-               "<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"OK\">"
+               "<INPUT TYPE=\"submit\" NAME=\"ok_button\" VALUE=\"%s\">"
                "&nbsp;"
-               "<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">"
-               "</CENTER></FORM>\n"
+               "<INPUT TYPE=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">"
+               "</CENTER></FORM>\n",
+               _("Save changes"),
+               _("Cancel")
        );
        
        wprintf("</td></tr></table></div>\n");
@@ -335,7 +352,7 @@ void submit_vcard(void) {
        char buf[SIZ];
        int i;
 
-       if (strcmp(bstr("sc"), "OK")) { 
+       if (strlen(bstr("ok_button")) == 0) { 
                readloop("readnew");
                return;
        }
@@ -358,6 +375,7 @@ void submit_vcard(void) {
                bstr("prefix"),
                bstr("suffix") );
        serv_printf("title:%s", bstr("title") );
+       serv_printf("fn:%s", bstr("displayname") );
        serv_printf("org:%s", bstr("org") );
        serv_printf("adr:%s;%s;%s;%s;%s;%s;%s",
                bstr("pobox"),