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)")
);
void display_smtpqueue_inner_div(void) {
- message_summary *Msg;
+ message_summary *Msg = NULL;
wcsession *WCC = WC;
int i;
int num_msgs;
StrBuf *Buf;
+ SharedMessageStatus Stat;
+ memset(&Stat, 0, sizeof(SharedMessageStatus));
/* Check to see if we can go to the __CitadelSMTPspoolout__ room.
* If not, we don't have access to the queue.
*/
FreeStrBuf(&Buf);
if (!strcasecmp(ChrPtr(WCC->wc_roomname), "__CitadelSMTPspoolout__")) {
- num_msgs = load_msg_ptrs("MSGS ALL", 0);
+ Stat.maxload = 10000;
+ Stat.lowest_found = (-1);
+ Stat.highest_found = (-1);
+ num_msgs = load_msg_ptrs("MSGS ALL", &Stat);
if (num_msgs > 0) {
wprintf("<table class=\"mailbox_summary\" rules=rows "
"cellpadding=2 style=\"width:100%%;\">"
for (i=0; i<num_msgs; ++i) {
Msg = GetMessagePtrAt(i, WCC->summ);
-
- display_queue_msg((Msg==NULL)? 0 : Msg->msgnum);
+ if (Msg != NULL) {
+ display_queue_msg(Msg->msgnum);
+ }
}
wprintf("</table>");
end_burst();
}
-/**
- * \brief display the outbound SMTP queue
+/*
+ * display the outbound SMTP queue
*/
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"));
"<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);
}
WebcitAddUrlHandler(HKEY("display_smtpqueue"), display_smtpqueue, 0);
WebcitAddUrlHandler(HKEY("display_smtpqueue_inner_div"), display_smtpqueue_inner_div, 0);
}
-
-/*@}*/