X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fmsg_renderers.c;h=c10c7cd987364b16cb4491add469fa4ea4791714;hb=8c321fbcc2a64f0d0627562fdf5651442e525ab1;hp=cd3cd88eab6fe1b66d39563b923d0e6955794b3f;hpb=8a38099b09f3080925ce7c4a62a016d6884f31bf;p=citadel.git diff --git a/webcit/msg_renderers.c b/webcit/msg_renderers.c index cd3cd88ea..c10c7cd98 100644 --- a/webcit/msg_renderers.c +++ b/webcit/msg_renderers.c @@ -6,6 +6,7 @@ * message index functions */ + void DestroyMimeParts(wc_mime_attachment *Mime) { FreeStrBuf(&Mime->Name); @@ -46,9 +47,6 @@ void DestroyMessageSummary(void *vMsg) DeleteHash(&Msg->Submessages); DeleteHash(&Msg->AttachLinks); DeleteHash(&Msg->AllAttach); - - DestroyMimeParts(&Msg->MsgBody); - free(Msg); } @@ -71,6 +69,117 @@ void RegisterMimeRenderer(const char *HeaderName, long HdrNLen, RenderMimeFunc M /*----------------------------------------------------------------------------*/ +/* + * qsort() compatible function to compare two longs in descending order. + */ +int longcmp_r(const void *s1, const void *s2) { + long l1; + long l2; + + l1 = *(long *)GetSearchPayload(s1); + l2 = *(long *)GetSearchPayload(s2); + + if (l1 > l2) return(-1); + if (l1 < l2) return(+1); + return(0); +} + +/* + * qsort() compatible function to compare two longs in descending order. + */ +int qlongcmp_r(const void *s1, const void *s2) { + long l1 = (long) s1; + long l2 = (long) s2; + + if (l1 > l2) return(-1); + if (l1 < l2) return(+1); + return(0); +} + + +/* + * qsort() compatible function to compare two message summary structs by ascending subject. + */ +int summcmp_subj(const void *s1, const void *s2) { + message_summary *summ1; + message_summary *summ2; + + summ1 = (message_summary *)GetSearchPayload(s1); + summ2 = (message_summary *)GetSearchPayload(s2); + return strcasecmp(ChrPtr(summ1->subj), ChrPtr(summ2->subj)); +} + +/* + * qsort() compatible function to compare two message summary structs by descending subject. + */ +int summcmp_rsubj(const void *s1, const void *s2) { + message_summary *summ1; + message_summary *summ2; + + summ1 = (message_summary *)GetSearchPayload(s1); + summ2 = (message_summary *)GetSearchPayload(s2); + return strcasecmp(ChrPtr(summ2->subj), ChrPtr(summ1->subj)); +} + +/* + * qsort() compatible function to compare two message summary structs by ascending sender. + */ +int summcmp_sender(const void *s1, const void *s2) { + message_summary *summ1; + message_summary *summ2; + + summ1 = (message_summary *)GetSearchPayload(s1); + summ2 = (message_summary *)GetSearchPayload(s2); + return strcasecmp(ChrPtr(summ1->from), ChrPtr(summ2->from)); +} + +/* + * qsort() compatible function to compare two message summary structs by descending sender. + */ +int summcmp_rsender(const void *s1, const void *s2) { + message_summary *summ1; + message_summary *summ2; + + summ1 = (message_summary *)GetSearchPayload(s1); + summ2 = (message_summary *)GetSearchPayload(s2); + return strcasecmp(ChrPtr(summ2->from), ChrPtr(summ1->from)); +} + +/* + * qsort() compatible function to compare two message summary structs by ascending date. + */ +int summcmp_date(const void *s1, const void *s2) { + message_summary *summ1; + message_summary *summ2; + + summ1 = (message_summary *)GetSearchPayload(s1); + summ2 = (message_summary *)GetSearchPayload(s2); + + if (summ1->date < summ2->date) return -1; + else if (summ1->date > summ2->date) return +1; + else return 0; +} + +/* + * qsort() compatible function to compare two message summary structs by descending date. + */ +int summcmp_rdate(const void *s1, const void *s2) { + message_summary *summ1; + message_summary *summ2; + + summ1 = (message_summary *)GetSearchPayload(s1); + summ2 = (message_summary *)GetSearchPayload(s2); + + if (summ1->date < summ2->date) return +1; + else if (summ1->date > summ2->date) return -1; + else return 0; +} + +/*----------------------------------------------------------------------------*/ +/* Don't wanna know... or? */ +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_nhdr(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) { @@ -97,10 +206,10 @@ void examine_from(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) Msg->from = NewStrBufPlain(NULL, StrLength(HdrLine)); StrBuf_RFC822_to_Utf8(Msg->from, HdrLine, WC->DefaultCharset, FoundCharset); } -void tmplput_MAIL_SUMM_FROM(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType) +void tmplput_MAIL_SUMM_FROM(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType) { message_summary *Msg = (message_summary*) Context; - StrBufAppendBuf(Target, Msg->from, 0); + StrBufAppendTemplate(Target, nArgs, Tokens, Context, ContextType, Msg->from, 0); } @@ -111,10 +220,10 @@ void examine_subj(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) Msg->subj = NewStrBufPlain(NULL, StrLength(HdrLine)); StrBuf_RFC822_to_Utf8(Msg->subj, HdrLine, WC->DefaultCharset, FoundCharset); } -void tmplput_MAIL_SUMM_SUBJECT(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType) +void tmplput_MAIL_SUMM_SUBJECT(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType) {/////TODO: Fwd: and RE: filter!! message_summary *Msg = (message_summary*) Context; - StrBufAppendBuf(Target, Msg->subj, 0); + StrBufAppendTemplate(Target, nArgs, Tokens, Context, ContextType, Msg->subj, 0); } @@ -124,10 +233,10 @@ void examine_msgn(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) Msg->reply_inreplyto = NewStrBufPlain(NULL, StrLength(HdrLine)); StrBuf_RFC822_to_Utf8(Msg->reply_inreplyto, HdrLine, WC->DefaultCharset, FoundCharset); } -void tmplput_MAIL_SUMM_INREPLYTO(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType) +void tmplput_MAIL_SUMM_INREPLYTO(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType) { message_summary *Msg = (message_summary*) Context; - StrBufAppendBuf(Target, Msg->reply_inreplyto, 0); + StrBufAppendTemplate(Target, nArgs, Tokens, Context, ContextType, Msg->reply_inreplyto, 0); } int Conditional_MAIL_SUMM_UNREAD(WCTemplateToken *Tokens, void *Context, int ContextType) @@ -142,10 +251,10 @@ void examine_wefw(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) Msg->reply_references = NewStrBufPlain(NULL, StrLength(HdrLine)); StrBuf_RFC822_to_Utf8(Msg->reply_references, HdrLine, WC->DefaultCharset, FoundCharset); } -void tmplput_MAIL_SUMM_REFIDS(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType) +void tmplput_MAIL_SUMM_REFIDS(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType) { message_summary *Msg = (message_summary*) Context; - StrBufAppendBuf(Target, Msg->reply_references, 0); + StrBufAppendTemplate(Target, nArgs, Tokens, Context, ContextType, Msg->reply_references, 0); } @@ -161,10 +270,10 @@ void examine_cccc(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) } StrBufAppendBuf(Msg->AllRcpt, Msg->cccc, 0); } -void tmplput_MAIL_SUMM_CCCC(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType) +void tmplput_MAIL_SUMM_CCCC(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType) { message_summary *Msg = (message_summary*) Context; - StrBufAppendBuf(Target, Msg->cccc, 0); + StrBufAppendTemplate(Target, nArgs, Tokens, Context, ContextType, Msg->cccc, 0); } @@ -178,10 +287,10 @@ void examine_room(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) Msg->Room = NewStrBufDup(HdrLine); } } -void tmplput_MAIL_SUMM_ORGROOM(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType) +void tmplput_MAIL_SUMM_ORGROOM(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType) { message_summary *Msg = (message_summary*) Context; - StrBufAppendBuf(Target, Msg->Room, 0); + StrBufAppendTemplate(Target, nArgs, Tokens, Context, ContextType, Msg->Room, 0); } @@ -190,12 +299,16 @@ void examine_rfca(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) FreeStrBuf(&Msg->Rfca); Msg->Rfca = NewStrBufDup(HdrLine); } -void tmplput_MAIL_SUMM_RFCA(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType) +void tmplput_MAIL_SUMM_RFCA(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType) { message_summary *Msg = (message_summary*) Context; - StrBufAppendBuf(Target, Msg->Rfca, 0); + StrBufAppendTemplate(Target, nArgs, Tokens, Context, ContextType, Msg->Rfca, 0); +} +int Conditional_MAIL_SUMM_RFCA(WCTemplateToken *Tokens, void *Context, int ContextType) +{ + message_summary *Msg = (message_summary*) Context; + return StrLength(Msg->Rfca) > 0; } - void examine_node(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) { @@ -207,10 +320,10 @@ void examine_node(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) Msg->OtherNode = NewStrBufDup(HdrLine); } } -void tmplput_MAIL_SUMM_OTHERNODE(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType) +void tmplput_MAIL_SUMM_OTHERNODE(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType) { message_summary *Msg = (message_summary*) Context; - StrBufAppendBuf(Target, Msg->OtherNode, 0); + StrBufAppendTemplate(Target, nArgs, Tokens, Context, ContextType, Msg->OtherNode, 0); } int Conditional_MAIL_SUMM_OTHERNODE(WCTemplateToken *Tokens, void *Context, int ContextType) { @@ -231,31 +344,35 @@ void examine_rcpt(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) } StrBufAppendBuf(Msg->AllRcpt, Msg->to, 0); } -void tmplput_MAIL_SUMM_TO(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType) +void tmplput_MAIL_SUMM_TO(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType) { message_summary *Msg = (message_summary*) Context; - StrBufAppendBuf(Target, Msg->to, 0); + StrBufAppendTemplate(Target, nArgs, Tokens, Context, ContextType, Msg->to, 0); } -void tmplput_MAIL_SUMM_ALLRCPT(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType) +void tmplput_MAIL_SUMM_ALLRCPT(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType) { message_summary *Msg = (message_summary*) Context; - StrBufAppendBuf(Target, Msg->AllRcpt, 0); + StrBufAppendTemplate(Target, nArgs, Tokens, Context, ContextType, Msg->AllRcpt, 0); } +HashList *iterate_get_mailsumm_All(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType) +{ + return WC->summ; +} void examine_time(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) { Msg->date = StrTol(HdrLine); } -void tmplput_MAIL_SUMM_DATE_STR(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType) +void tmplput_MAIL_SUMM_DATE_STR(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType) { char datebuf[64]; message_summary *Msg = (message_summary*) Context; webcit_fmt_date(datebuf, Msg->date, 1); StrBufAppendBufPlain(Target, datebuf, -1, 0); } -void tmplput_MAIL_SUMM_DATE_NO(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType) +void tmplput_MAIL_SUMM_DATE_NO(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType) { message_summary *Msg = (message_summary*) Context; StrBufAppendPrintf(Target, "%ld", Msg->date, 0); @@ -271,7 +388,7 @@ void render_MAIL(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCharset if ( (!IsEmptyStr(mime_submessages)) && (!section[0]) ) { for (i=0; i"); read_message(Mime->msgnum, 1, ChrPtr(Mime->Section)); wprintf(""); @@ -315,79 +432,102 @@ void render_MIME_ICS(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCha void examine_mime_part(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) { - wc_mime_attachment *mime; + wc_mime_attachment *Mime; StrBuf *Buf; - void *vMimeRenderer; - - mime = (wc_mime_attachment*) malloc(sizeof(wc_mime_attachment)); - memset(mime, 0, sizeof(wc_mime_attachment)); - mime->msgnum = Msg->msgnum; + + 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(mime->Name, HdrLine, 0, '|'); + Mime->Name = NewStrBuf(); + StrBufExtract_token(Buf, HdrLine, 0, '|'); + StrBuf_RFC822_to_Utf8(Mime->Name, Buf, WC->DefaultCharset, FoundCharset); + StrBufTrim(Mime->Name); StrBufExtract_token(Buf, HdrLine, 1, '|'); - mime->FileName = NewStrBuf(); - StrBuf_RFC822_to_Utf8(mime->FileName, Buf, WC->DefaultCharset, FoundCharset); - - mime->PartNum = NewStrBuf(); - StrBufExtract_token(mime->PartNum, HdrLine, 2, '|'); - - mime->Disposition = NewStrBuf(); - StrBufExtract_token(mime->Disposition, HdrLine, 3, '|'); - - mime->ContentType = NewStrBuf(); - StrBufExtract_token(mime->ContentType, HdrLine, 4, '|'); - - mime->length = StrBufExtract_int(HdrLine, 5, '|'); - - StrBufTrim(mime->Name); - StrBufTrim(mime->FileName); + Mime->FileName = NewStrBuf(); + StrBuf_RFC822_to_Utf8(Mime->FileName, Buf, WC->DefaultCharset, FoundCharset); + StrBufTrim(Mime->FileName); + + Mime->PartNum = NewStrBuf(); + StrBufExtract_token(Mime->PartNum, HdrLine, 2, '|'); + StrBufTrim(Mime->PartNum); + if (strchr(ChrPtr(Mime->PartNum), '.') != NULL) + Mime->level = 2; + else + Mime->level = 1; + + Mime->Disposition = NewStrBuf(); + StrBufExtract_token(Mime->Disposition, HdrLine, 3, '|'); + + Mime->ContentType = NewStrBuf(); + StrBufExtract_token(Mime->ContentType, HdrLine, 4, '|'); + StrBufTrim(Mime->ContentType); + StrBufLowerCase(Mime->ContentType); + + Mime->length = StrBufExtract_int(HdrLine, 5, '|'); + + if ( (StrLength(Mime->FileName) == 0) && (StrLength(Mime->Name) > 0) ) { + StrBufAppendBuf(Mime->FileName, Mime->Name, 0); + } - if ( (StrLength(mime->FileName) == 0) && (StrLength(mime->Name) > 0) ) { - StrBufAppendBuf(mime->FileName, mime->Name, 0); + if (StrLength(Msg->PartNum) > 0) { + StrBuf *tmp; + StrBufPrintf(Buf, "%s.%s", ChrPtr(Msg->PartNum), ChrPtr(Mime->PartNum)); + tmp = Mime->PartNum; + Mime->PartNum = Buf; + Buf = tmp; } if (Msg->AllAttach == NULL) Msg->AllAttach = NewHash(1,NULL); - Put(Msg->AllAttach, SKEY(mime->PartNum), mime, DestroyMime); + Put(Msg->AllAttach, SKEY(Mime->PartNum), Mime, DestroyMime); + FreeStrBuf(&Buf); +} - if (GetHash(MimeRenderHandler, SKEY(mime->ContentType), &vMimeRenderer) && +void evaluate_mime_part(message_summary *Msg, wc_mime_attachment *Mime) +{ + void *vMimeRenderer; + + /* just print the root-node */ + if ((Mime->level == 1) && + GetHash(MimeRenderHandler, SKEY(Mime->ContentType), &vMimeRenderer) && vMimeRenderer != NULL) { - mime->Renderer = (RenderMimeFunc) vMimeRenderer; + Mime->Renderer = (RenderMimeFunc) vMimeRenderer; if (Msg->Submessages == NULL) Msg->Submessages = NewHash(1,NULL); - Put(Msg->Submessages, SKEY(mime->PartNum), mime, reference_free_handler); + Put(Msg->Submessages, SKEY(Mime->PartNum), Mime, reference_free_handler); } - else if ((!strcasecmp(ChrPtr(mime->Disposition), "inline")) - && (!strncasecmp(ChrPtr(mime->ContentType), "image/", 6)) ){ + 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); + Put(Msg->AttachLinks, SKEY(Mime->PartNum), Mime, reference_free_handler); } - else if ((StrLength(mime->ContentType) > 0) && - ( (!strcasecmp(ChrPtr(mime->Disposition), "attachment")) - || (!strcasecmp(ChrPtr(mime->Disposition), "inline")) - || (!strcasecmp(ChrPtr(mime->Disposition), "")))) + else if ((Mime->level == 1) && + (StrLength(Mime->ContentType) > 0) && + ( (!strcasecmp(ChrPtr(Mime->Disposition), "attachment")) + || (!strcasecmp(ChrPtr(Mime->Disposition), "inline")) + || (!strcasecmp(ChrPtr(Mime->Disposition), "")))) { if (Msg->AttachLinks == NULL) Msg->AttachLinks = NewHash(1,NULL); - Put(Msg->AttachLinks, SKEY(mime->PartNum), mime, reference_free_handler); - if (strcasecmp(ChrPtr(mime->ContentType), "application/octet-stream") == 0) { - FlushStrBuf(mime->ContentType); - StrBufAppendBufPlain(mime->ContentType, - GuessMimeByFilename(SKEY(mime->FileName)), + Put(Msg->AttachLinks, SKEY(Mime->PartNum), Mime, reference_free_handler); + if ((strcasecmp(ChrPtr(Mime->ContentType), "application/octet-stream") == 0) && + (StrLength(Mime->FileName) > 0)) { + FlushStrBuf(Mime->ContentType); + StrBufAppendBufPlain(Mime->ContentType, + GuessMimeByFilename(SKEY(Mime->FileName)), -1, 0); } } - - FreeStrBuf(&Buf); } -void tmplput_MAIL_SUMM_NATTACH(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType) +void tmplput_MAIL_SUMM_NATTACH(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType) { message_summary *Msg = (message_summary*) Context; StrBufAppendPrintf(Target, "%ld", GetCount(Msg->Attachments)); @@ -405,10 +545,10 @@ void examine_hnod(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) Msg->hnod = NewStrBufPlain(NULL, StrLength(HdrLine)); StrBuf_RFC822_to_Utf8(Msg->hnod, HdrLine, WC->DefaultCharset, FoundCharset); } -void tmplput_MAIL_SUMM_H_NODE(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType) +void tmplput_MAIL_SUMM_H_NODE(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType) { message_summary *Msg = (message_summary*) Context; - StrBufAppendBuf(Target, Msg->hnod, 0); + StrBufAppendTemplate(Target, nArgs, Tokens, Context, ContextType, Msg->hnod, 0); } int Conditional_MAIL_SUMM_H_NODE(WCTemplateToken *Tokens, void *Context, int ContextType) { @@ -419,14 +559,14 @@ int Conditional_MAIL_SUMM_H_NODE(WCTemplateToken *Tokens, void *Context, int Con void examine_text(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) -{////TODO: read messages here - Msg->MsgBody.Data = NewStrBuf(); +{ + Msg->MsgBody->Data = NewStrBuf(); } void examine_msg4_partnum(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) { - Msg->MsgBody.PartNum = NewStrBufDup(HdrLine); - StrBufTrim(Msg->MsgBody.PartNum);/////TODO: striplt == trim? + Msg->MsgBody->PartNum = NewStrBufDup(HdrLine); + StrBufTrim(Msg->MsgBody->PartNum);/////TODO: striplt == trim? } void examine_content_encoding(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) @@ -436,39 +576,62 @@ void examine_content_encoding(message_summary *Msg, StrBuf *HdrLine, StrBuf *Fou void examine_content_lengh(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) { - Msg->MsgBody.length = StrTol(HdrLine); - Msg->MsgBody.size_known = 1; + Msg->MsgBody->length = StrTol(HdrLine); + Msg->MsgBody->size_known = 1; } void examine_content_type(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) -{////TODO - int len, i; - Msg->MsgBody.ContentType = NewStrBufDup(HdrLine); - StrBufTrim(Msg->MsgBody.ContentType);/////todo==striplt? - len = StrLength(Msg->MsgBody.ContentType); - for (i=0; iMsgBody.ContentType) + i, "charset=", 8)) {/// TODO: WHUT? -// safestrncpy(mime_charset, &mime_content_type[i+8], - /// sizeof mime_charset); - } - }/**** - for (i=0; iMsgBody->ContentType = NewStrBufDup(HdrLine); + sem = strchr(ChrPtr(HdrLine), ';'); + + if (sem != NULL) { + Token = NewStrBufPlain(NULL, StrLength(HdrLine)); + Value = NewStrBufPlain(NULL, StrLength(HdrLine)); + len = sem - ChrPtr(HdrLine); + StrBufCutAt(Msg->MsgBody->ContentType, len, NULL); + while (sem != NULL) { + while (isspace(*(sem + 1))) + sem ++; + StrBufCutLeft(HdrLine, sem - ChrPtr(HdrLine)); + sem = strchr(ChrPtr(HdrLine), ';'); + if (sem != NULL) + len = sem - ChrPtr(HdrLine); + else + len = StrLength(HdrLine); + FlushStrBuf(Token); + FlushStrBuf(Value); + StrBufAppendBufPlain(Token, ChrPtr(HdrLine), len, 0); + eq = strchr(ChrPtr(Token), '='); + if (eq != NULL) { + len = eq - ChrPtr(Token); + StrBufAppendBufPlain(Value, eq + 1, StrLength(Token) - len - 1, 0); + StrBufCutAt(Token, len, NULL); + StrBufTrim(Value); + } + StrBufTrim(Token); + + if (GetHash(MsgHeaderHandler, SKEY(Token), &vHdr) && + (vHdr != NULL)) { + 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)); } + FreeStrBuf(&Token); + FreeStrBuf(&Value); } - */ } -void tmplput_MAIL_SUMM_N(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType) +void tmplput_MAIL_SUMM_N(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType) { message_summary *Msg = (message_summary*) Context; StrBufAppendPrintf(Target, "%ld", Msg->msgnum); @@ -503,17 +666,22 @@ int Conditional_MAIL_MIME_ATTACH(WCTemplateToken *Tokens, void *Context, int Con /*----------------------------------------------------------------------------*/ -void tmplput_QUOTED_MAIL_BODY(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType) +void tmplput_QUOTED_MAIL_BODY(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType) { long MsgNum; - MsgNum = LBstr(Token->Params[0]->Start, Token->Params[0]->len); - read_message(Target, HKEY("view_message_replyquote"), MsgNum, 0, NULL); + StrBuf *Buf; + + MsgNum = LBstr(Tokens->Params[0]->Start, Tokens->Params[0]->len); + Buf = NewStrBuf(); + read_message(Buf, HKEY("view_message_replyquote"), MsgNum, 0, NULL); + StrBufAppendTemplate(Target, nArgs, Tokens, Context, ContextType, Buf, 1); + FreeStrBuf(&Buf); } -void tmplput_MAIL_BODY(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType) +void tmplput_MAIL_BODY(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType) { message_summary *Msg = (message_summary*) Context; - StrBufAppendBuf(Target, Msg->MsgBody.Data, 0); + StrBufAppendTemplate(Target, nArgs, Tokens, Context, ContextType, Msg->MsgBody->Data, 0); } @@ -531,10 +699,11 @@ void render_MAIL_text_plain(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *F StrBuf *cs = NULL; const char *ptr, *pte; const char *BufPtr = NULL; - StrBuf *Line = NewStrBuf(); - StrBuf *Line1 = NewStrBuf(); - StrBuf *Line2 = NewStrBuf(); - StrBuf *Target = NewStrBufPlain(NULL, StrLength(Mime->Data)); + StrBuf *Line; + StrBuf *Line1; + StrBuf *Line2; + StrBuf *Target; + int ConvertIt = 1; int bn = 0; int bq = 0; @@ -547,7 +716,8 @@ void render_MAIL_text_plain(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *F if ((StrLength(Mime->Data) == 0) && (Mime->length > 0)) { FreeStrBuf(&Mime->Data); Mime->Data = NewStrBufPlain(NULL, Mime->length); - read_message(Mime->Data, HKEY("view_submessage"), Mime->msgnum, 0, Mime->PartNum); + if (!read_message(Mime->Data, HKEY("view_submessage"), Mime->msgnum, 0, Mime->PartNum)) + return; } /* Boring old 80-column fixed format text gets handled this way... */ @@ -563,7 +733,7 @@ void render_MAIL_text_plain(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *F cs = FoundCharset; else if (StrLength(WC->DefaultCharset) > 0) cs = WC->DefaultCharset; - if (cs == 0) { + if (cs == NULL) { ConvertIt = 0; } else { @@ -575,6 +745,10 @@ void render_MAIL_text_plain(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *F } } #endif + Line = NewStrBuf(); + Line1 = NewStrBuf(); + Line2 = NewStrBuf(); + Target = NewStrBufPlain(NULL, StrLength(Mime->Data)); while ((n = StrBufSipLine(Line, Mime->Data, &BufPtr), n >= 0) && !done) { @@ -684,57 +858,91 @@ HashList *iterate_get_mime_Attachments(StrBuf *Target, int nArgs, WCTemplateToke return Msg->AllAttach; } -void tmplput_MIME_Name(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType) +void tmplput_MIME_Name(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType) { wc_mime_attachment *mime = (wc_mime_attachment*) Context; - StrBufAppendBuf(Target, mime->Name, 0); + StrBufAppendTemplate(Target, nArgs, Tokens, Context, ContextType, mime->Name, 0); } -void tmplput_MIME_FileName(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType) +void tmplput_MIME_FileName(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType) { wc_mime_attachment *mime = (wc_mime_attachment*) Context; - StrBufAppendBuf(Target, mime->FileName, 0); + StrBufAppendTemplate(Target, nArgs, Tokens, Context, ContextType, mime->FileName, 0); } -void tmplput_MIME_PartNum(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType) +void tmplput_MIME_PartNum(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType) { wc_mime_attachment *mime = (wc_mime_attachment*) Context; - StrBufAppendBuf(Target, mime->PartNum, 0); + StrBufAppendTemplate(Target, nArgs, Tokens, Context, ContextType, mime->PartNum, 0); } -void tmplput_MIME_MsgNum(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType) +void tmplput_MIME_MsgNum(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType) { wc_mime_attachment *mime = (wc_mime_attachment*) Context; StrBufAppendPrintf(Target, "%ld", mime->msgnum); } -void tmplput_MIME_Disposition(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType) +void tmplput_MIME_Disposition(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType) { wc_mime_attachment *mime = (wc_mime_attachment*) Context; - StrBufAppendBuf(Target, mime->Disposition, 0); + StrBufAppendTemplate(Target, nArgs, Tokens, Context, ContextType, mime->Disposition, 0); } -void tmplput_MIME_ContentType(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType) +void tmplput_MIME_ContentType(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType) { wc_mime_attachment *mime = (wc_mime_attachment*) Context; - StrBufAppendBuf(Target, mime->ContentType, 0); + StrBufAppendTemplate(Target, nArgs, Tokens, Context, ContextType, mime->ContentType, 0); } -void tmplput_MIME_Charset(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType) +void examine_charset(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) +{ + Msg->MsgBody->Charset = NewStrBufDup(HdrLine); +} + +void tmplput_MIME_Charset(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType) { wc_mime_attachment *mime = (wc_mime_attachment*) Context; - StrBufAppendBuf(Target, mime->Charset, 0); + StrBufAppendTemplate(Target, nArgs, Tokens, Context, ContextType, mime->Charset, 0); } -void tmplput_MIME_Data(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType) +void tmplput_MIME_Data(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType) { wc_mime_attachment *mime = (wc_mime_attachment*) Context; if (mime->Renderer != NULL) mime->Renderer(mime, NULL, NULL); - StrBufAppendBuf(Target, mime->Data, 0); /// TODO: check whether we need to load it now? + StrBufAppendTemplate(Target, nArgs, Tokens, Context, ContextType, mime->Data, 0); + /// TODO: check whether we need to load it now? +} + +void tmplput_MIME_LoadData(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType) +{ + wcsession *WCC = WC; + wc_mime_attachment *mime = (wc_mime_attachment*) Context; + wc_mime_attachment *att; + + if ( (!strcasecmp(ChrPtr(mime->Disposition), "inline"))|| + (!strcasecmp(ChrPtr(mime->Disposition), "attachment")) ) + { + + int n; + char N[64]; + /* steal this mime part... */ + att = malloc(sizeof(wc_mime_attachment)); + memcpy(att, mime, sizeof(wc_mime_attachment)); + memset(mime, 0, sizeof(wc_mime_attachment)); + + if (att->Data == NULL) + MimeLoadData(att); + + if (WCC->attachments == NULL) + WCC->attachments = NewHash(1, NULL); + /* And add it to the list. */ + n = snprintf(N, sizeof N, "%d", GetCount(WCC->attachments) + 1); + Put(WCC->attachments, N, n, att, DestroyMime); + } } -void tmplput_MIME_Length(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType) +void tmplput_MIME_Length(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType) { wc_mime_attachment *mime = (wc_mime_attachment*) Context; StrBufAppendPrintf(Target, "%ld", mime->length); @@ -745,25 +953,44 @@ HashList *iterate_get_registered_Attachments(StrBuf *Target, int nArgs, WCTempla return WC->attachments; } -void tmplput_ATT_Length(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType) +void servcmd_do_search(char *buf, long bufsize) { - wc_attachment *att = (wc_attachment*) Context; - StrBufAppendPrintf(Target, "%ld", att->length); + snprintf(buf, bufsize, "MSGS SEARCH|%s", bstr("query")); } -void tmplput_ATT_Contenttype(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType) +void servcmd_headers(char *buf, long bufsize) { - wc_attachment *att = (wc_attachment*) Context; - StrBufAppendBuf(Target, att->content_type, 0); + snprintf(buf, bufsize, "MSGS ALL"); } -void tmplput_ATT_FileName(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType) +void servcmd_readfwd(char *buf, long bufsize) { - wc_attachment *att = (wc_attachment*) Context; - StrBufAppendBuf(Target, att->filename, 0); + snprintf(buf, bufsize, "MSGS ALL"); } +void servcmd_readnew(char *buf, long bufsize) +{ + snprintf(buf, bufsize, "MSGS NEW"); +} +void servcmd_readold(char *buf, long bufsize) +{ + snprintf(buf, bufsize, "MSGS OLD"); +} + + +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} +}; + + + + + @@ -772,6 +999,25 @@ void InitModule_MSGRENDERERS (void) { + RegisterSortFunc(HKEY("date"), + NULL, 0, + summcmp_date, + summcmp_rdate, + CTX_MAILSUM); + RegisterSortFunc(HKEY("subject"), + NULL, 0, + summcmp_subj, + summcmp_rsubj, + CTX_MAILSUM); + RegisterSortFunc(HKEY("sender"), + NULL, 0, + summcmp_sender, + summcmp_rsender, + CTX_MAILSUM); + + RegisterIterator("MAIL:SUMM:MSGS", 0, NULL, iterate_get_mailsumm_All, + NULL,NULL, CTX_MAILSUM, CTX_NONE); + RegisterNamespace("MAIL:SUMM:DATESTR", 0, 0, tmplput_MAIL_SUMM_DATE_STR, 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); @@ -789,10 +1035,8 @@ InitModule_MSGRENDERERS 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); - RegisterNamespace("ATT:SIZE", 0, 1, tmplput_ATT_Length, CTX_ATT); - RegisterNamespace("ATT:TYPE", 0, 1, tmplput_ATT_Contenttype, CTX_ATT); - RegisterNamespace("ATT:FILENAME", 0, 1, tmplput_ATT_FileName, CTX_ATT); + RegisterConditional(HKEY("COND:MAIL:SUMM:RFCA"), 0, Conditional_MAIL_SUMM_RFCA, 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); @@ -821,9 +1065,10 @@ InitModule_MSGRENDERERS 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:LOADDATA", 0, 0, tmplput_MIME_LoadData, CTX_MIME_ATACH); RegisterIterator("MSG:ATTACHNAMES", 0, NULL, iterate_get_registered_Attachments, - NULL, NULL, CTX_ATT, CTX_NONE); + NULL, NULL, CTX_MIME_ATACH, CTX_NONE); RegisterMimeRenderer(HKEY("message/rfc822"), render_MAIL); RegisterMimeRenderer(HKEY("text/x-vcard"), render_MIME_VCard); @@ -856,4 +1101,10 @@ InitModule_MSGRENDERERS RegisterMsgHdr(HKEY("Content-type"), examine_content_type, 0); RegisterMsgHdr(HKEY("Content-length"), examine_content_lengh, 0); RegisterMsgHdr(HKEY("Content-transfer-encoding"), examine_content_encoding, 0); + RegisterMsgHdr(HKEY("charset"), examine_charset, 0); + + /* Don't care... */ + RegisterMsgHdr(HKEY("pref"), examine_pref, 0); + RegisterMsgHdr(HKEY("suff"), examine_suff, 0); + RegisterMsgHdr(HKEY("path"), examine_path, 0); }