HashList *MsgHeaderHandler = NULL;
HashList *DflMsgHeaderHandler = NULL;
+HashList *DflEnumMsgHeaderHandler = NULL;
static inline void CheckConvertBufs(struct wcsession *WCC)
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);
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)
{
eMessageField f;
if (GetFieldFromMnemonic(&f, HeaderName)) {
Put(DflMsgHeaderHandler, HeaderName, HdrNLen, ev, NULL);
+ Put(DflEnumMsgHeaderHandler, IKEY(f), ev, reference_free_handler);
return;
}
}
/* 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;
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,
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,
return StrLength(Msg->ReplyTo) > 0;
}
-void examine_node(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
-{
- wcsession *WCC = WC;
-
- if ( (StrLength(HdrLine) > 0) &&
- ((WC->CurRoom.QRFlags & QR_NETWORK)
- || ((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);
- }
-}
-void tmplput_MAIL_SUMM_OTHERNODE(StrBuf *Target, WCTemplputParams *TP)
-{
- message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM);
- StrBufAppendTemplate(Target, TP, Msg->OtherNode, 0);
-}
-int Conditional_MAIL_SUMM_OTHERNODE(StrBuf *Target, WCTemplputParams *TP)
-{
- message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM);
- return StrLength(Msg->OtherNode) > 0;
-}
-
void examine_nvto(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
{
wcsession *WCC = WC;
StrBufAppendPrintf(Target, "%ld", GetCount(Msg->Attachments));
}
-
-void examine_hnod(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
-{
- wcsession *WCC = WC;
-
- CheckConvertBufs(WCC);
- FreeStrBuf(&Msg->hnod);
- Msg->hnod = NewStrBufPlain(NULL, StrLength(HdrLine));
- StrBuf_RFC822_2_Utf8(Msg->hnod,
- HdrLine,
- WCC->DefaultCharset,
- FoundCharset,
- WCC->ConvertBuf1,
- WCC->ConvertBuf2);
-}
-void tmplput_MAIL_SUMM_H_NODE(StrBuf *Target, WCTemplputParams *TP)
-{
- message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM);
- StrBufAppendTemplate(Target, TP, Msg->hnod, 0);
-}
-int Conditional_MAIL_SUMM_H_NODE(StrBuf *Target, WCTemplputParams *TP)
-{
- message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM);
- return StrLength(Msg->hnod) > 0;
-}
-
-
-
void examine_text(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
{
if (Msg->MsgBody->Data == NULL)
int ReadOneMessageSummary(message_summary *Msg, StrBuf *FoundCharset, StrBuf *Buf)
{
- void *vHdr;
- headereval *Hdr;
const char *buf;
const char *ebuf;
int nBuf;
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;
}
* 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);
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 <mkdio.h>
- 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)
{
"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 */
"subj", /* U -> eMsgSubject */
"nvto", /* V -> eenVelopeTo */
"wefw", /* W -> eWeferences */
- "cccc" /* Y -> eCarbonCopY */
+ "cccc", /* Y -> eCarbonCopY */
+ "nhdr", /* % -> eHeaderOnly */
+ "type", /* % -> eFormatType */
+ "part", /* % -> eMessagePart */
+ "suff", /* % -> eSubFolder */
+ "pref" /* % -> ePevious */
};
HashList *msgKeyLookup = NULL;
void FillMsgKeyLookupTable(void)
{
- long i;
+ long i = 0;
msgKeyLookup = NewHash (1, FourHash);
- for (i=0; i < 20; i++) {
+ while (i != eLastHeader) {
if (fieldMnemonics[i] != NULL) {
Put(msgKeyLookup, fieldMnemonics[i], 4, (void*)i, reference_free_handler);
}
+ i++;
}
}
RegisterNamespace("MAIL:SUMM:NTATACH", 0, 0, tmplput_MAIL_SUMM_NATTACH, NULL, CTX_MAILSUM);
RegisterNamespace("MAIL:SUMM:CCCC", 0, 2, tmplput_MAIL_SUMM_CCCC, NULL, CTX_MAILSUM);
RegisterNamespace("MAIL:SUMM:REPLYTO", 0, 2, tmplput_MAIL_SUMM_REPLYTO, NULL, CTX_MAILSUM);
- RegisterNamespace("MAIL:SUMM:H_NODE", 0, 2, tmplput_MAIL_SUMM_H_NODE, NULL, CTX_MAILSUM);
RegisterNamespace("MAIL:SUMM:ALLRCPT", 0, 2, tmplput_MAIL_SUMM_ALLRCPT, NULL, CTX_MAILSUM);
RegisterNamespace("MAIL:SUMM:ORGROOM", 0, 2, tmplput_MAIL_SUMM_ORGROOM, NULL, CTX_MAILSUM);
RegisterNamespace("MAIL:SUMM:RFCA", 0, 2, tmplput_MAIL_SUMM_RFCA, NULL, CTX_MAILSUM);
- RegisterNamespace("MAIL:SUMM:OTHERNODE", 2, 0, tmplput_MAIL_SUMM_OTHERNODE, NULL, CTX_MAILSUM);
RegisterNamespace("MAIL:SUMM:REFIDS", 0, 1, tmplput_MAIL_SUMM_REFIDS, NULL, CTX_MAILSUM);
RegisterNamespace("MAIL:SUMM:INREPLYTO", 0, 2, tmplput_MAIL_SUMM_INREPLYTO, NULL, CTX_MAILSUM);
RegisterNamespace("MAIL:BODY", 0, 2, tmplput_MAIL_BODY, NULL, CTX_MAILSUM);
RegisterConditional("COND:MAIL:SUMM:CCCC", 0, Conditional_MAIL_SUMM_CCCC, CTX_MAILSUM);
RegisterConditional("COND:MAIL:SUMM:REPLYTO", 0, Conditional_MAIL_SUMM_REPLYTO, CTX_MAILSUM);
RegisterConditional("COND:MAIL:SUMM:UNREAD", 0, Conditional_MAIL_SUMM_UNREAD, CTX_MAILSUM);
- RegisterConditional("COND:MAIL:SUMM:H_NODE", 0, Conditional_MAIL_SUMM_H_NODE, CTX_MAILSUM);
- RegisterConditional("COND:MAIL:SUMM:OTHERNODE", 0, Conditional_MAIL_SUMM_OTHERNODE, 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);
RegisterMimeRenderer(HKEY("text/x-citadel-variformat"), render_MAIL_variformat, 1, 2);
RegisterMimeRenderer(HKEY("text/plain"), render_MAIL_text_plain, 1, 3);
RegisterMimeRenderer(HKEY("text"), render_MAIL_text_plain, 1, 1);
+ RegisterMimeRenderer(HKEY("text/x-markdown"), 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);
- FillMsgKeyLookupTable();
-
/* 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);
RegisterMsgHdr(HKEY("wefw"), examine_wefw, 0);
RegisterMsgHdr(HKEY("cccc"), examine_cccc, 0);
RegisterMsgHdr(HKEY("rep2"), examine_replyto, 0);
- RegisterMsgHdr(HKEY("hnod"), examine_hnod, 0);
RegisterMsgHdr(HKEY("room"), examine_room, 0);
RegisterMsgHdr(HKEY("rfca"), examine_rfca, 0);
- RegisterMsgHdr(HKEY("node"), examine_node, 0);
RegisterMsgHdr(HKEY("rcpt"), examine_rcpt, 0);
RegisterMsgHdr(HKEY("nvto"), examine_nvto, 0);
RegisterMsgHdr(HKEY("time"), examine_time, 0);
(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);
projects / citadel.git / blobdiff