From 162dd390626daad58aceb1e97440532d197c021e Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Sun, 29 Feb 2004 05:34:25 +0000
Subject: [PATCH] * Display the Chat menu option as "Chat with other users in
 <roomname>"

---
 webcit/ChangeLog  |  4 ++++
 webcit/mainmenu.c |  5 ++++-
 webcit/subst.c    | 18 +++++++++++++-----
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 456996639..2fad26351 100644
--- 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 a00168b1d..48cbe03df 100644
--- 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 87441c5e2..0e9b4e37c 100644
--- 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 */
-- 
2.39.2