* follow api-change in several places

[citadel.git] / webcit / addressbook_popup.c

diff --git a/webcit/addressbook_popup.c b/webcit/addressbook_popup.c
index 6cfb5b5c3a8b02c918d619ac102628334d257857..3cb23ebddbd3366b2b4c947cf73fd5f4f5dc16f2 100644 (file)
--- 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,7 +48,9 @@ void display_address_book_middle_div(void) {
                bstr("target_input")
        );
 
-       wprintf("<option value=\"__LOCAL_USERS__\">");
+       wprintf("<option value=\"__LOCAL_USERS__\" %s>", 
+               (strcmp(ChrPtr(DefAddrBook), "__LOCAL_USERS__") == 0)?
+               "selected=\"selected\" ":"");
        escputs(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,8 @@ 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",
+       StrBufAppendPrintf(WC->trailing_javascript,
+               "PopulateAddressBookInnerDiv($('which_addr_book').value,'%s');",
                bstr("target_input")
        );
 
@@ -100,6 +108,7 @@ void display_address_book_inner_div() {
        char target_label[64];
        long len;
        char *Name;
+       const char *VCName;
        void *Namee;
        HashList *List;
        HashPos  *it;
@@ -126,8 +135,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,6 +148,7 @@ void display_address_book_inner_div() {
        }
 
        else {
+               set_room_pref("defaddrbook",NewStrBufDup(sbstr("which_addr_book")), 0);
                safestrncpy(saved_roomname, WC->wc_roomname, sizeof saved_roomname);
                gotoroom(bstr("which_addr_book"));
                serv_puts("DVCA");
@@ -150,8 +160,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("\">");