From 741ac7d021c1983e023231ce48da11b63c9d8a6e Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Thu, 3 Sep 2009 15:25:18 +0000
Subject: [PATCH] * Move SMTP queue view JavaScript to wclib.js * Initial load
 of SMTP queue is now done with an ajax refresh, so if the queue is large the
 page displays with a throbber and then loads

---
 webcit/smtpqueue.c     | 35 ++++++++---------------------------
 webcit/static/wclib.js | 16 ++++++++++++++++
 2 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/webcit/smtpqueue.c b/webcit/smtpqueue.c
index f1310a6ad..b3c0983d1 100644
--- a/webcit/smtpqueue.c
+++ b/webcit/smtpqueue.c
@@ -131,7 +131,7 @@ void display_queue_msg(long msgnum)
 
 	wprintf("<tr><td>");
 	wprintf("%ld<br />", msgnum);
-	wprintf(" <a href=\"javascript:DeleteQueueMsg(%ld,%ld);\">%s</a>", 
+	wprintf(" <a href=\"javascript:DeleteSMTPqueueMsg(%ld,%ld);\">%s</a>", 
 		msgnum, msgid, _("(Delete)")
 	);
 
@@ -233,26 +233,6 @@ void display_smtpqueue(void)
 {
 	output_headers(1, 1, 2, 0, 0, 0);
 
-	wprintf("<script type=\"text/javascript\">				\n"
-		"function RefreshQueueDisplay() {				\n"
-		"	new Ajax.Updater('smtpqueue_inner_div', 		\n"
-		"	'display_smtpqueue_inner_div', { method: 'get',		\n"
-		"		parameters: Math.random() } );			\n"
-		"}								\n"
-		"								\n"
-		"function DeleteQueueMsg(msgnum1, msgnum2) {					\n"
- 		"	new Ajax.Request(							\n"
-		"		'ajax_servcmd', {						\n"
-		"			method: 'post',						\n"
-		"			parameters: 'g_cmd=DELE ' + msgnum1 + ',' + msgnum2,	\n"
-		"			onComplete: RefreshQueueDisplay()			\n"
-		"		}								\n"
-		"	);									\n"
-		"}										\n"
-		"								\n"
-		"</script>							\n"
-	);
-
 	wprintf("<div id=\"banner\">\n");
 	wprintf("<h1>");
 	wprintf(_("View the outbound SMTP queue"));
@@ -265,16 +245,17 @@ void display_smtpqueue(void)
 		"<table class=\"smtpqueue_background\">"
 		"<tr><td valign=top>\n");
 
-	wprintf("<div id=\"smtpqueue_inner_div\">");
-
-	display_smtpqueue_inner_div();
-
-	wprintf("</div>"
+	wprintf("<div id=\"smtpqueue_inner_div\">"
+		"<div align=\"center\"><img src=\"static/throbber.gif\"></div>"
+		"</div>"
 		"<div align=\"center\">"
-		"<a href=\"javascript:RefreshQueueDisplay();\">%s</a>"
+		"<a href=\"javascript:RefreshSMTPqueueDisplay();\">%s</a>"
 		"</div>"
 		"</td></tr></table></div>\n", _("Refresh this page")
 	);
+
+	StrBufAppendPrintf(WC->trailing_javascript, "RefreshSMTPqueueDisplay();\n");
+
 	wDumpContent(1);
 
 }
diff --git a/webcit/static/wclib.js b/webcit/static/wclib.js
index ff5d1b0cd..77b07f5f8 100644
--- a/webcit/static/wclib.js
+++ b/webcit/static/wclib.js
@@ -924,3 +924,19 @@ function resizeViewport() {
     global.style.width = newContentSize+"px";
   }
 }
+
+function RefreshSMTPqueueDisplay() {
+	new Ajax.Updater('smtpqueue_inner_div',
+	'display_smtpqueue_inner_div', { method: 'get',
+		parameters: Math.random() } );
+}
+
+function DeleteSMTPqueueMsg(msgnum1, msgnum2) {
+	new Ajax.Request(
+		'ajax_servcmd', {
+			method: 'post',
+			parameters: 'g_cmd=DELE ' + msgnum1 + ',' + msgnum2,
+			onComplete: RefreshSMTPqueueDisplay()
+		}
+	);
+}
-- 
2.30.2