CtxType CTX_MAILSUM = CTX_NONE;
CtxType CTX_MIME_ATACH = CTX_NONE;
-inline void CheckConvertBufs(struct wcsession *WCC)
+HashList *MsgHeaderHandler = NULL;
+HashList *DflMsgHeaderHandler = NULL;
+HashList *DflEnumMsgHeaderHandler = NULL;
+
+
+static inline void CheckConvertBufs(struct wcsession *WCC)
{
if (WCC->ConvertBuf1 == NULL)
WCC->ConvertBuf1 = NewStrBuf();
FreeStrBuf(&Msg->reply_references);
FreeStrBuf(&Msg->cccc);
FreeStrBuf(&Msg->ReplyTo);
- FreeStrBuf(&Msg->hnod);
FreeStrBuf(&Msg->AllRcpt);
FreeStrBuf(&Msg->Room);
FreeStrBuf(&Msg->Rfca);
- FreeStrBuf(&Msg->OtherNode);
-
+ FreeStrBuf(&Msg->EnvTo);
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)
+{
+ 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)
{
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);
}
/* 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));
+ 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));
+ 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)
+void examine_nvto(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;
+ CheckConvertBufs(WCC);
+ FreeStrBuf(&Msg->EnvTo);
+ Msg->EnvTo = NewStrBufPlain(NULL, StrLength(HdrLine));
+ StrBuf_RFC822_2_Utf8(Msg->EnvTo,
+ HdrLine,
+ WCC->DefaultCharset,
+ FoundCharset,
+ WCC->ConvertBuf1,
+ WCC->ConvertBuf2);
}
-void render_MAIL(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCharset)
+void render_MAIL(StrBuf *Target, WCTemplputParams *TP, StrBuf *FoundCharset)
{
+ wc_mime_attachment *Mime = (wc_mime_attachment *) CTX(CTX_MIME_ATACH);
const StrBuf *TemplateMime;
if (Mime->Data == NULL)
Mime->Data = NewStrBufPlain(NULL, Mime->length);
else
FlushStrBuf(Mime->Data);
- read_message(Mime->Data, HKEY("view_submessage"), Mime->msgnum, Mime->PartNum, &TemplateMime);
+ read_message(Mime->Data, HKEY("view_submessage"), Mime->msgnum, Mime->PartNum, &TemplateMime, TP);
/*
if ( (!IsEmptyStr(mime_submessages)) && (!section[0]) ) {
for (i=0; i<num_tokens(mime_submessages, '|'); ++i) {
*/
}
-void render_MIME_VCard(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCharset)
-{
- wcsession *WCC = WC;
- if (StrLength(Mime->Data) == 0)
- MimeLoadData(Mime);
- if (StrLength(Mime->Data) > 0) {
- StrBuf *Buf;
- Buf = NewStrBuf();
- /** If it's my vCard I can edit it */
- if ( (!strcasecmp(ChrPtr(WCC->CurRoom.name), USERCONFIGROOM))
- || (!strcasecmp(&(ChrPtr(WCC->CurRoom.name)[11]), USERCONFIGROOM))
- || (WC->CurRoom.view == VIEW_ADDRESSBOOK)
- ) {
- StrBufAppendPrintf(Buf, "<a href=\"edit_vcard?msgnum=%ld?partnum=%s\">",
- Mime->msgnum, ChrPtr(Mime->PartNum));
- StrBufAppendPrintf(Buf, "[%s]</a>", _("edit"));
- }
-
- /* In all cases, display the full card */
- display_vcard(Buf, Mime, 0, 1, NULL, -1);
- FreeStrBuf(&Mime->Data);
- Mime->Data = Buf;
- }
-
-}
-
-void render_MIME_ICS(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCharset)
+void render_MIME_ICS(StrBuf *Target, WCTemplputParams *TP, StrBuf *FoundCharset)
{
+ wc_mime_attachment *Mime = (wc_mime_attachment *) CTX(CTX_MIME_ATACH);
if (StrLength(Mime->Data) == 0) {
MimeLoadData(Mime);
}
}
-void evaluate_mime_part(message_summary *Msg, wc_mime_attachment *Mime)
+void evaluate_mime_part(StrBuf *Target, WCTemplputParams *TP)
{
+ message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM);
+ wc_mime_attachment *Mime = (wc_mime_attachment *) CTX(CTX_MIME_ATACH);
void *vMimeRenderer;
/* just print the root-node */
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)
void examine_content_type(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
{
- void *vHdr;
- headereval *Hdr;
StrBuf *Token;
StrBuf *Value;
const char* sem;
}
StrBufTrim(Token);
- if (GetHash(MsgHeaderHandler, SKEY(Token), &vHdr) &&
- (vHdr != NULL)) {
- Hdr = (headereval*)vHdr;
- Hdr->evaluator(Msg, Value, FoundCharset);
- }
- else syslog(1, "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);
}
}
+
+int ReadOneMessageSummary(message_summary *Msg, StrBuf *FoundCharset, StrBuf *Buf)
+{
+ const char *buf;
+ const char *ebuf;
+ int nBuf;
+ long len;
+
+ serv_printf("MSG0 %ld|1", Msg->msgnum); /* ask for headers only */
+
+ StrBuf_ServGetln(Buf);
+ if (GetServerStatus(Buf, NULL) != 1) {
+ return 0;
+ }
+
+ while (len = StrBuf_ServGetln(Buf),
+ (len >= 0) &&
+ ((len != 3) ||
+ strcmp(ChrPtr(Buf), "000")))
+ {
+ buf = ChrPtr(Buf);
+ ebuf = strchr(ChrPtr(Buf), '=');
+ nBuf = ebuf - 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;
+}
+
void tmplput_MAIL_SUMM_N(StrBuf *Target, WCTemplputParams *TP)
{
message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM);
void tmplput_MAIL_SUMM_PERMALINK(StrBuf *Target, WCTemplputParams *TP)
{
message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM);
- char perma_link[1024];
-
- strcpy(perma_link, "/readfwd?go=");
- urlesc(&perma_link[12], sizeof(perma_link) - 12, (char *)ChrPtr(WC->CurRoom.name) );
- sprintf(&perma_link[strlen(perma_link)], "?start_reading_at=%ld#%ld", Msg->msgnum, Msg->msgnum);
- StrBufAppendPrintf(Target, "%s", perma_link);
+ StrBuf *perma_link;
+ const StrBuf *View;
+
+ perma_link = NewStrBufPlain(HKEY("/readfwd?go="));
+ StrBufUrlescAppend(perma_link, WC->CurRoom.name, NULL);
+ View = sbstr("view");
+ if (View != NULL) {
+ StrBufAppendBufPlain(perma_link, HKEY("?view="), 0);
+ StrBufAppendBuf(perma_link, View, 0);
+ }
+ StrBufAppendBufPlain(perma_link, HKEY("?start_reading_at="), 0);
+ StrBufAppendPrintf(perma_link, "%ld#%ld", Msg->msgnum, Msg->msgnum);
+ StrBufAppendBuf(Target, perma_link, 0);
+ FreeStrBuf(&perma_link);
}
MsgNum = LBstr(TKEY(0));
Buf = NewStrBuf();
- read_message(Buf, HKEY("view_message_replyquote"), MsgNum, NULL, &Mime);
+ read_message(Buf, HKEY("view_message_replyquote"), MsgNum, NULL, &Mime, TP);
StrBufAppendTemplate(Target, TP, Buf, 1);
FreeStrBuf(&Buf);
}
MsgNum = LBstr(TKEY(0));
Buf = NewStrBuf();
- read_message(Buf, HKEY("view_message_edit"), MsgNum, NULL, &Mime);
+ read_message(Buf, HKEY("view_message_edit"), MsgNum, NULL, &Mime, TP);
StrBufAppendTemplate(Target, TP, Buf, 1);
FreeStrBuf(&Buf);
}
* 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);
+ read_message(Buf, HKEY("view_message_wikiedit"), msgnum, NULL, &Mime, TP);
StrBufAppendTemplate(Target, TP, Buf, 1);
FreeStrBuf(&Buf);
}
}
-void render_MAIL_variformat(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCharset)
+void render_MAIL_variformat(StrBuf *Target, WCTemplputParams *TP, StrBuf *FoundCharset)
{
/* Messages in legacy Citadel variformat get handled thusly... */
- StrBuf *Target = NewStrBufPlain(NULL, StrLength(Mime->Data));
- FmOut(Target, "JUSTIFY", Mime->Data);
+ wc_mime_attachment *Mime = (wc_mime_attachment *) CTX(CTX_MIME_ATACH);
+ StrBuf *TTarget = NewStrBufPlain(NULL, StrLength(Mime->Data));
+ FmOut(TTarget, "JUSTIFY", Mime->Data);
FreeStrBuf(&Mime->Data);
- Mime->Data = Target;
+ Mime->Data = TTarget;
}
-void render_MAIL_text_plain(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCharset)
+void render_MAIL_text_plain(StrBuf *Target, WCTemplputParams *TP, StrBuf *FoundCharset)
{
+ wc_mime_attachment *Mime = (wc_mime_attachment *) CTX(CTX_MIME_ATACH);
const char *ptr, *pte;
const char *BufPtr = NULL;
StrBuf *Line;
StrBuf *Line1;
StrBuf *Line2;
- StrBuf *Target;
+ StrBuf *TTarget;
long Linecount;
long nEmptyLines;
int bn = 0;
else {
ctdl_iconv_open("UTF-8", ChrPtr(cs), &ic);
if (ic == (iconv_t)(-1) ) {
- syslog(5, "%s:%d iconv_open(UTF-8, %s) failed: %s\n",
+ syslog(LOG_WARNING, "%s:%d iconv_open(UTF-8, %s) failed: %s\n",
__FILE__, __LINE__, ChrPtr(Mime->Charset), strerror(errno));
}
}
Line = NewStrBufPlain(NULL, SIZ);
Line1 = NewStrBufPlain(NULL, SIZ);
Line2 = NewStrBufPlain(NULL, SIZ);
- Target = NewStrBufPlain(NULL, StrLength(Mime->Data));
+ TTarget = NewStrBufPlain(NULL, StrLength(Mime->Data));
Linecount = 0;
nEmptyLines = 0;
if (StrLength(Mime->Data) > 0)
if (StrLength(Line) == 0) {
if (Linecount == 0)
continue;
- StrBufAppendBufPlain(Target, HKEY("<tt></tt><br>\n"), 0);
+ StrBufAppendBufPlain(TTarget, HKEY("<tt></tt><br>\n"), 0);
nEmptyLines ++;
continue;
}
nEmptyLines = 0;
for (i = bn; i < bq; i++)
- StrBufAppendBufPlain(Target, HKEY("<blockquote>"), 0);
+ StrBufAppendBufPlain(T
Target, HKEY("<blockquote>"), 0);
for (i = bq; i < bn; i++)
- StrBufAppendBufPlain(Target, HKEY("</blockquote>"), 0);
+ StrBufAppendBufPlain(TTarget, HKEY("</blockquote>"), 0);
#ifdef HAVE_ICONV
if (ConvertIt) {
StrBufConvert(Line, Line1, &ic);
}
#endif
- StrBufAppendBufPlain(Target, HKEY("<tt>"), 0);
+ StrBufAppendBufPlain(TTarget, HKEY("<tt>"), 0);
UrlizeText(Line1, Line, Line2);
- StrEscAppend(Target, Line1, NULL, 0, 0);
- StrBufAppendBufPlain(Target, HKEY("</tt><br>\n"), 0);
+ StrEscAppend(TTarget, Line1, NULL, 0, 0);
+ StrBufAppendBufPlain(TTarget, HKEY("</tt><br>\n"), 0);
bn = bq;
Linecount ++;
}
(BufPtr != NULL));
if (nEmptyLines > 0)
- StrBufCutRight(Target, nEmptyLines * (sizeof ("<tt></tt><br>\n") - 1));
+ StrBufCutRight(TTarget, nEmptyLines * (sizeof ("<tt></tt><br>\n") - 1));
for (i = 0; i < bn; i++)
- StrBufAppendBufPlain(Target, HKEY("</blockquote>"), 0);
+ StrBufAppendBufPlain(TTarget, HKEY("</blockquote>"), 0);
- StrBufAppendBufPlain(Target, HKEY("</i><br>"), 0);
+ StrBufAppendBufPlain(TTarget, HKEY("</i><br>"), 0);
#ifdef HAVE_ICONV
if (ic != (iconv_t)(-1) ) {
iconv_close(ic);
#endif
FreeStrBuf(&Mime->Data);
- Mime->Data = Target;
+ Mime->Data = TTarget;
FlushStrBuf(Mime->ContentType);
StrBufAppendBufPlain(Mime->ContentType, HKEY("text/html"), 0);
FlushStrBuf(Mime->Charset);
FreeStrBuf(&Line2);
}
-void render_MAIL_html(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCharset)
+void render_MAIL_html(StrBuf *Target, WCTemplputParams *TP, StrBuf *FoundCharset)
{
+ wc_mime_attachment *Mime = (wc_mime_attachment *) CTX(CTX_MIME_ATACH);
StrBuf *Buf;
if (StrLength(Mime->Data) == 0)
Mime->Data = Buf;
}
-void render_MAIL_UNKNOWN(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCharset)
+
+void render_MAIL_UNKNOWN(StrBuf *Target, WCTemplputParams *TP, StrBuf *FoundCharset)
{
+ wc_mime_attachment *Mime = (wc_mime_attachment *) CTX(CTX_MIME_ATACH);
/* Unknown weirdness */
FlushStrBuf(Mime->Data);
StrBufAppendBufPlain(Mime->Data, _("I don't know how to display "), -1, 0);
{
wc_mime_attachment *mime = (wc_mime_attachment*) CTX(CTX_MIME_ATACH);
if (mime->Renderer != NULL)
- mime->Renderer->f(mime, NULL, NULL);
+ mime->Renderer->f(Target, TP, NULL);
StrBufAppendTemplate(Target, TP, mime->Data, 0);
/* TODO: check whether we need to load it now? */
}
{ {HKEY("readlt")}, servcmd_readlt }
};
+const char* fieldMnemonics[] = {
+ "from", /* A -> eAuthor */
+ "exti", /* E -> eXclusivID */
+ "rfca", /* F -> erFc822Addr */
+ "msgn", /* I -> emessageId */
+ "jrnl", /* J -> eJournal */
+ "rep2", /* K -> eReplyTo */
+ "list", /* L -> eListID */
+ "text", /* M -> eMesageText */
+ "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 ParseMessageListHeaders_Detail(StrBuf *Line,
- const char **pos,
- message_summary *Msg,
- StrBuf *ConversionBuffer)
+int GetFieldFromMnemonic(eMessageField *f, const char* c)
{
- wcsession *WCC = WC;
- long len;
- long totallen;
-
- CheckConvertBufs(WCC);
-
- totallen = StrLength(Line);
- Msg->from = NewStrBufPlain(NULL, totallen);
- len = StrBufExtract_NextToken(ConversionBuffer, Line, pos, '|');
- if (len > 0) {
- /* Handle senders with RFC2047 encoding */
- StrBuf_RFC822_2_Utf8(Msg->from,
- ConversionBuffer,
- WCC->DefaultCharset,
- NULL,
- WCC->ConvertBuf1,
- WCC->ConvertBuf2);
+ void *v = NULL;
+ if (GetHash(msgKeyLookup, c, 4, &v)) {
+ *f = (eMessageField) v;
+ return 1;
}
-
- /* node name */
- len = StrBufExtract_NextToken(ConversionBuffer, Line, pos, '|');
- if ((len > 0 ) &&
- ( ((WCC->CurRoom.QRFlags & QR_NETWORK)
- || ((strcasecmp(ChrPtr(ConversionBuffer), ChrPtr(WCC->serv_info->serv_nodename))
- && (strcasecmp(ChrPtr(ConversionBuffer), ChrPtr(WCC->serv_info->serv_fqdn))))))))
- {
- StrBufAppendBufPlain(Msg->from, HKEY(" @ "), 0);
- StrBufAppendBuf(Msg->from, ConversionBuffer, 0);
- }
-
- /* Internet address (not used)
- * StrBufExtract_token(Msg->inetaddr, Line, 4, '|');
- */
- StrBufSkip_NTokenS(Line, pos, '|', 1);
- Msg->subj = NewStrBufPlain(NULL, totallen);
-
- FlushStrBuf(ConversionBuffer);
- /* we assume the subject is the last parameter inside of the list;
- * thus we don't use the tokenizer to fetch it, since it will hick up
- * on tokenizer chars inside of the subjects
- StrBufExtract_NextToken(ConversionBuffer, Line, pos, '|');
- */
- len = 0;
- if (*pos != StrBufNOTNULL) {
- len = totallen - (*pos - ChrPtr(Line));
- StrBufPlain(ConversionBuffer, *pos, len);
- *pos = StrBufNOTNULL;
- if ((len > 0) &&
- (*(ChrPtr(ConversionBuffer) + len - 1) == '|'))
- StrBufCutRight(ConversionBuffer, 1);
- }
-
- if (len == 0)
- StrBufAppendBufPlain(Msg->subj, _("(no subject)"), -1,0);
- else {
- StrBuf_RFC822_2_Utf8(Msg->subj,
- ConversionBuffer,
- WCC->DefaultCharset,
- NULL,
- WCC->ConvertBuf1,
- WCC->ConvertBuf2);
- }
-
- return 1;
-}
-
-
-int mailview_GetParamsGetServerCall(SharedMessageStatus *Stat,
- void **ViewSpecific,
- long oper,
- char *cmd,
- long len,
- char *filter,
- long flen)
-{
- DoTemplate(HKEY("msg_listview"),NULL,&NoCtx);
-
- return 200;
-}
-
-int mailview_Cleanup(void **ViewSpecific)
-{
- /* Note: wDumpContent() will output one additional </div> tag. */
- /* We ought to move this out into template */
- wDumpContent(1);
-
return 0;
}
-
-int json_GetParamsGetServerCall(SharedMessageStatus *Stat,
- void **ViewSpecific,
- long oper,
- char *cmd,
- long len,
- char *filter,
- long flen)
-{
- Stat->defaultsortorder = 2;
- Stat->sortit = 1;
- Stat->load_seen = 1;
- /* Generally using maxmsgs|startmsg is not required
- in mailbox view, but we have a 'safemode' for clients
- (*cough* Exploder) that simply can't handle too many */
- if (havebstr("maxmsgs")) Stat->maxmsgs = ibstr("maxmsgs");
- else Stat->maxmsgs = 9999999;
- if (havebstr("startmsg")) Stat->startmsg = lbstr("startmsg");
- snprintf(cmd, len, "MSGS %s|%s||1",
- (oper == do_search) ? "SEARCH" : "ALL",
- (oper == do_search) ? bstr("query") : ""
- );
-
- return 200;
-}
-int json_MessageListHdr(SharedMessageStatus *Stat, void **ViewSpecific)
-{
- /* TODO: make a generic function */
- hprintf("HTTP/1.1 200 OK\r\n");
- hprintf("Content-type: application/json; charset=utf-8\r\n");
- hprintf("Server: %s / %s\r\n", PACKAGE_STRING, ChrPtr(WC->serv_info->serv_software));
- hprintf("Connection: close\r\n");
- hprintf("Pragma: no-cache\r\nCache-Control: no-store\r\nExpires:-1\r\n");
- begin_burst();
- return 0;
-}
-
-int json_RenderView_or_Tail(SharedMessageStatus *Stat,
- void **ViewSpecific,
- long oper)
+void FillMsgKeyLookupTable(void)
{
- DoTemplate(HKEY("mailsummary_json"),NULL, NULL);
-
- return 0;
-}
+ long i = 0;
-int json_Cleanup(void **ViewSpecific)
-{
- /* Note: wDumpContent() will output one additional </div> tag. */
- /* We ought to move this out into template */
- end_burst();
+ msgKeyLookup = NewHash (1, FourHash);
- return 0;
+ while (i != eLastHeader) {
+ if (fieldMnemonics[i] != NULL) {
+ Put(msgKeyLookup, fieldMnemonics[i], 4, (void*)i, reference_free_handler);
+ }
+ i++;
+ }
}
{
RegisterCTX(CTX_MAILSUM);
RegisterCTX(CTX_MIME_ATACH);
- RegisterReadLoopHandlerset(
- VIEW_MAILBOX,
- mailview_GetParamsGetServerCall,
- NULL, /* TODO: is this right? */
- NULL,
- ParseMessageListHeaders_Detail,
- NULL,
- NULL,
- mailview_Cleanup);
-
- RegisterReadLoopHandlerset(
- VIEW_JSON_LIST,
- json_GetParamsGetServerCall,
- json_MessageListHdr,
- NULL, /* TODO: is this right? */
- ParseMessageListHeaders_Detail,
- NULL,
- json_RenderView_or_Tail,
- json_Cleanup);
RegisterSortFunc(HKEY("date"),
NULL, 0,
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);
/* mime renderers translate an attachment into webcit viewable html text */
RegisterMimeRenderer(HKEY("message/rfc822"), render_MAIL, 0, 150);
- RegisterMimeRenderer(HKEY("text/x-vcard"), render_MIME_VCard, 1, 201);
- RegisterMimeRenderer(HKEY("text/vcard"), render_MIME_VCard, 1, 200);
-/*
+//*
RegisterMimeRenderer(HKEY("text/calendar"), render_MIME_ICS, 1, 501);
RegisterMimeRenderer(HKEY("application/ics"), render_MIME_ICS, 1, 500);
//*/
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);
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);
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);
RegisterMsgHdr(HKEY("part"), examine_mime_part, 0);
RegisterMsgHdr(HKEY("text"), examine_text, 1);
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)
projects / citadel.git / blobdiff