*/
#include "webcit.h"
+CtxType CTX_MAILQITEM = CTX_NONE;
+CtxType CTX_MAILQ_RCPT = CTX_NONE;
HashList *QItemHandlers = NULL;
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;
+ OneQueItem *Item = (OneQueItem*) CTX(CTX_MAILQITEM);
StrBufAppendTemplate(Target, TP, Item->SenderRoom, 0);
}
int Conditional_MailQ_HaveSourceRoom(StrBuf *Target, WCTemplputParams *TP)
{
- OneQueItem *Item = (OneQueItem*) CTX;
+ 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;
}
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 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)
{
- output_headers(1, 1, 1, 0, 0, 0);
+ if (yesbstr("ListOnly"))
+ output_headers(1, 0, 0, 0, 0, 0);
+ else
+ 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)
{
+ RegisterCTX(CTX_MAILQITEM);
+ RegisterCTX(CTX_MAILQ_RCPT);
RegisterQItemHandler(HKEY("msgid"), QItem_Handle_MsgID);
RegisterQItemHandler(HKEY("envelope_from"), QItem_Handle_EnvelopeFrom);
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(HKEY("COND:MAILQ:HAVESRCROOM"), 0, Conditional_MailQ_HaveSourceRoom, 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);