From: Art Cancro <ajc@citadel.org>
Date: Fri, 30 Sep 2005 20:57:27 +0000 (+0000)
Subject: * Added "Display Name" (or as vCard calls it, "friendly name" or "fn") to
X-Git-Tag: v7.86~4596
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=eca93655df6993855d86edff5cf4a744871a12c3;p=citadel.git

* Added "Display Name" (or as vCard calls it, "friendly name" or "fn") to
  the vCard editing screen.
---

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 6513b9a26..69f049cc5 100644
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,8 @@
 $Log$
+Revision 625.32  2005/09/30 20:57:27  ajc
+* Added "Display Name" (or as vCard calls it, "friendly name" or "fn") to
+  the vCard editing screen.
+
 Revision 625.31  2005/09/29 15:59:33  ajc
 * Finished the "signature" function.
 
@@ -3093,4 +3097,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/vcard_edit.c b/webcit/vcard_edit.c
index 2f31bffe7..317bb087f 100644
--- a/webcit/vcard_edit.c
+++ b/webcit/vcard_edit.c
@@ -19,27 +19,28 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
 	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 displayname[256];
+	char title[256];
+	char org[256];
 
 	lastname[0] = 0;
 	firstname[0] = 0;
@@ -114,6 +115,10 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
 				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);
 			}
@@ -207,6 +212,13 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
 	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\" "
@@ -363,6 +375,7 @@ void submit_vcard(void) {
 		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"),