message_summary *Msg = (message_summary*) CTX;
StrBufAppendTemplate(Target, TP, Msg->subj, 0);
}
+int Conditional_MAIL_SUMM_SUBJECT(StrBuf *Target, WCTemplputParams *TP)
+{
+ message_summary *Msg = (message_summary*) CTX;
+ return StrLength(Msg->subj) > 0;
+}
void examine_msgn(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
message_summary *Msg = (message_summary*) CTX;
return StrLength(Msg->Rfca) > 0;
}
+int Conditional_MAIL_SUMM_CCCC(StrBuf *Target, WCTemplputParams *TP)
+{
+ message_summary *Msg = (message_summary*) CTX;
+ return StrLength(Msg->cccc) > 0;
+}
void examine_node(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
{
+ wcsession *WCC = WC;
+
if ( (StrLength(HdrLine) > 0) &&
((WC->room_flags & QR_NETWORK)
- || ((strcasecmp(ChrPtr(HdrLine), ChrPtr(serv_info.serv_nodename))
- && (strcasecmp(ChrPtr(HdrLine), ChrPtr(serv_info.serv_fqdn))))))) {
+ || ((strcasecmp(ChrPtr(HdrLine), ChrPtr(WCC->serv_info->serv_nodename))
+ && (strcasecmp(ChrPtr(HdrLine), ChrPtr(WCC->serv_info->serv_fqdn))))))) {
FreeStrBuf(&Msg->OtherNode);
Msg->OtherNode = NewStrBufDup(HdrLine);
}
message_summary *Msg = (message_summary*) CTX;
StrBufAppendTemplate(Target, TP, Msg->to, 0);
}
+int Conditional_MAIL_SUMM_TO(StrBuf *Target, WCTemplputParams *TP)
+{
+ message_summary *Msg = (message_summary*) CTX;
+ return StrLength(Msg->to) != 0;
+}
+int Conditional_MAIL_SUMM_SUBJ(StrBuf *Target, WCTemplputParams *TP)
+{
+ message_summary *Msg = (message_summary*) CTX;
+ return StrLength(Msg->subj) != 0;
+}
void tmplput_MAIL_SUMM_ALLRCPT(StrBuf *Target, WCTemplputParams *TP)
{
message_summary *Msg = (message_summary*) CTX;
}
+
+void tmplput_SUMM_COUNT(StrBuf *Target, WCTemplputParams *TP)
+{
+ StrBufAppendPrintf(Target, "%d", GetCount( WC->summ));
+}
+
HashList *iterate_get_mailsumm_All(StrBuf *Target, WCTemplputParams *TP)
{
return WC->summ;
}
-int Conditional_ROOM_DISPLAY_MSG(StrBuf *Target, WCTemplputParams *TP) {
- wcsession *WCC = WC;
- IterateStruct *ITC = CCTX;
- int num_inset = ITC->n;
- if ((num_inset >= WC->startmsg) && (WCC->num_displayed <= WCC->maxmsgs)) {
- WCC->num_displayed = WCC->num_displayed+1;
- return 1; /* Pass GO, collect $200 */
- }
- return 0;
-}
-int Conditional_MAIL_SUMM_LASTMSG(StrBuf *Target, WCTemplputParams *TP) {
- IterateStruct *ITC = CCTX;
- int is_last_n = ITC->LastN;
-/*
- //GetHash(WC->vars, HKEY("ITERATE:N"), (void *)&n_dsubst);
- //num_inset = n_dsubst->lvalue;
- */
- /* Is the num_displayed higher than maxmsgs? OR last in iterator */
- return ((WC->num_displayed > WC->maxmsgs) || (is_last_n == 1));
-}
void examine_time(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
{
Msg->date = StrTol(HdrLine);
{
char datebuf[64];
message_summary *Msg = (message_summary*) CTX;
- webcit_fmt_date(datebuf, Msg->date, 1);
+ webcit_fmt_date(datebuf, 64, Msg->date, DATEFMT_BRIEF);
StrBufAppendBufPlain(Target, datebuf, -1, 0);
}
{
char datebuf[64];
message_summary *Msg = (message_summary*) CTX;
- webcit_fmt_date(datebuf, Msg->date, 0);
+ webcit_fmt_date(datebuf, 64, Msg->date, DATEFMT_FULL);
StrBufAppendBufPlain(Target, datebuf, -1, 0);
}
void tmplput_MAIL_SUMM_DATE_NO(StrBuf *Target, WCTemplputParams *TP)
}
/* In all cases, display the full card */
- display_vcard(Buf, ChrPtr(Mime->Data), 0, 1, NULL, Mime->msgnum);
+ display_vcard(Buf, Mime->Data, 0, 1, NULL, Mime->msgnum);
FreeStrBuf(&Mime->Data);
Mime->Data = Buf;
}
Mime->PartNum = NewStrBuf();
StrBufExtract_token(Mime->PartNum, HdrLine, 2, '|');
StrBufTrim(Mime->PartNum);
- if (strchr(ChrPtr(Mime->PartNum), '.') != NULL)
+ if (strchr(ChrPtr(Mime->PartNum), '.') != NULL)
Mime->level = 2;
else
Mime->level = 1;
StrBufTrim(Mime->ContentType);
StrBufLowerCase(Mime->ContentType);
+ if (!strcmp(ChrPtr(Mime->ContentType), "application/octet-stream")) {
+ StrBufPlain(Mime->ContentType,
+ GuessMimeByFilename(SKEY(Mime->FileName)), -1);
+ }
Mime->length = StrBufExtract_int(HdrLine, 5, '|');
if ( (StrLength(Mime->FileName) == 0) && (StrLength(Mime->Name) > 0) ) {
}
if (i > 0) StrBufCutLeft(Line, i);
- if (StrLength(Line) == 0)
+ if (StrLength(Line) == 0) {
+ StrBufAppendBufPlain(Target, HKEY("<tt></tt><br />\n"), 0);
continue;
+ }
for (i = bn; i < bq; i++)
StrBufAppendBufPlain(Target, HKEY("<blockquote>"), 0);
groupchange_sender,
CTX_MAILSUM);
+ RegisterNamespace("SUMM:COUNT", 0, 0, tmplput_SUMM_COUNT, CTX_NONE);
/* iterate over all known mails in WC->summ */
RegisterIterator("MAIL:SUMM:MSGS", 0, NULL, iterate_get_mailsumm_All,
NULL,NULL, CTX_MAILSUM, CTX_NONE, IT_NOFLAG);
RegisterNamespace("MAIL:SUMM:ORGROOM", 0, 2, tmplput_MAIL_SUMM_ORGROOM, CTX_MAILSUM);
RegisterNamespace("MAIL:SUMM:RFCA", 0, 2, tmplput_MAIL_SUMM_RFCA, CTX_MAILSUM);
RegisterNamespace("MAIL:SUMM:OTHERNODE", 2, 0, tmplput_MAIL_SUMM_OTHERNODE, CTX_MAILSUM);
- RegisterNamespace("MAIL:SUMM:REFIDS", 0, 0, tmplput_MAIL_SUMM_REFIDS, CTX_MAILSUM);
+ RegisterNamespace("MAIL:SUMM:REFIDS", 0, 1, tmplput_MAIL_SUMM_REFIDS, CTX_MAILSUM);
RegisterNamespace("MAIL:SUMM:INREPLYTO", 0, 2, tmplput_MAIL_SUMM_INREPLYTO, CTX_MAILSUM);
RegisterNamespace("MAIL:BODY", 0, 2, tmplput_MAIL_BODY, CTX_MAILSUM);
RegisterNamespace("MAIL:QUOTETEXT", 1, 2, tmplput_QUOTED_MAIL_BODY, CTX_NONE);
- RegisterConditional(HKEY("COND:ROOM:DISPLAYMSG"), 0, Conditional_ROOM_DISPLAY_MSG, CTX_MAILSUM);
- RegisterConditional(HKEY("COND:MAIL:SUMM:LASTMSG"), 0, Conditional_MAIL_SUMM_LASTMSG, CTX_MAILSUM);
RegisterConditional(HKEY("COND:MAIL:SUMM:RFCA"), 0, Conditional_MAIL_SUMM_RFCA, CTX_MAILSUM);
+ RegisterConditional(HKEY("COND:MAIL:SUMM:CCCC"), 0, Conditional_MAIL_SUMM_CCCC, CTX_MAILSUM);
RegisterConditional(HKEY("COND:MAIL:SUMM:UNREAD"), 0, Conditional_MAIL_SUMM_UNREAD, CTX_MAILSUM);
RegisterConditional(HKEY("COND:MAIL:SUMM:H_NODE"), 0, Conditional_MAIL_SUMM_H_NODE, CTX_MAILSUM);
RegisterConditional(HKEY("COND:MAIL:SUMM:OTHERNODE"), 0, Conditional_MAIL_SUMM_OTHERNODE, CTX_MAILSUM);
+ RegisterConditional(HKEY("COND:MAIL:SUMM:SUBJECT"), 0, Conditional_MAIL_SUMM_SUBJECT, CTX_MAILSUM);
RegisterConditional(HKEY("COND:MAIL:ANON"), 0, Conditional_ANONYMOUS_MESSAGE, CTX_MAILSUM);
-
+ RegisterConditional(HKEY("COND:MAIL:TO"), 0, Conditional_MAIL_SUMM_TO, CTX_MAILSUM);
+ RegisterConditional(HKEY("COND:MAIL:SUBJ"), 0, Conditional_MAIL_SUMM_SUBJ, CTX_MAILSUM);
/* do we have mimetypes to iterate over? */
RegisterConditional(HKEY("COND:MAIL:MIME:ATTACH"), 0, Conditional_MAIL_MIME_ALL, CTX_MAILSUM);