* 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 f3445cfef3c72a9ca57650d586c6d45c2b9d000d..19e06c0b427218e782dc785d485fd6b5971a438d 100644 (file)
--- a/webcit/addressbook_popup.c
+++ b/webcit/addressbook_popup.c
@@ -28,6 +28,7 @@ void display_address_book_middle_div(void) {
        char buf[256];
        long len;
        char *Name;
+       const char *VCName;
        void *Namee;
        StrBuf *DefAddrBook;
        HashList *List;
@@ -49,8 +50,8 @@ void display_address_book_middle_div(void) {
 
        wprintf("<option value=\"__LOCAL_USERS__\" %s>", 
                (strcmp(ChrPtr(DefAddrBook), "__LOCAL_USERS__") == 0)?
-               "active=\"yes\" ":"");
-       escputs(serv_info.serv_humannode);
+               "selected=\"selected\" ":"");
+       escputs(ChrPtr(serv_info.serv_humannode));
        wprintf("</option>\n");
 
        
@@ -66,12 +67,12 @@ 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);
                if (strcmp(ChrPtr(DefAddrBook), Namee) == 0)
-                       wprintf("\" active=\"yes\" >");
+                       wprintf("\" selected=\"selected\" >");
                else
                        wprintf("\">");
                escputs((char*)Namee);
@@ -87,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")
        );
 
@@ -108,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();
 
@@ -134,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("\">");
@@ -148,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")) {
@@ -159,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("\">");
@@ -170,6 +170,7 @@ void display_address_book_inner_div() {
                DeleteHashPos(&it);
                DeleteHash(&List);
                gotoroom(saved_roomname);
+               FreeStrBuf(&saved_roomname);
        }
 
        wprintf("</select>\n");