From 52d8adf3fa79c627e904b403e0cb525a30adbe0e Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Sat, 19 Jun 2004 03:11:07 +0000
Subject: [PATCH] * Instead of a crufty "the topmost Internet email address
 will be used   for outgoing email" explanation, separated it into "Primary
 Internet   email address" and "Other email addresses" boxes.

---
 webcit/ChangeLog                        |  6 +++-
 webcit/static/newstartpage.html         |  2 +-
 webcit/static/prompt_for_recipient.html |  2 +-
 webcit/vcard_edit.c                     | 40 ++++++++++++++++---------
 4 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 9f6713a05..7a5d7fa49 100644
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,9 @@
 $Log$
+Revision 521.10  2004/06/19 03:11:07  ajc
+* Instead of a crufty "the topmost Internet email address will be used
+  for outgoing email" explanation, separated it into "Primary Internet
+  email address" and "Other email addresses" boxes.
+
 Revision 521.9  2004/06/19 02:42:12  ajc
 * Removed the "aides access to mailboxes" config option, which is no longer
   part of the Citadel system.
@@ -1908,4 +1913,3 @@ Sun Dec  6 19:50:55 EST 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
 
 1998-12-03 Nathan Bryant <bryant@cs.usm.maine.edu>
 	* webserver.c: warning fix
-
diff --git a/webcit/static/newstartpage.html b/webcit/static/newstartpage.html
index 00089d913..75573cf4f 100644
--- a/webcit/static/newstartpage.html
+++ b/webcit/static/newstartpage.html
@@ -1,4 +1,4 @@
-<TABLE WIDTH="100%" BORDER="0" BGCOLOR="#000077">
+<TABLE WIDTH="100%" BORDER="0" BGCOLOR="#444455">
 <TR>
 	<TD>
 		<FONT SIZE=+1 COLOR="#FFFFFF"
diff --git a/webcit/static/prompt_for_recipient.html b/webcit/static/prompt_for_recipient.html
index a90ddef06..79948daab 100644
--- a/webcit/static/prompt_for_recipient.html
+++ b/webcit/static/prompt_for_recipient.html
@@ -1,4 +1,4 @@
-<TABLE WIDTH=100% BORDER=0 BGCOLOR="#007700">
+<TABLE WIDTH=100% BORDER=0 BGCOLOR="#444455">
 <TR><TD><SPAN CLASS="titlebar">
 Send private e-mail
 </SPAN></TD></TR></TABLE>
diff --git a/webcit/vcard_edit.c b/webcit/vcard_edit.c
index 1eec8b339..e20d29673 100644
--- a/webcit/vcard_edit.c
+++ b/webcit/vcard_edit.c
@@ -56,7 +56,8 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
 	char country[SIZ];
 	char hometel[SIZ];
 	char worktel[SIZ];
-	char inetemail[SIZ];
+	char primary_inetemail[SIZ];
+	char other_inetemail[SIZ];
 	char extrafields[SIZ];
 
 	lastname[0] = 0;
@@ -73,7 +74,8 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
 	country[0] = 0;
 	hometel[0] = 0;
 	worktel[0] = 0;
-	inetemail[0] = 0;
+	primary_inetemail[0] = 0;
+	other_inetemail[0] = 0;
 	extrafields[0] = 0;
 
 	output_headers(3);
@@ -150,10 +152,15 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
 			}
 	
 			else if (!strcasecmp(key, "email;internet")) {
-				if (inetemail[0] != 0) {
-					strcat(inetemail, "\n");
+				if (primary_inetemail[0] == 0) {
+					strcpy(primary_inetemail, value);
+				}
+				else {
+					if (other_inetemail[0] != 0) {
+						strcat(other_inetemail, "\n");
+					}
+					strcat(other_inetemail, value);
 				}
-				strcat(inetemail, value);
 			}
 	
 			else {
@@ -236,12 +243,16 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
 		"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("<BR><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>"
+		"<TEXTAREA NAME=\"other_inetemail\" ROWS=5 COLS=40 WIDTH=40>");
+	escputs(other_inetemail);
 	wprintf("</TEXTAREA></TD></TR></TABLE><BR>\n");
 
 	wprintf("<INPUT TYPE=\"hidden\" NAME=\"extrafields\" VALUE=\"");
@@ -313,9 +324,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');
 		if (strlen(buf) > 0) {
 			serv_printf("email;internet:%s", buf);
 		}
-- 
2.39.2