X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fvcard_edit.c;h=755dae6fc9472e566b55d8d2d218bf58b7b7988c;hb=d120028b4c45f3c26d05186c8ba488fd2feef13f;hp=58047f7b8c85d937e10f889194751fee14c22dc3;hpb=25085ec2cf0f8a5d34cfb8906e43e2df18d0e0ed;p=citadel.git

diff --git a/webcit/vcard_edit.c b/webcit/vcard_edit.c
index 58047f7b8..755dae6fc 100644
--- a/webcit/vcard_edit.c
+++ b/webcit/vcard_edit.c
@@ -1,62 +1,46 @@
 /*
- * vcard_edit.c
+ * $Id$
  *
- * Handles editing of vCard objects.
+ * Handles on-screen editing of vCard objects.
  *
- * $Id$
  */
 
-#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"
 
-
-
-void edit_vcard(void) {
+/* 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.
+ */
+void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
 	char buf[SIZ];
 	char *serialized_vcard = NULL;
 	size_t total_len = 0;
-	size_t bytes = 0;
-	size_t thisblock = 0;
 	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 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 fullname[256];
+	char title[256];
+	char org[256];
 
 	lastname[0] = 0;
 	firstname[0] = 0;
@@ -72,129 +56,145 @@ void edit_vcard(void) {
 	country[0] = 0;
 	hometel[0] = 0;
 	worktel[0] = 0;
-	inetemail[0] = 0;
+	primary_inetemail[0] = 0;
+	other_inetemail[0] = 0;
+	title[0] = 0;
+	org[0] = 0;
 	extrafields[0] = 0;
 
-	output_headers(1);
-
-	strcpy(whatuser, "");
-	sprintf(buf, "MSG0 %s|1", bstr("msgnum") );
-	serv_puts(buf);
-	serv_gets(buf);
-	if (buf[0] != '1') {
-		wDumpContent(1);
-		return;
-	}
-	while (serv_gets(buf), strcmp(buf, "000")) {
-		if (!strncasecmp(buf, "from=", 5)) {
-			strcpy(whatuser, &buf[5]);
-		}
-		else if (!strncasecmp(buf, "node=", 5)) {
-			strcat(whatuser, " @ ");
-			strcat(whatuser, &buf[5]);
-		}
-	}
-
-	total_len = atoi(&buf[4]);
-
+	safestrncpy(whatuser, "", sizeof whatuser);
 
-	sprintf(buf, "OPNA %s|%s", bstr("msgnum"), bstr("partnum") );
-	serv_puts(buf);
-	serv_gets(buf);
-	if (buf[0] != '2') {
-		wDumpContent(1);
-		return;
-	}
-
-	total_len = atoi(&buf[4]);
-	serialized_vcard = malloc(total_len + 1);
-	while (bytes < total_len) {
-		thisblock = 4000;
-		if ((total_len - bytes) < thisblock) thisblock = total_len - bytes;
-		sprintf(buf, "READ %d|%d", bytes, thisblock);
+	if (msgnum >= 0) {
+		sprintf(buf, "MSG0 %ld|1", msgnum);
 		serv_puts(buf);
-		serv_gets(buf);
-		if (buf[0] == '6') {
-			thisblock = atoi(&buf[4]);
-			serv_read(&serialized_vcard[bytes], thisblock);
-			bytes += thisblock;
-		}
-		else {
-			wprintf("Error: %s<BR>\n", &buf[4]);
+		serv_getln(buf, sizeof buf);
+		if (buf[0] != '1') {
+			convenience_page("770000", _("Error"), &buf[4]);
+			return;
 		}
-	}
-
-	serv_puts("CLOS");
-	serv_gets(buf);
-	serialized_vcard[total_len + 1] = 0;
-
-	v = vcard_load(serialized_vcard);
-	free(serialized_vcard);
-
-	/* Populate the variables for our form */
-	i = 0;
-	while (key = vcard_get_prop(v, "", 0, i, 1), key != NULL) {
-		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, ';');
-		}
-
-		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, ';');
-		}
-
-		else if (!strcasecmp(key, "tel;home")) {
-			extract_token(hometel, value, 0, ';');
+		while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
+			if (!strncasecmp(buf, "from=", 5)) {
+				safestrncpy(whatuser, &buf[5], sizeof whatuser);
+			}
+			else if (!strncasecmp(buf, "node=", 5)) {
+				strcat(whatuser, " @ ");
+				strcat(whatuser, &buf[5]);
+			}
 		}
-
-		else if (!strcasecmp(key, "tel;work")) {
-			extract_token(worktel, value, 0, ';');
+	
+		sprintf(buf, "OPNA %ld|%s", msgnum, partnum);
+		serv_puts(buf);
+		serv_getln(buf, sizeof buf);
+		if (buf[0] != '2') {
+			convenience_page("770000", "Error", &buf[4]);
+			return;
 		}
+	
+		total_len = atoi(&buf[4]);
+		serialized_vcard = malloc(total_len + 2);
+	
+		read_server_binary(serialized_vcard, total_len);
+	
+		serv_puts("CLOS");
+		serv_getln(buf, sizeof buf);
+		serialized_vcard[total_len] = 0;
+	
+		v = vcard_load(serialized_vcard);
+		free(serialized_vcard);
+	
+		/* Populate the variables for our form */
+		i = 0;
+		while (key = vcard_get_prop(v, "", 0, i, 1), key != NULL) {
+			value = vcard_get_prop(v, "", 0, i++, 0);
+	
+			if (!strcasecmp(key, "n")) {
+				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, "email;internet")) {
-			if (inetemail[0] != 0) {
-				strcat(inetemail, "\n");
+			else if (!strcasecmp(key, "fn")) {
+				safestrncpy(fullname, value, sizeof fullname);
 			}
-			strcat(inetemail, value);
-		}
 
-		else {
-			strcat(extrafields, key);
-			strcat(extrafields, ":");
-			strcat(extrafields, value);
-			strcat(extrafields, "\n");
+			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, ';', 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, ';', sizeof hometel);
+			}
+	
+			else if (!strcasecmp(key, "tel;work")) {
+				extract_token(worktel, value, 0, ';', sizeof worktel);
+			}
+	
+			else if (!strcasecmp(key, "email;internet")) {
+				if (primary_inetemail[0] == 0) {
+					safestrncpy(primary_inetemail, value, sizeof primary_inetemail);
+				}
+				else {
+					if (other_inetemail[0] != 0) {
+						strcat(other_inetemail, "\n");
+					}
+					strcat(other_inetemail, value);
+				}
+			}
+	
+			else {
+				strcat(extrafields, key);
+				strcat(extrafields, ":");
+				strcat(extrafields, value);
+				strcat(extrafields, "\n");
+			}
+	
 		}
-
-	}
 	
-	vcard_free(v);
+		vcard_free(v);
+	}
 
 	/* Display the form */
-	wprintf("<FORM METHOD=\"POST\" ACTION=\"/submit_vcard\">\n");
-	wprintf("<H2><IMG VALIGN=CENTER SRC=\"/static/vcard.gif\">"
-		"Contact information for ");
-	escputs(whatuser);
-	wprintf("</H2>\n");
+	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\">");
+	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 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");
+		"<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>",
@@ -206,84 +206,160 @@ void edit_vcard(void) {
 		"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=\"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:"));
+	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("<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("<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>");
+	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("</td></tr></table>\n");
 
 	wprintf("<INPUT TYPE=\"hidden\" NAME=\"extrafields\" VALUE=\"");
 	escputs(extrafields);
 	wprintf("\">\n");
 
-	wprintf("<CENTER>\n");
-                wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"OK\">");
-                wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">");
-                wprintf("</CENTER></FORM>\n");
+	wprintf("<INPUT TYPE=\"hidden\" NAME=\"return_to\" VALUE=\"");
+	urlescputs(return_to);
+	wprintf("\">\n");
 
-	 
+	wprintf("<CENTER>\n"
+		"<INPUT TYPE=\"submit\" NAME=\"ok_button\" VALUE=\"%s\">"
+		"&nbsp;"
+		"<INPUT TYPE=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">"
+		"</CENTER></FORM>\n",
+		_("Save changes"),
+		_("Cancel")
+	);
+	
+	wprintf("</td></tr></table></div>\n");
 	wDumpContent(1);
 }
 
 
 
+void edit_vcard(void) {
+	long msgnum;
+	char *partnum;
+
+	msgnum = atol(bstr("msgnum"));
+	partnum = bstr("partnum");
+	do_edit_vcard(msgnum, partnum, "");
+}
+
+
+
+
 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||");
-	fprintf(stderr, "%s\n", buf);
 	serv_puts(buf);
-	serv_gets(buf);
-	fprintf(stderr, "%s\n", buf);
+	serv_getln(buf, sizeof buf);
 	if (buf[0] != '4') {
 		edit_vcard();
 		return;
@@ -298,6 +374,9 @@ void submit_vcard(void) {
 		bstr("middlename"),
 		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"),
 		bstr("extadr"),
@@ -308,9 +387,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', sizeof buf);
 		if (strlen(buf) > 0) {
 			serv_printf("email;internet:%s", buf);
 		}
@@ -320,5 +400,13 @@ void submit_vcard(void) {
 	serv_puts("end:vcard");
 	serv_puts("000");
 
-	readloop("readnew");
+	if (!strcmp(bstr("return_to"), "select_user_to_edit")) {
+		select_user_to_edit(NULL, NULL);
+	}
+	else if (!strcmp(bstr("return_to"), "do_welcome")) {
+		do_welcome();
+	}
+	else {
+		readloop("readnew");
+	}
 }