X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Faddressbook_popup.c;h=a9bf01a4b8b339afacae43487f95ff9a9702fd2c;hb=a3ba94ad306d781296c53012f732f3a910015263;hp=add472740648e933217b80e77bf556c94c851f13;hpb=d8abfc1ab880919a13cfc012427eab7ee0363334;p=citadel.git

diff --git a/webcit/addressbook_popup.c b/webcit/addressbook_popup.c
index add472740..a9bf01a4b 100644
--- a/webcit/addressbook_popup.c
+++ b/webcit/addressbook_popup.c
@@ -1,56 +1,61 @@
 /*
  * $Id$
  *
- * \defgroup AjaxAutoCompletion ajax-powered autocompletion...
- * \ingroup ClientPower
+ * AJAX-powered auto-completion
  */
 
-/*@{*/
 #include "webcit.h"
 
 
-/**
- * \brief Call this right before wDumpContent() on any page which requires the address book popup
+/*
+ * Call this right before wDumpContent() on any page which requires the address book popup
  */
 void address_book_popup(void) {
 	/* Open a new div, hidden initially, for address book popups. */
-	wprintf("</div>\n");	/* End of 'content' div */
-	wprintf("<div id=\"address_book_popup\" style=\"display:none;\">");
-	wprintf("<div id=\"address_book_popup_container_div\">");
-	wprintf("<div id=\"address_book_popup_middle_div\"></div>");
-	wprintf("<div id=\"address_book_inner_div\"></div>");
-	wprintf("</div>");
+	wc_printf("</div>\n");	/* End of 'content' div */
+	wc_printf("<div id=\"address_book_popup\" style=\"display:none;\">");
+	wc_printf("<div id=\"address_book_popup_container_div\">");
+	wc_printf("<div id=\"address_book_popup_middle_div\"></div>");
+	wc_printf("<div id=\"address_book_inner_div\"></div>");
+	wc_printf("</div>");
 	/* The 'address_book_popup' div will be closed by wDumpContent() */
 }
 
-/**
- * \brief Address book popup window
+/*
+ * Address book popup window
  */
 void display_address_book_middle_div(void) {
 	char buf[256];
 	long len;
-	char *Name, *Namee;
+	char *Name;
+	const char *VCName;
+	void *Namee;
+	StrBuf *DefAddrBook;
 	HashList *List;
 	HashPos  *it;
 
 	begin_ajax_response();
 
-	wprintf("<table border=0 width=100%%><tr valign=middle>");
-	wprintf("<td align=left><img src=\"static/viewcontacts_32x.gif\"></td>");
-	wprintf("<td align=center>");
+	DefAddrBook = get_room_pref("defaddrbook");
 
-	wprintf("<form>"
+	wc_printf("<table border=0 width=100%%><tr valign=middle>");
+	wc_printf("<td align=left><img src=\"static/viewcontacts_32x.gif\"></td>");
+	wc_printf("<td align=center>");
+
+	wc_printf("<form>"
 		"<select class=\"address_book_popup_title\" size=1 id=\"which_addr_book\" "
 		" onChange=\"PopulateAddressBookInnerDiv($('which_addr_book').value,'%s')\">",
 		bstr("target_input")
 	);
 
-	wprintf("<option value=\"__LOCAL_USERS__\">");
-	escputs(serv_info.serv_humannode);
-	wprintf("</option>\n");
+	wc_printf("<option value=\"__LOCAL_USERS__\" %s>", 
+		(strcmp(ChrPtr(DefAddrBook), "__LOCAL_USERS__") == 0)?
+		"selected=\"selected\" ":"");
+	escputs(ChrPtr(WC->serv_info->serv_humannode));
+	wc_printf("</option>\n");
 
 	
-	List = NewHash();
+	List = NewHash(1, NULL);
 	serv_puts("LKRA");
 	serv_getln(buf, sizeof buf);
 	if (buf[0] == '1') while(len = serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
@@ -61,28 +66,29 @@ void display_address_book_middle_div(void) {
 		}
 	}
 
-	SortByHashKey(List);
-	it = GetNewHashPos();
-	while (GetNextHashPos(List, it, &len, &Name, (void**)&Namee)) {
-		wprintf("<option value=\"");
-		urlescputs(Namee);
-		wprintf("\">");
-		escputs(Namee);
-		wprintf("</option>\n");
+	SortByHashKey(List, 1);
+	it = GetNewHashPos(List, 0);
+	while (GetNextHashPos(List, it, &len, &VCName, &Namee)) {
+		wc_printf("<option value=\"");
+		urlescputs((char*)Namee);
+		if (strcmp(ChrPtr(DefAddrBook), Namee) == 0)
+			wc_printf("\" selected=\"selected\" >");
+		else
+			wc_printf("\">");
+		escputs((char*)Namee);
+		wc_printf("</option>\n");
 	}
 	DeleteHashPos(&it);
 	DeleteHash(&List);
-	wprintf("</select></form>");
+	wc_printf("</select></form>");
 
-	wprintf("</td>");
-	wprintf("<td align=right "
+	wc_printf("</td>");
+	wc_printf("<td align=right "
 		"onclick=\"javascript:$('address_book_popup').style.display='none';\" "
 		"><img src=\"static/closewindow.gif\">");
-	wprintf("</td></tr></table>");
+	wc_printf("</td></tr></table>");
 
-	wprintf("<script type=\"text/javascript\">"
-		"PopulateAddressBookInnerDiv($('which_addr_book').value,'%s');"
-		"</script>\n",
+	wc_printf("<script type=\"text/javascript\">PopulateAddressBookInnerDiv($('which_addr_book').value,'%s');</script>",
 		bstr("target_input")
 	);
 
@@ -91,8 +97,8 @@ void display_address_book_middle_div(void) {
 
 
 
-/**
- * \brief Address book popup results
+/*
+ * Address book popup results
  */
 void display_address_book_inner_div() {
 	char buf[256];
@@ -100,16 +106,18 @@ void display_address_book_inner_div() {
 	char target_id[64];
 	char target_label[64];
 	long len;
-	char *Name, *Namee;
+	char *Name;
+	const char *VCName;
+	void *Namee;
 	HashList *List;
 	HashPos  *it;
 	int i;
-	char saved_roomname[128];
+	StrBuf *saved_roomname;
 
 	begin_ajax_response();
 
-	List = NewHash();
-	wprintf("<div align=center><form onSubmit=\"return false;\">"
+	List = NewHash(1, NULL);
+	wc_printf("<div align=center><form onSubmit=\"return false;\">"
 		"<select multiple name=\"whichaddr\" id=\"whichaddr\" size=\"15\">\n");
 
 	if (!strcasecmp(bstr("which_addr_book"), "__LOCAL_USERS__")) {
@@ -118,25 +126,30 @@ void display_address_book_inner_div() {
 		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);
+			if((len > 5) && (strncmp(Name, "SYS_", 4) == 0)) {
+				free(Name);
+				continue;
+			}
 			Put(List, Name, len, Name, NULL);
 
 		}
-		SortByHashKey(List);
-		it = GetNewHashPos();
-		while (GetNextHashPos(List, it, &len, &Name, (void**)&Namee)) {
-			wprintf("<option value=\"");
-			urlescputs(Namee);
-			wprintf("\">");
-			escputs(Namee);
-			wprintf("</option>\n");
+		SortByHashKey(List, 1);
+		it = GetNewHashPos(List, 0);
+		while (GetNextHashPos(List, it, &len, &VCName, &Namee)) {
+			wc_printf("<option value=\"");
+			escputs((char*)Namee);
+			wc_printf("\">");
+			escputs((char*)Namee);
+			wc_printf("</option>\n");
 		}
 		DeleteHashPos(&it);
 		DeleteHash(&List);
 	}
 
 	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->CurRoom.name);
+		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")) {
@@ -145,43 +158,52 @@ void display_address_book_inner_div() {
 			Put(List, Name, len, Name, NULL);
 
 		}
-		SortByHashKey(List);
-		it = GetNewHashPos();
-		while (GetNextHashPos(List, it, &len, &Name, (void**)&Namee)) {
-			wprintf("<option value=\"");
-			urlescputs(Namee);
-			wprintf("\">");
-			escputs(Namee);
-			wprintf("</option>\n");
+		SortByHashKey(List, 1);
+		it = GetNewHashPos(List, 0);
+		while (GetNextHashPos(List, it, &len, &VCName, (void**)&Namee)) {
+			wc_printf("<option value=\"");
+			escputs((char*)Namee);
+			wc_printf("\">");
+			escputs((char*)Namee);
+			wc_printf("</option>\n");
 		}
 		DeleteHashPos(&it);
 		DeleteHash(&List);
-		gotoroom(bstr(saved_roomname));
+		gotoroom(saved_roomname);
+		FreeStrBuf(&saved_roomname);
 	}
 
-	wprintf("</select>\n");
+	wc_printf("</select>\n");
 
-	wprintf("%s: ", _("Add"));
+	wc_printf("%s: ", _("Add"));
 
 	num_targets = num_tokens(bstr("target_input"), '|');
 	for (i=0; i<num_targets; i+=2) {
 		extract_token(target_id, bstr("target_input"), i, '|', sizeof target_id);
 		extract_token(target_label, bstr("target_input"), i+1, '|', sizeof target_label);
-		wprintf("<INPUT TYPE=\"submit\" NAME=\"select_button\" VALUE=\"%s\" ", target_label);
-		wprintf("onClick=\"AddContactsToTarget($('%s'),$('whichaddr'));\">", target_id);
+		wc_printf("<INPUT TYPE=\"submit\" NAME=\"select_button\" VALUE=\"%s\" ", target_label);
+		wc_printf("onClick=\"AddContactsToTarget($('%s'),$('whichaddr'));\">", target_id);
 	}
 
 	/* This 'close window' button works.  Omitting it because we already have a close button
 	 * in the upper right corner, and this one takes up space.
 	 *
-	wprintf("<INPUT TYPE=\"submit\" NAME=\"close_button\" VALUE=\"%s\" ", _("Close window"));
-	wprintf("onclick=\"javascript:$('address_book_popup').style.display='none';\">");
+	wc_printf("<INPUT TYPE=\"submit\" NAME=\"close_button\" VALUE=\"%s\" ", _("Close window"));
+	wc_printf("onclick=\"javascript:$('address_book_popup').style.display='none';\">");
 	 */
 
-	wprintf("</form></div>\n");
+	wc_printf("</form></div>\n");
 
 	end_ajax_response();
 }
 
 
-/** @} */
+
+
+void 
+InitModule_ADDRBOOK_POPUP
+(void)
+{
+	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);
+}