/*
- * $Id: $
+ * $Id$
*/
/**
* \defgroup SMTPqueue Display the outbound SMTP queue
char recipients[65536];
char thisrecp[256];
char thisdsn[256];
+ long msgid = 0;
+ int len;
strcpy(sender, "");
strcpy(recipients, "");
while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
- if (strlen(buf) > 0) {
- if (buf[strlen(buf)-1] == 13) {
- buf[strlen(buf)-1] = 0;
+ if (!IsEmptyStr(buf)) {
+ len = strlen(buf);
+ if (buf[len - 1] == 13) {
+ buf[len - 1] = 0;
}
}
- if ( (strlen(buf) == 0) && (in_body == 0) ) {
+ if ( (IsEmptyStr(buf) == 0) && (in_body == 0) ) {
in_body = 1;
}
if ( (in_body) && (is_delivery_list) ) {
extract_token(keyword, buf, 0, '|', sizeof keyword);
+ if (!strcasecmp(keyword, "msgid")) {
+ msgid = extract_long(buf, 1);
+ }
+
if (!strcasecmp(keyword, "submitted")) {
submitted = extract_long(buf, 1);
}
if (!strcasecmp(keyword, "bounceto")) {
extract_token(sender, buf, 1, '|', sizeof sender);
+
+ /* Strip off local hostname if it's our own */
+ char *atsign;
+ atsign = strchr(sender, '@');
+ if (atsign != NULL) {
+ ++atsign;
+ if (!strcasecmp(atsign, serv_info.serv_nodename)) {
+ --atsign;
+ *atsign = 0;
+ }
+ }
}
if (!strcasecmp(keyword, "remote")) {
if (strlen(recipients) + strlen(thisrecp) + strlen(thisdsn) + 100
< sizeof recipients) {
- if (strlen(recipients) > 0) {
+ if (!IsEmptyStr(recipients)) {
strcat(recipients, "<br />");
}
stresc(&recipients[strlen(recipients)], thisrecp, 1, 1);
}
wprintf("<tr><td>");
- wprintf("%ld", msgnum);
+ wprintf("%ld<br />", msgnum);
+ wprintf(" <a href=\"javascript:DeleteQueueMsg(%ld,%ld);\">%s</a>",
+ msgnum, msgid, _("(Delete)")
+ );
wprintf("</td><td>");
if (submitted > 0) {
}
-/**
- * \brief display the outbound SMTP queue
- */
-void display_smtpqueue(void)
-{
+void display_smtpqueue_inner_div(void) {
int i;
int num_msgs;
- output_headers(1, 1, 2, 0, 0, 0);
- wprintf("<div id=\"banner\">\n");
- wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>");
- wprintf("<SPAN CLASS=\"titlebar\">");
- wprintf(_("View the outbound SMTP queue"));
- wprintf("</SPAN>\n");
- wprintf("</TD></TR></TABLE>\n");
- wprintf("</div>\n<div id=\"content\">\n");
-
- wprintf("<div class=\"fix_scrollbar_bug\">"
- "<table border=0 width=100%% bgcolor=\"#FFFFFF\">"
- "<tr><td valign=top>\n");
-
-
/* Check to see if we can go to the __CitadelSMTPspoolout__ room.
* If not, we don't have access to the queue.
*/
wprintf("</div><br /><br />");
}
- wprintf("</td></tr></table></div>\n");
+}
+
+/**
+ * \brief 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"));
+ wprintf("</h1>\n");
+ wprintf("</div>\n");
+
+ wprintf("<div id=\"content\" class=\"service\">\n");
+
+ wprintf("<div class=\"fix_scrollbar_bug\">"
+ "<table class=\"smtpqueue_background\">"
+ "<tr><td valign=top>\n");
+
+ wprintf("<div id=\"smtpqueue_inner_div\">");
+
+ display_smtpqueue_inner_div();
+
+ wprintf("</div>"
+ "<div align=\"center\">"
+ "<a href=\"javascript:RefreshQueueDisplay();\">%s</a>"
+ "</div>"
+ "</td></tr></table></div>\n", _("Refresh this page")
+ );
wDumpContent(1);
}