From: Art Cancro <ajc@citadel.org>
Date: Wed, 5 Mar 2008 04:14:14 +0000 (+0000)
Subject: Backed out changes in r6088 of addressbook_popup.c
X-Git-Tag: v7.86~2442
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=9d1398a812cc97c98adb3a2afd86a00bb86a51a6

Backed out changes in r6088 of addressbook_popup.c
The list may have been nicely sorted, but selecting addresses from the list
causes the names to have escaped HTML characters in them.
---

diff --git a/webcit/addressbook_popup.c b/webcit/addressbook_popup.c
index add472740..91641482c 100644
--- a/webcit/addressbook_popup.c
+++ b/webcit/addressbook_popup.c
@@ -28,10 +28,7 @@ void address_book_popup(void) {
  */
 void display_address_book_middle_div(void) {
 	char buf[256];
-	long len;
-	char *Name, *Namee;
-	HashList *List;
-	HashPos  *it;
+	char ebuf[256];
 
 	begin_ajax_response();
 
@@ -49,29 +46,18 @@ void display_address_book_middle_div(void) {
 	escputs(serv_info.serv_humannode);
 	wprintf("</option>\n");
 
-	
-	List = NewHash();
 	serv_puts("LKRA");
 	serv_getln(buf, sizeof buf);
-	if (buf[0] == '1') while(len = serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
+	if (buf[0] == '1') while(serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
 		if (extract_int(buf, 6) == VIEW_ADDRESSBOOK) {
-			Name = (char*) malloc(len + 1);
-			len = extract_token(Name, buf, 0, '|', len);
-			Put(List, Name, len, Name, NULL);
+			extract_token(ebuf, buf, 0, '|', sizeof ebuf);
+			wprintf("<option value=\"");
+			urlescputs(ebuf);
+			wprintf("\">");
+			escputs(ebuf);
+			wprintf("</option>\n");
 		}
 	}
-
-	SortByHashKey(List);
-	it = GetNewHashPos();
-	while (GetNextHashPos(List, it, &len, &Name, (void**)&Namee)) {
-		wprintf("<option value=\"");
-		urlescputs(Namee);
-		wprintf("\">");
-		escputs(Namee);
-		wprintf("</option>\n");
-	}
-	DeleteHashPos(&it);
-	DeleteHash(&List);
 	wprintf("</select></form>");
 
 	wprintf("</td>");
@@ -96,42 +82,29 @@ void display_address_book_middle_div(void) {
  */
 void display_address_book_inner_div() {
 	char buf[256];
+	char username[256];
 	int num_targets = 0;
 	char target_id[64];
 	char target_label[64];
-	long len;
-	char *Name, *Namee;
-	HashList *List;
-	HashPos  *it;
 	int i;
 	char saved_roomname[128];
 
 	begin_ajax_response();
 
-	List = NewHash();
 	wprintf("<div align=center><form onSubmit=\"return false;\">"
 		"<select multiple name=\"whichaddr\" id=\"whichaddr\" size=\"15\">\n");
 
 	if (!strcasecmp(bstr("which_addr_book"), "__LOCAL_USERS__")) {
 		serv_puts("LIST");
 		serv_getln(buf, sizeof buf);
-		if (buf[0] == '1') while(len = serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-			Name = (char*) malloc(len + 1);
-			len = extract_token(Name, buf, 0, '|', len + 1);
-			Put(List, Name, len, Name, NULL);
-
-		}
-		SortByHashKey(List);
-		it = GetNewHashPos();
-		while (GetNextHashPos(List, it, &len, &Name, (void**)&Namee)) {
+		if (buf[0] == '1') while(serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
+			extract_token(username, buf, 0, '|', sizeof username);
 			wprintf("<option value=\"");
-			urlescputs(Namee);
+			escputs(username);
 			wprintf("\">");
-			escputs(Namee);
+			escputs(username);
 			wprintf("</option>\n");
 		}
-		DeleteHashPos(&it);
-		DeleteHash(&List);
 	}
 
 	else {
@@ -139,23 +112,13 @@ void display_address_book_inner_div() {
 		gotoroom(bstr("which_addr_book"));
 		serv_puts("DVCA");
 		serv_getln(buf, sizeof buf);
-		if (buf[0] == '1') while(len = serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-			Name = (char*) malloc(len + 1);
-			len = extract_token(Name, buf, 0, '|', len + 1);
-			Put(List, Name, len, Name, NULL);
-
-		}
-		SortByHashKey(List);
-		it = GetNewHashPos();
-		while (GetNextHashPos(List, it, &len, &Name, (void**)&Namee)) {
+		if (buf[0] == '1') while(serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
 			wprintf("<option value=\"");
-			urlescputs(Namee);
+			escputs(buf);
 			wprintf("\">");
-			escputs(Namee);
+			escputs(buf);
 			wprintf("</option>\n");
 		}
-		DeleteHashPos(&it);
-		DeleteHash(&List);
 		gotoroom(bstr(saved_roomname));
 	}