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

diff --git a/webcit/addressbook_popup.c b/webcit/addressbook_popup.c
index 7f35fa0d5..8b5b97973 100644
--- a/webcit/addressbook_popup.c
+++ b/webcit/addressbook_popup.c
@@ -1,7 +1,20 @@
 /*
- * $Id$
- *
  * AJAX-powered auto-completion
+ *
+ * Copyright (c) 1996-2011 by the citadel.org team
+ *
+ * This program is open source software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "webcit.h"
@@ -12,12 +25,12 @@
  */
 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() */
 }
 
@@ -38,21 +51,21 @@ void display_address_book_middle_div(void) {
 
 	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>");
+	wc_printf("<table border=0 width=100%%><tr valign=middle>");
+	wc_printf("<td align=left><img src=\"static/webcit_icons/essen/32x32/contact.png\"></td>");
+	wc_printf("<td align=center>");
 
-	wprintf("<form>"
+	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__\" %s>", 
+	wc_printf("<option value=\"__LOCAL_USERS__\" %s>", 
 		(strcmp(ChrPtr(DefAddrBook), "__LOCAL_USERS__") == 0)?
 		"selected=\"selected\" ":"");
 	escputs(ChrPtr(WC->serv_info->serv_humannode));
-	wprintf("</option>\n");
+	wc_printf("</option>\n");
 
 	
 	List = NewHash(1, NULL);
@@ -69,26 +82,26 @@ void display_address_book_middle_div(void) {
 	SortByHashKey(List, 1);
 	it = GetNewHashPos(List, 0);
 	while (GetNextHashPos(List, it, &len, &VCName, &Namee)) {
-		wprintf("<option value=\"");
+		wc_printf("<option value=\"");
 		urlescputs((char*)Namee);
 		if (strcmp(ChrPtr(DefAddrBook), Namee) == 0)
-			wprintf("\" selected=\"selected\" >");
+			wc_printf("\" selected=\"selected\" >");
 		else
-			wprintf("\">");
+			wc_printf("\">");
 		escputs((char*)Namee);
-		wprintf("</option>\n");
+		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>");
+		"><img src=\"static/webcit_icons/closewindow.gif\">");
+	wc_printf("</td></tr></table>");
 
-	wprintf("<script type=\"text/javascript\">PopulateAddressBookInnerDiv($('which_addr_book').value,'%s');</script>",
+	wc_printf("<script type=\"text/javascript\">PopulateAddressBookInnerDiv($('which_addr_book').value,'%s');</script>",
 		bstr("target_input")
 	);
 
@@ -117,7 +130,7 @@ void display_address_book_inner_div() {
 	begin_ajax_response();
 
 	List = NewHash(1, NULL);
-	wprintf("<div align=center><form onSubmit=\"return false;\">"
+	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__")) {
@@ -136,11 +149,11 @@ void display_address_book_inner_div() {
 		SortByHashKey(List, 1);
 		it = GetNewHashPos(List, 0);
 		while (GetNextHashPos(List, it, &len, &VCName, &Namee)) {
-			wprintf("<option value=\"");
+			wc_printf("<option value=\"");
 			escputs((char*)Namee);
-			wprintf("\">");
+			wc_printf("\">");
 			escputs((char*)Namee);
-			wprintf("</option>\n");
+			wc_printf("</option>\n");
 		}
 		DeleteHashPos(&it);
 		DeleteHash(&List);
@@ -148,7 +161,7 @@ void display_address_book_inner_div() {
 
 	else {
 		set_room_pref("defaddrbook",NewStrBufDup(sbstr("which_addr_book")), 0);
-		saved_roomname = NewStrBufDup(WC->wc_roomname);
+		saved_roomname = NewStrBufDup(WC->CurRoom.name);
 		gotoroom(sbstr("which_addr_book"));
 		serv_puts("DVCA");
 		serv_getln(buf, sizeof buf);
@@ -161,11 +174,11 @@ void display_address_book_inner_div() {
 		SortByHashKey(List, 1);
 		it = GetNewHashPos(List, 0);
 		while (GetNextHashPos(List, it, &len, &VCName, (void**)&Namee)) {
-			wprintf("<option value=\"");
+			wc_printf("<option value=\"");
 			escputs((char*)Namee);
-			wprintf("\">");
+			wc_printf("\">");
 			escputs((char*)Namee);
-			wprintf("</option>\n");
+			wc_printf("</option>\n");
 		}
 		DeleteHashPos(&it);
 		DeleteHash(&List);
@@ -173,26 +186,26 @@ void display_address_book_inner_div() {
 		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();
 }