X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Faddressbook_popup.c;h=7f35fa0d50a5db7319954b287f4081acd773acc3;hb=6ec73d6906542ea2f8cca2e62f7625ee2e17ae03;hp=6cfb5b5c3a8b02c918d619ac102628334d257857;hpb=95749fd514c4e6041e3117f20f0d7b461dc379cc;p=citadel.git

diff --git a/webcit/addressbook_popup.c b/webcit/addressbook_popup.c
index 6cfb5b5c3..7f35fa0d5 100644
--- a/webcit/addressbook_popup.c
+++ b/webcit/addressbook_popup.c
@@ -28,12 +28,16 @@ void display_address_book_middle_div(void) {
 	char buf[256];
 	long len;
 	char *Name;
+	const char *VCName;
 	void *Namee;
+	StrBuf *DefAddrBook;
 	HashList *List;
 	HashPos  *it;
 
 	begin_ajax_response();
 
+	DefAddrBook = get_room_pref("defaddrbook");
+
 	wprintf("<table border=0 width=100%%><tr valign=middle>");
 	wprintf("<td align=left><img src=\"static/viewcontacts_32x.gif\"></td>");
 	wprintf("<td align=center>");
@@ -44,8 +48,10 @@ void display_address_book_middle_div(void) {
 		bstr("target_input")
 	);
 
-	wprintf("<option value=\"__LOCAL_USERS__\">");
-	escputs(serv_info.serv_humannode);
+	wprintf("<option value=\"__LOCAL_USERS__\" %s>", 
+		(strcmp(ChrPtr(DefAddrBook), "__LOCAL_USERS__") == 0)?
+		"selected=\"selected\" ":"");
+	escputs(ChrPtr(WC->serv_info->serv_humannode));
 	wprintf("</option>\n");
 
 	
@@ -61,11 +67,14 @@ void display_address_book_middle_div(void) {
 	}
 
 	SortByHashKey(List, 1);
-	it = GetNewHashPos();
-	while (GetNextHashPos(List, it, &len, &Name, &Namee)) {
+	it = GetNewHashPos(List, 0);
+	while (GetNextHashPos(List, it, &len, &VCName, &Namee)) {
 		wprintf("<option value=\"");
 		urlescputs((char*)Namee);
-		wprintf("\">");
+		if (strcmp(ChrPtr(DefAddrBook), Namee) == 0)
+			wprintf("\" selected=\"selected\" >");
+		else
+			wprintf("\">");
 		escputs((char*)Namee);
 		wprintf("</option>\n");
 	}
@@ -79,9 +88,7 @@ void display_address_book_middle_div(void) {
 		"><img src=\"static/closewindow.gif\">");
 	wprintf("</td></tr></table>");
 
-	wprintf("<script type=\"text/javascript\">"
-		"PopulateAddressBookInnerDiv($('which_addr_book').value,'%s');"
-		"</script>\n",
+	wprintf("<script type=\"text/javascript\">PopulateAddressBookInnerDiv($('which_addr_book').value,'%s');</script>",
 		bstr("target_input")
 	);
 
@@ -100,11 +107,12 @@ void display_address_book_inner_div() {
 	char target_label[64];
 	long len;
 	char *Name;
+	const char *VCName;
 	void *Namee;
 	HashList *List;
 	HashPos  *it;
 	int i;
-	char saved_roomname[128];
+	StrBuf *saved_roomname;
 
 	begin_ajax_response();
 
@@ -126,8 +134,8 @@ void display_address_book_inner_div() {
 
 		}
 		SortByHashKey(List, 1);
-		it = GetNewHashPos();
-		while (GetNextHashPos(List, it, &len, &Name, &Namee)) {
+		it = GetNewHashPos(List, 0);
+		while (GetNextHashPos(List, it, &len, &VCName, &Namee)) {
 			wprintf("<option value=\"");
 			escputs((char*)Namee);
 			wprintf("\">");
@@ -139,8 +147,9 @@ void display_address_book_inner_div() {
 	}
 
 	else {
-		safestrncpy(saved_roomname, WC->wc_roomname, sizeof saved_roomname);
-		gotoroom(bstr("which_addr_book"));
+		set_room_pref("defaddrbook",NewStrBufDup(sbstr("which_addr_book")), 0);
+		saved_roomname = NewStrBufDup(WC->wc_roomname);
+		gotoroom(sbstr("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")) {
@@ -150,8 +159,8 @@ void display_address_book_inner_div() {
 
 		}
 		SortByHashKey(List, 1);
-		it = GetNewHashPos();
-		while (GetNextHashPos(List, it, &len, &Name, (void**)&Namee)) {
+		it = GetNewHashPos(List, 0);
+		while (GetNextHashPos(List, it, &len, &VCName, (void**)&Namee)) {
 			wprintf("<option value=\"");
 			escputs((char*)Namee);
 			wprintf("\">");
@@ -161,6 +170,7 @@ void display_address_book_inner_div() {
 		DeleteHashPos(&it);
 		DeleteHash(&List);
 		gotoroom(saved_roomname);
+		FreeStrBuf(&saved_roomname);
 	}
 
 	wprintf("</select>\n");
@@ -194,6 +204,6 @@ void
 InitModule_ADDRBOOK_POPUP
 (void)
 {
-	WebcitAddUrlHandler(HKEY("display_address_book_middle_div"), display_address_book_middle_div, 0);
-	WebcitAddUrlHandler(HKEY("display_address_book_inner_div"), display_address_book_inner_div, 0);
+	WebcitAddUrlHandler(HKEY("display_address_book_middle_div"), "", 0, display_address_book_middle_div, 0);
+	WebcitAddUrlHandler(HKEY("display_address_book_inner_div"), "", 0, display_address_book_inner_div, 0);
 }