/*
* $Id$
- *
- * Handles 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>
+/**
+ * \defgroup vCardEdit Handles on-screen editing of vCard objects.
+ * \ingroup VCards
+ */
+/*@{*/
#include "webcit.h"
#include "vcard.h"
-
-/* Edit the vCard component of a MIME message. Supply the message number
+/**
+ * \brief 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.
+ * \param msgnum number of the item on the citadel server
+ * \param partnum what???
+ * \param return_to where to go back in the browser after edit ????
*/
void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
char buf[SIZ];
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 fullname[256];
+ char title[256];
+ char org[256];
lastname[0] = 0;
firstname[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(fullname, value, sizeof fullname);
}
else if (!strcasecmp(key, "title")) {
- strcpy(title, value);
+ safestrncpy(title, value, sizeof title);
}
else if (!strcasecmp(key, "org")) {
- strcpy(org, value);
+ 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) {
vcard_free(v);
}
- /* Display the form */
- output_headers(1, 1, 2, 0, 0, 0, 0);
+ /** Display the form */
+ 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\">"
- "Edit contact information"
- "</SPAN>"
- "</TD></TR></TABLE>\n"
+ "<table width=100%% border=0 bgcolor=\"#444455\"><tr><td>"
+ "<span class=\"titlebar\">"
+ "<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("<div id=\"fix_scrollbar_bug\">"
+ wprintf("<form method=\"POST\" action=\"submit_vcard\">\n");
+ wprintf("<div class=\"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");
- wprintf("<TR><TD><INPUT TYPE=\"text\" NAME=\"prefix\" "
- "VALUE=\"%s\" MAXLENGTH=\"5\" SIZE=\"5\"></TD>",
+ wprintf("<table border=0><tr>"
+ "<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);
- wprintf("<TD><INPUT TYPE=\"text\" NAME=\"firstname\" "
- "VALUE=\"%s\" MAXLENGTH=\"29\"></TD>",
+ wprintf("<td><input type=\"text\" name=\"firstname\" "
+ "value=\"%s\" maxlength=\"29\"></td>",
firstname);
- wprintf("<TD><INPUT TYPE=\"text\" NAME=\"middlename\" "
- "VALUE=\"%s\" MAXLENGTH=\"29\"></TD>",
+ wprintf("<td><input type=\"text\" name=\"middlename\" "
+ "value=\"%s\" maxlength=\"29\"></td>",
middlename);
- wprintf("<TD><INPUT TYPE=\"text\" NAME=\"lastname\" "
- "VALUE=\"%s\" MAXLENGTH=\"29\"></TD>",
+ wprintf("<td><input type=\"text\" name=\"lastname\" "
+ "value=\"%s\" maxlength=\"29\"></td>",
lastname);
- wprintf("<TD><INPUT TYPE=\"text\" NAME=\"suffix\" "
- "VALUE=\"%s\" MAXLENGTH=\"10\" SIZE=\"10\"></TD></TR></TABLE>\n",
+ wprintf("<td><input type=\"text\" name=\"suffix\" "
+ "value=\"%s\" maxlength=\"10\" size=\"10\"></td></tr></table>\n",
suffix);
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",
+ wprintf(_("Display name:"));
+ wprintf("<br>"
+ "<input type=\"text\" name=\"fullname\" "
+ "value=\"%s\" maxlength=\"40\"><br><br>\n",
+ fullname
+ );
+
+ wprintf(_("Title:"));
+ wprintf("<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",
+ 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>PO box:</td><td>"
- "<INPUT TYPE=\"text\" NAME=\"pobox\" "
- "VALUE=\"%s\" MAXLENGTH=\"29\"></td></tr>\n",
+ 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>"
- "<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> </td><td>"
- "<INPUT TYPE=\"text\" NAME=\"street\" "
- "VALUE=\"%s\" MAXLENGTH=\"29\"></td></tr>\n",
+ "<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\"></td></tr>\n",
+ 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>"
- "<INPUT TYPE=\"text\" NAME=\"state\" "
- "VALUE=\"%s\" MAXLENGTH=\"2\"></td></tr>\n",
+ 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>"
- "<INPUT TYPE=\"text\" NAME=\"zipcode\" "
- "VALUE=\"%s\" MAXLENGTH=\"10\"></td></tr>\n",
+ 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>"
- "<INPUT TYPE=\"text\" NAME=\"country\" "
- "VALUE=\"%s\" MAXLENGTH=\"29\" WIDTH=\"5\"></td></tr>\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>"
- "<TD><INPUT TYPE=\"text\" NAME=\"hometel\" "
- "VALUE=\"%s\" MAXLENGTH=\"29\"></TD>\n",
+ 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>"
- "<TD><INPUT TYPE=\"text\" NAME=\"worktel\" "
- "VALUE=\"%s\" MAXLENGTH=\"29\"></TD></TR></TABLE>\n",
+ wprintf("<td>");
+ wprintf(_("Work telephone:"));
+ wprintf("</td>"
+ "<td><input type=\"text\" name=\"worktel\" "
+ "value=\"%s\" maxlength=\"29\"></td></tr></table>\n",
worktel);
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=\"");
+ 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 />"
- "<TEXTAREA NAME=\"other_inetemail\" ROWS=5 COLS=40 WIDTH=40>");
+ "</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");
+ wprintf("</textarea></td></tr></table>\n");
wprintf("</td></tr></table>\n");
- wprintf("<INPUT TYPE=\"hidden\" NAME=\"extrafields\" VALUE=\"");
+ wprintf("<input type=\"hidden\" name=\"extrafields\" value=\"");
escputs(extrafields);
wprintf("\">\n");
- wprintf("<INPUT TYPE=\"hidden\" NAME=\"return_to\" VALUE=\"");
+ wprintf("<input type=\"hidden\" name=\"return_to\" value=\"");
urlescputs(return_to);
wprintf("\">\n");
- wprintf("<CENTER>\n"
- "<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"OK\">"
+ wprintf("<center>\n"
+ "<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");
}
-
+/**
+ * \brief commit the edits to the citadel server
+ */
void edit_vcard(void) {
long msgnum;
char *partnum;
-
+/**
+ * \brief parse edited vcard from the browser
+ */
void submit_vcard(void) {
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;
}
- serv_puts("Content-type: text/x-vcard");
+ serv_puts("Content-type: text/x-vcard; charset=UTF-8");
serv_puts("");
serv_puts("begin:vcard");
serv_printf("n:%s;%s;%s;%s;%s",
bstr("prefix"),
bstr("suffix") );
serv_printf("title:%s", bstr("title") );
+ serv_printf("fn:%s", bstr("fullname") );
serv_printf("org:%s", bstr("org") );
serv_printf("adr:%s;%s;%s;%s;%s;%s;%s",
bstr("pobox"),
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);
}
serv_puts("end:vcard");
serv_puts("000");
- if (!strcmp(bstr("return_to"), "/select_user_to_edit")) {
+ if (!strcmp(bstr("return_to"), "select_user_to_edit")) {
select_user_to_edit(NULL, NULL);
}
- else if (!strcmp(bstr("return_to"), "/do_welcome")) {
+ else if (!strcmp(bstr("return_to"), "do_welcome")) {
do_welcome();
}
else {
readloop("readnew");
}
}
+
+
+
+/*@}*/
projects / citadel.git / blobdiff