* Display the Chat menu option as "Chat with other users in <roomname>"

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 456996639c39a24c4a7f91c0630f330cbc15e1d9..2fad2635137072374205aae2e2dc4b51009de8f7 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,7 @@
 $Log$
+Revision 505.9  2004/02/29 05:34:25  ajc
+* Display the Chat menu option as "Chat with other users in <roomname>"
+
 Revision 505.8  2004/02/27 05:04:38  ajc
 * fix frameset bug in page popups
 
@@ -1693,3 +1696,4 @@ Sun Dec  6 19:50:55 EST 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
 
 1998-12-03 Nathan Bryant <bryant@cs.usm.maine.edu>
        * webserver.c: warning fix
+

diff --git a/webcit/mainmenu.c b/webcit/mainmenu.c
index a00168b1d702bc3e1d2f41e075a52936b395daa2..48cbe03dfece9f2f54d6b33928226d6746bc9342 100644 (file)
--- a/webcit/mainmenu.c
+++ b/webcit/mainmenu.c
@@ -143,7 +143,10 @@ void display_main_menu(void)
 
        wprintf("<A HREF=\"/chat\">"
                "<span class=\"mainmenu\">"
-               "Chat with other online users</span></A><BR>\n");
+               "Chat with other users in <i>"
+       );
+       escputs(WC->wc_roomname);
+       wprintf("</i></span></A><BR>\n");
 
        wprintf("<A HREF=\"/display_generic\">\n");
        wprintf("<span class=\"menudesc\">"

diff --git a/webcit/subst.c b/webcit/subst.c
index 87441c5e240d01434fda35c5854dc6f19df5d6c3..0e9b4e37c2bc01d0d774abbc96f178c28db8044a 100644 (file)
--- a/webcit/subst.c
+++ b/webcit/subst.c
@@ -149,19 +149,19 @@ void print_value_of(char *keyname) {
        }
 
        else if (!strcasecmp(keyname, "SERV_NODENAME")) {
-               wprintf("%s", serv_info.serv_nodename);
+               escputs(serv_info.serv_nodename);
        }
 
        else if (!strcasecmp(keyname, "SERV_HUMANNODE")) {
-               wprintf("%s", serv_info.serv_humannode);
+               escputs(serv_info.serv_humannode);
        }
 
        else if (!strcasecmp(keyname, "SERV_FQDN")) {
-               wprintf("%s", serv_info.serv_fqdn);
+               escputs(serv_info.serv_fqdn);
        }
 
        else if (!strcasecmp(keyname, "SERV_SOFTWARE")) {
-               wprintf("%s", serv_info.serv_software);
+               escputs(serv_info.serv_software);
        }
 
        else if (!strcasecmp(keyname, "SERV_REV_LEVEL")) {
@@ -172,7 +172,15 @@ void print_value_of(char *keyname) {
        }
 
        else if (!strcasecmp(keyname, "SERV_BBS_CITY")) {
-               wprintf("%s", serv_info.serv_bbs_city);
+               escputs(serv_info.serv_bbs_city);
+       }
+
+       else if (!strcasecmp(keyname, "CURRENT_USER")) {
+               escputs(WC->wc_username);
+       }
+
+       else if (!strcasecmp(keyname, "CURRENT_ROOM")) {
+               escputs(WC->wc_roomname);
        }
 
        /* Page-local variables */