From 40f1092858d2e65098518ce9ec6183d76ba69c19 Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Fri, 27 Jan 2006 20:04:11 +0000
Subject: [PATCH]  Do a JavaScript alert if we fail to open the Instant
 Messenger window.

---
 webcit/ChangeLog |  3 +++
 webcit/paging.c  | 50 ++++++++++++++++++++++++++++++++----------------
 2 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index c85fa733d..1a4feaa4e 100644
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,5 +1,8 @@
 $Id$
 
+Fri Jan 27 15:03:42 EST 2006 ajc
+* Do a JavaScript alert if we fail to open the Instant Messenger window.
+
 Fri Jan 27 13:50:38 EST 2006 ajc
 * Page popups work again.
 
diff --git a/webcit/paging.c b/webcit/paging.c
index 097b6b74b..3dee4f533 100644
--- a/webcit/paging.c
+++ b/webcit/paging.c
@@ -160,34 +160,52 @@ void page_popup(void)
 {
 	char buf[SIZ];
 
+	/** JavaScript function to alert the user that popups are probably blocked */
+	wprintf("<script type=\"text/javascript\">	"
+		"function PopUpFailed() {	"
+		" alert(\"%s\");	"
+		"}	"
+		"</script>\n",
+		_("You have one or more instant messages waiting, but the Citadel Instant Messenger "
+		  "window failed to open.  This is probably because you have a popup blocker "
+		  "installed.  Please configure your popup blocker to allow popups from this site "
+		  "if you wish to receive instant messages.")
+	);
+
 	/** First, do the check as part of our page load. */
 	serv_puts("NOOP");
 	serv_getln(buf, sizeof buf);
 	if (buf[3] == '*') {
 		if ((time(NULL) - WC->last_pager_check) > 60) {
 			wprintf("<script type=\"text/javascript\">"
-				" window.open('static/instant_messenger.html', 'CTDL_MESSENGER', "
-				" 'width=700,height=400');"
+				" var oWin = window.open('static/instant_messenger.html', "
+				" 'CTDL_MESSENGER', 'width=700,height=400');	"
+				" if (oWin==null || typeof(oWin)==\"undefined\") {	"
+				"  PopUpFailed();	"
+				" }	"
 				"</script>"
 			);	
 		}
 	}
 
 	/** Then schedule it to happen again a minute from now if the user is idle. */
-	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"
+	wprintf("<script type=\"text/javascript\">	"
+		" function HandleSslp(sslg_xmlresponse) {	"
+		"  sslg_response = sslg_xmlresponse.responseText.substr(0, 1);	"
+		"  if (sslg_response == 'Y') {	"
+		"   var oWin = window.open('static/instant_messenger.html', 'CTDL_MESSENGER',	"
+		"    'width=700,height=400');	"
+		"   if (oWin==null || typeof(oWin)==\"undefined\") {	"
+		"    PopUpFailed();	"
+		"   }	"
+		"  }	"
+		" }	"
+		" function CheckPager() {	"
+		"  new Ajax.Request('sslg', { method: 'get', parameters: Math.random(),	"
+		"   onSuccess: HandleSslp } );	"
+		" }	"
+		" new PeriodicalExecuter(CheckPager, 30);	"
+		"</script>	"
 	);
 }
 
-- 
2.39.2