/*
- * $Id: $
+ * $Id$
+ *
+ * Display the outbound SMTP queue
*/
-/**
- * \defgroup SMTPqueue Display the outbound SMTP queue
- * \ingroup CitadelConfig
- */
-/*@{*/
+
#include "webcit.h"
-/**
- * \brief display one message in the queue
+/*
+ * display one message in the queue
*/
void display_queue_msg(long msgnum)
{
int number_of_attempts = 0;
char sender[256];
char recipients[65536];
+ int recipients_len = 0;
char thisrecp[256];
char thisdsn[256];
+ char thismsg[512];
+ int thismsg_len;
+ long msgid = 0;
+ int len;
strcpy(sender, "");
strcpy(recipients, "");
+ recipients_len = 0;
serv_printf("MSG2 %ld", msgnum);
serv_getln(buf, sizeof buf);
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)) && (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")) {
+ char *atsign;
extract_token(sender, buf, 1, '|', sizeof sender);
+
+ /* Strip off local hostname if it's our own */
+ atsign = strchr(sender, '@');
+ if (atsign != NULL) {
+ ++atsign;
+ if (!strcasecmp(atsign, ChrPtr(WC->serv_info->serv_nodename))) {
+ --atsign;
+ *atsign = 0;
+ }
+ }
}
if (!strcasecmp(keyword, "remote")) {
+ thismsg[0] = 0;
+
extract_token(thisrecp, buf, 1, '|', sizeof thisrecp);
extract_token(thisdsn, buf, 3, '|', sizeof thisdsn);
- if (strlen(recipients) + strlen(thisrecp) + strlen(thisdsn) + 100
- < sizeof recipients) {
- if (strlen(recipients) > 0) {
- strcat(recipients, "<br />");
+ if (!IsEmptyStr(thisrecp)) {
+ stresc(thismsg, sizeof thismsg, thisrecp, 1, 1);
+ if (!IsEmptyStr(thisdsn)) {
+ strcat(thismsg, "<br /> <i>");
+ stresc(&thismsg[strlen(thismsg)], sizeof thismsg,
+ thisdsn, 1, 1);
+ strcat(thismsg, "</i>");
+ }
+ thismsg_len = strlen(thismsg);
+
+ if ((recipients_len + thismsg_len + 100) < sizeof recipients) {
+ if (!IsEmptyStr(recipients)) {
+ strcpy(&recipients[recipients_len], "<br />");
+ recipients_len += 6;
+ }
+ strcpy(&recipients[recipients_len], thismsg);
+ recipients_len += thismsg_len;
}
- stresc(&recipients[strlen(recipients)], thisrecp, 1, 1);
- strcat(recipients, "<br /> <i>");
- stresc(&recipients[strlen(recipients)], thisdsn, 1, 1);
- strcat(recipients, "</i>");
}
}
}
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) {
- fmt_date(buf, submitted, 1);
+ webcit_fmt_date(buf, 1024, submitted, 1);
wprintf("%s", buf);
}
else {
wprintf("</td><td>");
if (last_attempt > 0) {
- fmt_date(buf, last_attempt, 1);
+ webcit_fmt_date(buf, 1024, last_attempt, 1);
wprintf("%s", buf);
}
else {
}
-/**
- * \brief display the outbound SMTP queue
- */
-void display_smtpqueue(void)
-{
+void display_smtpqueue_inner_div(void) {
+ message_summary *Msg;
+ wcsession *WCC = WC;
int i;
int num_msgs;
+ StrBuf *Buf;
+ SharedMessageStatus Stat;
- 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");
-
-
+ 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.
*/
- gotoroom("__CitadelSMTPspoolout__");
- if (!strcasecmp(WC->wc_roomname, "__CitadelSMTPspoolout__")) {
+ Buf = NewStrBufPlain(HKEY("__CitadelSMTPspoolout__"));
+ gotoroom(Buf);
+ FreeStrBuf(&Buf);
+ if (!strcasecmp(ChrPtr(WCC->wc_roomname), "__CitadelSMTPspoolout__")) {
- num_msgs = load_msg_ptrs("MSGS ALL", 0);
+ num_msgs = load_msg_ptrs("MSGS ALL", &Msg);
if (num_msgs > 0) {
wprintf("<table class=\"mailbox_summary\" rules=rows "
- "cellpadding=2 style=\"width:100%%;-moz-user-select:none;\">"
+ "cellpadding=2 style=\"width:100%%;\">"
);
wprintf("<tr><td><b><i>");
wprintf("</i></b></td></tr>\n");
for (i=0; i<num_msgs; ++i) {
- display_queue_msg(WC->msgarr[i]);
+ Msg = GetMessagePtrAt(i, WCC->summ);
+
+ display_queue_msg((Msg==NULL)? 0 : Msg->msgnum);
}
wprintf("</table>");
wprintf(_("You do not have permission to view this resource."));
wprintf("</div><br /><br />");
}
+ output_headers(0, 0, 0, 0, 0, 0);
+ end_burst();
+}
- wprintf("</td></tr></table></div>\n");
- wDumpContent(1);
+/*
+ * 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);
+
+}
-/*@}*/
+void
+InitModule_SMTP_QUEUE
+(void)
+{
+ WebcitAddUrlHandler(HKEY("display_smtpqueue"), display_smtpqueue, 0);
+ WebcitAddUrlHandler(HKEY("display_smtpqueue_inner_div"), display_smtpqueue_inner_div, 0);
+}
projects / citadel.git / blobdiff