X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=webcit%2Fmsg_renderers.c;h=c5af544928774e9e11be62961bc69f7df997caf3;hp=f6d31e90fb4c105f244d40bebaa7173f739b39ff;hb=4b4dc864ede7c5d8d956febe4a0afb422b78e7c4;hpb=a91d5e80ca1d7086fdf0c7d801ea32bd061b9c89 diff --git a/webcit/msg_renderers.c b/webcit/msg_renderers.c index f6d31e90f..c5af54492 100644 --- a/webcit/msg_renderers.c +++ b/webcit/msg_renderers.c @@ -1,8 +1,18 @@ -/*----------------------------------------------------------------------------*/ #include "webcit.h" #include "webserver.h" +#include "dav.h" + -/** + +inline void CheckConvertBufs(struct wcsession *WCC) +{ + if (WCC->ConvertBuf1 == NULL) + WCC->ConvertBuf1 = NewStrBuf(); + if (WCC->ConvertBuf2 == NULL) + WCC->ConvertBuf2 = NewStrBuf(); +} + +/* * message index functions */ @@ -41,9 +51,7 @@ void DestroyMessageSummary(void *vMsg) FreeStrBuf(&Msg->Rfca); FreeStrBuf(&Msg->OtherNode); - FreeStrBuf(&Msg->reply_to); - - DeleteHash(&Msg->Attachments); /**< list of Accachments */ + DeleteHash(&Msg->Attachments); /* list of Attachments */ DeleteHash(&Msg->Submessages); DeleteHash(&Msg->AttachLinks); DeleteHash(&Msg->AllAttach); @@ -61,14 +69,18 @@ void RegisterMsgHdr(const char *HeaderName, long HdrNLen, ExamineMsgHeaderFunc e Put(MsgHeaderHandler, HeaderName, HdrNLen, ev, NULL); } -void RegisterMimeRenderer(const char *HeaderName, long HdrNLen, RenderMimeFunc MimeRenderer) +void RegisterMimeRenderer(const char *HeaderName, long HdrNLen, + RenderMimeFunc MimeRenderer, + int InlineRenderable, + int Priority) { RenderMimeFuncStruct *f; f = (RenderMimeFuncStruct*) malloc(sizeof(RenderMimeFuncStruct)); f->f = MimeRenderer; Put(MimeRenderHandler, HeaderName, HdrNLen, f, NULL); - + if (InlineRenderable) + RegisterEmbeddableMimeType(HeaderName, HdrNLen, 10000 - Priority); } /*----------------------------------------------------------------------------*/ @@ -239,7 +251,6 @@ int Conditional_ANONYMOUS_MESSAGE(StrBuf *Target, WCTemplputParams *TP) return Msg->nhdr != 0; } - void examine_type(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) { Msg->format_type = StrToi(HdrLine); @@ -248,9 +259,17 @@ 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); FreeStrBuf(&Msg->from); Msg->from = NewStrBufPlain(NULL, StrLength(HdrLine)); - StrBuf_RFC822_to_Utf8(Msg->from, HdrLine, WC->DefaultCharset, FoundCharset); + StrBuf_RFC822_2_Utf8(Msg->from, + HdrLine, + WCC->DefaultCharset, + FoundCharset, + WCC->ConvertBuf1, + WCC->ConvertBuf2); } void tmplput_MAIL_SUMM_FROM(StrBuf *Target, WCTemplputParams *TP) { @@ -258,27 +277,61 @@ void tmplput_MAIL_SUMM_FROM(StrBuf *Target, WCTemplputParams *TP) StrBufAppendTemplate(Target, TP, Msg->from, 0); } - - void examine_subj(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) { + wcsession *WCC = WC; + + CheckConvertBufs(WCC); FreeStrBuf(&Msg->subj); Msg->subj = NewStrBufPlain(NULL, StrLength(HdrLine)); - StrBuf_RFC822_to_Utf8(Msg->subj, HdrLine, WC->DefaultCharset, FoundCharset); + StrBuf_RFC822_2_Utf8(Msg->subj, + HdrLine, + WCC->DefaultCharset, + FoundCharset, + WCC->ConvertBuf1, + WCC->ConvertBuf2); } void tmplput_MAIL_SUMM_SUBJECT(StrBuf *Target, WCTemplputParams *TP) -{/*////TODO: Fwd: and RE: filter!!*/ - +{ message_summary *Msg = (message_summary*) CTX; + + if (TP->Tokens->nParameters == 4) + { + const char *pch; + long len; + + GetTemplateTokenString(Target, TP, 3, &pch, &len); + if ((len > 0)&& + (strstr(ChrPtr(Msg->subj), pch) == NULL)) + { + GetTemplateTokenString(Target, TP, 2, &pch, &len); + StrBufAppendBufPlain(Target, pch, len, 0); + } + } 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) { + wcsession *WCC = WC; + + CheckConvertBufs(WCC); FreeStrBuf(&Msg->reply_inreplyto); Msg->reply_inreplyto = NewStrBufPlain(NULL, StrLength(HdrLine)); - StrBuf_RFC822_to_Utf8(Msg->reply_inreplyto, HdrLine, WC->DefaultCharset, FoundCharset); + StrBuf_RFC822_2_Utf8(Msg->reply_inreplyto, + HdrLine, + WCC->DefaultCharset, + FoundCharset, + WCC->ConvertBuf1, + WCC->ConvertBuf2); } void tmplput_MAIL_SUMM_INREPLYTO(StrBuf *Target, WCTemplputParams *TP) { @@ -289,14 +342,22 @@ void tmplput_MAIL_SUMM_INREPLYTO(StrBuf *Target, WCTemplputParams *TP) int Conditional_MAIL_SUMM_UNREAD(StrBuf *Target, WCTemplputParams *TP) { message_summary *Msg = (message_summary*) CTX; - return Msg->is_new != 0; + return (Msg->Flags & MSGFLAG_READ) != 0; } void examine_wefw(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) { + wcsession *WCC = WC; + + CheckConvertBufs(WCC); FreeStrBuf(&Msg->reply_references); Msg->reply_references = NewStrBufPlain(NULL, StrLength(HdrLine)); - StrBuf_RFC822_to_Utf8(Msg->reply_references, HdrLine, WC->DefaultCharset, FoundCharset); + StrBuf_RFC822_2_Utf8(Msg->reply_references, + HdrLine, + WCC->DefaultCharset, + FoundCharset, + WCC->ConvertBuf1, + WCC->ConvertBuf2); } void tmplput_MAIL_SUMM_REFIDS(StrBuf *Target, WCTemplputParams *TP) { @@ -307,9 +368,17 @@ void tmplput_MAIL_SUMM_REFIDS(StrBuf *Target, WCTemplputParams *TP) void examine_cccc(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) { + wcsession *WCC = WC; + + CheckConvertBufs(WCC); FreeStrBuf(&Msg->cccc); Msg->cccc = NewStrBufPlain(NULL, StrLength(HdrLine)); - StrBuf_RFC822_to_Utf8(Msg->cccc, HdrLine, WC->DefaultCharset, FoundCharset); + StrBuf_RFC822_2_Utf8(Msg->cccc, + HdrLine, + WCC->DefaultCharset, + FoundCharset, + WCC->ConvertBuf1, + WCC->ConvertBuf2); if (Msg->AllRcpt == NULL) Msg->AllRcpt = NewStrBufPlain(NULL, StrLength(HdrLine)); if (StrLength(Msg->AllRcpt) > 0) { @@ -327,7 +396,7 @@ void tmplput_MAIL_SUMM_CCCC(StrBuf *Target, WCTemplputParams *TP) void examine_room(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) { if ((StrLength(HdrLine) > 0) && - (strcasecmp(ChrPtr(HdrLine), ChrPtr(WC->wc_roomname)))) { + (strcasecmp(ChrPtr(HdrLine), ChrPtr(WC->CurRoom.name)))) { FreeStrBuf(&Msg->Room); Msg->Room = NewStrBufDup(HdrLine); } @@ -354,13 +423,20 @@ int Conditional_MAIL_SUMM_RFCA(StrBuf *Target, WCTemplputParams *TP) 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))))))) { + ((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); } @@ -379,9 +455,17 @@ int Conditional_MAIL_SUMM_OTHERNODE(StrBuf *Target, WCTemplputParams *TP) void examine_rcpt(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) { + wcsession *WCC = WC; + + CheckConvertBufs(WCC); FreeStrBuf(&Msg->to); Msg->to = NewStrBufPlain(NULL, StrLength(HdrLine)); - StrBuf_RFC822_to_Utf8(Msg->to, HdrLine, WC->DefaultCharset, FoundCharset); + StrBuf_RFC822_2_Utf8(Msg->to, + HdrLine, + WCC->DefaultCharset, + FoundCharset, + WCC->ConvertBuf1, + WCC->ConvertBuf2); if (Msg->AllRcpt == NULL) Msg->AllRcpt = NewStrBufPlain(NULL, StrLength(HdrLine)); if (StrLength(Msg->AllRcpt) > 0) { @@ -394,6 +478,16 @@ void tmplput_MAIL_SUMM_TO(StrBuf *Target, WCTemplputParams *TP) 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; @@ -401,34 +495,15 @@ void tmplput_MAIL_SUMM_ALLRCPT(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) { - return WC->summ; -} -int Conditional_ROOM_DISPLAY_MSG(StrBuf *Target, WCTemplputParams *TP) { - //message_summary *Msg = (message_summary *) CTX; - wcsubst *subst; - wcsession *WCC = WC; - GetHash(WCC->vars, HKEY("ITERATE:N"), (void *)&subst); - long num_inset = subst->lvalue; - if ((num_inset >= WC->startmsg) && (WCC->num_displayed <= WCC->maxmsgs)) { - WCC->num_displayed = WCC->num_displayed+1; - return 1; // Pass GO, collect $200 - } - return 0; -} -int Conditional_MAIL_SUMM_LASTMSG(StrBuf *Target, WCTemplputParams *TP) { - wcsubst *nsubst, *n_dsubst; - long is_last_n; - - GetHash(WC->vars, HKEY("ITERATE:LASTN"), (void *)&nsubst); - is_last_n = nsubst->lvalue; - - //GetHash(WC->vars, HKEY("ITERATE:N"), (void *)&n_dsubst); - //num_inset = n_dsubst->lvalue; - - // Is the num_displayed higher than maxmsgs? OR last in iterator - return ((WC->num_displayed > WC->maxmsgs) || (is_last_n == 1)); + return WC->summ; } void examine_time(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) { @@ -439,15 +514,21 @@ void tmplput_MAIL_SUMM_DATE_BRIEF(StrBuf *Target, WCTemplputParams *TP) { 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); } +void tmplput_MAIL_SUMM_EUID(StrBuf *Target, WCTemplputParams *TP) +{ + message_summary *Msg = (message_summary*) CTX; + StrBufAppendTemplate(Target, TP, Msg->euid, 0); +} + void tmplput_MAIL_SUMM_DATE_FULL(StrBuf *Target, WCTemplputParams *TP) { 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) @@ -460,16 +541,21 @@ void tmplput_MAIL_SUMM_DATE_NO(StrBuf *Target, WCTemplputParams *TP) void render_MAIL(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCharset) { - Mime->Data = NewStrBufPlain(NULL, Mime->length); - read_message(Mime->Data, HKEY("view_submessage"), Mime->msgnum, 0, Mime->PartNum); + 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); /* if ( (!IsEmptyStr(mime_submessages)) && (!section[0]) ) { for (i=0; i"); + wc_printf("
"); read_message(Mime->msgnum, 1, ChrPtr(Mime->Section)); - wprintf("
"); + wc_printf(""); } } */ @@ -478,28 +564,63 @@ void render_MAIL(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCharset void render_MIME_VCard(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCharset) { wcsession *WCC = WC; - MimeLoadData(Mime); + 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->wc_roomname), USERCONFIGROOM)) - || (!strcasecmp(&(ChrPtr(WCC->wc_roomname)[11]), USERCONFIGROOM)) - || (WC->wc_view == VIEW_ADDRESSBOOK) + if ( (!strcasecmp(ChrPtr(WCC->CurRoom.name), USERCONFIGROOM)) + || (!strcasecmp(&(ChrPtr(WCC->CurRoom.name)[11]), USERCONFIGROOM)) + || (WC->CurRoom.view == VIEW_ADDRESSBOOK) ) { - StrBufAppendPrintf(Buf, "", + StrBufAppendPrintf(Buf, "", Mime->msgnum, ChrPtr(Mime->PartNum)); StrBufAppendPrintf(Buf, "[%s]", _("edit")); } /* In all cases, display the full card */ - display_vcard(Buf, ChrPtr(Mime->Data), 0, 1, NULL, Mime->msgnum); + display_vcard(Buf, Mime, 0, 1, NULL, -1); FreeStrBuf(&Mime->Data); Mime->Data = Buf; } } +void render_MIME_VNote(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCharset) +{ + if (StrLength(Mime->Data) == 0) + MimeLoadData(Mime); + if (StrLength(Mime->Data) > 0) { + struct vnote *v; + StrBuf *Buf; + char *vcard; + + Buf = NewStrBuf(); + vcard = SmashStrBuf(&Mime->Data); + v = vnote_new_from_str(vcard); + free (vcard); + 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); + Mime->Data = Buf; + } + else { + if (Mime->Data == NULL) + Mime->Data = NewStrBuf(); + else + FlushStrBuf(Mime->Data); + } + } +} + void render_MIME_ICS(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCharset) { if (StrLength(Mime->Data) == 0) { @@ -514,41 +635,64 @@ void render_MIME_ICS(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCha void examine_mime_part(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) { + const char *Ptr = NULL; wc_mime_attachment *Mime; StrBuf *Buf; - + wcsession *WCC = WC; + + CheckConvertBufs(WCC); Mime = (wc_mime_attachment*) malloc(sizeof(wc_mime_attachment)); memset(Mime, 0, sizeof(wc_mime_attachment)); Mime->msgnum = Msg->msgnum; Buf = NewStrBuf(); Mime->Name = NewStrBuf(); - StrBufExtract_token(Buf, HdrLine, 0, '|'); - StrBuf_RFC822_to_Utf8(Mime->Name, Buf, WC->DefaultCharset, FoundCharset); + StrBufExtract_NextToken(Buf, HdrLine, &Ptr, '|'); + StrBuf_RFC822_2_Utf8(Mime->Name, + Buf, + WCC->DefaultCharset, + FoundCharset, + WCC->ConvertBuf1, + WCC->ConvertBuf2); StrBufTrim(Mime->Name); - StrBufExtract_token(Buf, HdrLine, 1, '|'); + StrBufExtract_NextToken(Buf, HdrLine, &Ptr, '|'); Mime->FileName = NewStrBuf(); - StrBuf_RFC822_to_Utf8(Mime->FileName, Buf, WC->DefaultCharset, FoundCharset); + StrBuf_RFC822_2_Utf8(Mime->FileName, + Buf, + WCC->DefaultCharset, + FoundCharset, + WCC->ConvertBuf1, + WCC->ConvertBuf2); StrBufTrim(Mime->FileName); Mime->PartNum = NewStrBuf(); - StrBufExtract_token(Mime->PartNum, HdrLine, 2, '|'); + StrBufExtract_NextToken(Mime->PartNum, HdrLine, &Ptr, '|'); StrBufTrim(Mime->PartNum); - if (strchr(ChrPtr(Mime->PartNum), '.') != NULL) + if (strchr(ChrPtr(Mime->PartNum), '.') != NULL) Mime->level = 2; else Mime->level = 1; Mime->Disposition = NewStrBuf(); - StrBufExtract_token(Mime->Disposition, HdrLine, 3, '|'); + StrBufExtract_NextToken(Mime->Disposition, HdrLine, &Ptr, '|'); Mime->ContentType = NewStrBuf(); - StrBufExtract_token(Mime->ContentType, HdrLine, 4, '|'); + StrBufExtract_NextToken(Mime->ContentType, HdrLine, &Ptr, '|'); StrBufTrim(Mime->ContentType); StrBufLowerCase(Mime->ContentType); + if (!strcmp(ChrPtr(Mime->ContentType), "application/octet-stream")) { + StrBufPlain(Mime->ContentType, + GuessMimeByFilename(SKEY(Mime->FileName)), -1); + } + + Mime->length = StrBufExtractNext_int(HdrLine, &Ptr, '|'); + + StrBufSkip_NTokenS(HdrLine, &Ptr, '|', 1); /* cbid?? */ + + Mime->Charset = NewStrBuf(); + StrBufExtract_NextToken(Mime->Charset, HdrLine, &Ptr, '|'); - Mime->length = StrBufExtract_int(HdrLine, 5, '|'); if ( (StrLength(Mime->FileName) == 0) && (StrLength(Mime->Name) > 0) ) { StrBufAppendBuf(Mime->FileName, Mime->Name, 0); @@ -574,7 +718,7 @@ void evaluate_mime_part(message_summary *Msg, wc_mime_attachment *Mime) void *vMimeRenderer; /* just print the root-node */ - if ((Mime->level == 1) && + if ((Mime->level >= 1) && GetHash(MimeRenderHandler, SKEY(Mime->ContentType), &vMimeRenderer) && vMimeRenderer != NULL) { @@ -583,14 +727,14 @@ void evaluate_mime_part(message_summary *Msg, wc_mime_attachment *Mime) Msg->Submessages = NewHash(1,NULL); Put(Msg->Submessages, SKEY(Mime->PartNum), Mime, reference_free_handler); } - else if ((Mime->level == 1) && + else if ((Mime->level >= 1) && (!strcasecmp(ChrPtr(Mime->Disposition), "inline")) && (!strncasecmp(ChrPtr(Mime->ContentType), "image/", 6)) ){ if (Msg->AttachLinks == NULL) Msg->AttachLinks = NewHash(1,NULL); Put(Msg->AttachLinks, SKEY(Mime->PartNum), Mime, reference_free_handler); } - else if ((Mime->level == 1) && + else if ((Mime->level >= 1) && (StrLength(Mime->ContentType) > 0) && ( (!strcasecmp(ChrPtr(Mime->Disposition), "attachment")) || (!strcasecmp(ChrPtr(Mime->Disposition), "inline")) @@ -618,9 +762,17 @@ void tmplput_MAIL_SUMM_NATTACH(StrBuf *Target, WCTemplputParams *TP) 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_to_Utf8(Msg->hnod, HdrLine, WC->DefaultCharset, FoundCharset); + StrBuf_RFC822_2_Utf8(Msg->hnod, + HdrLine, + WCC->DefaultCharset, + FoundCharset, + WCC->ConvertBuf1, + WCC->ConvertBuf2); } void tmplput_MAIL_SUMM_H_NODE(StrBuf *Target, WCTemplputParams *TP) { @@ -637,7 +789,10 @@ int Conditional_MAIL_SUMM_H_NODE(StrBuf *Target, WCTemplputParams *TP) void examine_text(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) { - Msg->MsgBody->Data = NewStrBuf(); + if (Msg->MsgBody->Data == NULL) + Msg->MsgBody->Data = NewStrBufPlain(NULL, SIZ); + else + FlushStrBuf(Msg->MsgBody->Data); } void examine_msg4_partnum(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) @@ -696,7 +851,7 @@ void examine_content_type(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCh Hdr = (headereval*)vHdr; Hdr->evaluator(Msg, Value, FoundCharset); } - else lprintf(1, "don't know how to handle content type sub-header[%s]\n", ChrPtr(Token)); + else syslog(1, "don't know how to handle content type sub-header[%s]\n", ChrPtr(Token)); } FreeStrBuf(&Token); FreeStrBuf(&Value); @@ -710,6 +865,21 @@ void tmplput_MAIL_SUMM_N(StrBuf *Target, WCTemplputParams *TP) } +void tmplput_MAIL_SUMM_PERMALINK(StrBuf *Target, WCTemplputParams *TP) +{ + message_summary *Msg = (message_summary*) CTX; + char perma_link[1024]; + char encoded_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); + + + CtdlEncodeBase64(encoded_link, perma_link, strlen(perma_link), 0); + StrBufAppendPrintf(Target, "/B64%s", encoded_link); +} + int Conditional_MAIL_MIME_ALL(StrBuf *Target, WCTemplputParams *TP) { @@ -735,21 +905,53 @@ int Conditional_MAIL_MIME_ATTACH(StrBuf *Target, WCTemplputParams *TP) return GetCount(Msg->AllAttach) > 0; } +void tmplput_QUOTED_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, NULL, &Mime); + StrBufAppendTemplate(Target, TP, Buf, 1); + FreeStrBuf(&Buf); +} -/*----------------------------------------------------------------------------*/ -void tmplput_QUOTED_MAIL_BODY(StrBuf *Target, WCTemplputParams *TP) +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); } +void tmplput_EDIT_WIKI_BODY(StrBuf *Target, WCTemplputParams *TP) +{ + const StrBuf *Mime; + long msgnum; + StrBuf *Buf; + + /* Insert the existing content of the wiki page into the editor. But we only want + * to do this the first time -- if the user is uploading an attachment we don't want + * to do it again. + */ + if (!havebstr("attach_button")) { + msgnum = locate_message_by_uid(BSTR("page")); + if (msgnum >= 0L) { + Buf = NewStrBuf(); + read_message(Buf, HKEY("view_message_wikiedit"), msgnum, NULL, &Mime); + StrBufAppendTemplate(Target, TP, Buf, 1); + FreeStrBuf(&Buf); + } + } +} + void tmplput_MAIL_BODY(StrBuf *Target, WCTemplputParams *TP) { message_summary *Msg = (message_summary*) CTX; @@ -768,35 +970,29 @@ void render_MAIL_variformat(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *F void render_MAIL_text_plain(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCharset) { - StrBuf *cs = NULL; const char *ptr, *pte; const char *BufPtr = NULL; StrBuf *Line; StrBuf *Line1; StrBuf *Line2; StrBuf *Target; - - int ConvertIt = 1; + long Linecount; + long nEmptyLines; int bn = 0; int bq = 0; - int i, n, done = 0; + int i; long len; #ifdef HAVE_ICONV + StrBuf *cs = NULL; + int ConvertIt = 1; iconv_t ic = (iconv_t)(-1) ; #endif 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... */ - if ((strcasecmp(ChrPtr(Mime->Charset), "us-ascii") == 0) && - (strcasecmp(ChrPtr(Mime->Charset), "UTF-8") == 0)) - ConvertIt = 0; - #ifdef HAVE_ICONV if (ConvertIt) { if (StrLength(Mime->Charset) != 0) @@ -808,71 +1004,95 @@ void render_MAIL_text_plain(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *F if (cs == NULL) { ConvertIt = 0; } + else if (!strcasecmp(ChrPtr(cs), "utf-8")) { + ConvertIt = 0; + } + else if (!strcasecmp(ChrPtr(cs), "us-ascii")) { + ConvertIt = 0; + } else { ctdl_iconv_open("UTF-8", ChrPtr(cs), &ic); if (ic == (iconv_t)(-1) ) { - lprintf(5, "%s:%d iconv_open(UTF-8, %s) failed: %s\n", + syslog(5, "%s:%d iconv_open(UTF-8, %s) failed: %s\n", __FILE__, __LINE__, ChrPtr(Mime->Charset), strerror(errno)); } } } #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) - { - done = n == 0; - bq = 0; - i = 0; - ptr = ChrPtr(Line); - len = StrLength(Line); - pte = ptr + len; - - while ((ptr < pte) && - ((*ptr == '>') || - isspace(*ptr))) + Linecount = 0; + nEmptyLines = 0; + if (StrLength(Mime->Data) > 0) + do { - if (*ptr == '>') - bq++; - ptr ++; - i++; - } - if (i > 0) StrBufCutLeft(Line, i); + StrBufSipLine(Line, Mime->Data, &BufPtr); + bq = 0; + i = 0; + ptr = ChrPtr(Line); + len = StrLength(Line); + pte = ptr + len; + + while ((ptr < pte) && + ((*ptr == '>') || + isspace(*ptr))) + { + if (*ptr == '>') + bq++; + ptr ++; + i++; + } + if (i > 0) StrBufCutLeft(Line, i); - if (StrLength(Line) == 0) - continue; + if (StrLength(Line) == 0) { + if (Linecount == 0) + continue; + StrBufAppendBufPlain(Target, HKEY("
\n"), 0); - for (i = bn; i < bq; i++) - StrBufAppendBufPlain(Target, HKEY("
"), 0); - for (i = bq; i < bn; i++) - StrBufAppendBufPlain(Target, HKEY("
"), 0); + nEmptyLines ++; + continue; + } + nEmptyLines = 0; + for (i = bn; i < bq; i++) + StrBufAppendBufPlain(Target, HKEY("
"), 0); + for (i = bq; i < bn; i++) + StrBufAppendBufPlain(Target, HKEY("
"), 0); +#ifdef HAVE_ICONV + if (ConvertIt) { + StrBufConvert(Line, Line1, &ic); + } +#endif + StrBufAppendBufPlain(Target, HKEY(""), 0); + UrlizeText(Line1, Line, Line2); - if (ConvertIt == 1) { - StrBufConvert(Line, Line1, &ic); + StrEscAppend(Target, Line1, NULL, 0, 0); + StrBufAppendBufPlain(Target, HKEY("
\n"), 0); + bn = bq; + Linecount ++; } + while ((BufPtr != StrBufNOTNULL) && + (BufPtr != NULL)); - StrBufAppendBufPlain(Target, HKEY(""), 0); - UrlizeText(Line1, Line, Line2); - - StrEscAppend(Target, Line1, NULL, 0, 0); - StrBufAppendBufPlain(Target, HKEY("
\n"), 0); - bn = bq; - } - + if (nEmptyLines > 0) + StrBufCutRight(Target, nEmptyLines * (sizeof ("
\n") - 1)); for (i = 0; i < bn; i++) StrBufAppendBufPlain(Target, HKEY(""), 0); - StrBufAppendBufPlain(Target, HKEY("
"), 0); + StrBufAppendBufPlain(Target, HKEY("
"), 0); #ifdef HAVE_ICONV if (ic != (iconv_t)(-1) ) { 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); @@ -889,8 +1109,8 @@ void render_MAIL_html(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCh /* 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), + (WC->CurRoom.view == VIEW_WIKI ? 1 : 0), + Mime->msgnum, Mime->Data, Buf); FreeStrBuf(&Mime->Data); Mime->Data = Buf; @@ -902,14 +1122,10 @@ void render_MAIL_UNKNOWN(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *Foun FlushStrBuf(Mime->Data); StrBufAppendBufPlain(Mime->Data, _("I don't know how to display "), -1, 0); StrBufAppendBuf(Mime->Data, Mime->ContentType, 0); - StrBufAppendBufPlain(Mime->Data, HKEY("
\n"), 0); + StrBufAppendBufPlain(Mime->Data, HKEY("
\n"), 0); } - - - - HashList *iterate_get_mime_All(StrBuf *Target, WCTemplputParams *TP) { message_summary *Msg = (message_summary*) CTX; @@ -993,8 +1209,9 @@ void tmplput_MIME_LoadData(StrBuf *Target, WCTemplputParams *TP) wc_mime_attachment *mime = (wc_mime_attachment*) CTX; wc_mime_attachment *att; - if ( (!strcasecmp(ChrPtr(mime->Disposition), "inline"))|| - (!strcasecmp(ChrPtr(mime->Disposition), "attachment")) ) + if (( (!strcasecmp(ChrPtr(mime->Disposition), "inline"))|| + (!strcasecmp(ChrPtr(mime->Disposition), "attachment"))) && + (strcasecmp(ChrPtr(mime->ContentType), "application/ms-tnef")!=0)) { int n; @@ -1026,6 +1243,11 @@ HashList *iterate_get_registered_Attachments(StrBuf *Target, WCTemplputParams *T return WC->attachments; } +void get_registered_Attachments_Count(StrBuf *Target, WCTemplputParams *TP) +{ + StrBufAppendPrintf(Target, "%ld", GetCount (WC->attachments)); +} + void servcmd_do_search(char *buf, long bufsize) { snprintf(buf, bufsize, "MSGS SEARCH|%s", bstr("query")); @@ -1041,6 +1263,16 @@ void servcmd_readfwd(char *buf, long bufsize) snprintf(buf, bufsize, "MSGS ALL"); } +void servcmd_readgt(char *buf, long bufsize) +{ + snprintf(buf, bufsize, "MSGS GT|%s", bstr("gt")); +} + +void servcmd_readlt(char *buf, long bufsize) +{ + snprintf(buf, bufsize, "MSGS LT|%s", bstr("lt")); +} + void servcmd_readnew(char *buf, long bufsize) { snprintf(buf, bufsize, "MSGS NEW"); @@ -1052,30 +1284,169 @@ void servcmd_readold(char *buf, long bufsize) } +/* DO NOT REORDER OR REMOVE ANY OF THESE */ readloop_struct rlid[] = { - { {HKEY("do_search")}, servcmd_do_search}, - { {HKEY("headers")}, servcmd_headers}, - { {HKEY("readfwd")}, servcmd_readfwd}, - { {HKEY("readnew")}, servcmd_readnew}, - { {HKEY("readold")}, servcmd_readold} + { {HKEY("do_search")}, servcmd_do_search }, + { {HKEY("headers")}, servcmd_headers }, + { {HKEY("readfwd")}, servcmd_readfwd }, + { {HKEY("readnew")}, servcmd_readnew }, + { {HKEY("readold")}, servcmd_readold }, + { {HKEY("readgt")}, servcmd_readgt }, + { {HKEY("readlt")}, servcmd_readlt } }; - -void SetAccessCommand(long Oper) +int ParseMessageListHeaders_Detail(StrBuf *Line, + const char **pos, + message_summary *Msg, + StrBuf *ConversionBuffer) { - wcsession *WCC = WC; + 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); + } + + /* 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); + } - if (WCC->UrlFragment1 != NULL ) { - FlushStrBuf(WCC->UrlFragment1); - StrBufAppendBufPlain(WCC->UrlFragment1, - rlid[Oper].name.Key, rlid[Oper].name.len, 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); } - else - WCC->UrlFragment1 = NewStrBufPlain(rlid[Oper].name.Key, rlid[Oper].name.len); + + 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 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) +{ + WCTemplputParams SubTP; + + memset(&SubTP, 0, sizeof(WCTemplputParams)); + DoTemplate(HKEY("mailsummary_json"),NULL, &SubTP); + + return 0; } - +int json_Cleanup(void **ViewSpecific) +{ + /* Note: wDumpContent() will output one additional tag. */ + /* We ought to move this out into template */ + end_burst(); + + return 0; +} @@ -1083,6 +1454,26 @@ void InitModule_MSGRENDERERS (void) { + 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, summcmp_date, @@ -1102,36 +1493,42 @@ InitModule_MSGRENDERERS groupchange_sender, CTX_MAILSUM); + RegisterNamespace("SUMM:COUNT", 0, 0, tmplput_SUMM_COUNT, NULL, 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); - 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:N", 0, 0, tmplput_MAIL_SUMM_N, CTX_MAILSUM); - RegisterNamespace("MAIL:SUMM:FROM", 0, 2, tmplput_MAIL_SUMM_FROM, CTX_MAILSUM); - RegisterNamespace("MAIL:SUMM:TO", 0, 2, tmplput_MAIL_SUMM_TO, CTX_MAILSUM); - RegisterNamespace("MAIL:SUMM:SUBJECT", 0, 4, tmplput_MAIL_SUMM_SUBJECT, CTX_MAILSUM); - RegisterNamespace("MAIL:SUMM:NTATACH", 0, 0, tmplput_MAIL_SUMM_NATTACH, CTX_MAILSUM); - RegisterNamespace("MAIL:SUMM:CCCC", 0, 2, tmplput_MAIL_SUMM_CCCC, CTX_MAILSUM); - RegisterNamespace("MAIL:SUMM:H_NODE", 0, 2, tmplput_MAIL_SUMM_H_NODE, CTX_MAILSUM); - RegisterNamespace("MAIL:SUMM:ALLRCPT", 0, 2, tmplput_MAIL_SUMM_ALLRCPT, 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: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); - RegisterConditional(HKEY("COND:ROOM:DISPLAYMSG"), 0, Conditional_ROOM_DISPLAY_MSG, CTX_MAILSUM); - RegisterConditional(HKEY("COND:MAIL:SUMM:LASTMSG"), 0, Conditional_MAIL_SUMM_LASTMSG, CTX_MAILSUM); + 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); + RegisterNamespace("MAIL:SUMM:DATEFULL", 0, 0, tmplput_MAIL_SUMM_DATE_FULL, NULL, CTX_MAILSUM); + RegisterNamespace("MAIL:SUMM:DATENO", 0, 0, tmplput_MAIL_SUMM_DATE_NO, NULL, CTX_MAILSUM); + RegisterNamespace("MAIL:SUMM:N", 0, 0, tmplput_MAIL_SUMM_N, NULL, CTX_MAILSUM); + RegisterNamespace("MAIL:SUMM:PERMALINK", 0, 0, tmplput_MAIL_SUMM_PERMALINK, NULL, CTX_MAILSUM); + RegisterNamespace("MAIL:SUMM:FROM", 0, 2, tmplput_MAIL_SUMM_FROM, NULL, CTX_MAILSUM); + RegisterNamespace("MAIL:SUMM:TO", 0, 2, tmplput_MAIL_SUMM_TO, NULL, CTX_MAILSUM); + RegisterNamespace("MAIL:SUMM:SUBJECT", 0, 4, tmplput_MAIL_SUMM_SUBJECT, NULL, CTX_MAILSUM); + 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: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); + RegisterNamespace("MAIL:QUOTETEXT", 1, 2, tmplput_QUOTED_MAIL_BODY, NULL, CTX_NONE); + RegisterNamespace("MAIL:EDITTEXT", 1, 2, tmplput_EDIT_MAIL_BODY, NULL, CTX_NONE); + RegisterNamespace("MAIL:EDITWIKI", 1, 2, tmplput_EDIT_WIKI_BODY, NULL, 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); @@ -1148,33 +1545,36 @@ InitModule_MSGRENDERERS NULL, NULL, CTX_MIME_ATACH, CTX_MAILSUM, IT_NOFLAG); /* Parts of a mime attachent */ - RegisterNamespace("MAIL:MIME:NAME", 0, 2, tmplput_MIME_Name, CTX_MIME_ATACH); - RegisterNamespace("MAIL:MIME:FILENAME", 0, 2, tmplput_MIME_FileName, CTX_MIME_ATACH); - RegisterNamespace("MAIL:MIME:PARTNUM", 0, 2, tmplput_MIME_PartNum, CTX_MIME_ATACH); - RegisterNamespace("MAIL:MIME:MSGNUM", 0, 2, tmplput_MIME_MsgNum, CTX_MIME_ATACH); - RegisterNamespace("MAIL:MIME:DISPOSITION", 0, 2, tmplput_MIME_Disposition, CTX_MIME_ATACH); - RegisterNamespace("MAIL:MIME:CONTENTTYPE", 0, 2, tmplput_MIME_ContentType, CTX_MIME_ATACH); - RegisterNamespace("MAIL:MIME:CHARSET", 0, 2, tmplput_MIME_Charset, CTX_MIME_ATACH); - RegisterNamespace("MAIL:MIME:LENGTH", 0, 2, tmplput_MIME_Length, CTX_MIME_ATACH); - RegisterNamespace("MAIL:MIME:DATA", 0, 2, tmplput_MIME_Data, CTX_MIME_ATACH); + RegisterNamespace("MAIL:MIME:NAME", 0, 2, tmplput_MIME_Name, NULL, CTX_MIME_ATACH); + RegisterNamespace("MAIL:MIME:FILENAME", 0, 2, tmplput_MIME_FileName, NULL, CTX_MIME_ATACH); + RegisterNamespace("MAIL:MIME:PARTNUM", 0, 2, tmplput_MIME_PartNum, NULL, CTX_MIME_ATACH); + RegisterNamespace("MAIL:MIME:MSGNUM", 0, 2, tmplput_MIME_MsgNum, NULL, CTX_MIME_ATACH); + RegisterNamespace("MAIL:MIME:DISPOSITION", 0, 2, tmplput_MIME_Disposition, NULL, CTX_MIME_ATACH); + RegisterNamespace("MAIL:MIME:CONTENTTYPE", 0, 2, tmplput_MIME_ContentType, NULL, CTX_MIME_ATACH); + 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, CTX_MIME_ATACH); + 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); + RegisterNamespace("MSG:NATTACH", 0, 0, get_registered_Attachments_Count, NULL, CTX_NONE); + /* mime renderers translate an attachment into webcit viewable html text */ - RegisterMimeRenderer(HKEY("message/rfc822"), render_MAIL); - RegisterMimeRenderer(HKEY("text/x-vcard"), render_MIME_VCard); - RegisterMimeRenderer(HKEY("text/vcard"), render_MIME_VCard); - RegisterMimeRenderer(HKEY("text/calendar"), render_MIME_ICS); - RegisterMimeRenderer(HKEY("application/ics"), render_MIME_ICS); - RegisterMimeRenderer(HKEY("text/x-citadel-variformat"), render_MAIL_variformat); - RegisterMimeRenderer(HKEY("text/plain"), render_MAIL_text_plain); - RegisterMimeRenderer(HKEY("text"), render_MAIL_text_plain); - RegisterMimeRenderer(HKEY("text/html"), render_MAIL_html); - RegisterMimeRenderer(HKEY(""), render_MAIL_UNKNOWN); + RegisterMimeRenderer(HKEY("message/rfc822"), render_MAIL, 0, 150); + RegisterMimeRenderer(HKEY("text/vnote"), render_MIME_VNote, 1, 300); + 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/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); @@ -1204,3 +1604,39 @@ InitModule_MSGRENDERERS RegisterMsgHdr(HKEY("suff"), examine_suff, 0); RegisterMsgHdr(HKEY("path"), examine_path, 0); } + +void +InitModule2_MSGRENDERERS +(void) +{ + /* and finalize the anouncement to the server... */ + CreateMimeStr(); +} +void +ServerStartModule_MSGRENDERERS +(void) +{ + MsgHeaderHandler = NewHash(1, NULL); + MimeRenderHandler = NewHash(1, NULL); + ReadLoopHandler = NewHash(1, NULL); +} + +void +ServerShutdownModule_MSGRENDERERS +(void) +{ + DeleteHash(&MsgHeaderHandler); + DeleteHash(&MimeRenderHandler); + DeleteHash(&ReadLoopHandler); +} + + + +void +SessionDestroyModule_MSGRENDERERS +(wcsession *sess) +{ + DeleteHash(&sess->attachments); + FreeStrBuf(&sess->ConvertBuf1); + FreeStrBuf(&sess->ConvertBuf2); +}