* ig made it.

[citadel.git] / webcit / addressbook_popup.c

diff --git a/webcit/addressbook_popup.c b/webcit/addressbook_popup.c
index 5e3118b0c88b197fc9dd572bcc2b77af28aaac5d..9ad632ecaa9104e7e9375016f85b7f61a8e539b3 100644 (file)
--- a/webcit/addressbook_popup.c
+++ b/webcit/addressbook_popup.c
@@ -29,11 +29,14 @@ void display_address_book_middle_div(void) {
        long len;
        char *Name;
        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 +47,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");
 
@@ -60,12 +65,15 @@ void display_address_book_middle_div(void) {
                }
        }
 
-       SortByHashKey(List, 0);
+       SortByHashKey(List, 1);
        it = GetNewHashPos();
        while (GetNextHashPos(List, it, &len, &Name, &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");
        }
@@ -118,10 +126,14 @@ 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, 0);
+               SortByHashKey(List, 1);
                it = GetNewHashPos();
                while (GetNextHashPos(List, it, &len, &Name, &Namee)) {
                        wprintf("<option value=\"");
@@ -135,6 +147,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");
@@ -145,7 +158,7 @@ void display_address_book_inner_div() {
                        Put(List, Name, len, Name, NULL);
 
                }
-               SortByHashKey(List, 0);
+               SortByHashKey(List, 1);
                it = GetNewHashPos();
                while (GetNextHashPos(List, it, &len, &Name, (void**)&Namee)) {
                        wprintf("<option value=\"");
@@ -156,7 +169,7 @@ void display_address_book_inner_div() {
                }
                DeleteHashPos(&it);
                DeleteHash(&List);
-               gotoroom((char*)BSTR(saved_roomname)); /* TODO: get rid of typecast */
+               gotoroom(saved_roomname);
        }
 
        wprintf("</select>\n");
@@ -182,3 +195,14 @@ void display_address_book_inner_div() {
 
        end_ajax_response();
 }
+
+
+
+
+void 
+InitModule_ADDRBOOK_POPUP
+(void)
+{
+       WebcitAddUrlHandler(HKEY("display_address_book_middle_div"), display_address_book_middle_div, 0);
+       WebcitAddUrlHandler(HKEY("display_address_book_inner_div"), display_address_book_inner_div, 0);
+}