From: Wilfried Goesgens <willi@arangodb.com>
Date: Tue, 17 Nov 2015 18:59:31 +0000 (+0100)
Subject: HTML-escape tablabels.
X-Git-Tag: Release_902~135
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=b3a15939bdee9bc729492575a2b191562c9a38b3

HTML-escape tablabels.
---

diff --git a/webcit/tabs.c b/webcit/tabs.c
index e644ec467..4b58ba590 100644
--- a/webcit/tabs.c
+++ b/webcit/tabs.c
@@ -127,7 +127,7 @@ void StrTabbedDialog(StrBuf *Target, int num_tabs, StrBuf *tabnames[]) {
 			( (i==0) ? "tab_cell_label" : "tab_cell_edit" ),
 			i
 			);
-		StrBufAppendBuf(Target, tabnames[i], 0);
+		StrEscAppend(Target, tabnames[i], NULL, 0, 0);
 		StrBufAppendBufPlain(
 			Target, 
 			HKEY(
diff --git a/webcit/vcard_edit.c b/webcit/vcard_edit.c
index 975ea239f..eda369b42 100644
--- a/webcit/vcard_edit.c
+++ b/webcit/vcard_edit.c
@@ -1080,7 +1080,7 @@ void do_addrbook_view(vcardview_struct* VS) {
 	int tabfirst = 0;
 	int tablast = 0;
 	int page = 0;
-	const char **tablabels;
+	const StrBuf **tablabels;
 	int num_ab = GetCount(VS->addrbook);
 	HashList *headlines;
 	HashPos *it;
@@ -1102,7 +1102,7 @@ void do_addrbook_view(vcardview_struct* VS) {
 
 	num_pages = (GetCount(VS->addrbook) / NAMESPERPAGE) + 1;
 
-	tablabels = malloc(num_pages * sizeof (char *));
+	tablabels = malloc(num_pages * sizeof (StrBuf *));
 	if (tablabels == NULL) {
 		return;
 	}
@@ -1132,11 +1132,10 @@ void do_addrbook_view(vcardview_struct* VS) {
 				StrBufAppendBuf(headline, a2->name, 0);
 			}
 		}
-		tablabels[i] = ChrPtr(headline);
+		tablabels[i] = headline;
 		Put(headlines, LKEY(i), headline, HFreeStrBuf);
 	}
-
-	tabbed_dialog(num_pages, tablabels);
+	StrTabbedDialog(WC->WBuf, num_pages, tablabels);
 	page = (-1);