X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fmsg_renderers.c;h=187753b2cd02ee67730b1c12ecd988f5950bc3e8;hb=HEAD;hp=7bd99aff37fa497fc8b883670b6c8b37f90fe210;hpb=de757dff5540847c070bd770f735067b89b1f614;p=citadel.git diff --git a/webcit/msg_renderers.c b/webcit/msg_renderers.c index 7bd99aff3..c32661081 100644 --- a/webcit/msg_renderers.c +++ b/webcit/msg_renderers.c @@ -1,5 +1,5 @@ #include "webcit.h" -#include "webserver.h" + #include "dav.h" CtxType CTX_MAILSUM = CTX_NONE; @@ -52,13 +52,10 @@ void DestroyMessageSummary(void *vMsg) FreeStrBuf(&Msg->reply_references); FreeStrBuf(&Msg->cccc); FreeStrBuf(&Msg->ReplyTo); - FreeStrBuf(&Msg->hnod); FreeStrBuf(&Msg->AllRcpt); FreeStrBuf(&Msg->Room); FreeStrBuf(&Msg->Rfca); FreeStrBuf(&Msg->EnvTo); - FreeStrBuf(&Msg->OtherNode); - DeleteHash(&Msg->Attachments); /* list of Attachments */ DeleteHash(&Msg->Submessages); DeleteHash(&Msg->AttachLinks); @@ -278,20 +275,20 @@ int groupchange_date(const void *s1, const void *s2) { } -/*----------------------------------------------------------------------------*/ -/* Don't wanna know... or? */ +/* Stub handlers for MIME parser */ void examine_pref(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) {return;} void examine_suff(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) {return;} void examine_path(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) {return;} + void examine_content_encoding(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) { -/* TODO: do we care? */ +/* nothing to do here */ } void examine_exti(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) { - /* we don't care */ +/* nothing to do here */ } void examine_nhdr(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) @@ -314,17 +311,15 @@ void examine_type(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) void examine_from(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) { - wcsession *WCC = WC; - - CheckConvertBufs(WCC); + CheckConvertBufs(WC); FreeStrBuf(&Msg->from); Msg->from = NewStrBufPlain(NULL, StrLength(HdrLine)); StrBuf_RFC822_2_Utf8(Msg->from, HdrLine, - WCC->DefaultCharset, + WC->DefaultCharset, FoundCharset, - WCC->ConvertBuf1, - WCC->ConvertBuf2); + WC->ConvertBuf1, + WC->ConvertBuf2); } void tmplput_MAIL_SUMM_FROM(StrBuf *Target, WCTemplputParams *TP) { @@ -334,17 +329,15 @@ void tmplput_MAIL_SUMM_FROM(StrBuf *Target, WCTemplputParams *TP) void examine_subj(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) { - wcsession *WCC = WC; - - CheckConvertBufs(WCC); + CheckConvertBufs(WC); FreeStrBuf(&Msg->subj); Msg->subj = NewStrBufPlain(NULL, StrLength(HdrLine)); StrBuf_RFC822_2_Utf8(Msg->subj, HdrLine, - WCC->DefaultCharset, + WC->DefaultCharset, FoundCharset, - WCC->ConvertBuf1, - WCC->ConvertBuf2); + WC->ConvertBuf1, + WC->ConvertBuf2); } void tmplput_MAIL_SUMM_SUBJECT(StrBuf *Target, WCTemplputParams *TP) { @@ -365,22 +358,30 @@ void tmplput_MAIL_SUMM_SUBJECT(StrBuf *Target, WCTemplputParams *TP) } StrBufAppendTemplate(Target, TP, Msg->subj, 0); } -int Conditional_MAIL_SUMM_SUBJECT(StrBuf *Target, WCTemplputParams *TP) -{ + +/* + * Conditional returns true if the message has a Subject and it is nonzero in length + */ +int Conditional_MAIL_SUMM_SUBJECT(StrBuf *Target, WCTemplputParams *TP) { message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM); + return StrLength(Msg->subj) > 0; +} - return StrLength(Msg->subj) > 0; +/* + * Conditional returns true if the message originated on the local system + */ +int Conditional_MAIL_LOCAL(StrBuf *Target, WCTemplputParams *TP) { + message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM); + return (Msg->is_local ? 1 : 0); } -void examine_msgn(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) -{ - wcsession *WCC = WC; +void examine_msgn(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) { long Offset = 0; const char *pOffset; - CheckConvertBufs(WCC); + CheckConvertBufs(WC); FreeStrBuf(&Msg->reply_inreplyto); Msg->reply_inreplyto = NewStrBufPlain(NULL, StrLength(HdrLine)); pOffset = strchr(ChrPtr(HdrLine), '/'); @@ -390,25 +391,26 @@ void examine_msgn(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) Msg->reply_inreplyto_hash = ThreadIdHashOffset(HdrLine, Offset); StrBuf_RFC822_2_Utf8(Msg->reply_inreplyto, HdrLine, - WCC->DefaultCharset, + WC->DefaultCharset, FoundCharset, - WCC->ConvertBuf1, - WCC->ConvertBuf2); + WC->ConvertBuf1, + WC->ConvertBuf2); } -void tmplput_MAIL_SUMM_INREPLYTO(StrBuf *Target, WCTemplputParams *TP) -{ + + +void tmplput_MAIL_SUMM_INREPLYTO(StrBuf *Target, WCTemplputParams *TP) { message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM); StrBufAppendTemplate(Target, TP, Msg->reply_inreplyto, 0); } -int Conditional_MAIL_SUMM_UNREAD(StrBuf *Target, WCTemplputParams *TP) -{ + +int Conditional_MAIL_SUMM_UNREAD(StrBuf *Target, WCTemplputParams *TP) { message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM); return (Msg->Flags & MSGFLAG_READ) != 0; } -void examine_wefw(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) -{ + +void examine_wefw(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) { wcsession *WCC = WC; long Offset = 0; const char *pOffset; @@ -428,14 +430,15 @@ void examine_wefw(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) WCC->ConvertBuf1, WCC->ConvertBuf2); } -void tmplput_MAIL_SUMM_REFIDS(StrBuf *Target, WCTemplputParams *TP) -{ + + +void tmplput_MAIL_SUMM_REFIDS(StrBuf *Target, WCTemplputParams *TP) { message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM); StrBufAppendTemplate(Target, TP, Msg->reply_references, 0); } -void examine_replyto(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) -{ + +void examine_replyto(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) { wcsession *WCC = WC; CheckConvertBufs(WCC); @@ -454,14 +457,15 @@ void examine_replyto(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset } StrBufAppendBuf(Msg->AllRcpt, Msg->ReplyTo, 0); } -void tmplput_MAIL_SUMM_REPLYTO(StrBuf *Target, WCTemplputParams *TP) -{ + + +void tmplput_MAIL_SUMM_REPLYTO(StrBuf *Target, WCTemplputParams *TP) { message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM); StrBufAppendTemplate(Target, TP, Msg->ReplyTo, 0); } -void examine_cccc(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) -{ + +void examine_cccc(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) { wcsession *WCC = WC; CheckConvertBufs(WCC); @@ -480,56 +484,65 @@ void examine_cccc(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) } StrBufAppendBuf(Msg->AllRcpt, Msg->cccc, 0); } -void tmplput_MAIL_SUMM_CCCC(StrBuf *Target, WCTemplputParams *TP) -{ + + +void tmplput_MAIL_SUMM_CCCC(StrBuf *Target, WCTemplputParams *TP) { message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM); StrBufAppendTemplate(Target, TP, Msg->cccc, 0); } -void examine_room(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) -{ +void examine_room(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) { if ((StrLength(HdrLine) > 0) && (strcasecmp(ChrPtr(HdrLine), ChrPtr(WC->CurRoom.name)))) { FreeStrBuf(&Msg->Room); Msg->Room = NewStrBufDup(HdrLine); } } -void tmplput_MAIL_SUMM_ORGROOM(StrBuf *Target, WCTemplputParams *TP) -{ + + +void tmplput_MAIL_SUMM_ORGROOM(StrBuf *Target, WCTemplputParams *TP) { message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM); StrBufAppendTemplate(Target, TP, Msg->Room, 0); } -void examine_rfca(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) -{ +void examine_rfca(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) { FreeStrBuf(&Msg->Rfca); Msg->Rfca = NewStrBufDup(HdrLine); } -void tmplput_MAIL_SUMM_RFCA(StrBuf *Target, WCTemplputParams *TP) -{ + + +void examine_locl(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) { + Msg->is_local = 1; +} + + +void tmplput_MAIL_SUMM_RFCA(StrBuf *Target, WCTemplputParams *TP) { message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM); StrBufAppendTemplate(Target, TP, Msg->Rfca, 0); } -int Conditional_MAIL_SUMM_RFCA(StrBuf *Target, WCTemplputParams *TP) -{ + + +int Conditional_MAIL_SUMM_RFCA(StrBuf *Target, WCTemplputParams *TP) { message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM); return StrLength(Msg->Rfca) > 0; } -int Conditional_MAIL_SUMM_CCCC(StrBuf *Target, WCTemplputParams *TP) -{ + + +int Conditional_MAIL_SUMM_CCCC(StrBuf *Target, WCTemplputParams *TP) { message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM); return StrLength(Msg->cccc) > 0; } -int Conditional_MAIL_SUMM_REPLYTO(StrBuf *Target, WCTemplputParams *TP) -{ + + +int Conditional_MAIL_SUMM_REPLYTO(StrBuf *Target, WCTemplputParams *TP) { message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM); return StrLength(Msg->ReplyTo) > 0; } -void examine_nvto(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) -{ + +void examine_nvto(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) { wcsession *WCC = WC; CheckConvertBufs(WCC); @@ -544,8 +557,7 @@ void examine_nvto(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) } -void examine_rcpt(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) -{ +void examine_rcpt(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) { wcsession *WCC = WC; CheckConvertBufs(WCC); @@ -564,43 +576,47 @@ void examine_rcpt(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) } StrBufAppendBuf(Msg->AllRcpt, Msg->to, 0); } -void tmplput_MAIL_SUMM_TO(StrBuf *Target, WCTemplputParams *TP) -{ + + +void tmplput_MAIL_SUMM_TO(StrBuf *Target, WCTemplputParams *TP) { message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM); StrBufAppendTemplate(Target, TP, Msg->to, 0); } -int Conditional_MAIL_SUMM_TO(StrBuf *Target, WCTemplputParams *TP) -{ + + +int Conditional_MAIL_SUMM_TO(StrBuf *Target, WCTemplputParams *TP) { message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM); return StrLength(Msg->to) != 0; } -int Conditional_MAIL_SUMM_SUBJ(StrBuf *Target, WCTemplputParams *TP) -{ + + +int Conditional_MAIL_SUMM_SUBJ(StrBuf *Target, WCTemplputParams *TP) { message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM); return StrLength(Msg->subj) != 0; } -void tmplput_MAIL_SUMM_ALLRCPT(StrBuf *Target, WCTemplputParams *TP) -{ + + +void tmplput_MAIL_SUMM_ALLRCPT(StrBuf *Target, WCTemplputParams *TP) { message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM); StrBufAppendTemplate(Target, TP, Msg->AllRcpt, 0); } - -void tmplput_SUMM_COUNT(StrBuf *Target, WCTemplputParams *TP) -{ +void tmplput_SUMM_COUNT(StrBuf *Target, WCTemplputParams *TP) { StrBufAppendPrintf(Target, "%d", GetCount( WC->summ)); } -HashList *iterate_get_mailsumm_All(StrBuf *Target, WCTemplputParams *TP) -{ + +HashList *iterate_get_mailsumm_All(StrBuf *Target, WCTemplputParams *TP) { return WC->summ; } -void examine_time(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) -{ + + +void examine_time(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) { Msg->date = StrTol(HdrLine); } + void tmplput_MAIL_SUMM_DATE_BRIEF(StrBuf *Target, WCTemplputParams *TP) { char datebuf[64]; @@ -1339,7 +1355,12 @@ readloop_struct rlid[] = { { {HKEY("readlt")}, servcmd_readlt } }; -const char* fieldMnemonics[] = { + +/* I think these are supposed to align with _eMessageField in messages.h + * So if you change one you have to change the other. + * TODO: figure out who did this and beat them with a wet noodle. + */ +const char *fieldMnemonics[] = { "from", /* A -> eAuthor */ "exti", /* E -> eXclusivID */ "rfca", /* F -> erFc822Addr */ @@ -1347,8 +1368,8 @@ const char* fieldMnemonics[] = { "jrnl", /* J -> eJournal */ "rep2", /* K -> eReplyTo */ "list", /* L -> eListID */ - "text", /* M -> eMesageText */ - "room", /* O -> eOriginalRoom */ + "text", /* M -> eMessageText */ + "locl", /* eIsLocal */ "path", /* P -> eMessagePath */ "rcpt", /* R -> eRecipient */ "spec", /* S -> eSpecialField */ @@ -1357,16 +1378,15 @@ const char* fieldMnemonics[] = { "nvto", /* V -> eenVelopeTo */ "wefw", /* W -> eWeferences */ "cccc", /* Y -> eCarbonCopY */ - "nhdr", /* % -> eHeaderOnly */ - "type", /* % -> eFormatType */ - "part", /* % -> eMessagePart */ - "suff", /* % -> eSubFolder */ - "pref" /* % -> ePevious */ + "nhdr", /* eHeaderOnly */ + "type", /* eFormatType */ + "part", /* eMessagePart */ + "suff" /* eSubFolder */ }; HashList *msgKeyLookup = NULL; -int GetFieldFromMnemonic(eMessageField *f, const char* c) -{ + +int GetFieldFromMnemonic(eMessageField *f, const char *c) { void *v = NULL; if (GetHash(msgKeyLookup, c, 4, &v)) { *f = (eMessageField) v; @@ -1375,22 +1395,19 @@ int GetFieldFromMnemonic(eMessageField *f, const char* c) return 0; } -void FillMsgKeyLookupTable(void) -{ + +void FillMsgKeyLookupTable(void) { long i = 0; msgKeyLookup = NewHash (1, FourHash); - - while (i != eLastHeader) { + for (i=0; isumm */ - RegisterIterator("MAIL:SUMM:MSGS", 0, NULL, iterate_get_mailsumm_All, - NULL,NULL, CTX_MAILSUM, CTX_NONE, IT_NOFLAG); + RegisterIterator("MAIL:SUMM:MSGS", 0, NULL, iterate_get_mailsumm_All, NULL,NULL, CTX_MAILSUM, CTX_NONE, IT_NOFLAG); RegisterNamespace("MAIL:SUMM:EUID", 0, 1, tmplput_MAIL_SUMM_EUID, NULL, CTX_MAILSUM); RegisterNamespace("MAIL:SUMM:DATEBRIEF", 0, 0, tmplput_MAIL_SUMM_DATE_BRIEF, NULL, CTX_MAILSUM); @@ -1449,22 +1466,19 @@ InitModule_MSGRENDERERS RegisterConditional("COND:MAIL:SUMM:UNREAD", 0, Conditional_MAIL_SUMM_UNREAD, CTX_MAILSUM); RegisterConditional("COND:MAIL:SUMM:SUBJECT", 0, Conditional_MAIL_SUMM_SUBJECT, CTX_MAILSUM); RegisterConditional("COND:MAIL:ANON", 0, Conditional_ANONYMOUS_MESSAGE, CTX_MAILSUM); - RegisterConditional("COND:MAIL:TO", 0, Conditional_MAIL_SUMM_TO, CTX_MAILSUM); - RegisterConditional("COND:MAIL:SUBJ", 0, Conditional_MAIL_SUMM_SUBJ, CTX_MAILSUM); + RegisterConditional("COND:MAIL:TO", 0, Conditional_MAIL_SUMM_TO, CTX_MAILSUM); + RegisterConditional("COND:MAIL:SUBJ", 0, Conditional_MAIL_SUMM_SUBJ, CTX_MAILSUM); + RegisterConditional("COND:MAIL:LOCAL", 0, Conditional_MAIL_LOCAL, CTX_MAILSUM); /* do we have mimetypes to iterate over? */ RegisterConditional("COND:MAIL:MIME:ATTACH", 0, Conditional_MAIL_MIME_ALL, CTX_MAILSUM); RegisterConditional("COND:MAIL:MIME:ATTACH:SUBMESSAGES", 0, Conditional_MAIL_MIME_SUBMESSAGES, CTX_MAILSUM); RegisterConditional("COND:MAIL:MIME:ATTACH:LINKS", 0, Conditional_MAIL_MIME_ATTACHLINKS, CTX_MAILSUM); RegisterConditional("COND:MAIL:MIME:ATTACH:ATT", 0, Conditional_MAIL_MIME_ATTACH, CTX_MAILSUM); - RegisterIterator("MAIL:MIME:ATTACH", 0, NULL, iterate_get_mime_All, - NULL, NULL, CTX_MIME_ATACH, CTX_MAILSUM, IT_NOFLAG); - RegisterIterator("MAIL:MIME:ATTACH:SUBMESSAGES", 0, NULL, iterate_get_mime_Submessages, - NULL, NULL, CTX_MIME_ATACH, CTX_MAILSUM, IT_NOFLAG); - RegisterIterator("MAIL:MIME:ATTACH:LINKS", 0, NULL, iterate_get_mime_AttachLinks, - NULL, NULL, CTX_MIME_ATACH, CTX_MAILSUM, IT_NOFLAG); - RegisterIterator("MAIL:MIME:ATTACH:ATT", 0, NULL, iterate_get_mime_Attachments, - NULL, NULL, CTX_MIME_ATACH, CTX_MAILSUM, IT_NOFLAG); + RegisterIterator("MAIL:MIME:ATTACH", 0, NULL, iterate_get_mime_All, NULL, NULL, CTX_MIME_ATACH, CTX_MAILSUM, IT_NOFLAG); + RegisterIterator("MAIL:MIME:ATTACH:SUBMESSAGES", 0, NULL, iterate_get_mime_Submessages, NULL, NULL, CTX_MIME_ATACH, CTX_MAILSUM, IT_NOFLAG); + RegisterIterator("MAIL:MIME:ATTACH:LINKS", 0, NULL, iterate_get_mime_AttachLinks, NULL, NULL, CTX_MIME_ATACH, CTX_MAILSUM, IT_NOFLAG); + RegisterIterator("MAIL:MIME:ATTACH:ATT", 0, NULL, iterate_get_mime_Attachments, NULL, NULL, CTX_MIME_ATACH, CTX_MAILSUM, IT_NOFLAG); /* Parts of a mime attachent */ RegisterNamespace("MAIL:MIME:NAME", 0, 2, tmplput_MIME_Name, NULL, CTX_MIME_ATACH); @@ -1476,13 +1490,12 @@ InitModule_MSGRENDERERS RegisterNamespace("MAIL:MIME:CHARSET", 0, 2, tmplput_MIME_Charset, NULL, CTX_MIME_ATACH); RegisterNamespace("MAIL:MIME:LENGTH", 0, 2, tmplput_MIME_Length, NULL, CTX_MIME_ATACH); RegisterNamespace("MAIL:MIME:DATA", 0, 2, tmplput_MIME_Data, NULL, CTX_MIME_ATACH); + /* load the actual attachment into WC->attachments; no output!!! */ RegisterNamespace("MAIL:MIME:LOADDATA", 0, 0, tmplput_MIME_LoadData, NULL, CTX_MIME_ATACH); /* iterate the WC->attachments; use the above tokens for their contents */ - RegisterIterator("MSG:ATTACHNAMES", 0, NULL, iterate_get_registered_Attachments, - NULL, NULL, CTX_MIME_ATACH, CTX_NONE, IT_NOFLAG); - + RegisterIterator("MSG:ATTACHNAMES", 0, NULL, iterate_get_registered_Attachments, NULL, NULL, CTX_MIME_ATACH, CTX_NONE, IT_NOFLAG); RegisterNamespace("MSG:NATTACH", 0, 0, get_registered_Attachments_Count, NULL, CTX_NONE); /* mime renderers translate an attachment into webcit viewable html text */ @@ -1514,8 +1527,10 @@ InitModule_MSGRENDERERS RegisterMsgHdr(HKEY("nvto"), examine_nvto, 0); RegisterMsgHdr(HKEY("time"), examine_time, 0); RegisterMsgHdr(HKEY("part"), examine_mime_part, 0); + RegisterMsgHdr(HKEY("locl"), examine_locl, 0); RegisterMsgHdr(HKEY("text"), examine_text, 1); - /* these are the content-type headers we get infront of a message; put it into the same hash since it doesn't clash. */ + + /* these are the content-type headers we get in front of a message; put it into the same hash since it doesn't clash. */ RegisterMsgHdr(HKEY("X-Citadel-MSG4-Partnum"), examine_msg4_partnum, 0); RegisterMsgHdr(HKEY("Content-type"), examine_content_type, 0); RegisterMsgHdr(HKEY("Content-length"), examine_content_lengh, 0);