/*
* $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.
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 displayname[256];
+ char title[256];
+ char org[256];
lastname[0] = 0;
firstname[0] = 0;
worktel[0] = 0;
primary_inetemail[0] = 0;
other_inetemail[0] = 0;
+ title[0] = 0;
+ org[0] = 0;
extrafields[0] = 0;
- strcpy(whatuser, "");
+ safestrncpy(whatuser, "", sizeof whatuser);
if (msgnum >= 0) {
sprintf(buf, "MSG0 %ld|1", msgnum);
serv_puts(buf);
- serv_gets(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_gets(buf), strcmp(buf, "000")) {
+ while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
if (!strncasecmp(buf, "from=", 5)) {
- strcpy(whatuser, &buf[5]);
+ safestrncpy(whatuser, &buf[5], sizeof whatuser);
}
else if (!strncasecmp(buf, "node=", 5)) {
strcat(whatuser, " @ ");
sprintf(buf, "OPNA %ld|%s", msgnum, partnum);
serv_puts(buf);
- serv_gets(buf);
+ serv_getln(buf, sizeof buf);
if (buf[0] != '2') {
convenience_page("770000", "Error", &buf[4]);
return;
read_server_binary(serialized_vcard, total_len);
serv_puts("CLOS");
- serv_gets(buf);
+ serv_getln(buf, sizeof buf);
serialized_vcard[total_len] = 0;
v = vcard_load(serialized_vcard);
value = vcard_get_prop(v, "", 0, i++, 0);
if (!strcasecmp(key, "n")) {
- extract_token(lastname, value, 0, ';');
- extract_token(firstname, value, 1, ';');
- extract_token(middlename, value, 2, ';');
- extract_token(prefix, value, 3, ';');
- extract_token(suffix, value, 4, ';');
+ extract_token(lastname, value, 0, ';', sizeof lastname);
+ extract_token(firstname, value, 1, ';', sizeof firstname);
+ extract_token(middlename, value, 2, ';', sizeof middlename);
+ extract_token(prefix, value, 3, ';', sizeof prefix);
+ 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);
+ }
+
+ else if (!strcasecmp(key, "org")) {
+ safestrncpy(org, value, sizeof org);
}
else if (!strcasecmp(key, "adr")) {
- extract_token(pobox, value, 0, ';');
- extract_token(extadr, value, 1, ';');
- extract_token(street, value, 2, ';');
- extract_token(city, value, 3, ';');
- extract_token(state, value, 4, ';');
- extract_token(zipcode, value, 5, ';');
- extract_token(country, value, 6, ';');
+ extract_token(pobox, value, 0, ';', sizeof pobox);
+ extract_token(extadr, value, 1, ';', sizeof extadr);
+ extract_token(street, value, 2, ';', sizeof street);
+ extract_token(city, value, 3, ';', sizeof city);
+ extract_token(state, value, 4, ';', sizeof state);
+ extract_token(zipcode, value, 5, ';', sizeof zipcode);
+ extract_token(country, value, 6, ';', sizeof country);
}
else if (!strcasecmp(key, "tel;home")) {
- extract_token(hometel, value, 0, ';');
+ extract_token(hometel, value, 0, ';', sizeof hometel);
}
else if (!strcasecmp(key, "tel;work")) {
- extract_token(worktel, value, 0, ';');
+ extract_token(worktel, value, 0, ';', sizeof worktel);
}
else if (!strcasecmp(key, "email;internet")) {
if (primary_inetemail[0] == 0) {
- strcpy(primary_inetemail, value);
+ safestrncpy(primary_inetemail, value, sizeof primary_inetemail);
}
else {
if (other_inetemail[0] != 0) {
}
/* 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/vcard.gif\">"
- "Contact information for "
- );
- escputs(whatuser);
+ "<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\"></TD>",
+ "VALUE=\"%s\" MAXLENGTH=\"5\" SIZE=\"5\"></TD>",
prefix);
wprintf("<TD><INPUT TYPE=\"text\" NAME=\"firstname\" "
"VALUE=\"%s\" MAXLENGTH=\"29\"></TD>",
"VALUE=\"%s\" MAXLENGTH=\"29\"></TD>",
lastname);
wprintf("<TD><INPUT TYPE=\"text\" NAME=\"suffix\" "
- "VALUE=\"%s\" MAXLENGTH=\"10\"></TD></TR></TABLE>\n",
+ "VALUE=\"%s\" MAXLENGTH=\"10\" SIZE=\"10\"></TD></TR></TABLE>\n",
suffix);
- wprintf("<TABLE border=0><TR><TD>PO box (optional):</TD>"
- "<TD><INPUT TYPE=\"text\" NAME=\"pobox\" "
- "VALUE=\"%s\" MAXLENGTH=\"29\"></TD></TR>\n",
+ wprintf("<table border=0 width=100%% bgcolor=\"#dddddd\">");
+ wprintf("<tr><td>");
+
+ 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:"));
+ wprintf("<br>"
+ "<INPUT TYPE=\"text\" NAME=\"org\" "
+ "VALUE=\"%s\" MAXLENGTH=\"40\"><br><br>\n",
+ org
+ );
+
+ wprintf("</td><td>");
+
+ wprintf("<table border=0>");
+ 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 line 1:</TD>"
- "<TD><INPUT TYPE=\"text\" NAME=\"extadr\" "
- "VALUE=\"%s\" MAXLENGTH=\"29\"></TD></TR>\n",
+ wprintf("<tr><td>");
+ wprintf(_("Address:"));
+ wprintf("</td><td>"
+ "<INPUT TYPE=\"text\" NAME=\"extadr\" "
+ "VALUE=\"%s\" MAXLENGTH=\"29\"></td></tr>\n",
extadr);
- wprintf("<TR><TD>Address line 2:</TD>"
- "<TD><INPUT TYPE=\"text\" NAME=\"street\" "
- "VALUE=\"%s\" MAXLENGTH=\"29\"></TD></TR>\n",
+ wprintf("<tr><td> </td><td>"
+ "<INPUT TYPE=\"text\" NAME=\"street\" "
+ "VALUE=\"%s\" MAXLENGTH=\"29\"></td></tr>\n",
street);
- wprintf("<TR><TD>City:</TD>"
- "<TD><INPUT TYPE=\"text\" NAME=\"city\" "
- "VALUE=\"%s\" MAXLENGTH=\"29\">\n",
+ wprintf("<tr><td>");
+ wprintf(_("City:"));
+ wprintf("</td><td>"
+ "<INPUT TYPE=\"text\" NAME=\"city\" "
+ "VALUE=\"%s\" MAXLENGTH=\"29\"></td></tr>\n",
city);
- wprintf(" State: "
+ wprintf("<tr><td>");
+ wprintf(_("State:"));
+ wprintf("</td><td>"
"<INPUT TYPE=\"text\" NAME=\"state\" "
- "VALUE=\"%s\" MAXLENGTH=\"2\">\n",
+ "VALUE=\"%s\" MAXLENGTH=\"2\"></td></tr>\n",
state);
- wprintf(" ZIP code: "
+ wprintf("<tr><td>");
+ wprintf(_("ZIP code:"));
+ wprintf("</td><td>"
"<INPUT TYPE=\"text\" NAME=\"zipcode\" "
- "VALUE=\"%s\" MAXLENGTH=\"10\"></TD></TR>\n",
+ "VALUE=\"%s\" MAXLENGTH=\"10\"></td></tr>\n",
zipcode);
- wprintf("<TR><TD>Country:</TD>"
- "<TD><INPUT TYPE=\"text\" NAME=\"country\" "
- "VALUE=\"%s\" MAXLENGTH=\"29\"></TD></TR></TABLE>\n",
+ wprintf("<tr><td>");
+ wprintf(_("Country:"));
+ wprintf("</td><td>"
+ "<INPUT TYPE=\"text\" NAME=\"country\" "
+ "VALUE=\"%s\" MAXLENGTH=\"29\" WIDTH=\"5\"></td></tr>\n",
country);
+ wprintf("</table>\n");
+
+ 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></TR>\n",
+ "VALUE=\"%s\" MAXLENGTH=\"29\"></TD>\n",
hometel);
- wprintf("<TR><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);
- wprintf("<br /><TABLE border=0><TR>"
- "<TD VALIGN=TOP>Primary Internet e-mail address<br />"
+ wprintf("<table border=0 width=100%% bgcolor=\"#dddddd\">");
+ wprintf("<tr><td>");
+
+ wprintf("<TABLE border=0><TR>"
+ "<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><br />\n");
+ wprintf("</TEXTAREA></TD></TR></TABLE>\n");
+
+ wprintf("</td></tr></table>\n");
wprintf("<INPUT TYPE=\"hidden\" NAME=\"extrafields\" VALUE=\"");
escputs(extrafields);
wprintf("\">\n");
wprintf("<CENTER>\n"
- "<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"OK\">"
+ "<INPUT TYPE=\"submit\" NAME=\"ok_button\" VALUE=\"%s\">"
" "
- "<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");
char buf[SIZ];
int i;
- if (strcmp(bstr("sc"), "OK")) {
+ if (strlen(bstr("ok_button")) == 0) {
readloop("readnew");
return;
}
sprintf(buf, "ENT0 1|||4||");
serv_puts(buf);
- serv_gets(buf);
+ serv_getln(buf, sizeof buf);
if (buf[0] != '4') {
edit_vcard();
return;
bstr("middlename"),
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"),
bstr("extadr"),
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');
+ extract_token(buf, bstr("other_inetemail"), i, '\n', sizeof buf);
if (strlen(buf) > 0) {
serv_printf("email;internet:%s", buf);
}
projects / citadel.git / blobdiff