From: Art Cancro <ajc@citadel.org>
Date: Fri, 18 Feb 2005 18:53:34 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: v7.86~5037
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=e88a6898162f2ab2cb5d0043ac3887f57fd62c8d;p=citadel.git

*** empty log message ***
---

diff --git a/webcit/mainmenu.c b/webcit/mainmenu.c
index 5a0af2f7d..630007f35 100644
--- a/webcit/mainmenu.c
+++ b/webcit/mainmenu.c
@@ -202,7 +202,7 @@ void display_aide_menu(void)
 		"</div>\n<div id=\"content\">\n"
 	);
 
-	wprintf("<center><table border=0 width=99%% bgcolor=\"#ffffff\"><tr><td>\n");
+	wprintf("<center><table border=1 cellpadding=5 bgcolor=\"#ffffff\"><tr><td>\n");
 
 	wprintf("<A HREF=\"/display_siteconfig\">"
 		"<span class=\"mainmenu\">"
diff --git a/webcit/messages.c b/webcit/messages.c
index 41a976cca..b3e55205c 100644
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -103,6 +103,11 @@ void fetchname_parsed_vcard(struct vCard *v, char *storename) {
 	if (v->numprops) for (i=0; i<(v->numprops); ++i) {
 		if (!strcasecmp(v->prop[i].name, "n")) {
 			strcpy(storename, v->prop[i].value);
+			if ((strlen(storename)>0) && (storename[0] != ';')) {
+				while(storename[strlen(storename)-1] == ';') {
+					storename[strlen(storename)-1] = 0;
+				}
+			}
 		}
 	}
 }
@@ -142,10 +147,11 @@ void display_parsed_vcard(struct vCard *v, int full) {
 	if (!full) {
 		wprintf("<TD>");
 		name = vcard_get_prop(v, "fn", 1, 0, 0);
-		if (name == NULL) name = vcard_get_prop(v, "n", 1, 0, 0);
 		if (name != NULL) {
-			strcpy(buf, name);
-			escputs(buf);
+			escputs(name);
+		}
+		else if (name = vcard_get_prop(v, "n", 1, 0, 0), name != NULL) {
+			escputs(name);
 		}
 		else {
 			wprintf("&nbsp;");