* fix_scrollbar_bug is now a class instead of an id. Fixes validator warnings.

* Corrected bad html generated when there's only one message in a summary view.
* Retain both login name and display name (fullname) in session structure.
  This fixes chat window authentication when connecting to a Citadel server
  using host based authentication.

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 89b03edb27c976890eb9fdb80b490b21fff654ec..ad86d980c5b55e6059c38a78ec496542c93b5bd6 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,5 +1,12 @@
 $Id$
 
+Wed Jan 18 16:39:12 EST 2006 ajc
+* fix_scrollbar_bug is now a class instead of an id.  Fixes validator warnings.
+* Corrected bad html generated when there's only one message in a summary view.
+* Retain both login name and display name (fullname) in session structure.
+  This fixes chat window authentication when connecting to a Citadel server
+  using host based authentication.
+
 Mon Jan 16 11:52:53 EST 2006 ajc
 * Experimental unix domain socket listener
 

diff --git a/webcit/auth.c b/webcit/auth.c
index f5ff48599dec232d598f2bc888d0fcc54ac3a99c..139ccda49dde88f6ac442d4a1bb1d92ad1a91066 100644 (file)
--- a/webcit/auth.c
+++ b/webcit/auth.c
@@ -85,7 +85,8 @@ void become_logged_in(char *user, char *pass, char *serv_response)
        char buf[SIZ];
 
        WC->logged_in = 1;
-       extract_token(WC->wc_username, &serv_response[4], 0, '|', sizeof WC->wc_username);
+       extract_token(WC->wc_fullname, &serv_response[4], 0, '|', sizeof WC->wc_fullname);
+       safestrncpy(WC->wc_username, user, sizeof WC->wc_username);
        safestrncpy(WC->wc_password, pass, sizeof WC->wc_password);
        WC->axlevel = extract_int(&serv_response[4], 1);
        if (WC->axlevel >= 6) {
@@ -248,6 +249,7 @@ void do_logout(void)
        safestrncpy(WC->wc_username, "", sizeof WC->wc_username);
        safestrncpy(WC->wc_password, "", sizeof WC->wc_password);
        safestrncpy(WC->wc_roomname, "", sizeof WC->wc_roomname);
+       safestrncpy(WC->wc_fullname, "", sizeof WC->wc_fullname);
 
        /* Calling output_headers() this way causes the cookies to be un-set */
        output_headers(1, 1, 0, 1, 0, 0);
@@ -326,7 +328,7 @@ void validate(void)
                return;
        }
 
-       wprintf("<div id=\"fix_scrollbar_bug\">"
+       wprintf("<div class=\"fix_scrollbar_bug\">"
                "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
        wprintf("<center>");
 
@@ -396,7 +398,7 @@ void display_reg(int during_login)
                return;
        }
 
-       vcard_msgnum = locate_user_vcard(WC->wc_username, -1);
+       vcard_msgnum = locate_user_vcard(WC->wc_fullname, -1);
        if (vcard_msgnum < 0L) {
                if (during_login) do_welcome();
                else display_main_menu();
@@ -440,7 +442,7 @@ void display_changepw(void)
                safestrncpy(WC->ImportantMessage, "", sizeof WC->ImportantMessage);
        }
 
-       wprintf("<div id=\"fix_scrollbar_bug\">"
+       wprintf("<div class=\"fix_scrollbar_bug\">"
                "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
 
        wprintf("<CENTER><br />");

diff --git a/webcit/calendar.c b/webcit/calendar.c
index e1453d4bfe8b6a7e3de26db3b2b0cbac1427de08..b52ce71591ce243ebe9b82d728652ea8965afebb 100644 (file)
--- a/webcit/calendar.c
+++ b/webcit/calendar.c
@@ -513,7 +513,7 @@ void display_edit_individual_task(icalcomponent *supplied_vtodo, long msgnum) {
                "</div>\n<div id=\"content\">\n"
        );
 
-       wprintf("<div id=\"fix_scrollbar_bug\">"
+       wprintf("<div class=\"fix_scrollbar_bug\">"
                "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>");
        
        wprintf("<FORM METHOD=\"POST\" action=\"save_task\">\n");

diff --git a/webcit/calendar_view.c b/webcit/calendar_view.c
index 5276039f12e501d1d483d1bc5a8c5a6cb340ede1..0879948fb1deeeacbf77b796880092aae582526d 100644 (file)
--- a/webcit/calendar_view.c
+++ b/webcit/calendar_view.c
@@ -140,7 +140,7 @@ void calendar_month_view(int year, int month, int day) {
        }
 
        /* Outer table (to get the background color) */
-       wprintf("<div id=\"fix_scrollbar_bug\">"
+       wprintf("<div class=\"fix_scrollbar_bug\">"
                "<TABLE width=100%% border=0 cellpadding=0 cellspacing=0 "
                "bgcolor=#204B78><TR><TD>\n");
 
@@ -335,7 +335,7 @@ void calendar_day_view(int year, int month, int day) {
 
 
        /* Outer table (to get the background color) */
-       wprintf("<div id=\"fix_scrollbar_bug\">"
+       wprintf("<div class=\"fix_scrollbar_bug\">"
                "<TABLE width=100%% border=0 cellpadding=0 cellspacing=0 "
                "bgcolor=#204B78><TR><TD>\n");
 
@@ -626,7 +626,7 @@ void do_tasks_view(void) {
        char buf[SIZ];
        icalproperty *p;
 
-       wprintf("<div id=\"fix_scrollbar_bug\">"
+       wprintf("<div class=\"fix_scrollbar_bug\">"
                "<table border=0 cellspacing=0 width=100%% bgcolor=\"#FFFFFF\">\n<tr>\n"
                "<TH>");
        wprintf(_("Name of task"));

diff --git a/webcit/event.c b/webcit/event.c
index 39aa58ce0c63bb4121780d4de82a3d68c1b7e292..15d56aeb338f484471f888bc536213bc3932501b 100644 (file)
--- a/webcit/event.c
+++ b/webcit/event.c
@@ -104,7 +104,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
        );
 
 
-       wprintf("<div id=\"fix_scrollbar_bug\">"
+       wprintf("<div class=\"fix_scrollbar_bug\">"
                "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
 
        /************************************************************

diff --git a/webcit/floors.c b/webcit/floors.c
index b67e4700107d9b5f23b95c6c35dc7582a587c9fe..7b210821cb315fa894d3a62f81bfa1b9fce990d1 100644 (file)
--- a/webcit/floors.c
+++ b/webcit/floors.c
@@ -53,7 +53,7 @@ void display_floorconfig(char *prepend_html)
                return;
        }
 
-       wprintf("<div id=\"fix_scrollbar_bug\">"
+       wprintf("<div class=\"fix_scrollbar_bug\">"
                "<TABLE BORDER=1 WIDTH=100%% bgcolor=\"#ffffff\">\n"
                "<TR><TH>");
        wprintf(_("Floor number"));

diff --git a/webcit/graphics.c b/webcit/graphics.c
index 6e6291975e9264718c0c9fe8a332f922b0f2b65c..4bc9e8e1146a5f47ce0c8299264c8cb59b648567 100644 (file)
--- a/webcit/graphics.c
+++ b/webcit/graphics.c
@@ -29,7 +29,7 @@ void display_graphics_upload(char *description, char *check_cmd, char *uplurl)
                "</div>\n<div id=\"content\">\n"
        );
 
-       wprintf("<div id=\"fix_scrollbar_bug\">"
+       wprintf("<div class=\"fix_scrollbar_bug\">"
                "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
 
        wprintf("<CENTER>\n");

diff --git a/webcit/groupdav_propfind.c b/webcit/groupdav_propfind.c
index c6f1bbdd2dcf3502991e9275d31b02a639030c68..2385d9900fdc7cc3186fe0f9eb80726f93e63e2e 100644 (file)
--- a/webcit/groupdav_propfind.c
+++ b/webcit/groupdav_propfind.c
@@ -105,9 +105,9 @@ void groupdav_folder_list(void) {
                        wprintf("<D:propstat>");
                        wprintf("<D:status>HTTP/1.1 200 OK</D:status>");
                        wprintf("<D:prop>");
-                       wprintf("<D:displayname>");
+                       wprintf("<D:fullname>");
                        escputs(roomname);
-                       wprintf("</D:displayname>");
+                       wprintf("</D:fullname>");
                        wprintf("<D:resourcetype><D:collection/>");
 
                        switch(view) {

diff --git a/webcit/iconbar.c b/webcit/iconbar.c
index 8d325d988eee2cd60831b4bfed84f7a7225349f9..dc18455d6da28f65605a0ce1fc1000822b9c3de0 100644 (file)
--- a/webcit/iconbar.c
+++ b/webcit/iconbar.c
@@ -471,7 +471,7 @@ void display_customize_iconbar(void) {
                "</div>\n<div id=\"content\">\n"
        );
 
-       wprintf("<div id=\"fix_scrollbar_bug\">"
+       wprintf("<div class=\"fix_scrollbar_bug\">"
                "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>");
 
        wprintf("<FORM METHOD=\"POST\" action=\"commit_iconbar\">\n");

diff --git a/webcit/inetconf.c b/webcit/inetconf.c
index 3bfde9d7c1625b62931fa1efced8d288df420628..eaee1b717085a98134a0c69a4a044a75eaab7f6a 100644 (file)
--- a/webcit/inetconf.c
+++ b/webcit/inetconf.c
@@ -93,7 +93,7 @@ void display_inetconf(void)
        wprintf("</TD></TR></TABLE>\n");
        wprintf("</div>\n<div id=\"content\">\n");
 
-       wprintf("<div id=\"fix_scrollbar_bug\">"
+       wprintf("<div class=\"fix_scrollbar_bug\">"
                "<table border=0 width=100%%><tr><td valign=top>\n");
        for (which=0; which<ic_max; ++which) {
                if (which == (ic_max / 2)) {

diff --git a/webcit/listsub.c b/webcit/listsub.c
index 28300597317bd9501d49ee207622154f8aaddc2d..80d65f7a4d169b3ada85019dd4d40b56f8283589 100644 (file)
--- a/webcit/listsub.c
+++ b/webcit/listsub.c
@@ -26,6 +26,7 @@ void do_listsub(void)
        int self;
        char sroom[SIZ];
 
+       strcpy(WC->wc_fullname, "");
        strcpy(WC->wc_username, "");
        strcpy(WC->wc_password, "");
        strcpy(WC->wc_roomname, "");

diff --git a/webcit/mainmenu.c b/webcit/mainmenu.c
index 9d26ef17f6a2682c374f4d740eb71068ca523071..15fb8a026fb6932741006f7e9692f1fdfe3c540f 100644 (file)
--- a/webcit/mainmenu.c
+++ b/webcit/mainmenu.c
@@ -14,7 +14,7 @@ void display_main_menu(void)
 {
        output_headers(1, 1, 1, 0, 0, 0);
 
-       wprintf("<div id=\"fix_scrollbar_bug\">"
+       wprintf("<div class=\"fix_scrollbar_bug\">"
                "<TABLE WIDTH=100%%>"
                "<TR><TD COLSPAN=2>\n");
 
@@ -201,7 +201,7 @@ void display_aide_menu(void)
                "</div>\n<div id=\"content\">\n"
        );
 
-       wprintf("<div id=\"fix_scrollbar_bug\">"
+       wprintf("<div class=\"fix_scrollbar_bug\">"
                "<table border=0 width=100%%><tr valign=top><td>");
 
        svprintf("BOXTITLE", WCS_STRING, _("Global Configuration"));
@@ -273,7 +273,7 @@ void display_generic(void)
                "</div>\n<div id=\"content\">\n"
        );
 
-       wprintf("<div id=\"fix_scrollbar_bug\">"
+       wprintf("<div class=\"fix_scrollbar_bug\">"
                "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
 
        wprintf("<CENTER>");

diff --git a/webcit/messages.c b/webcit/messages.c
index 0139a96105ea526e3f0b890bfd11420ed7d42621..ea2171d1512b73b794598099635fc5741467a2b4 100644 (file)
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -250,13 +250,13 @@ void display_parsed_vcard(struct vCard *v, int full) {
        char firsttoken[SIZ];
        int pass;
 
-       char displayname[SIZ];
+       char fullname[SIZ];
        char title[SIZ];
        char org[SIZ];
        char phone[SIZ];
        char mailto[SIZ];
 
-       strcpy(displayname, "");
+       strcpy(fullname, "");
        strcpy(phone, "");
        strcpy(mailto, "");
        strcpy(title, "");
@@ -269,9 +269,9 @@ void display_parsed_vcard(struct vCard *v, int full) {
                        escputs(name);
                }
                else if (name = vcard_get_prop(v, "n", 1, 0, 0), name != NULL) {
-                       strcpy(displayname, name);
-                       vcard_n_prettyize(displayname);
-                       escputs(displayname);
+                       strcpy(fullname, name);
+                       vcard_n_prettyize(fullname);
+                       escputs(fullname);
                }
                else {
                        wprintf(" ");
@@ -321,15 +321,15 @@ void display_parsed_vcard(struct vCard *v, int full) {
        
                        /* N is name, but only if there's no FN already there */
                        if (!strcasecmp(firsttoken, "n")) {
-                               if (strlen(displayname) == 0) {
-                                       strcpy(displayname, thisvalue);
-                                       vcard_n_prettyize(displayname);
+                               if (strlen(fullname) == 0) {
+                                       strcpy(fullname, thisvalue);
+                                       vcard_n_prettyize(fullname);
                                }
                        }
        
                        /* FN (full name) is a true 'display name' field */
                        else if (!strcasecmp(firsttoken, "fn")) {
-                               strcpy(displayname, thisvalue);
+                               strcpy(fullname, thisvalue);
                        }
 
                        /* title */
@@ -348,7 +348,7 @@ void display_parsed_vcard(struct vCard *v, int full) {
                                        "<a href=\"display_enter"
                                        "?force_room=_MAIL_?recp=");
 
-                               urlesc(&mailto[strlen(mailto)], displayname);
+                               urlesc(&mailto[strlen(mailto)], fullname);
                                urlesc(&mailto[strlen(mailto)], " <");
                                urlesc(&mailto[strlen(mailto)], thisvalue);
                                urlesc(&mailto[strlen(mailto)], ">");
@@ -424,7 +424,7 @@ void display_parsed_vcard(struct vCard *v, int full) {
                        "<TD COLSPAN=2 BGCOLOR=\"#FFFFFF\">"
                        "<IMG ALIGN=CENTER src=\"static/viewcontacts_48x.gif\">"
                        "<FONT SIZE=+1><B>");
-                       escputs(displayname);
+                       escputs(fullname);
                        wprintf("</B></FONT>");
                        if (strlen(title) > 0) {
                                wprintf("<div align=right>");
@@ -553,7 +553,7 @@ void read_message(long msgnum, int printable_view, char *section) {
 
        /* begin everythingamundo table */
        if (!printable_view) {
-               wprintf("<div id=\"fix_scrollbar_bug\">\n");
+               wprintf("<div class=\"fix_scrollbar_bug\">\n");
                wprintf("<table width=100%% border=1 cellspacing=0 "
                        "cellpadding=0><TR><TD>\n");
        }
@@ -1664,7 +1664,7 @@ int load_msg_ptrs(char *servcmd, int with_headers)
 {
        char buf[1024];
        time_t datestamp;
-       char displayname[128];
+       char fullname[128];
        char nodename[128];
        char inetaddr[128];
        char subject[256];
@@ -1695,7 +1695,7 @@ int load_msg_ptrs(char *servcmd, int with_headers)
                if (nummsgs < maxload) {
                        WC->msgarr[nummsgs] = extract_long(buf, 0);
                        datestamp = extract_long(buf, 1);
-                       extract_token(displayname, buf, 2, '|', sizeof displayname);
+                       extract_token(fullname, buf, 2, '|', sizeof fullname);
                        extract_token(nodename, buf, 3, '|', sizeof nodename);
                        extract_token(inetaddr, buf, 4, '|', sizeof inetaddr);
                        extract_token(subject, buf, 5, '|', sizeof subject);
@@ -1711,8 +1711,8 @@ int load_msg_ptrs(char *servcmd, int with_headers)
                                memset(&WC->summ[nummsgs-1], 0, sizeof(struct message_summary));
                                WC->summ[nummsgs-1].msgnum = WC->msgarr[nummsgs-1];
                                safestrncpy(WC->summ[nummsgs-1].subj, _("(no subject)"), sizeof WC->summ[nummsgs-1].subj);
-                               if (strlen(displayname) > 0) {
-                                       safestrncpy(WC->summ[nummsgs-1].from, displayname, sizeof WC->summ[nummsgs-1].from);
+                               if (strlen(fullname) > 0) {
+                                       safestrncpy(WC->summ[nummsgs-1].from, fullname, sizeof WC->summ[nummsgs-1].from);
                                }
                                if (strlen(subject) > 0) {
                                safestrncpy(WC->summ[nummsgs-1].subj, subject,
@@ -2057,7 +2057,7 @@ void readloop(char *oper)
 
                /* note that Date and Delete are now in the same column */
                wprintf("<div id=\"message_list_hdr\">"
-                       "<div id=\"fix_scrollbar_bug\">"
+                       "<div class=\"fix_scrollbar_bug\">"
                        "<table cellspacing=0 style=\"width:100%%\">"
                        "<tr>"
                );
@@ -2083,10 +2083,9 @@ void readloop(char *oper)
 
                wprintf("<div id=\"message_list\">"
 
-                       "<div id=\"fix_scrollbar_bug\">\n"
+                       "<div class=\"fix_scrollbar_bug\">\n"
 
-                       "<span class=\"mailbox_summary\">"
-                       "<table id=\"summary_headers\" rules=rows "
+                       "<table class=\"mailbox_summary\" id=\"summary_headers\" rules=rows "
                        "cellspacing=0 style=\"width:100%%;-moz-user-select:none;\">"
                );
        }
@@ -2134,8 +2133,7 @@ void readloop(char *oper)
        /* Set the "is_bbview" variable if it appears that we are looking at
         * a classic bulletin board view.
         */
-       if (num_displayed > 1) {
-          if ((!is_tasks) && (!is_calendar) && (!is_addressbook)
+       if ((!is_tasks) && (!is_calendar) && (!is_addressbook)
              && (!is_notes) && (!is_singlecard) && (!is_summary)) {
                is_bbview = 1;
        }
@@ -2159,16 +2157,16 @@ void readloop(char *oper)
        }
 
        if (is_summary) {
-               wprintf("</table></span>"
+               wprintf("</table>"
                        "</div>\n");                    /* end of 'fix_scrollbar_bug' div */
                wprintf("</div>");                      /* end of 'message_list' div */
 
                /* Here's the grab-it-to-resize-the-message-list widget */
                wprintf("<div id=\"resize_msglist\" "
                        "onMouseDown=\"CtdlResizeMsgListMouseDown(event)\">"
-                       "<div id=\"fix_scrollbar_bug\">"
+                       "<div class=\"fix_scrollbar_bug\">"
                        "<table width=100%% border=3 cellspacing=0 "
-                       "bgcolor=\"#ccc\" "
+                       "bgcolor=\"#cccccc\" "
                        "cellpadding=0><TR><TD> </td></tr></table>"
                        "</div></div>\n"
                );
@@ -2250,19 +2248,18 @@ void readloop(char *oper)
                        "[selectedIndex].value\">\n"
                );
 
-               wprintf("<option %s value=\"%s&sortby=forward\">oldest to newest</option>\n",
+               wprintf("<option %s value=\"%s?sortby=forward\">oldest to newest</option>\n",
                        (bbs_reverse ? "" : "selected"),
                        oper
                );
        
-               wprintf("<option %s value=\"%s&sortby=reverse\">newest to oldest</option>\n",
+               wprintf("<option %s value=\"%s?sortby=reverse\">newest to oldest</option>\n",
                        (bbs_reverse ? "selected" : ""),
                        oper
                );
        
                wprintf("</select></form>\n");
                /* end bbview scroller */
-           }
        }
 
 DONE:
@@ -2278,12 +2275,6 @@ DONE:
                do_addrbook_view(addrbook, num_ab);     /* Render the address book */
        }
 
-       /* Put the data transfer hidden iframe in a hidden div, to make it *really* hidden */
-       wprintf("</div>"
-               "<div display=\"hidden\">\n"
-               "<iframe name=\"msgloader1\" id=\"msgloader1\" width=\"1\"></iframe>\n"
-       );
-
        /* Note: wDumpContent() will output one additional </div> tag. */
        wDumpContent(1);
        if (addrbook != NULL) free(addrbook);
@@ -2531,7 +2522,7 @@ void display_enter(void)
        embed_room_banner(NULL, navbar_none);
        wprintf("</div>\n");
        wprintf("<div id=\"content\">\n"
-               "<div id=\"fix_scrollbar_bug\">"
+               "<div class=\"fix_scrollbar_bug\">"
                "<table width=100%% border=0 bgcolor=\"#ffffff\"><tr><td>");
 
        /* First test to see whether this is a room that requires recipients to be entered */
@@ -2567,7 +2558,7 @@ void display_enter(void)
        now = time(NULL);
        fmt_date(buf, now, 0);
        strcat(&buf[strlen(buf)], _(" <I>from</I> "));
-       stresc(&buf[strlen(buf)], WC->wc_username, 1, 1);
+       stresc(&buf[strlen(buf)], WC->wc_fullname, 1, 1);
 
        /* Don't need this anymore, it's in the input box below
        if (strlen(bstr("recp")) > 0) {

diff --git a/webcit/paging.c b/webcit/paging.c
index 2548c968bbfaeb7dc4634aa6dab1c857ea3e6b4e..ddc2fbbeaf1087422b7dbb255e2d15ce4f9bba01 100644 (file)
--- a/webcit/paging.c
+++ b/webcit/paging.c
@@ -25,7 +25,7 @@ void display_page(void)
                 "</div>\n<div id=\"content\">\n"
         );
                                                                                                                              
-        wprintf("<div id=\"fix_scrollbar_bug\">"
+        wprintf("<div class=\"fix_scrollbar_bug\">"
                "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
 
        wprintf(_("Send an instant message to: "));
@@ -373,7 +373,7 @@ void chat_recv(void) {
                                if (strcasecmp(cl_user, WC->last_chat_user)) {
                                        wprintf("<B>");
        
-                                       if (!strcasecmp(cl_user, WC->wc_username)) {
+                                       if (!strcasecmp(cl_user, WC->wc_fullname)) {
                                                wprintf("<FONT COLOR=&quot;#FF0000&quot;>");
                                        }
                                        else {

diff --git a/webcit/preferences.c b/webcit/preferences.c
index 991a268ca583ff56e3df73a10e3fdfd63c048aa0..9414a1edaac4561989218cedcbaec55c4d2e6f21 100644 (file)
--- a/webcit/preferences.c
+++ b/webcit/preferences.c
@@ -190,7 +190,7 @@ void display_preferences(void)
        wprintf("</div>\n"
                "<div id=\"content\">\n");
 
-       wprintf("<div id=\"fix_scrollbar_bug\">"
+       wprintf("<div class=\"fix_scrollbar_bug\">"
                "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
 
        /* begin form */

diff --git a/webcit/roomops.c b/webcit/roomops.c
index 81ac71a8849700a8d1ecd10e750a9914abbb2d91..5ed5c5a3e67709ff7441413bef49a45f02d26e8a 100644 (file)
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -225,6 +225,9 @@ void readinfo(void)
        if (buf[0] == '1') {
                fmout("CENTER");
        }
+       else {
+               wprintf(" ");
+       }
 }
 
 
@@ -878,7 +881,7 @@ void display_editroom(void)
 
        /* print the tabbed dialog */
        wprintf("<br />"
-               "<div id=\"fix_scrollbar_bug\">"
+               "<div class=\"fix_scrollbar_bug\">"
                "<TABLE border=0 cellspacing=0 cellpadding=0 width=100%%>"
                "<TR ALIGN=CENTER>"
                "<TD>&nbsp;</TD>\n");
@@ -983,7 +986,7 @@ void display_editroom(void)
        /* end tabbed dialog */ 
 
        /* begin content of whatever tab is open now */
-       wprintf("<div id=\"fix_scrollbar_bug\">"
+       wprintf("<div class=\"fix_scrollbar_bug\">"
                "<TABLE border=0 width=100%% bgcolor=\"#FFFFFF\">\n"
                "<TR><TD>\n");
 
@@ -1835,7 +1838,7 @@ void display_entroom(void)
                "</div>\n<div id=\"content\">\n"
        );
 
-       wprintf("<div id=\"fix_scrollbar_bug\">"
+       wprintf("<div class=\"fix_scrollbar_bug\">"
                "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
 
        wprintf("<form name=\"create_room_form\" method=\"POST\" action=\"entroom\">\n");
@@ -2044,7 +2047,7 @@ void display_private(char *rname, int req_pass)
                "</div>\n<div id=\"content\">\n"
        );
 
-       wprintf("<div id=\"fix_scrollbar_bug\">"
+       wprintf("<div class=\"fix_scrollbar_bug\">"
                "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
 
        wprintf("<CENTER>\n");

diff --git a/webcit/setup_wizard.c b/webcit/setup_wizard.c
index 5b389301fdfa440dffee0256143725c4d270ba01..bc2b2277a722261bdff60371e6dd13eb7fbfd921 100644 (file)
--- a/webcit/setup_wizard.c
+++ b/webcit/setup_wizard.c
@@ -37,7 +37,7 @@ void do_setup_wizard(void)
        wprintf("</div>\n"
                "<div id=\"content\">\n");
 
-       wprintf("<div id=\"fix_scrollbar_bug\">"
+       wprintf("<div class=\"fix_scrollbar_bug\">"
                "<form method=\"post\" action=\"setup_wizard\">\n"
        );
 

diff --git a/webcit/siteconfig.c b/webcit/siteconfig.c
index 273650c90a5ee52b9f1b1253a3ad9004e94b3b96..25c9a852ea6418ebd7691ce540755d40350fa154 100644 (file)
--- a/webcit/siteconfig.c
+++ b/webcit/siteconfig.c
@@ -51,7 +51,7 @@ void display_siteconfig(void)
                return;
        }
 
-       wprintf("<div id=\"fix_scrollbar_bug\">"
+       wprintf("<div class=\"fix_scrollbar_bug\">"
                "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>");
 
        char *tabnames[] = {

diff --git a/webcit/static/webcit.css b/webcit/static/webcit.css
index 58f6e50b54296e0c7615458a3d1fd520d50dbe8c..184b79cf21950b5d1322e4c5b225f609707cef5f 100644 (file)
--- a/webcit/static/webcit.css
+++ b/webcit/static/webcit.css
@@ -170,7 +170,7 @@ body {
 }
 
 
-#fix_scrollbar_bug {
+.fix_scrollbar_bug {
        margin-right:1px;               /* Gecko and other non-broken browsers */
        width: expression('97%');       /* Only IE6 understands 'expression' - fixes weird scrollbarbug */
 }

diff --git a/webcit/subst.c b/webcit/subst.c
index 60e96c633af169c23a6eb2934a380c310baf3ba2..c872650db803cd8846a54c662652819cf5a8586c 100644 (file)
--- a/webcit/subst.c
+++ b/webcit/subst.c
@@ -157,7 +157,7 @@ void print_value_of(char *keyname) {
        }
 
        else if (!strcasecmp(keyname, "CURRENT_USER")) {
-               escputs(WC->wc_username);
+               escputs(WC->wc_fullname);
        }
 
        else if (!strcasecmp(keyname, "CURRENT_ROOM")) {

diff --git a/webcit/summary.c b/webcit/summary.c
index 4a13e339b0df88dc1c415e53f16def881f3c7197..2c3244fecda1db8fa49810483e8e136c0808b077 100644 (file)
--- a/webcit/summary.c
+++ b/webcit/summary.c
@@ -233,7 +233,7 @@ void summary_inner_div(void) {
         * not people I consider worthwhile, I still want them to use WebCit.
         */
 
-       wprintf("<div id=\"fix_scrollbar_bug\">"
+       wprintf("<div class=\"fix_scrollbar_bug\">"
                "<table border=0 width=100%%><tr valign=top>");
 
        /*
@@ -278,7 +278,7 @@ void summary(void) {
                "<SPAN CLASS=\"titlebar\">"
        );
 
-       snprintf(title, sizeof title, _("Summary page for %s"), WC->wc_username);
+       snprintf(title, sizeof title, _("Summary page for %s"), WC->wc_fullname);
        escputs(title);
        wprintf("</SPAN></TD><TD>\n");
        wprintf("</TD><TD ALIGN=RIGHT><SPAN CLASS=\"titlebar\">");

diff --git a/webcit/useredit.c b/webcit/useredit.c
index 73328b00be92fc919062583aaaaeea9fb8c86159..f1c872f9b6a2a3905c0b59fe281541798e384e2a 100644 (file)
--- a/webcit/useredit.c
+++ b/webcit/useredit.c
@@ -270,7 +270,7 @@ void display_edituser(char *supplied_username, int is_new) {
        wprintf("</SPAN></TD></TR></TABLE>\n");
        wprintf("</div>\n<div id=\"content\">\n");
 
-       wprintf("<div id=\"fix_scrollbar_bug\">"
+       wprintf("<div class=\"fix_scrollbar_bug\">"
                "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
        wprintf("<FORM METHOD=\"POST\" action=\"edituser\">\n"
                "<INPUT TYPE=\"hidden\" NAME=\"username\" VALUE=\"");

diff --git a/webcit/userlist.c b/webcit/userlist.c
index b073630a778c8c71ef35ce429c87291973fefc96..a0bced0ae006d921b739528f61a6a8c9cda57f06 100644 (file)
--- a/webcit/userlist.c
+++ b/webcit/userlist.c
@@ -54,7 +54,7 @@ void userlist(void)
                goto DONE;
        }
 
-       wprintf("<div id=\"fix_scrollbar_bug\">"
+       wprintf("<div class=\"fix_scrollbar_bug\">"
                "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
        wprintf(_("<TR><TH>User Name</TH><TH>Number</TH><TH>Access Level</TH>"
                "<TH>Last Login</TH><TH>Total Logins</TH><TH>Total Posts</TH></TR>"));
@@ -121,7 +121,7 @@ void showuser(void)
                "</div>\n<div id=\"content\">\n"
        );
 
-       wprintf("<div id=\"fix_scrollbar_bug\">"
+       wprintf("<div class=\"fix_scrollbar_bug\">"
                "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
 
        serv_printf("OIMG _userpic_|%s", who);

diff --git a/webcit/vcard_edit.c b/webcit/vcard_edit.c
index 7ff6a76aab17d4d251141aa2002f957032b9aa76..755dae6fc9472e566b55d8d2d218bf58b7b7988c 100644 (file)
--- a/webcit/vcard_edit.c
+++ b/webcit/vcard_edit.c
@@ -38,7 +38,7 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
        char primary_inetemail[256];
        char other_inetemail[SIZ];
        char extrafields[SIZ];
-       char displayname[256];
+       char fullname[256];
        char title[256];
        char org[256];
 
@@ -116,7 +116,7 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
                        }
 
                        else if (!strcasecmp(key, "fn")) {
-                               safestrncpy(displayname, value, sizeof displayname);
+                               safestrncpy(fullname, value, sizeof fullname);
                        }
 
                        else if (!strcasecmp(key, "title")) {
@@ -182,7 +182,7 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
        );
 
        wprintf("<FORM METHOD=\"POST\" action=\"submit_vcard\">\n");
-       wprintf("<div id=\"fix_scrollbar_bug\">"
+       wprintf("<div class=\"fix_scrollbar_bug\">"
                "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
 
        wprintf("<TABLE border=0><TR>"
@@ -214,9 +214,9 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
 
        wprintf(_("Display name:"));
        wprintf("<br>"
-               "<INPUT TYPE=\"text\" NAME=\"displayname\" "
+               "<INPUT TYPE=\"text\" NAME=\"fullname\" "
                "VALUE=\"%s\" MAXLENGTH=\"40\"><br><br>\n",
-               displayname
+               fullname
        );
 
        wprintf(_("Title:"));
@@ -375,7 +375,7 @@ void submit_vcard(void) {
                bstr("prefix"),
                bstr("suffix") );
        serv_printf("title:%s", bstr("title") );
-       serv_printf("fn:%s", bstr("displayname") );
+       serv_printf("fn:%s", bstr("fullname") );
        serv_printf("org:%s", bstr("org") );
        serv_printf("adr:%s;%s;%s;%s;%s;%s;%s",
                bstr("pobox"),

diff --git a/webcit/webcit.c b/webcit/webcit.c
index 127808b0940aa050675ecbfd826af57b058068d1..7220a5d7eae9eaf010e3bf3129cfa4e6563dfc10 100644 (file)
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -1374,7 +1374,7 @@ void session_loop(struct httprequest *req)
        } else if (!strcasecmp(action, "editinfo")) {
                save_edit(_("Room info"), "EINF 1", 1);
        } else if (!strcasecmp(action, "display_editbio")) {
-               sprintf(buf, "RBIO %s", WC->wc_username);
+               sprintf(buf, "RBIO %s", WC->wc_fullname);
                display_edit(_("Your bio"), "NOOP", buf, "editbio", 3);
        } else if (!strcasecmp(action, "editbio")) {
                save_edit(_("Your bio"), "EBIO", 0);

diff --git a/webcit/webcit.h b/webcit/webcit.h
index 331ffb37e87b46035f147526c348e96e548786cd..78cfa7f4afbfadc7b760a272e6d4c95a13788982 100644 (file)
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -308,6 +308,7 @@ struct wcsession {
        struct wcsession *next;         /* Linked list */
        int wc_session;                 /* WebCit session ID */
        char wc_username[128];
+       char wc_fullname[128];
        char wc_password[128];
        char wc_roomname[256];
        int connected;