From: Art Cancro <ajc@citadel.org>
Date: Thu, 12 Jan 2006 05:41:48 +0000 (+0000)
Subject: Changes to instant messenger to work around IE bugs
X-Git-Tag: v7.86~4327
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=1da07686b98c167e26d702fef7bc77c5e97df504;p=citadel.git

Changes to instant messenger to work around IE bugs
---

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 923041109..712a9c0ae 100644
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,5 +1,8 @@
 $Id$
 
+Thu Jan 12 00:40:28 EST 2006 ajc
+* Changes to instant messenger to work around IE bugs
+
 Wed Jan 11 23:20:48 EST 2006 ajc
 * More updates to instant messenger:
   - Better delineation of input box.  Added an icon and a slightly darker
diff --git a/webcit/paging.c b/webcit/paging.c
index e15515691..2548c968b 100644
--- a/webcit/paging.c
+++ b/webcit/paging.c
@@ -170,19 +170,20 @@ void page_popup(void)
 	}
 
 	/* Then schedule it to happen again a minute from now if the user is idle. */
-	wprintf("<script type=\"text/javascript\">	"
-		" function HandleSslp(sslg_xmlresponse) {	"
-		"  sslg_response = sslg_xmlresponse.responseText.substr(0, 1);	"
-		"  if (sslg_response == 'Y') {	"
-		"   window.open('static/instant_messenger.html', 'CTDL_MESSENGER',	"
-		"    'width=700,height=400');	"
-		"   }	"
-		" }	"
-		" function CheckPager() {	"
-		"  new Ajax.Request('sslg', { method: 'get', onSuccess: HandleSslp } );	"
-		" }	"
-		" new PeriodicalExecuter(CheckPager, 30);	"
-		"</script>\n"
+	wprintf("<script type=\"text/javascript\">	\n"
+		" function HandleSslp(sslg_xmlresponse) {	\n"
+		"  sslg_response = sslg_xmlresponse.responseText.substr(0, 1);	\n"
+		"  if (sslg_response == 'Y') {	\n"
+		"   window.open('static/instant_messenger.html', 'CTDL_MESSENGER',	\n"
+		"    'width=700,height=400');	\n"
+		"   }	\n"
+		" }	\n"
+		" function CheckPager() {	\n"
+		"  new Ajax.Request('sslg', { method: 'get', parameters: Math.random(),	\n"
+		"   onSuccess: HandleSslp } );	\n"
+		" }	\n"
+		" new PeriodicalExecuter(CheckPager, 30);	\n"
+		"</script>	\n"
 	);
 }
 
diff --git a/webcit/webcit.c b/webcit/webcit.c
index 92eed0d93..81f3281a7 100644
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -390,8 +390,6 @@ void output_headers(	int do_httpheaders,	/* 1 = output HTTP headers
 	/* ICONBAR */
 	if (do_htmlhead) {
 
-		/* check for instant messages (these display in a new window) */
-		page_popup();
 
 		/* check for ImportantMessages (these display in a div overlaying the main screen) */
 		if (strlen(WC->ImportantMessage) > 0) {
@@ -404,10 +402,16 @@ void output_headers(	int do_httpheaders,	/* 1 = output HTTP headers
 				"</script>\n");
 			safestrncpy(WC->ImportantMessage, "", sizeof WC->ImportantMessage);
 		}
+
 		if ( (WC->logged_in) && (!unset_cookies) ) {
 			wprintf("<div id=\"iconbar\">");
 			do_selected_iconbar();
+
+			/* check for instant messages (these display in a new window) */
+			page_popup();
+			wprintf("</div>");
 		}
+
 		if (do_room_banner == 1) {
 			wprintf("<div id=\"banner\">\n");
 			embed_room_banner(NULL, navbar_default);