From: Art Cancro <ajc@citadel.org>
Date: Sat, 29 May 1999 05:01:12 +0000 (+0000)
Subject:         * WebCit now sends the name of the end user's browser as the client
X-Git-Tag: v7.86~7676
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=553f7fa36b751286e540f858599c999c61a2e8b6;p=citadel.git

    * WebCit now sends the name of the end user's browser as the client
          name in a Citadel IDEN command rather than its own name.
---

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index d57b18577..98093203a 100644
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -3,6 +3,8 @@ Sat May 29 00:25:47 EDT 1999 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
 	  the transition back to the Lobby after it's all done.
 	* Added ExpressMessageCat() to allow code to send the user messages
 	  along with incoming express messages
+	* WebCit now sends the name of the end user's browser as the client
+	  name in a Citadel IDEN command rather than its own name.
 
 Fri May 21 23:35:17 EDT 1999 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
 	* Minor code cleanups
diff --git a/webcit/child.h b/webcit/child.h
index 5079e1d14..d698e36f3 100644
--- a/webcit/child.h
+++ b/webcit/child.h
@@ -15,7 +15,7 @@ void list_all_rooms_by_floor(void);
 void slrp_highest(void);
 void gotonext(void);
 void ungoto(void);
-void get_serv_info(char *);
+void get_serv_info(char *, char *);
 int connectsock(char *host, char *service, char *protocol);
 void serv_gets(char *strbuf);
 void serv_puts(char *string);
diff --git a/webcit/roomops.c b/webcit/roomops.c
index e2a43bbea..6d853ebde 100644
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -366,7 +366,7 @@ void embed_room_banner(char *got) {
 	wprintf("</FONT></TD>");
 
 	/* Let the user know if new mail has arrived */
-	if (new_mail > remember_new_mail) {
+	if ( (new_mail > remember_new_mail) && (new_mail>0) ) {
 		wprintf("<TD VALIGN=TOP>"
 			"<IMG SRC=\"/static/mail.gif\" border=0 "
 			"ALT=\"You have new mail\">"
diff --git a/webcit/serv_func.c b/webcit/serv_func.c
index 686dcc1bb..823fb5f85 100644
--- a/webcit/serv_func.c
+++ b/webcit/serv_func.c
@@ -15,18 +15,18 @@ struct serv_info serv_info;
 /*
  * get info about the server we've connected to
  */
-void get_serv_info(char *browser_host)
+void get_serv_info(char *browser_host, char *user_agent)
 {
 	char buf[256];
 	int a;
 
 	serv_printf("IDEN %d|%d|%d|%s|%s",
-		    DEVELOPER_ID,
-		    CLIENT_ID,
-		    CLIENT_VERSION,
-		    SERVER,
-		    browser_host
-	    );
+		DEVELOPER_ID,
+		CLIENT_ID,
+		CLIENT_VERSION,
+		user_agent,
+		browser_host
+	);
 	serv_gets(buf);
 
 	serv_puts("INFO");
diff --git a/webcit/webcit.c b/webcit/webcit.c
index 9b56b7376..0f577f5c0 100644
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -606,7 +606,7 @@ void upload_handler(char *name, char *filename, char *encoding,
 }
 
 
-void session_loop(char *browser_host)
+void session_loop(char *browser_host, char *user_agent)
 {
 	char cmd[256];
 	char action[256];
@@ -698,7 +698,7 @@ void session_loop(char *browser_host)
 		serv_sock = connectsock(c_host, c_port, "tcp");
 		connected = 1;
 		serv_gets(buf);	/* get the server welcome message */
-		get_serv_info(browser_host);
+		get_serv_info(browser_host, user_agent);
 	}
 	check_for_express_messages();
 
@@ -956,6 +956,6 @@ int main(int argc, char *argv[])
 		noframes = 0;
 
 	while (1) {
-		session_loop(argv[4]);
+		session_loop(argv[4], browser);
 	}
 }