return Msg->nhdr != 0;
}
-
void examine_type(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
{
Msg->format_type = StrToi(HdrLine);
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;
}
-
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)
void render_MAIL(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCharset)
{
+ const StrBuf *TemplateMime;
+
Mime->Data = NewStrBufPlain(NULL, Mime->length);
- read_message(Mime->Data, HKEY("view_submessage"), Mime->msgnum, 0, Mime->PartNum);
+ read_message(Mime->Data, HKEY("view_submessage"), Mime->msgnum, Mime->PartNum, &TemplateMime);
/*
if ( (!IsEmptyStr(mime_submessages)) && (!section[0]) ) {
for (i=0; i<num_tokens(mime_submessages, '|'); ++i) {
}
/* 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;
}
}
-void render_MIME_ICS(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCharset)
+
+void render_MIME_VNote(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCharset)
{
MimeLoadData(Mime);
+ if (StrLength(Mime->Data) > 0) {
+ struct vnote *v;
+ StrBuf *Buf;
+
+ Buf = NewStrBuf();
+ v = vnote_new_from_str(ChrPtr(Mime->Data));
+ if (v) {
+ WCTemplputParams TP;
+
+ memset(&TP, 0, sizeof(WCTemplputParams));
+ TP.Filter.ContextType = CTX_VNOTE;
+ TP.Context = v;
+ DoTemplate(HKEY("mail_vnoteitem"),
+ Buf, &TP);
+
+ vnote_free(v);
+
+ FreeStrBuf(&Mime->Data);
+ Mime->Data = Buf;
+ }
+ else
+ FlushStrBuf(Mime->Data);
+ }
+
+}
+
+void render_MIME_ICS(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCharset)
+{
+ if (StrLength(Mime->Data) == 0) {
+ MimeLoadData(Mime);
+ }
if (StrLength(Mime->Data) > 0) {
cal_process_attachment(Mime);
}
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) ) {
void examine_text(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
{
- Msg->MsgBody->Data = NewStrBuf();
+ Msg->MsgBody->Data = NewStrBufPlain(NULL, SIZ);
}
void examine_msg4_partnum(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
StrBufTrim(Msg->MsgBody->PartNum);
}
-
void examine_content_lengh(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
{
Msg->MsgBody->length = StrTol(HdrLine);
/*----------------------------------------------------------------------------*/
void tmplput_QUOTED_MAIL_BODY(StrBuf *Target, WCTemplputParams *TP)
{
- long MsgNum;
+ const StrBuf *Mime;
+ long MsgNum;
+ StrBuf *Buf;
+
+ MsgNum = LBstr(TKEY(0));
+ Buf = NewStrBuf();
+ read_message(Buf, HKEY("view_message_replyquote"), MsgNum, NULL, &Mime);
+ StrBufAppendTemplate(Target, TP, Buf, 1);
+ FreeStrBuf(&Buf);
+}
+
+void tmplput_EDIT_MAIL_BODY(StrBuf *Target, WCTemplputParams *TP)
+{
+ const StrBuf *Mime;
+ long MsgNum;
StrBuf *Buf;
MsgNum = LBstr(TKEY(0));
Buf = NewStrBuf();
- read_message(Buf, HKEY("view_message_replyquote"), MsgNum, 0, NULL);
+ read_message(Buf, HKEY("view_message_edit"), MsgNum, NULL, &Mime);
StrBufAppendTemplate(Target, TP, Buf, 1);
FreeStrBuf(&Buf);
}
if ((StrLength(Mime->Data) == 0) && (Mime->length > 0)) {
FreeStrBuf(&Mime->Data);
- Mime->Data = NewStrBufPlain(NULL, Mime->length);
- if (!read_message(Mime->Data, HKEY("view_submessage"), Mime->msgnum, 0, Mime->PartNum))
- return;
+ MimeLoadData(Mime);
}
/* Boring old 80-column fixed format text gets handled this way... */
}
}
#endif
- Line = NewStrBuf();
- Line1 = NewStrBuf();
- Line2 = NewStrBuf();
+ Line = NewStrBufPlain(NULL, SIZ);
+ Line1 = NewStrBufPlain(NULL, SIZ);
+ Line2 = NewStrBufPlain(NULL, SIZ);
Target = NewStrBufPlain(NULL, StrLength(Mime->Data));
while ((n = StrBufSipLine(Line, Mime->Data, &BufPtr), n >= 0) && !done)
}
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);
iconv_close(ic);
}
#endif
+
FreeStrBuf(&Mime->Data);
Mime->Data = Target;
+ FlushStrBuf(Mime->ContentType);
+ StrBufAppendBufPlain(Mime->ContentType, HKEY("text/html"), 0);
+ FlushStrBuf(Mime->Charset);
+ StrBufAppendBufPlain(Mime->Charset, HKEY("UTF-8"), 0);
FreeStrBuf(&Line);
FreeStrBuf(&Line1);
FreeStrBuf(&Line2);
void render_MAIL_html(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCharset)
{
StrBuf *Buf;
- /* HTML is fun, but we've got to strip it first */
+
if (StrLength(Mime->Data) == 0)
return;
Buf = NewStrBufPlain(NULL, StrLength(Mime->Data));
+ /* HTML is fun, but we've got to strip it first */
output_html(ChrPtr(Mime->Charset),
(WC->wc_view == VIEW_WIKI ? 1 : 0),
- StrToi(Mime->PartNum),
+ Mime->msgnum,
Mime->Data, Buf);
FreeStrBuf(&Mime->Data);
Mime->Data = Buf;
void SetAccessCommand(long Oper)
{
+/* TODO: whats achieved by this?
wcsession *WCC = WC;
if (WCC->UrlFragment1 != NULL ) {
}
else
WCC->UrlFragment1 = NewStrBufPlain(rlid[Oper].name.Key, rlid[Oper].name.len);
+*/
}
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);
- /* render parts of the message struct */
RegisterNamespace("MAIL:SUMM:DATEBRIEF", 0, 0, tmplput_MAIL_SUMM_DATE_BRIEF, CTX_MAILSUM);
RegisterNamespace("MAIL:SUMM:DATEFULL", 0, 0, tmplput_MAIL_SUMM_DATE_FULL, CTX_MAILSUM);
RegisterNamespace("MAIL:SUMM:DATENO", 0, 0, tmplput_MAIL_SUMM_DATE_NO, CTX_MAILSUM);
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);
-
+ RegisterNamespace("MAIL:EDITTEXT", 1, 2, tmplput_EDIT_MAIL_BODY, CTX_NONE);
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);
/* mime renderers translate an attachment into webcit viewable html text */
RegisterMimeRenderer(HKEY("message/rfc822"), render_MAIL);
+ RegisterMimeRenderer(HKEY("text/vnote"), render_MIME_VNote);
RegisterMimeRenderer(HKEY("text/x-vcard"), render_MIME_VCard);
RegisterMimeRenderer(HKEY("text/vcard"), render_MIME_VCard);
RegisterMimeRenderer(HKEY("text/calendar"), render_MIME_ICS);
RegisterMsgHdr(HKEY("suff"), examine_suff, 0);
RegisterMsgHdr(HKEY("path"), examine_path, 0);
}
+
+void
+ServerStartModule_MSGRENDERERS
+(void)
+{
+ MsgHeaderHandler = NewHash(1, NULL);
+ MimeRenderHandler = NewHash(1, NULL);
+}
+
+void
+ServerShutdownModule_MSGRENDERERS
+(void)
+{
+ DeleteHash(&MsgHeaderHandler);
+ DeleteHash(&MimeRenderHandler);
+}
+
+
+
+void
+SessionDestroyModule_MSGRENDERERS
+(wcsession *sess)
+{
+ DeleteHash(&sess->attachments);
+}
projects / citadel.git / blobdiff