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);
}
{
char datebuf[64];
message_summary *Msg = (message_summary*) CTX;
- webcit_fmt_date(datebuf, Msg->date, 1);
+ webcit_fmt_date(datebuf, 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, Msg->date, DATEFMT_FULL);
StrBufAppendBufPlain(Target, datebuf, -1, 0);
}
void tmplput_MAIL_SUMM_DATE_NO(StrBuf *Target, WCTemplputParams *TP)
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) ) {