char primary_inetemail[SIZ];
char other_inetemail[SIZ];
char extrafields[SIZ];
+ char title[SIZ];
+ char org[SIZ];
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;
- output_headers(1, 1, 0, 0, 0, 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') {
- wDumpContent(1);
+ 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') {
- 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;
+ serv_getln(buf, sizeof buf);
+ serialized_vcard[total_len] = 0;
v = vcard_load(serialized_vcard);
free(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, "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 */
- do_template("beginbox_nt");
+ 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/savecontact_48x.gif\">"
+ "Edit contact information"
+ "</SPAN>"
+ "</TD></TR></TABLE>\n"
+ "</div>\n<div id=\"content\">\n"
+ );
+
wprintf("<FORM METHOD=\"POST\" ACTION=\"/submit_vcard\">\n");
- wprintf("<H2><IMG ALIGN=CENTER SRC=\"/static/vcard.gif\">"
- "Contact information for ");
- escputs(whatuser);
- wprintf("</H2>\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>Last</TD>"
"<TD>Suffix</TD></TR>\n");
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("Title:<br>"
+ "<INPUT TYPE=\"text\" NAME=\"title\" "
+ "VALUE=\"%s\" MAXLENGTH=\"40\"><br><br>\n",
+ title
+ );
+
+ wprintf("Organization:<br>"
+ "<INPUT TYPE=\"text\" NAME=\"org\" "
+ "VALUE=\"%s\" MAXLENGTH=\"40\"><br><br>\n",
+ org
+ );
+
+ wprintf("</td><td>");
+
+ wprintf("<table border=0>");
+ wprintf("<tr><td>PO box:</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>Address:</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>City:</td><td>"
+ "<INPUT TYPE=\"text\" NAME=\"city\" "
+ "VALUE=\"%s\" MAXLENGTH=\"29\"></td></tr>\n",
city);
- wprintf(" State: "
+ wprintf("<tr><td>State:</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>ZIP code:</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>Country:</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>"
"<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>Work telephone:</TD>"
"<TD><INPUT TYPE=\"text\" NAME=\"worktel\" "
"VALUE=\"%s\" MAXLENGTH=\"29\"></TD></TR></TABLE>\n",
worktel);
- wprintf("<br /><TABLE border=0><TR>"
+ wprintf("<table border=0 width=100%% bgcolor=\"#dddddd\">");
+ wprintf("<tr><td>");
+
+ wprintf("<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>"
- "Other Internet e-mail addresses<br />"
+ "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("</TEXTAREA></TD></TR></TABLE>\n");
+
+ wprintf("</td></tr></table>\n");
wprintf("<INPUT TYPE=\"hidden\" NAME=\"extrafields\" VALUE=\"");
escputs(extrafields);
"</CENTER></FORM>\n"
);
- do_template("endbox");
+ wprintf("</td></tr></table></div>\n");
wDumpContent(1);
}
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("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