*/
#include "webcit.h"
+CtxType CTX_MAILQITEM = CTX_NONE;
+CtxType CTX_MAILQ_RCPT = CTX_NONE;
HashList *QItemHandlers = NULL;
-/*
- * display one message in the queue
- */
-void display_queue_msg(long msgnum)
-{
- char buf[1024];
- char keyword[32];
- int in_body = 0;
- int is_delivery_list = 0;
- time_t submitted = 0;
- time_t attempted = 0;
- time_t last_attempt = 0;
- 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);
- if (buf[0] != '1') return;
-
- while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-
- if (!IsEmptyStr(buf)) {
- len = strlen(buf);
- if (buf[len - 1] == 13) {
- buf[len - 1] = 0;
- }
- }
-
- if ( (IsEmptyStr(buf)) && (in_body == 0) ) {
- in_body = 1;
- }
-
- if ( (!in_body)
- && (!strncasecmp(buf, "Content-type: application/x-citadel-delivery-list", 49))
- ) {
- is_delivery_list = 1;
- }
-
- if ( (in_body) && (!is_delivery_list) ) {
- while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
- /* Not a delivery list; flush and return quietly. */
- }
- return;
- }
-
- 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, "attempted")) {
- attempted = extract_long(buf, 1);
- ++number_of_attempts;
- if (attempted > last_attempt) {
- last_attempt = attempted;
- }
- }
-
- 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 (!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;
- }
- }
-
- }
-
- }
-
- }
-
- wc_printf("<tr><td>");
- wc_printf("%ld<br>", msgnum);
- wc_printf(" <a href=\"javascript:DeleteSMTPqueueMsg(%ld,%ld);\">%s</a>",
- msgnum, msgid, _("(Delete)")
- );
-
- wc_printf("</td><td>");
- if (submitted > 0) {
- webcit_fmt_date(buf, 1024, submitted, 1);
- wc_printf("%s", buf);
- }
- else {
- wc_printf(" ");
- }
-
- wc_printf("</td><td>");
- if (last_attempt > 0) {
- webcit_fmt_date(buf, 1024, last_attempt, 1);
- wc_printf("%s", buf);
- }
- else {
- wc_printf(" ");
- }
-
- wc_printf("</td><td>");
- escputs(sender);
-
- wc_printf("</td><td>");
- wc_printf("%s", recipients);
- wc_printf("</td></tr>\n");
-
-}
-
-
-void display_smtpqueue_inner_div(void) {
- 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.
- */
- Buf = NewStrBufPlain(HKEY("__CitadelSMTPspoolout__"));
- gotoroom(Buf);
- FreeStrBuf(&Buf);
- if (!strcasecmp(ChrPtr(WCC->CurRoom.name), "__CitadelSMTPspoolout__")) {
-
- Stat.maxload = 10000;
- Stat.lowest_found = (-1);
- Stat.highest_found = (-1);
-// num_msgs = load_msg_ptrs("MSGS ALL|0|1", "SUBJ|;QMSG", &Stat, NULL);
- num_msgs = load_msg_ptrs("MSGS ", NULL, &Stat, NULL);
- if (num_msgs > 0) {
- wc_printf("<table class=\"mailbox_summary\" rules=rows "
- "cellpadding=2 style=\"width:100%%;\">"
- );
-
- wc_printf("<tr><td><b><i>");
- wc_printf(_("Message ID"));
- wc_printf("</i></b></td><td><b><i>");
- wc_printf(_("Date/time submitted"));
- wc_printf("</i></b></td><td><b><i>");
- wc_printf(_("Last attempt"));
- wc_printf("</i></b></td><td><b><i>");
- wc_printf(_("Sender"));
- wc_printf("</i></b></td><td><b><i>");
- wc_printf(_("Recipients"));
- wc_printf("</i></b></td></tr>\n");
-
- for (i=0; (i < num_msgs) && (i < Stat.maxload); ++i) {
- Msg = GetMessagePtrAt(i, WCC->summ);
- if (Msg != NULL) {
- display_queue_msg(Msg->msgnum);
- }
- }
-
- wc_printf("</table>");
-
- }
- else {
- wc_printf("<br><br><div align=\"center\">");
- wc_printf(_("The queue is empty."));
- wc_printf("</div><br><br>");
- }
- }
- else {
- wc_printf("<br><br><div align=\"center\">");
- wc_printf(_("You do not have permission to view this resource."));
- wc_printf("</div><br><br>");
- }
- output_headers(0, 0, 0, 0, 0, 0);
- end_burst();
-}
-
-/*
- * display the outbound SMTP queue
- */
-void display_smtpqueue(void)
-{
- output_headers(1, 1, 2, 0, 0, 0);
-
- wc_printf("<div id=\"banner\">\n");
- wc_printf("<h1>");
- wc_printf(_("View the outbound SMTP queue"));
- wc_printf("</h1>\n");
- wc_printf("</div>\n");
-
- wc_printf("<div id=\"content\" class=\"service\">\n");
-
- wc_printf("<table class=\"smtpqueue_background\">"
- "<tr><td valign=top>\n");
-
- wc_printf("<div id=\"smtpqueue_inner_div\">"
- "<div align=\"center\"><img src=\"static/webcit_icons/throbber.gif\"></div>"
- "</div>"
- "<div align=\"center\">"
- "<a href=\"javascript:RefreshSMTPqueueDisplay();\">%s</a>"
- "</div>"
- "</td></tr></table>\n", _("Refresh this page")
- );
-
- StrBufAppendPrintf(WC->trailing_javascript, "RefreshSMTPqueueDisplay();\n");
-
- wDumpContent(1);
-
-}
-
-
-
-
-
-
-
-
typedef struct _mailq_entry {
/**<
* 0 = No delivery has yet been attempted
* 2 = Delivery was successful
+ * 3 = Transient error like connection problem. Try next remote if available.
* 4 = A transient error was experienced ... try again later
* 5 = Delivery to this address failed permanently. The error message
* should be placed in the fourth field so that a bounce message may
long ActiveDeliveries;
StrBuf *EnvelopeFrom;
StrBuf *BounceTo;
+ StrBuf *SenderRoom;
ParsedURL *URL;
ParsedURL *FallBackHost;
} OneQueItem;
typedef void (*QItemHandler)(OneQueItem *Item, StrBuf *Line, const char **Pos);
+typedef struct __QItemHandlerStruct {
+ QItemHandler H;
+} QItemHandlerStruct;
+
+void RegisterQItemHandler(const char *Key, long Len, QItemHandler H)
+{
+ QItemHandlerStruct *HS = (QItemHandlerStruct*)malloc(sizeof(QItemHandlerStruct));
+ HS->H = H;
+ Put(QItemHandlers, Key, Len, HS, NULL);
+}
void FreeMailQEntry(void *qv)
{
DeleteHash(&(*Item)->MailQEntries);
FreeStrBuf(&(*Item)->EnvelopeFrom);
FreeStrBuf(&(*Item)->BounceTo);
+ FreeStrBuf(&(*Item)->SenderRoom);
FreeURL(&(*Item)->URL);
free(*Item);
Item = NULL;
StrBufExtract_NextToken(Token, Line, &pItemPart, '|');
if (GetHash(QItemHandlers, SKEY(Token), &vHandler))
{
- QItemHandler H;
- H = (QItemHandler) vHandler;
- H(Item, Line, &pItemPart);
+ QItemHandlerStruct *HS;
+ HS = (QItemHandlerStruct*) vHandler;
+ HS->H(Item, Line, &pItemPart);
}
}
FreeStrBuf(&Line);
void tmplput_MailQID(StrBuf *Target, WCTemplputParams *TP)
{
- OneQueItem *Item = (OneQueItem*) CTX;
+ OneQueItem *Item = (OneQueItem*) CTX(CTX_MAILQITEM);
StrBufAppendPrintf(Target, "%ld", Item->QueMsgID);;
}
void tmplput_MailQPayloadID(StrBuf *Target, WCTemplputParams *TP)
{
- OneQueItem *Item = (OneQueItem*) CTX;
+ OneQueItem *Item = (OneQueItem*) CTX(CTX_MAILQITEM);
StrBufAppendPrintf(Target, "%ld", Item->MessageID);
}
void tmplput_MailQBounceTo(StrBuf *Target, WCTemplputParams *TP)
{
- OneQueItem *Item = (OneQueItem*) CTX;
+ OneQueItem *Item = (OneQueItem*) CTX(CTX_MAILQITEM);
StrBufAppendTemplate(Target, TP, Item->BounceTo, 0);
}
void tmplput_MailQAttempted(StrBuf *Target, WCTemplputParams *TP)
{
char datebuf[64];
- OneQueItem *Item = (OneQueItem*) CTX;
+ OneQueItem *Item = (OneQueItem*) CTX(CTX_MAILQITEM);
webcit_fmt_date(datebuf, 64, Item->ReattemptWhen, DATEFMT_BRIEF);
StrBufAppendBufPlain(Target, datebuf, -1, 0);
}
void tmplput_MailQSubmitted(StrBuf *Target, WCTemplputParams *TP)
{
char datebuf[64];
- OneQueItem *Item = (OneQueItem*) CTX;
+ OneQueItem *Item = (OneQueItem*) CTX(CTX_MAILQITEM);
webcit_fmt_date(datebuf, 64, Item->Submitted, DATEFMT_BRIEF);
StrBufAppendBufPlain(Target, datebuf, -1, 0);
}
void tmplput_MailQEnvelopeFrom(StrBuf *Target, WCTemplputParams *TP)
{
- OneQueItem *Item = (OneQueItem*) CTX;
+ OneQueItem *Item = (OneQueItem*) CTX(CTX_MAILQITEM);
StrBufAppendTemplate(Target, TP, Item->EnvelopeFrom, 0);
}
+void tmplput_MailQSourceRoom(StrBuf *Target, WCTemplputParams *TP)
+{
+ OneQueItem *Item = (OneQueItem*) CTX(CTX_MAILQITEM);
+ StrBufAppendTemplate(Target, TP, Item->SenderRoom, 0);
+}
+
+int Conditional_MailQ_HaveSourceRoom(StrBuf *Target, WCTemplputParams *TP)
+{
+ OneQueItem *Item = (OneQueItem*) CTX(CTX_MAILQITEM);
+ return StrLength(Item->SenderRoom) > 0;
+}
+
void tmplput_MailQRetry(StrBuf *Target, WCTemplputParams *TP)
{
char datebuf[64];
- OneQueItem *Item = (OneQueItem*) CTX;
+ OneQueItem *Item = (OneQueItem*) CTX(CTX_MAILQITEM);
if (Item->Retry == 0) {
StrBufAppendBufPlain(Target, _("First Attempt pending"), -1, 0);
void tmplput_MailQRCPT(StrBuf *Target, WCTemplputParams *TP)
{
- MailQEntry *Entry = (MailQEntry*) CTX;
+ MailQEntry *Entry = (MailQEntry*) CTX(CTX_MAILQ_RCPT);
StrBufAppendTemplate(Target, TP, Entry->Recipient, 0);
}
void tmplput_MailQRCPTStatus(StrBuf *Target, WCTemplputParams *TP)
{
- MailQEntry *Entry = (MailQEntry*) CTX;
+ MailQEntry *Entry = (MailQEntry*) CTX(CTX_MAILQ_RCPT);
StrBufAppendPrintf(Target, "%ld", Entry->Status);
}
void tmplput_MailQStatusMsg(StrBuf *Target, WCTemplputParams *TP)
{
- MailQEntry *Entry = (MailQEntry*) CTX;
+ MailQEntry *Entry = (MailQEntry*) CTX(CTX_MAILQ_RCPT);
StrBufAppendTemplate(Target, TP, Entry->StatusMessage, 0);
}
HashList *iterate_get_Recipients(StrBuf *Target, WCTemplputParams *TP)
{
- OneQueItem *Item = (OneQueItem*) CTX;
+ OneQueItem *Item = (OneQueItem*) CTX(CTX_MAILQITEM);
return Item->MailQEntries;
}
StrBufExtract_NextToken(Item->BounceTo, Line, Pos, '|');
}
+void QItem_Handle_SenderRoom(OneQueItem *Item, StrBuf *Line, const char **Pos)
+{
+ if (Item->SenderRoom == NULL)
+ Item->SenderRoom = NewStrBufPlain(NULL, StrLength(Line));
+ StrBufExtract_NextToken(Item->SenderRoom, Line, Pos, '|');
+}
+
void QItem_Handle_Recipient(OneQueItem *Item, StrBuf *Line, const char **Pos)
{
+ const char *pch;
if (Item->Current == NULL)
NewMailQEntry(Item);
if (Item->Current->Recipient == NULL)
StrBufExtract_NextToken(Item->Current->Recipient, Line, Pos, '|');
Item->Current->Status = StrBufExtractNext_int(Line, Pos, '|');
StrBufExtract_NextToken(Item->Current->StatusMessage, Line, Pos, '|');
+
+ pch = ChrPtr(Item->Current->StatusMessage);
+ while ((pch != NULL) && (*pch != '\0')) {
+ pch = strchr(pch, ';');
+ if (pch != NULL) {
+ pch ++;
+ if (*pch == ' ') {
+ StrBufPeek(Item->Current->StatusMessage,
+ pch, -1, '\n');
+ }
+ }
+ }
Item->Current = NULL; // TODO: is this always right?
}
void QItem_Handle_retry(OneQueItem *Item, StrBuf *Line, const char **Pos)
{
- Item->Retry =
- StrBufExtractNext_int(Line, Pos, '|');
- Item->Retry *= 2;
+ Item->Retry = StrBufExtractNext_int(Line, Pos, '|');
}
-
-
-
-
-void render_QUEUE(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCharset)
+void render_QUEUE(StrBuf *Target, WCTemplputParams *TP, StrBuf *FoundCharset)
{
+ wc_mime_attachment *Mime = CTX(CTX_MIME_ATACH);
WCTemplputParams SubTP;
+ OneQueItem* Context;
- memset(&SubTP, 0, sizeof(WCTemplputParams));
- SubTP.Filter.ContextType = CTX_MAILQITEM;
- SubTP.Context = DeserializeQueueItem(Mime->Data, Mime->msgnum);
- DoTemplate(HKEY("view_mailq_message"),NULL, &SubTP);
- FreeQueItem ((OneQueItem**)&SubTP.Context);
+ Context = DeserializeQueueItem(Mime->Data, Mime->msgnum);
+ StackContext(TP, &SubTP, Context, CTX_MAILQITEM, 0, TP->Tokens);
+ {
+ DoTemplate(HKEY("view_mailq_message"), NULL, &SubTP);
+ }
+ UnStackContext(&SubTP);
+
+ FreeQueItem (&Context);
}
void
int qview_PrintPageHeader(SharedMessageStatus *Stat, void **ViewSpecific)
{
- if (!WC->is_aide)
- {
- output_headers(1, 1, 1, 0, 0, 0);
- }
+ if (yesbstr("ListOnly"))
+ output_headers(1, 0, 0, 0, 0, 0);
else
- {
- output_headers(1, 1, 2, 0, 0, 0);
- }
+ output_headers(1, 1, 1, 0, 0, 0);
return 0;
}
else {
snprintf(cmd, len, "MSGS ALL|0|1");
snprintf(filter, flen, "SUBJ|QMSG");
- DoTemplate(HKEY("view_mailq_header"), NULL, NULL);
+ if (yesbstr("ListOnly"))
+ DoTemplate(HKEY("view_mailq_table"), NULL, NULL);
+ else
+ DoTemplate(HKEY("view_mailq_header"), NULL, NULL);
return 200;
}
}
wcsession *WCC = WC;
WCTemplputParams SubTP;
- if (GetCount(WCC->summ) == 0)
- DoTemplate(HKEY("view_mailq_footer_empty"),NULL, &SubTP);
+ memset(&SubTP, 0, sizeof(WCTemplputParams));
+ if (yesbstr("ListOnly"))
+ DoTemplate(HKEY("view_mailq_footer_listonly"),NULL, &SubTP);
else
- DoTemplate(HKEY("view_mailq_footer"),NULL, &SubTP);
-
+ {
+ if (GetCount(WCC->summ) == 0)
+ DoTemplate(HKEY("view_mailq_footer_empty"),NULL, &SubTP);
+ else
+ DoTemplate(HKEY("view_mailq_footer"),NULL, &SubTP);
+ }
+
return 0;
}
int qview_Cleanup(void **ViewSpecific)
{
- wDumpContent(1);
+
+ wDumpContent(yesbstr("ListOnly")?0:1);
return 0;
}
InitModule_SMTP_QUEUE
(void)
{
-
- Put(QItemHandlers, HKEY("msgid"), QItem_Handle_MsgID, reference_free_handler);
- Put(QItemHandlers, HKEY("envelope_from"), QItem_Handle_EnvelopeFrom, reference_free_handler);
- Put(QItemHandlers, HKEY("retry"), QItem_Handle_retry, reference_free_handler);
- Put(QItemHandlers, HKEY("attempted"), QItem_Handle_Attempted, reference_free_handler);
- Put(QItemHandlers, HKEY("remote"), QItem_Handle_Recipient, reference_free_handler);
- Put(QItemHandlers, HKEY("bounceto"), QItem_Handle_BounceTo, reference_free_handler);
- Put(QItemHandlers, HKEY("submitted"), QItem_Handle_Submitted, reference_free_handler);
-
- WebcitAddUrlHandler(HKEY("display_smtpqueue"), "", 0, display_smtpqueue, 0);
- WebcitAddUrlHandler(HKEY("display_smtpqueue_inner_div"), "", 0, display_smtpqueue_inner_div, 0);
+ RegisterCTX(CTX_MAILQITEM);
+ RegisterCTX(CTX_MAILQ_RCPT);
+
+ RegisterQItemHandler(HKEY("msgid"), QItem_Handle_MsgID);
+ RegisterQItemHandler(HKEY("envelope_from"), QItem_Handle_EnvelopeFrom);
+ RegisterQItemHandler(HKEY("retry"), QItem_Handle_retry);
+ RegisterQItemHandler(HKEY("attempted"), QItem_Handle_Attempted);
+ RegisterQItemHandler(HKEY("remote"), QItem_Handle_Recipient);
+ RegisterQItemHandler(HKEY("bounceto"), QItem_Handle_BounceTo);
+ RegisterQItemHandler(HKEY("source_room"), QItem_Handle_SenderRoom);
+ RegisterQItemHandler(HKEY("submitted"), QItem_Handle_Submitted);
RegisterMimeRenderer(HKEY("application/x-citadel-delivery-list"), render_QUEUE, 1, 9000);
-
-
RegisterNamespace("MAILQ:ID", 0, 0, tmplput_MailQID, NULL, CTX_MAILQITEM);
RegisterNamespace("MAILQ:PAYLOAD:ID", 0, 0, tmplput_MailQPayloadID, NULL, CTX_MAILQITEM);
RegisterNamespace("MAILQ:BOUNCETO", 0, 1, tmplput_MailQBounceTo, NULL, CTX_MAILQITEM);
RegisterNamespace("MAILQ:ATTEMPTED", 0, 0, tmplput_MailQAttempted, NULL, CTX_MAILQITEM);
RegisterNamespace("MAILQ:SUBMITTED", 0, 0, tmplput_MailQSubmitted, NULL, CTX_MAILQITEM);
RegisterNamespace("MAILQ:ENVELOPEFROM", 0, 1, tmplput_MailQEnvelopeFrom, NULL, CTX_MAILQITEM);
+ RegisterNamespace("MAILQ:SRCROOM", 0, 1, tmplput_MailQSourceRoom, NULL, CTX_MAILQITEM);
+ RegisterConditional("COND:MAILQ:HAVESRCROOM", 0, Conditional_MailQ_HaveSourceRoom, CTX_MAILQITEM);
RegisterNamespace("MAILQ:RETRY", 0, 0, tmplput_MailQRetry, NULL, CTX_MAILQITEM);
RegisterNamespace("MAILQ:RCPT:ADDR", 0, 1, tmplput_MailQRCPT, NULL, CTX_MAILQ_RCPT);