X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fmsg_renderers.c;h=c925c58ee971160ac8d6a2ebbacf08703083be46;hb=c73091a2ae896b6be5aa94b911c1c89d76a85688;hp=d04959865188d830015890c6bfa9f9c1b66cefed;hpb=22e4e5ffb65d6973b0a613d5b410f3a9dcf6a71c;p=citadel.git diff --git a/webcit/msg_renderers.c b/webcit/msg_renderers.c index d04959865..c925c58ee 100644 --- a/webcit/msg_renderers.c +++ b/webcit/msg_renderers.c @@ -5,6 +5,11 @@ CtxType CTX_MAILSUM = CTX_NONE; CtxType CTX_MIME_ATACH = CTX_NONE; +HashList *MsgHeaderHandler = NULL; +HashList *DflMsgHeaderHandler = NULL; +HashList *DflEnumMsgHeaderHandler = NULL; + + static inline void CheckConvertBufs(struct wcsession *WCC) { if (WCC->ConvertBuf1 == NULL) @@ -61,7 +66,39 @@ void DestroyMessageSummary(void *vMsg) free(Msg); } +int EvaluateMsgHdrEnum(eMessageField f, message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) +{ + void *vHdr; + headereval* Hdr = NULL; + if (GetHash(DflEnumMsgHeaderHandler, IKEY(f), &vHdr) && + (vHdr != NULL)) { + Hdr = (headereval*)vHdr; + } + if (Hdr == NULL) + return -1; + Hdr->evaluator(Msg, HdrLine, FoundCharset); + return Hdr->Type; +} +int EvaluateMsgHdr(const char *HeaderName, long HdrNLen, message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) +{ + void *vHdr; + headereval* Hdr = NULL; + if (HdrNLen == 4) { + if (GetHash(DflMsgHeaderHandler, HeaderName, HdrNLen, &vHdr) && + (vHdr != NULL)) { + Hdr = (headereval*)vHdr; + } + } + if (Hdr == NULL && GetHash(MsgHeaderHandler, HeaderName, HdrNLen, &vHdr) && + (vHdr != NULL)) { + Hdr = (headereval*)vHdr; + } + if (Hdr == NULL) + return -1; + Hdr->evaluator(Msg, HdrLine, FoundCharset); + return Hdr->Type; +} void RegisterMsgHdr(const char *HeaderName, long HdrNLen, ExamineMsgHeaderFunc evaluator, int type) { @@ -69,6 +106,15 @@ void RegisterMsgHdr(const char *HeaderName, long HdrNLen, ExamineMsgHeaderFunc e ev = (headereval*) malloc(sizeof(headereval)); ev->evaluator = evaluator; ev->Type = type; + + if (HdrNLen == 4) { + eMessageField f; + if (GetFieldFromMnemonic(&f, HeaderName)) { + Put(DflMsgHeaderHandler, HeaderName, HdrNLen, ev, NULL); + Put(DflEnumMsgHeaderHandler, IKEY(f), ev, reference_free_handler); + return; + } + } Put(MsgHeaderHandler, HeaderName, HdrNLen, ev, NULL); } @@ -242,6 +288,12 @@ void examine_content_encoding(message_summary *Msg, StrBuf *HdrLine, StrBuf *Fou /* TODO: do we care? */ } + +void examine_exti(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) +{ + /* we don't care */ +} + void examine_nhdr(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) { Msg->nhdr = 0; @@ -325,11 +377,17 @@ int Conditional_MAIL_SUMM_SUBJECT(StrBuf *Target, WCTemplputParams *TP) void examine_msgn(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) { wcsession *WCC = WC; + long Offset = 0; + const char *pOffset; CheckConvertBufs(WCC); FreeStrBuf(&Msg->reply_inreplyto); Msg->reply_inreplyto = NewStrBufPlain(NULL, StrLength(HdrLine)); - Msg->reply_inreplyto_hash = ThreadIdHash(HdrLine); + pOffset = strchr(ChrPtr(HdrLine), '/'); + if (pOffset != NULL) { + Offset = pOffset - ChrPtr(HdrLine); + } + Msg->reply_inreplyto_hash = ThreadIdHashOffset(HdrLine, Offset); StrBuf_RFC822_2_Utf8(Msg->reply_inreplyto, HdrLine, WCC->DefaultCharset, @@ -352,11 +410,17 @@ int Conditional_MAIL_SUMM_UNREAD(StrBuf *Target, WCTemplputParams *TP) void examine_wefw(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) { wcsession *WCC = WC; + long Offset = 0; + const char *pOffset; CheckConvertBufs(WCC); FreeStrBuf(&Msg->reply_references); Msg->reply_references = NewStrBufPlain(NULL, StrLength(HdrLine)); - Msg->reply_references_hash = ThreadIdHash(HdrLine); + pOffset = strchr(ChrPtr(HdrLine), '/'); + if (pOffset != NULL) { + Offset = pOffset - ChrPtr(HdrLine); + } + Msg->reply_references_hash = ThreadIdHashOffset(HdrLine, Offset); StrBuf_RFC822_2_Utf8(Msg->reply_references, HdrLine, WCC->DefaultCharset, @@ -803,8 +867,6 @@ void examine_content_lengh(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundC void examine_content_type(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) { - void *vHdr; - headereval *Hdr; StrBuf *Token; StrBuf *Value; const char* sem; @@ -840,12 +902,8 @@ void examine_content_type(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCh } StrBufTrim(Token); - if (GetHash(MsgHeaderHandler, SKEY(Token), &vHdr) && - (vHdr != NULL)) { - Hdr = (headereval*)vHdr; - Hdr->evaluator(Msg, Value, FoundCharset); - } - else syslog(LOG_WARNING, "don't know how to handle content type sub-header[%s]\n", ChrPtr(Token)); + if (EvaluateMsgHdr(SKEY(Token), Msg, Value, FoundCharset) < 0) + syslog(LOG_WARNING, "don't know how to handle content type sub-header[%s]\n", ChrPtr(Token)); } FreeStrBuf(&Token); FreeStrBuf(&Value); @@ -855,8 +913,6 @@ void examine_content_type(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCh int ReadOneMessageSummary(message_summary *Msg, StrBuf *FoundCharset, StrBuf *Buf) { - void *vHdr; - headereval *Hdr; const char *buf; const char *ebuf; int nBuf; @@ -878,13 +934,8 @@ int ReadOneMessageSummary(message_summary *Msg, StrBuf *FoundCharset, StrBuf *Bu ebuf = strchr(ChrPtr(Buf), '='); nBuf = ebuf - buf; - if (GetHash(MsgHeaderHandler, buf, nBuf, &vHdr) && - (vHdr != NULL)) { - Hdr = (headereval*)vHdr; - StrBufCutLeft(Buf, nBuf + 1); - Hdr->evaluator(Msg, Buf, FoundCharset); - } - else syslog(LOG_INFO, "Don't know how to handle Message Headerline [%s]", ChrPtr(Buf)); + if (EvaluateMsgHdr(buf, nBuf, Msg, Buf, FoundCharset) < 0) + syslog(LOG_INFO, "Don't know how to handle Message Headerline [%s]", ChrPtr(Buf)); } return 1; } @@ -977,11 +1028,11 @@ void tmplput_EDIT_WIKI_BODY(StrBuf *Target, WCTemplputParams *TP) * to do it again. */ if (!havebstr("attach_button")) { - char *wikipage = strdup(bstr("page")); + StrBuf *wikipage = NewStrBufDup(sbstr("page")); putbstr("format", NewStrBufPlain(HKEY("plain"))); str_wiki_index(wikipage); - msgnum = locate_message_by_uid(wikipage); - free(wikipage); + msgnum = locate_message_by_uid(ChrPtr(wikipage)); + FreeStrBuf(&wikipage); if (msgnum >= 0L) { Buf = NewStrBuf(); read_message(Buf, HKEY("view_message_wikiedit"), msgnum, NULL, &Mime, TP); @@ -1158,40 +1209,6 @@ void render_MAIL_html(StrBuf *Target, WCTemplputParams *TP, StrBuf *FoundCharset Mime->Data = Buf; } -#ifdef HAVE_MARKDOWN -/* -char * MarkdownHandleURL(const char* SourceURL, const int len, void* something) -{ - -} -*/ -void render_MAIL_markdown(StrBuf *Target, WCTemplputParams *TP, StrBuf *FoundCharset) -{ -#include - wc_mime_attachment *Mime = (wc_mime_attachment *) CTX(CTX_MIME_ATACH); - MMIOT *doc; - char *md_as_html = NULL; - const char *format; - - if (StrLength(Mime->Data) == 0) - return; - - format = bstr("format"); - - if ((format == NULL) || - strcmp(format, "plain")) - { - doc = mkd_string(ChrPtr(Mime->Data), StrLength(Mime->Data), 0); - mkd_basename(doc, "/wiki?page="); - mkd_compile(doc, 0); - if (mkd_document(doc, &md_as_html) != EOF) { - FreeStrBuf(&Mime->Data); - Mime->Data = NewStrBufPlain(md_as_html, -1); - } - mkd_cleanup(doc); - } -} -#endif void render_MAIL_UNKNOWN(StrBuf *Target, WCTemplputParams *TP, StrBuf *FoundCharset) { @@ -1373,6 +1390,59 @@ readloop_struct rlid[] = { { {HKEY("readlt")}, servcmd_readlt } }; +const char* fieldMnemonics[] = { + "from", /* A -> eAuthor */ + "exti", /* E -> eXclusivID */ + "rfca", /* F -> erFc822Addr */ + "hnod", /* H -> eHumanNode */ + "msgn", /* I -> emessageId */ + "jrnl", /* J -> eJournal */ + "rep2", /* K -> eReplyTo */ + "list", /* L -> eListID */ + "text", /* M -> eMesageText */ + "node", /* N -> eNodeName */ + "room", /* O -> eOriginalRoom */ + "path", /* P -> eMessagePath */ + "rcpt", /* R -> eRecipient */ + "spec", /* S -> eSpecialField */ + "time", /* T -> eTimestamp */ + "subj", /* U -> eMsgSubject */ + "nvto", /* V -> eenVelopeTo */ + "wefw", /* W -> eWeferences */ + "cccc", /* Y -> eCarbonCopY */ + "nhdr", /* % -> eHeaderOnly */ + "type", /* % -> eFormatType */ + "part", /* % -> eMessagePart */ + "suff", /* % -> eSubFolder */ + "pref" /* % -> ePevious */ +}; +HashList *msgKeyLookup = NULL; + +int GetFieldFromMnemonic(eMessageField *f, const char* c) +{ + void *v = NULL; + if (GetHash(msgKeyLookup, c, 4, &v)) { + *f = (eMessageField) v; + return 1; + } + return 0; +} + +void FillMsgKeyLookupTable(void) +{ + long i = 0; + + msgKeyLookup = NewHash (1, FourHash); + + while (i != eLastHeader) { + if (fieldMnemonics[i] != NULL) { + Put(msgKeyLookup, fieldMnemonics[i], 4, (void*)i, reference_free_handler); + } + i++; + } +} + + void InitModule_MSGRENDERERS @@ -1482,13 +1552,11 @@ InitModule_MSGRENDERERS RegisterMimeRenderer(HKEY("text/plain"), render_MAIL_text_plain, 1, 3); RegisterMimeRenderer(HKEY("text"), render_MAIL_text_plain, 1, 1); RegisterMimeRenderer(HKEY("text/html"), render_MAIL_html, 1, 100); -#ifdef HAVE_MARKDOWN - RegisterMimeRenderer(HKEY("text/x-markdown"), render_MAIL_markdown, 1, 30); -#endif RegisterMimeRenderer(HKEY(""), render_MAIL_UNKNOWN, 0, 0); /* these headers are citserver replies to MSG4 and friends. one evaluator for each */ RegisterMsgHdr(HKEY("nhdr"), examine_nhdr, 0); + RegisterMsgHdr(HKEY("exti"), examine_exti, 0); RegisterMsgHdr(HKEY("type"), examine_type, 0); RegisterMsgHdr(HKEY("from"), examine_from, 0); RegisterMsgHdr(HKEY("subj"), examine_subj, 0); @@ -1529,22 +1597,28 @@ void ServerStartModule_MSGRENDERERS (void) { + DflMsgHeaderHandler = NewHash (1, FourHash); + DflEnumMsgHeaderHandler = NewHash (1, Flathash); MsgHeaderHandler = NewHash(1, NULL); MimeRenderHandler = NewHash(1, NULL); ReadLoopHandler = NewHash(1, NULL); + FillMsgKeyLookupTable(); } void ServerShutdownModule_MSGRENDERERS (void) { + DeleteHash(&DflMsgHeaderHandler); + DeleteHash(&DflEnumMsgHeaderHandler); + + DeleteHash(&MsgHeaderHandler); DeleteHash(&MimeRenderHandler); DeleteHash(&ReadLoopHandler); + DeleteHash(&msgKeyLookup); } - - void SessionDestroyModule_MSGRENDERERS (wcsession *sess)