* move addressbook popup code back from trailing javascript; its not printed in this...

[citadel.git] / webcit / addressbook_popup.c

diff --git a/webcit/addressbook_popup.c b/webcit/addressbook_popup.c
index b8be3e77aef133608ee40476287ec737ea748c66..19e06c0b427218e782dc785d485fd6b5971a438d 100644 (file)
--- a/webcit/addressbook_popup.c
+++ b/webcit/addressbook_popup.c
@@ -51,7 +51,7 @@ void display_address_book_middle_div(void) {
        wprintf("<option value=\"__LOCAL_USERS__\" %s>", 
                (strcmp(ChrPtr(DefAddrBook), "__LOCAL_USERS__") == 0)?
                "selected=\"selected\" ":"");
-       escputs(serv_info.serv_humannode);
+       escputs(ChrPtr(serv_info.serv_humannode));
        wprintf("</option>\n");
 
        
@@ -67,7 +67,7 @@ void display_address_book_middle_div(void) {
        }
 
        SortByHashKey(List, 1);
-       it = GetNewHashPos();
+       it = GetNewHashPos(List, 0);
        while (GetNextHashPos(List, it, &len, &VCName, &Namee)) {
                wprintf("<option value=\"");
                urlescputs((char*)Namee);
@@ -88,8 +88,7 @@ void display_address_book_middle_div(void) {
                "><img src=\"static/closewindow.gif\">");
        wprintf("</td></tr></table>");
 
-       StrBufAppendPrintf(WC->trailing_javascript,
-               "PopulateAddressBookInnerDiv($('which_addr_book').value,'%s');",
+       wprintf("<script type=\"text/javascript\">PopulateAddressBookInnerDiv($('which_addr_book').value,'%s');</script>",
                bstr("target_input")
        );
 
@@ -113,7 +112,7 @@ void display_address_book_inner_div() {
        HashList *List;
        HashPos  *it;
        int i;
-       char saved_roomname[128];
+       StrBuf *saved_roomname;
 
        begin_ajax_response();
 
@@ -135,7 +134,7 @@ void display_address_book_inner_div() {
 
                }
                SortByHashKey(List, 1);
-               it = GetNewHashPos();
+               it = GetNewHashPos(List, 0);
                while (GetNextHashPos(List, it, &len, &VCName, &Namee)) {
                        wprintf("<option value=\"");
                        escputs((char*)Namee);
@@ -149,8 +148,8 @@ 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"));
+               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")) {
@@ -160,7 +159,7 @@ void display_address_book_inner_div() {
 
                }
                SortByHashKey(List, 1);
-               it = GetNewHashPos();
+               it = GetNewHashPos(List, 0);
                while (GetNextHashPos(List, it, &len, &VCName, (void**)&Namee)) {
                        wprintf("<option value=\"");
                        escputs((char*)Namee);
@@ -171,6 +170,7 @@ void display_address_book_inner_div() {
                DeleteHashPos(&it);
                DeleteHash(&List);
                gotoroom(saved_roomname);
+               FreeStrBuf(&saved_roomname);
        }
 
        wprintf("</select>\n");