X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fmessages.c;h=d1b0f20817cc3b2bbe6f5584573b2d5ae6380516;hb=HEAD;hp=f990c8700b09d1e358e502181194cccc5ec5c045;hpb=dca4414169da8ea7161d5b95fc9ccbefe5d39651;p=citadel.git diff --git a/webcit/messages.c b/webcit/messages.c index f990c8700..ec6306ecc 100644 --- a/webcit/messages.c +++ b/webcit/messages.c @@ -1,24 +1,26 @@ -/* - * Functions which deal with the fetching and displaying of messages. - * - * Copyright (c) 1996-2012 by the citadel.org team - * - * This program is open source software. You can redistribute it and/or - * modify it under the terms of the GNU General Public License, version 3. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ +// Functions which deal with the fetching and displaying of messages. +// +// Copyright (c) 1996-2022 by the citadel.org team +// +// This program is open source software. We call it open source, not +// free software, because Richard Stallman is a communist and an asshole. +// No one has done more damage to open source software than Stallman (ok, +// maybe Nat and Miguel have done more damage, but they were paid by +// Microsoft to do so). Richard Stallman is a far-left ultra-communist +// who hates America, hates freedom, and deserves to be canceled. +// +// The program is licensed under the General Public License, version 3. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. #include "webcit.h" -#include "webserver.h" + #include "dav.h" #include "calendar.h" -HashList *MsgHeaderHandler = NULL; -HashList *MsgEvaluators = NULL; HashList *MimeRenderHandler = NULL; HashList *ReadLoopHandler = NULL; int dbg_analyze_msg = 0; @@ -27,28 +29,24 @@ int dbg_analyze_msg = 0; #define SENDER_COL_WIDTH_PCT 30 /* Mailbox view column width */ #define DATE_PLUS_BUTTONS_WIDTH_PCT 20 /* Mailbox view column width */ -void jsonMessageListHdr(void); - -void display_enter(void); - -typedef void (*MsgPartEvaluatorFunc)(message_summary *Sum, StrBuf *Buf); +void fixview() { + /* workaround for json listview; its not useable directly */ + if (WC->CurRoom.view == VIEW_JSON_LIST) { + StrBuf *View = NewStrBuf(); + StrBufPrintf(View, "%d", VIEW_MAILBOX); + putbstr("view", View);; + } +} -typedef struct _MsgPartEvaluatorStruct { - MsgPartEvaluatorFunc f; -} MsgPartEvaluatorStruct; -int load_message(message_summary *Msg, - StrBuf *FoundCharset, - StrBuf **Error) -{ +int load_message(message_summary *Msg, StrBuf *FoundCharset, StrBuf **Error) { StrBuf *Buf; StrBuf *HdrToken; - headereval *Hdr; - void *vHdr; char buf[SIZ]; int Done = 0; int state=0; - + int rc; + Buf = NewStrBuf(); if (Msg->PartNum != NULL) { serv_printf("MSG4 %ld|%s", Msg->msgnum, ChrPtr(Msg->PartNum)); @@ -95,14 +93,11 @@ int load_message(message_summary *Msg, StrBufCutLeft(Buf, StrLength(HdrToken) + 1); /* look up one of the examine_* functions to parse the content */ - if (GetHash(MsgHeaderHandler, SKEY(HdrToken), &vHdr) && - (vHdr != NULL)) { - Hdr = (headereval*)vHdr; - Hdr->evaluator(Msg, Buf, FoundCharset); - if (Hdr->Type == 1) { - state++; - } - }/* TODO: + rc = EvaluateMsgHdr(SKEY(HdrToken), Msg, Buf, FoundCharset); + if (rc == 1) { + state++; + } + /* TODO: else LogError(Target, __FUNCTION__, "don't know how to handle message header[%s]\n", @@ -123,11 +118,8 @@ int load_message(message_summary *Msg, if (StrLength(HdrToken) > 0) { StrBufCutLeft(Buf, StrLength(HdrToken) + 1); /* the examine*'s know how to do with mime headers too... */ - if (GetHash(MsgHeaderHandler, SKEY(HdrToken), &vHdr) && - (vHdr != NULL)) { - Hdr = (headereval*)vHdr; - Hdr->evaluator(Msg, Buf, FoundCharset); - } + EvaluateMsgHdr(SKEY(HdrToken), Msg, Buf, FoundCharset); + break; } } @@ -161,16 +153,14 @@ int load_message(message_summary *Msg, } - /* - * I wanna SEE that message! + * Display a message to the user * * msgnum Message number to display * printable_view Nonzero to display a printable view * section Optional for encapsulated message/rfc822 submessage */ -int read_message(StrBuf *Target, const char *tmpl, long tmpllen, long msgnum, const StrBuf *PartNum, const StrBuf **OutMime) -{ +int read_message(StrBuf *Target, const char *tmpl, long tmpllen, long msgnum, const StrBuf *PartNum, const StrBuf **OutMime, WCTemplputParams *TP) { StrBuf *Buf; StrBuf *FoundCharset; HashPos *it; @@ -179,16 +169,26 @@ int read_message(StrBuf *Target, const char *tmpl, long tmpllen, long msgnum, co void *vHdr; long len; const char *Key; + WCTemplputParams SuperTP; WCTemplputParams SubTP; StrBuf *Error = NULL; + memset(&SuperTP, 0, sizeof(WCTemplputParams)); + memset(&SubTP, 0, sizeof(WCTemplputParams)); + Buf = NewStrBuf(); FoundCharset = NewStrBuf(); Msg = (message_summary *)malloc(sizeof(message_summary)); + if (!Msg) { + syslog(LOG_DEBUG, "malloc() error"); + } memset(Msg, 0, sizeof(message_summary)); Msg->msgnum = msgnum; Msg->PartNum = PartNum; Msg->MsgBody = (wc_mime_attachment*) malloc(sizeof(wc_mime_attachment)); + if (!Msg->MsgBody) { + syslog(LOG_DEBUG, "malloc() error"); + } memset(Msg->MsgBody, 0, sizeof(wc_mime_attachment)); Msg->MsgBody->msgnum = msgnum; @@ -202,37 +202,46 @@ int read_message(StrBuf *Target, const char *tmpl, long tmpllen, long msgnum, co StrBufTrim(Buf); StrBufLowerCase(Buf); - /* Locate a renderer capable of converting this MIME part into HTML */ - if (GetHash(MimeRenderHandler, SKEY(Buf), &vHdr) && - (vHdr != NULL)) { - RenderMimeFuncStruct *Render; - Render = (RenderMimeFuncStruct*)vHdr; - Render->f(Msg->MsgBody, NULL, FoundCharset); - } - - if (StrLength(Msg->reply_references)> 0) { - /* Trim down excessively long lists of thread references. We eliminate the - * second one in the list so that the thread root remains intact. - */ - int rrtok = num_tokens(ChrPtr(Msg->reply_references), '|'); - int rrlen = StrLength(Msg->reply_references); - if ( ((rrtok >= 3) && (rrlen > 900)) || (rrtok > 10) ) { - StrBufRemove_token(Msg->reply_references, 1, '|'); + StackContext(TP, &SuperTP, Msg, CTX_MAILSUM, 0, NULL); + { + /* Locate a renderer capable of converting this MIME part into HTML */ + if (GetHash(MimeRenderHandler, SKEY(Buf), &vHdr) && + (vHdr != NULL)) { + RenderMimeFuncStruct *Render; + + StackContext(&SuperTP, &SubTP, Msg->MsgBody, CTX_MIME_ATACH, 0, NULL); + { + Render = (RenderMimeFuncStruct*)vHdr; + Render->f(Target, &SubTP, FoundCharset); + } + UnStackContext(&SubTP); + } + + if (StrLength(Msg->reply_references)> 0) { + /* Trim down excessively long lists of thread references. We eliminate the + * second one in the list so that the thread root remains intact. + */ + int rrtok = num_tokens(ChrPtr(Msg->reply_references), '|'); + int rrlen = StrLength(Msg->reply_references); + if ( ((rrtok >= 3) && (rrlen > 900)) || (rrtok > 10) ) { + StrBufRemove_token(Msg->reply_references, 1, '|'); + } } - } - /* now check if we need to translate some mimeparts, and remove the duplicate */ - it = GetNewHashPos(Msg->AllAttach, 0); - while (GetNextHashPos(Msg->AllAttach, it, &len, &Key, &vMime) && - (vMime != NULL)) { - wc_mime_attachment *Mime = (wc_mime_attachment*) vMime; - evaluate_mime_part(Msg, Mime); + /* now check if we need to translate some mimeparts, and remove the duplicate */ + it = GetNewHashPos(Msg->AllAttach, 0); + while (GetNextHashPos(Msg->AllAttach, it, &len, &Key, &vMime) && + (vMime != NULL)) { + StackContext(&SuperTP, &SubTP, vMime, CTX_MIME_ATACH, 0, NULL); + { + evaluate_mime_part(Target, &SubTP); + } + UnStackContext(&SubTP); + } + DeleteHashPos(&it); + *OutMime = DoTemplate(tmpl, tmpllen, Target, &SuperTP); } - DeleteHashPos(&it); - memset(&SubTP, 0, sizeof(WCTemplputParams)); - SubTP.Filter.ContextType = CTX_MAILSUM; - SubTP.Context = Msg; - *OutMime = DoTemplate(tmpl, tmpllen, Target, &SubTP); + UnStackContext(&SuperTP); DestroyMessageSummary(Msg); FreeStrBuf(&FoundCharset); @@ -241,9 +250,7 @@ int read_message(StrBuf *Target, const char *tmpl, long tmpllen, long msgnum, co } -long -HttpStatus(long CitadelStatus) -{ +long HttpStatus(long CitadelStatus) { long httpstatus = 502; switch (MAJORCODE(CitadelStatus)) @@ -298,7 +305,7 @@ HttpStatus(long CitadelStatus) default: case BINARY_FOLLOWS: case SEND_BINARY: - case START_CHAT_MODE: + case SEND_THEN_RECV: case ASYNC_MSG: case MORE_DATA: case SEND_LISTING: @@ -309,47 +316,45 @@ HttpStatus(long CitadelStatus) return httpstatus; } + /* * Unadorned HTML output of an individual message, suitable * for placing in a hidden iframe, for printing, or whatever */ -void handle_one_message(void) -{ - long CitStatus; +void handle_one_message(void) { + long CitStatus = ERROR + NOT_HERE; int CopyMessage = 0; const StrBuf *Destination; void *vLine; const StrBuf *Mime; long msgnum = 0L; - wcsession *WCC = WC; const StrBuf *Tmpl; StrBuf *CmdBuf = NULL; const char *pMsg; - - pMsg = strchr(ChrPtr(WCC->Hdr->HR.ReqLine), '/'); + pMsg = strchr(ChrPtr(WC->Hdr->HR.ReqLine), '/'); if (pMsg == NULL) { HttpStatus(CitStatus); return; } msgnum = atol(pMsg + 1); - StrBufCutAt(WCC->Hdr->HR.ReqLine, 0, pMsg); - gotoroom(WCC->Hdr->HR.ReqLine); - switch (WCC->Hdr->HR.eReqType) + StrBufCutAt(WC->Hdr->HR.ReqLine, 0, pMsg); + gotoroom(WC->Hdr->HR.ReqLine); + switch (WC->Hdr->HR.eReqType) { case eGET: case ePOST: Tmpl = sbstr("template"); if (StrLength(Tmpl) > 0) - read_message(WCC->WBuf, SKEY(Tmpl), msgnum, NULL, &Mime); + read_message(WC->WBuf, SKEY(Tmpl), msgnum, NULL, &Mime, NULL); else - read_message(WCC->WBuf, HKEY("view_message"), msgnum, NULL, &Mime); + read_message(WC->WBuf, HKEY("view_message"), msgnum, NULL, &Mime, NULL); http_transmit_thing(ChrPtr(Mime), 0); break; case eDELETE: CmdBuf = NewStrBuf (); - if ((WCC->CurRoom.RAFlags & UA_ISTRASH) != 0) { /* Delete from Trash is a real delete */ + if ((WC->CurRoom.RAFlags & UA_ISTRASH) != 0) { /* Delete from Trash is a real delete */ serv_printf("DELE %ld", msgnum); } else { /* Otherwise move it to Trash */ @@ -362,7 +367,7 @@ void handle_one_message(void) case eCOPY: CopyMessage = 1; case eMOVE: - if (GetHash(WCC->Hdr->HTTPHeaders, HKEY("DESTINATION"), &vLine) && + if (GetHash(WC->Hdr->HTTPHeaders, HKEY("DESTINATION"), &vLine) && (vLine!=NULL)) { Destination = (StrBuf*) vLine; serv_printf("MOVE %ld|%s|%d", msgnum, ChrPtr(Destination), CopyMessage); @@ -388,27 +393,26 @@ void handle_one_message(void) void embed_message(void) { const StrBuf *Mime; long msgnum = 0L; - wcsession *WCC = WC; const StrBuf *Tmpl; StrBuf *CmdBuf = NULL; - msgnum = StrBufExtract_long(WCC->Hdr->HR.ReqLine, 0, '/'); + msgnum = StrBufExtract_long(WC->Hdr->HR.ReqLine, 0, '/'); if (msgnum <= 0) return; - switch (WCC->Hdr->HR.eReqType) + switch (WC->Hdr->HR.eReqType) { case eGET: case ePOST: Tmpl = sbstr("template"); if (StrLength(Tmpl) > 0) - read_message(WCC->WBuf, SKEY(Tmpl), msgnum, NULL, &Mime); + read_message(WC->WBuf, SKEY(Tmpl), msgnum, NULL, &Mime, NULL); else - read_message(WCC->WBuf, HKEY("view_message"), msgnum, NULL, &Mime); + read_message(WC->WBuf, HKEY("view_message"), msgnum, NULL, &Mime, NULL); http_transmit_thing(ChrPtr(Mime), 0); break; case eDELETE: CmdBuf = NewStrBuf (); - if ((WCC->CurRoom.RAFlags & UA_ISTRASH) != 0) { /* Delete from Trash is a real delete */ + if ((WC->CurRoom.RAFlags & UA_ISTRASH) != 0) { /* Delete from Trash is a real delete */ serv_printf("DELE %ld", msgnum); } else { /* Otherwise move it to Trash */ @@ -440,11 +444,12 @@ void print_message(void) { begin_burst(); - read_message(WC->WBuf, HKEY("view_message_print"), msgnum, NULL, &Mime); + read_message(WC->WBuf, HKEY("view_message_print"), msgnum, NULL, &Mime, NULL); wDumpContent(0); } + /* * Display a message's headers */ @@ -461,7 +466,7 @@ void display_headers(void) { PACKAGE_STRING); begin_burst(); - serv_printf("MSG2 %ld|3", msgnum); + serv_printf("MSG2 %ld|1", msgnum); serv_getln(buf, sizeof buf); if (buf[0] == '1') { while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) { @@ -473,51 +478,6 @@ void display_headers(void) { } -message_summary *ReadOneMessageSummary(StrBuf *RawMessage, const char *DefaultSubject, long MsgNum) -{ - void *vEval; - MsgPartEvaluatorStruct *Eval; - message_summary *Msg; - StrBuf *Buf; - const char *buf; - const char *ebuf; - int nBuf; - long len; - - Buf = NewStrBuf(); - - serv_printf("MSG0 %ld|1", MsgNum); /* ask for headers only */ - - StrBuf_ServGetln(Buf); - if (GetServerStatus(Buf, NULL) == 1) { - FreeStrBuf(&Buf); - return NULL; - } - - Msg = (message_summary*)malloc(sizeof(message_summary)); - memset(Msg, 0, sizeof(message_summary)); - while (len = StrBuf_ServGetln(Buf), - (len >= 0) && - ((len != 3) || - strcmp(ChrPtr(Buf), "000"))) - { - buf = ChrPtr(Buf); - ebuf = strchr(ChrPtr(Buf), '='); - nBuf = ebuf - buf; - if (GetHash(MsgEvaluators, buf, nBuf, &vEval) && vEval != NULL) { - Eval = (MsgPartEvaluatorStruct*) vEval; - StrBufCutLeft(Buf, nBuf + 1); - Eval->f(Msg, Buf); - } - else syslog(1, "Don't know how to handle Message Headerline [%s]", ChrPtr(Buf)); - } - return Msg; -} - - - - - /* * load message pointers from the server for a "read messages" operation * @@ -525,10 +485,14 @@ message_summary *ReadOneMessageSummary(StrBuf *RawMessage, const char *DefaultSu */ int load_msg_ptrs(const char *servcmd, const char *filter, + StrBuf *FoundCharset, SharedMessageStatus *Stat, - load_msg_ptrs_detailheaders LH) + void **ViewSpecific, + load_msg_ptrs_detailheaders LH, + StrBuf *FetchMessageList, + eMessageField *MessageFieldList, + long HeaderCount) { - wcsession *WCC = WC; message_summary *Msg; StrBuf *Buf, *Buf2; long len; @@ -540,10 +504,10 @@ int load_msg_ptrs(const char *servcmd, Stat->lowest_found = LONG_MAX; Stat->highest_found = LONG_MIN; - if (WCC->summ != NULL) { - DeleteHash(&WCC->summ); + if (WC->summ != NULL) { + DeleteHash(&WC->summ); } - WCC->summ = NewHash(1, Flathash); + WC->summ = NewHash(1, Flathash); Buf = NewStrBuf(); serv_puts(servcmd); @@ -558,6 +522,10 @@ int load_msg_ptrs(const char *servcmd, serv_puts("000"); break; } + else if (FetchMessageList != NULL) { + serv_putbuf(FetchMessageList); + break; + } /* fall back to empty filter in case of we were fooled... */ serv_puts(""); serv_puts("000"); @@ -567,34 +535,42 @@ int load_msg_ptrs(const char *servcmd, return (Stat->nummsgs); } Buf2 = NewStrBuf(); - while (len = StrBuf_ServGetln(Buf), - ((len >= 0) && - ((len != 3) || - strcmp(ChrPtr(Buf), "000")!= 0))) - { + while (len = StrBuf_ServGetln(Buf), ((len >= 0) && ((len != 3) || strcmp(ChrPtr(Buf), "000")!= 0))) { if (Stat->nummsgs < Stat->maxload) { skipit = 0; Ptr = NULL; Msg = (message_summary*)malloc(sizeof(message_summary)); + if (!Msg) { + syslog(LOG_DEBUG, "malloc() error"); + } memset(Msg, 0, sizeof(message_summary)); Msg->msgnum = StrBufExtractNext_long(Buf, &Ptr, '|'); Msg->date = StrBufExtractNext_long(Buf, &Ptr, '|'); - - if (Stat->nummsgs == 0) { - if (Msg->msgnum < Stat->lowest_found) { - Stat->lowest_found = Msg->msgnum; - } - if (Msg->msgnum > Stat->highest_found) { - Stat->highest_found = Msg->msgnum; + if (MessageFieldList != NULL) { + long i; + for (i = 0; i < HeaderCount; i++) { + StrBufExtract_NextToken(Buf2, Buf, &Ptr, '|'); + if (StrLength(Buf2) > 0) { + EvaluateMsgHdrEnum(MessageFieldList[i], Msg, Buf2, FoundCharset); + } } } + else { + if (Stat->nummsgs == 0) { + if (Msg->msgnum < Stat->lowest_found) { + Stat->lowest_found = Msg->msgnum; + } + if (Msg->msgnum > Stat->highest_found) { + Stat->highest_found = Msg->msgnum; + } + } - if ((Msg->msgnum == 0) && (StrLength(Buf) < 32)) { - free(Msg); - continue; + if ((Msg->msgnum == 0) && (StrLength(Buf) < 32)) { + free(Msg); + continue; + } } - /* * as citserver probably gives us messages in forward date sorting * nummsgs should be the same order as the message date. @@ -605,13 +581,13 @@ int load_msg_ptrs(const char *servcmd, skipit = 1; } if ((!skipit) && (LH != NULL)) { - if (!LH(Buf, &Ptr, Msg, Buf2)){ + if (!LH(Buf, &Ptr, Msg, Buf2, ViewSpecific)){ free(Msg); continue; } } n = Msg->msgnum; - Put(WCC->summ, (const char *)&n, sizeof(n), Msg, DestroyMessageSummary); + Put(WC->summ, (const char *)&n, sizeof(n), Msg, DestroyMessageSummary); } Stat->nummsgs++; } @@ -621,17 +597,16 @@ int load_msg_ptrs(const char *servcmd, } - -/** - * \brief sets FlagToSet for each of ScanMe that appears in MatchMSet - * \param ScanMe List of BasicMsgStruct to be searched it MatchSet - * \param MatchMSet MSet we want to flag - * \param FlagToSet Flag to set on each BasicMsgStruct->Flags if in MSet +/* + * sets FlagToSet for each of ScanMe that appears in MatchMSet + * ScanMe: List of BasicMsgStruct to be searched it MatchSet + * MatchMSet: MSet we want to flag + * FlagToSet: Flag to set on each BasicMsgStruct->Flags if in MSet */ -void SetFlagsFromMSet(HashList *ScanMe, MSet *MatchMSet, int FlagToSet, int Reverse) -{ +long SetFlagsFromMSet(HashList *ScanMe, MSet *MatchMSet, int FlagToSet, int Reverse) { const char *HashKey; long HKLen; + long count = 0; HashPos *at; void *vMsg; message_summary *Msg; @@ -642,19 +617,21 @@ void SetFlagsFromMSet(HashList *ScanMe, MSet *MatchMSet, int FlagToSet, int Reve Msg = (message_summary*) vMsg; if (Reverse && IsInMSetList(MatchMSet, Msg->msgnum)) { Msg->Flags = Msg->Flags | FlagToSet; + count++; } else if (!Reverse && !IsInMSetList(MatchMSet, Msg->msgnum)) { Msg->Flags = Msg->Flags | FlagToSet; + count++; } } DeleteHashPos(&at); + return count; } -void load_seen_flags(void) -{ +long load_seen_flags(void) { + long count = 0; StrBuf *OldMsg; - wcsession *WCC = WC; MSet *MatchMSet; OldMsg = NewStrBuf(); @@ -665,15 +642,16 @@ void load_seen_flags(void) } else { FreeStrBuf(&OldMsg); - return; + return 0; } if (ParseMSet(&MatchMSet, OldMsg)) { - SetFlagsFromMSet(WCC->summ, MatchMSet, MSGFLAG_READ, 0); + count = SetFlagsFromMSet(WC->summ, MatchMSet, MSGFLAG_READ, 0); } DeleteMSet(&MatchMSet); FreeStrBuf(&OldMsg); + return count; } extern readloop_struct rlid[]; @@ -689,6 +667,9 @@ typedef struct _RoomRenderer{ RenderView_or_Tail_func RenderView_or_Tail; View_Cleanup_func ViewCleanup; load_msg_ptrs_detailheaders LHParse; + long HeaderCount; + StrBuf *FetchMessageList; + eMessageField *MessageFieldList; } RoomRenderer; @@ -697,8 +678,7 @@ typedef struct _RoomRenderer{ * * Set oper to "readnew" or "readold" or "readfwd" or "headers" or "readgt" or "readlt" or "do_search" */ -void readloop(long oper, eCustomRoomRenderer ForceRenderer) -{ +void readloop(long oper, eCustomRoomRenderer ForceRenderer) { RoomRenderer *ViewMsg; void *vViewMsg; void *vMsg; @@ -706,20 +686,19 @@ void readloop(long oper, eCustomRoomRenderer ForceRenderer) char cmd[256] = ""; char filter[256] = ""; int i, r; - wcsession *WCC = WC; HashPos *at; const char *HashKey; long HKLen; WCTemplputParams SubTP; SharedMessageStatus Stat; - void *ViewSpecific; + void *ViewSpecific = NULL; if (havebstr("is_summary") && (1 == (ibstr("is_summary")))) { - WCC->CurRoom.view = VIEW_MAILBOX; + WC->CurRoom.view = VIEW_MAILBOX; } if (havebstr("view")) { - WCC->CurRoom.view = ibstr("view"); + WC->CurRoom.view = ibstr("view"); } memset(&Stat, 0, sizeof(SharedMessageStatus)); @@ -727,12 +706,12 @@ void readloop(long oper, eCustomRoomRenderer ForceRenderer) Stat.lowest_found = (-1); Stat.highest_found = (-1); if (ForceRenderer == eUseDefault) - GetHash(ReadLoopHandler, IKEY(WCC->CurRoom.view), &vViewMsg); + GetHash(ReadLoopHandler, IKEY(WC->CurRoom.view), &vViewMsg); else GetHash(ReadLoopHandler, IKEY(ForceRenderer), &vViewMsg); if (vViewMsg == NULL) { - WCC->CurRoom.view = VIEW_BBS; - GetHash(ReadLoopHandler, IKEY(WCC->CurRoom.view), &vViewMsg); + WC->CurRoom.view = VIEW_BBS; + GetHash(ReadLoopHandler, IKEY(WC->CurRoom.view), &vViewMsg); } if (vViewMsg == NULL) { return; /* TODO: print message */ @@ -770,26 +749,41 @@ void readloop(long oper, eCustomRoomRenderer ForceRenderer) } if (!IsEmptyStr(cmd)) { const char *p = NULL; + StrBuf *FoundCharset = NULL; if (!IsEmptyStr(filter)) p = filter; - Stat.nummsgs = load_msg_ptrs(cmd, p, &Stat, ViewMsg->LHParse); + if (ViewMsg->HeaderCount > 0) { + FoundCharset = NewStrBuf(); + } + Stat.nummsgs = load_msg_ptrs(cmd, p, + FoundCharset, + &Stat, + &ViewSpecific, + ViewMsg->LHParse, + ViewMsg->FetchMessageList, + ViewMsg->MessageFieldList, + ViewMsg->HeaderCount); + FreeStrBuf(&FoundCharset); } if (Stat.sortit) { CompareFunc SortIt; - memset(&SubTP, 0, sizeof(WCTemplputParams)); - SubTP.Filter.ContextType = CTX_MAILSUM; - SubTP.Context = NULL; - SortIt = RetrieveSort(&SubTP, NULL, 0, - HKEY("date"), Stat.defaultsortorder); + StackContext(NULL, &SubTP, NULL, CTX_MAILSUM, 0, NULL); + { + SortIt = RetrieveSort(&SubTP, + NULL, 0, + HKEY("date"), + Stat.defaultsortorder); + } + UnStackContext(&SubTP); if (SortIt != NULL) - SortByPayload(WCC->summ, SortIt); + SortByPayload(WC->summ, SortIt); } if (Stat.startmsg < 0) { Stat.startmsg = 0; } - if (Stat.load_seen) load_seen_flags(); + if (Stat.load_seen) Stat.numNewmsgs = load_seen_flags(); /* * Print any inforation above the message list... @@ -797,9 +791,9 @@ void readloop(long oper, eCustomRoomRenderer ForceRenderer) if (ViewMsg->PrintViewHeader != NULL) ViewMsg->PrintViewHeader(&Stat, &ViewSpecific); - WCC->startmsg = Stat.startmsg; - WCC->maxmsgs = Stat.maxmsgs; - WCC->num_displayed = 0; + WC->startmsg = Stat.startmsg; + WC->maxmsgs = Stat.maxmsgs; + WC->num_displayed = 0; /* Put some helpful data in vars for mailsummary_json */ { @@ -807,21 +801,23 @@ void readloop(long oper, eCustomRoomRenderer ForceRenderer) Foo = NewStrBuf (); StrBufPrintf(Foo, "%ld", Stat.nummsgs); - PutBstr(HKEY("__READLOOP:TOTALMSGS"), NewStrBufDup(Foo)); + PutBstr(HKEY("__READLOOP:TOTALMSGS"), NewStrBufDup(Foo)); /* keep Foo! */ + + StrBufPrintf(Foo, "%ld", Stat.numNewmsgs); + PutBstr(HKEY("__READLOOP:NEWMSGS"), NewStrBufDup(Foo)); /* keep Foo! */ + StrBufPrintf(Foo, "%ld", Stat.startmsg); - PutBstr(HKEY("__READLOOP:STARTMSG"), Foo); + PutBstr(HKEY("__READLOOP:STARTMSG"), Foo); /* store Foo elsewhere, descope it here. */ } /* * iterate over each message. if we need to load an attachment, do it here. */ - if ((ViewMsg->LoadMsgFromServer != NULL) && - (!IsEmptyStr(cmd))) - { - at = GetNewHashPos(WCC->summ, 0); + if ((ViewMsg->LoadMsgFromServer != NULL) && (!IsEmptyStr(cmd))) { + at = GetNewHashPos(WC->summ, 0); Stat.num_displayed = i = 0; - while ( GetNextHashPos(WCC->summ, at, &HKLen, &HashKey, &vMsg)) { + while ( GetNextHashPos(WC->summ, at, &HKLen, &HashKey, &vMsg)) { Msg = (message_summary*) vMsg; if ((Msg->msgnum >= Stat.startmsg) && (Stat.num_displayed <= Stat.maxmsgs)) { ViewMsg->LoadMsgFromServer(&Stat, @@ -844,20 +840,17 @@ void readloop(long oper, eCustomRoomRenderer ForceRenderer) if (ViewMsg->ViewCleanup != NULL) ViewMsg->ViewCleanup(&ViewSpecific); - WCC->startmsg = 0; - WCC->maxmsgs = 0; - if (WCC->summ != NULL) { - DeleteHash(&WCC->summ); + WC->startmsg = 0; + WC->maxmsgs = 0; + if (WC->summ != NULL) { + DeleteHash(&WC->summ); } } -/* - * Back end for post_message() - * ... this is where the actual message gets transmitted to the server. - */ +// Back end for post_message() +// This is where the actual message gets transmitted to the server. void post_mime_to_server(void) { - wcsession *WCC = WC; char top_boundary[SIZ]; char alt_boundary[SIZ]; int is_multipart = 0; @@ -870,12 +863,12 @@ void post_mime_to_server(void) { int include_text_alt = 0; /* Set to nonzero to include multipart/alternative text/plain */ sprintf(top_boundary, "Citadel--Multipart--%s--%04x--%04x", - ChrPtr(WCC->serv_info->serv_fqdn), + ChrPtr(WC->serv_info->serv_fqdn), getpid(), ++seq ); sprintf(alt_boundary, "Citadel--Multipart--%s--%04x--%04x", - ChrPtr(WCC->serv_info->serv_fqdn), + ChrPtr(WC->serv_info->serv_fqdn), getpid(), ++seq ); @@ -885,12 +878,13 @@ void post_mime_to_server(void) { serv_puts("X-Mailer: " PACKAGE_STRING); /* If there are attachments, we have to do multipart/mixed */ - if (GetCount(WCC->attachments) > 0) { + syslog(LOG_DEBUG, "This message will have %d attachments", GetCount(WC->attachments)); + if (GetCount(WC->attachments) > 0) { is_multipart = 1; } /* Only do multipart/alternative for mailboxes. BBS and Wiki rooms don't need it. */ - if (WC->CurRoom.view == VIEW_MAILBOX) { + if ((WC->CurRoom.view == VIEW_MAILBOX) || (WC->CurRoom.view == VIEW_JSON_LIST)) { include_text_alt = 1; } @@ -903,8 +897,8 @@ void post_mime_to_server(void) { /* Remember, serv_printf() appends an extra newline */ if (include_text_alt) { - serv_printf("Content-type: multipart/alternative; " - "boundary=\"%s\"\n", alt_boundary); + StrBuf *Buf; + serv_printf("Content-type: multipart/alternative; boundary=\"%s\"\n", alt_boundary); serv_printf("This is a multipart message in MIME format.\n"); serv_printf("--%s", alt_boundary); @@ -912,9 +906,11 @@ void post_mime_to_server(void) { serv_puts("Content-Transfer-Encoding: quoted-printable"); serv_puts(""); txtmail = html_to_ascii(bstr("msgtext"), 0, 80, 0); - text_to_server_qp(txtmail); /* Transmit message in quoted-printable encoding */ + Buf = NewStrBufPlain(txtmail, -1); free(txtmail); + text_to_server_qp(Buf); /* Transmit message in quoted-printable encoding */ + FreeStrBuf(&Buf); serv_printf("\n--%s", alt_boundary); } @@ -922,7 +918,9 @@ void post_mime_to_server(void) { serv_puts("Content-Transfer-Encoding: quoted-printable"); serv_puts(""); serv_puts("\r\n"); - text_to_server_qp(bstr("msgtext")); /* Transmit message in quoted-printable encoding */ + if (havebstr("msgtext")) { + text_to_server_qp(sbstr("msgtext")); /* Transmit message in quoted-printable encoding */ + } serv_puts("\r\n"); if (include_text_alt) { @@ -936,15 +934,21 @@ void post_mime_to_server(void) { HashPos *it; /* Add in the attachments */ - it = GetNewHashPos(WCC->attachments, 0); - while (GetNextHashPos(WCC->attachments, it, &len, &Key, &vAtt)) { + it = GetNewHashPos(WC->attachments, 0); + while (GetNextHashPos(WC->attachments, it, &len, &Key, &vAtt)) { att = (wc_mime_attachment *)vAtt; if (att->length == 0) continue; - encoded_length = ((att->length * 150) / 100); + + encoded_length = att->length + (att->length / 2); // make it 150% of the original size for encoding encoded = malloc(encoded_length); - if (encoded == NULL) break; - encoded_strlen = CtdlEncodeBase64(encoded, ChrPtr(att->Data), StrLength(att->Data), 1); + if (!encoded) { + syslog(LOG_ERR, "malloc() error"); + break; + } + syslog(LOG_DEBUG, "Attachment: raw len %d", StrLength(att->Data)); + encoded_strlen = CtdlEncodeBase64(encoded, ChrPtr(att->Data), StrLength(att->Data), BASE64_YES_LINEBREAKS); + syslog(LOG_DEBUG, "Attachment: encoded len %d", encoded_strlen); serv_printf("--%s", top_boundary); serv_printf("Content-type: %s", ChrPtr(att->ContentType)); @@ -975,8 +979,7 @@ void post_mime_to_server(void) { * discarded. This prevents the accidental double-saving of the same message * if the user happens to click the browser "back" button. */ -void post_message(void) -{ +void post_message(void) { StrBuf *UserName; StrBuf *EmailAddress; StrBuf *EncBuf; @@ -985,7 +988,6 @@ void post_message(void) static long dont_post = (-1L); int is_anonymous = 0; const StrBuf *display_name = NULL; - wcsession *WCC = WC; StrBuf *Buf; if (havebstr("force_room")) { @@ -1011,7 +1013,7 @@ void post_message(void) StrBuf *Recp = NULL; StrBuf *Cc = NULL; StrBuf *Bcc = NULL; - char *wikipage = NULL; + StrBuf *wikipage = NULL; const StrBuf *my_email_addr = NULL; StrBuf *CmdBuf = NULL; StrBuf *references = NULL; @@ -1027,7 +1029,7 @@ void post_message(void) StrBuf_ServGetln(Buf); if (GetServerStatusMsg(Buf, NULL, 1, 2) != 2) { /* You probably don't even have a dumb Drafts folder */ - syslog(9, "%s:%d: server save to drafts error: %s\n", __FILE__, __LINE__, ChrPtr(Buf) + 4); + syslog(LOG_DEBUG, "%s:%d: server save to drafts error: %s\n", __FILE__, __LINE__, ChrPtr(Buf) + 4); AppendImportantMessage(_("Saved to Drafts failed: "), -1); display_enter(); FreeStrBuf(&Buf); @@ -1066,7 +1068,7 @@ void post_message(void) FreeStrBuf(&EmailAddress); FreeStrBuf(&EncBuf); - wikipage = strdup(bstr("page")); + wikipage = NewStrBufDup(sbstr("page")); str_wiki_index(wikipage); my_email_addr = sbstr("my_email_addr"); @@ -1074,7 +1076,7 @@ void post_message(void) StrLength(encoded_subject) + StrLength(Cc) + StrLength(Bcc) + - strlen(wikipage) + + StrLength(wikipage) + StrLength(my_email_addr) + StrLength(references); CmdBuf = NewStrBufPlain(NULL, sizeof (CMD) + HeaderLen); @@ -1086,7 +1088,7 @@ void post_message(void) ChrPtr(display_name), saving_to_drafts?"":ChrPtr(Cc), saving_to_drafts?"":ChrPtr(Bcc), - wikipage, + ChrPtr(wikipage), ChrPtr(my_email_addr), ChrPtr(references)); FreeStrBuf(&references); @@ -1094,14 +1096,14 @@ void post_message(void) free(wikipage); if ((HeaderLen + StrLength(sbstr("msgtext")) < 10) && - (GetCount(WCC->attachments) == 0)){ + (GetCount(WC->attachments) == 0)){ AppendImportantMessage(_("Refusing to post empty message.\n"), -1); FreeStrBuf(&CmdBuf); } else { - syslog(9, "%s\n", ChrPtr(CmdBuf)); + syslog(LOG_DEBUG, "%s\n", ChrPtr(CmdBuf)); serv_puts(ChrPtr(CmdBuf)); FreeStrBuf(&CmdBuf); @@ -1122,7 +1124,8 @@ void post_message(void) post_mime_to_server(); if (saving_to_drafts) { AppendImportantMessage(_("Message has been saved to Drafts.\n"), -1); - gotoroom(WCC->CurRoom.name); + gotoroom(WC->CurRoom.name); + fixview(); readloop(readnew, eUseDefault); FreeStrBuf(&Buf); return; @@ -1137,10 +1140,10 @@ void post_message(void) } dont_post = lbstr("postseq"); } else { - syslog(9, "%s:%d: server post error: %s", __FILE__, __LINE__, ChrPtr(Buf) + 4); + syslog(LOG_DEBUG, "%s:%d: server post error: %s", __FILE__, __LINE__, ChrPtr(Buf) + 4); AppendImportantMessage(ChrPtr(Buf) + 4, StrLength(Buf) - 4); display_enter(); - if (saving_to_drafts) gotoroom(WCC->CurRoom.name); + if (saving_to_drafts) gotoroom(WC->CurRoom.name); FreeStrBuf(&Recp); FreeStrBuf(&Buf); FreeStrBuf(&Cc); @@ -1154,7 +1157,7 @@ void post_message(void) FreeStrBuf(&Bcc); } - DeleteHash(&WCC->attachments); + DeleteHash(&WC->attachments); /* * We may have been supplied with instructions regarding the location @@ -1174,6 +1177,7 @@ void post_message(void) * Otherwise, just go to the "read messages" loop. */ else { + fixview(); readloop(readnew, eUseDefault); } } @@ -1183,43 +1187,72 @@ void post_message(void) * Client is uploading an attachment */ void upload_attachment(void) { - wcsession *WCC = WC; const char *pch; int n; const char *newn; long newnlen; void *v; wc_mime_attachment *att; + const StrBuf *Tmpl = sbstr("template"); + const StrBuf *MimeType = NULL; + const StrBuf *UID; + + begin_burst(); + syslog(LOG_DEBUG, "upload_attachment()"); + if (!Tmpl) { + wc_printf("upload_attachment()
\n"); + } - syslog(9, "upload_attachment()\n"); - wc_printf("upload_attachment()
\n"); + if (WC->upload_length <= 0) { + syslog(LOG_DEBUG, "ERROR no attachment was uploaded\n"); + if (Tmpl) { + putlbstr("UPLOAD_ERROR", 1); + MimeType = DoTemplate(SKEY(Tmpl), NULL, &NoCtx); + } + else { + wc_printf("ERROR no attachment was uploaded
\n"); + } + http_transmit_thing(ChrPtr(MimeType), 0); - if (WCC->upload_length <= 0) { - syslog(9, "ERROR no attachment was uploaded\n"); - wc_printf("ERROR no attachment was uploaded
\n"); return; } - syslog(9, "Client is uploading %d bytes\n", WCC->upload_length); - wc_printf("Client is uploading %d bytes
\n", WCC->upload_length); - att = malloc(sizeof(wc_mime_attachment)); + syslog(LOG_DEBUG, "Client has uploaded %d bytes", WC->upload_length); + if (Tmpl) { + putlbstr("UPLOAD_LENGTH", WC->upload_length); + } + else { + wc_printf("Client is uploading %d bytes
\n", WC->upload_length); + } + + att = (wc_mime_attachment*)malloc(sizeof(wc_mime_attachment)); + if (!att) { + syslog(LOG_DEBUG, "malloc() error"); + } memset(att, 0, sizeof(wc_mime_attachment )); - att->length = WCC->upload_length; - att->ContentType = NewStrBufPlain(WCC->upload_content_type, -1); - att->FileName = NewStrBufDup(WCC->upload_filename); - - if (WCC->attachments == NULL) { - WCC->attachments = NewHash(1, Flathash); + att->length = WC->upload_length; + att->ContentType = NewStrBufPlain(WC->upload_content_type, -1); + att->FileName = NewStrBufDup(WC->upload_filename); + UID = sbstr("qquuid"); + if (UID) { + att->PartNum = NewStrBufDup(UID); + } + + syslog(LOG_DEBUG, "attachment length: %d", att->length); + syslog(LOG_DEBUG, "att. content type: %s", ChrPtr(att->ContentType)); + syslog(LOG_DEBUG, "att upload buffer: %s", ((WC->upload == NULL) ? "null" : "not null")); + + + if (WC->attachments == NULL) { + WC->attachments = NewHash(1, Flathash); } /* And add it to the list. */ n = 0; - if ((GetCount(WCC->attachments) > 0) && - GetHashAt(WCC->attachments, - GetCount(WCC->attachments) -1, - &newnlen, &newn, &v)) - n = *((int*) newn) + 1; - Put(WCC->attachments, IKEY(n), att, DestroyMime); + if ((GetCount(WC->attachments) > 0) && GetHashAt(WC->attachments, GetCount(WC->attachments) -1, &newnlen, &newn, &v)) { + n = *((int*) newn) + 1; + } + Put(WC->attachments, IKEY(n), att, DestroyMime); /* * Mozilla sends a simple filename, which is what we want, @@ -1239,9 +1272,12 @@ void upload_attachment(void) { * Transfer control of this memory from the upload struct * to the attachment struct. */ - att->Data = WCC->upload; - WCC->upload = NULL; - WCC->upload_length = 0; + att->Data = WC->upload; + WC->upload = NULL; + WC->upload_length = 0; + + if (Tmpl) MimeType = DoTemplate(SKEY(Tmpl), NULL, &NoCtx); + http_transmit_thing(ChrPtr(MimeType), 0); } @@ -1252,65 +1288,61 @@ void upload_attachment(void) { * There is probably a better way to do this. */ void remove_attachment(void) { - wcsession *WCC = WC; wc_mime_attachment *att; void *vAtt; StrBuf *WhichAttachment; HashPos *at; long len; + int found=0; const char *key; WhichAttachment = NewStrBufDup(sbstr("which_attachment")); + if (ChrPtr(WhichAttachment)[0] == '/') + StrBufCutLeft(WhichAttachment, 1); StrBufUnescape(WhichAttachment, 0); - at = GetNewHashPos(WCC->attachments, 0); + at = GetNewHashPos(WC->attachments, 0); do { - GetHashPos(WCC->attachments, at, &len, &key, &vAtt); - + vAtt = NULL; + GetHashPos(WC->attachments, at, &len, &key, &vAtt); + att = (wc_mime_attachment*) vAtt; - if ((att != NULL) && - (strcmp(ChrPtr(WhichAttachment), - ChrPtr(att->FileName) ) == 0)) + if ((att != NULL) && + ( + !strcmp(ChrPtr(WhichAttachment), ChrPtr(att->FileName)) || + ((att->PartNum != NULL) && + !strcmp(ChrPtr(WhichAttachment), ChrPtr(att->PartNum))) + )) { - DeleteEntryFromHash(WCC->attachments, at); + DeleteEntryFromHash(WC->attachments, at); + found=1; break; } } - while (NextHashPos(WCC->attachments, at)); + while (NextHashPos(WC->attachments, at)); + FreeStrBuf(&WhichAttachment); - wc_printf("remove_attachment() completed\n"); + wc_printf("remove_attachment(%d) completed\n", found); } -long FourHash(const char *key, long length) -{ - int i; - long ret = 0; - const unsigned char *ptr = (const unsigned char*)key; - - for (i = 0; i < 4; i++, ptr ++) - ret = (ret << 8) | - ( ((*ptr >= 'a') && - (*ptr <= 'z'))? - *ptr - 'a' + 'A': - *ptr); - - return ret; -} +const char *ReplyToModeStrings [3] = { + "reply", + "replyall", + "forward" +}; +typedef enum _eReplyToNodes { + eReply, + eReplyAll, + eForward +}eReplyToNodes; -long l_subj; -long l_wefw; -long l_msgn; -long l_from; -long l_rcpt; -long l_cccc; -long l_node; -long l_rfca; /* * display the message entry screen */ -void display_enter(void) -{ +void display_enter(void) { + const char *ReplyingModeStr; + eReplyToNodes ReplyMode = eReply; StrBuf *Line; long Result; int rc; @@ -1318,7 +1350,6 @@ void display_enter(void) int recipient_required = 0; int subject_required = 0; int is_anonymous = 0; - wcsession *WCC = WC; int i = 0; long replying_to; @@ -1345,6 +1376,7 @@ void display_enter(void) } else if (rc != 2) { /* Any other error means that we cannot continue */ rc = GetServerStatusMsg(Line, &Result, 0, 2); + fixview(); readloop(readnew, eUseDefault); FreeStrBuf(&Line); return; @@ -1359,17 +1391,16 @@ void display_enter(void) * Are we perhaps in an address book view? If so, then an "enter * message" command really means "add new entry." */ - if (WCC->CurRoom.defview == VIEW_ADDRESSBOOK) { - do_edit_vcard(-1, "", NULL, NULL, "", ChrPtr(WCC->CurRoom.name)); + if (WC->CurRoom.defview == VIEW_ADDRESSBOOK) { + do_edit_vcard(-1, "", NULL, NULL, "", ChrPtr(WC->CurRoom.name)); FreeStrBuf(&Line); return; } /* - * Are we perhaps in a calendar room? If so, then an "enter - * message" command really means "add new calendar item." + * Are we perhaps in a calendar room? If so, then an "enter message" command really means "add new calendar item." */ - if (WCC->CurRoom.defview == VIEW_CALENDAR) { + if (WC->CurRoom.defview == VIEW_CALENDAR) { display_edit_event(); FreeStrBuf(&Line); return; @@ -1379,12 +1410,21 @@ void display_enter(void) * Are we perhaps in a tasks view? If so, then an "enter * message" command really means "add new task." */ - if (WCC->CurRoom.defview == VIEW_TASKS) { + if (WC->CurRoom.defview == VIEW_TASKS) { display_edit_task(); FreeStrBuf(&Line); return; } + ReplyingModeStr = bstr("replying_mode"); + if (ReplyingModeStr != NULL) { + for (i = 0; i < 3; i++) { + if (strcmp(ReplyingModeStr, ReplyToModeStrings[i]) == 0) { + ReplyMode = (eReplyToNodes) i; + break; + } + } + } /* * If the "replying_to" variable is set, it refers to a message @@ -1396,102 +1436,120 @@ void display_enter(void) StrBuf *wefw = NULL; StrBuf *msgn = NULL; StrBuf *from = NULL; - StrBuf *node = NULL; StrBuf *rfca = NULL; StrBuf *rcpt = NULL; StrBuf *cccc = NULL; + StrBuf *replyto = NULL; + StrBuf *nvto = NULL; + int message_originated_locally = 0; serv_printf("MSG0 %ld|1", replying_to); StrBuf_ServGetln(Line); if (GetServerStatusMsg(Line, NULL, 0, 0) == 1) - while (len = StrBuf_ServGetln(Line), - (len >= 0) && - ((len != 3) || - strcmp(ChrPtr(Line), "000"))) - { - long which = 0; - if ((StrLength(Line) > 4) && - (ChrPtr(Line)[4] == '=')) - which = FourHash(ChrPtr(Line), 4); - - if (which == l_subj) - { - StrBuf *subj = NewStrBuf(); - StrBuf *FlatSubject; - - if (!strcasecmp(bstr("replying_mode"), "forward")) { - if (strncasecmp(ChrPtr(Line) + 5, "Fw:", 3)) { - StrBufAppendBufPlain(subj, HKEY("Fw: "), 0); + while (len = StrBuf_ServGetln(Line), (len >= 0) && ((len != 3) || strcmp(ChrPtr(Line), "000"))) { + eMessageField which; + if ((StrLength(Line) > 4) && (ChrPtr(Line)[4] == '=') && GetFieldFromMnemonic(&which, ChrPtr(Line))) switch (which) { + case eMsgSubject: { + StrBuf *subj = NewStrBuf(); + StrBuf *FlatSubject; + + if (ReplyMode == eForward) { + if (strncasecmp(ChrPtr(Line) + 5, "Fw:", 3)) { + StrBufAppendBufPlain(subj, HKEY("Fw: "), 0); + } } - } - else { - if (strncasecmp(ChrPtr(Line) + 5, "Re:", 3)) { - StrBufAppendBufPlain(subj, HKEY("Re: "), 0); + else { + if (strncasecmp(ChrPtr(Line) + 5, "Re:", 3)) { + StrBufAppendBufPlain(subj, HKEY("Re: "), 0); + } } + StrBufAppendBufPlain(subj, + ChrPtr(Line) + 5, + StrLength(Line) - 5, 0); + FlatSubject = NewStrBufPlain(NULL, StrLength(subj)); + StrBuf_RFC822_to_Utf8(FlatSubject, subj, NULL, NULL); + + PutBstr(HKEY("subject"), FlatSubject); } - StrBufAppendBufPlain(subj, - ChrPtr(Line) + 5, - StrLength(Line) - 5, 0); - FlatSubject = NewStrBufPlain(NULL, StrLength(subj)); - StrBuf_RFC822_to_Utf8(FlatSubject, subj, NULL, NULL); + break; - PutBstr(HKEY("subject"), FlatSubject); - } + case eIsLocal: { + message_originated_locally = 1; + break; + } - else if (which == l_wefw) - { - int rrtok; - int rrlen; + case eWeferences: + { + int rrtok; + int rrlen; - wefw = NewStrBufPlain(ChrPtr(Line) + 5, StrLength(Line) - 5); + wefw = NewStrBufPlain(ChrPtr(Line) + 5, StrLength(Line) - 5); - /* Trim down excessively long lists of thread references. We eliminate the - * second one in the list so that the thread root remains intact. - */ - rrtok = num_tokens(ChrPtr(wefw), '|'); - rrlen = StrLength(wefw); - if ( ((rrtok >= 3) && (rrlen > 900)) || (rrtok > 10) ) { - StrBufRemove_token(wefw, 1, '|'); + /* Trim down excessively long lists of thread references. We eliminate the + * second one in the list so that the thread root remains intact. + */ + rrtok = num_tokens(ChrPtr(wefw), '|'); + rrlen = StrLength(wefw); + if ( ((rrtok >= 3) && (rrlen > 900)) || (rrtok > 10) ) { + StrBufRemove_token(wefw, 1, '|'); + } + break; } - } - else if (which == l_msgn) { - msgn = NewStrBufPlain(ChrPtr(Line) + 5, StrLength(Line) - 5); - } + case emessageId: + msgn = NewStrBufPlain(ChrPtr(Line) + 5, StrLength(Line) - 5); + break; + + case eAuthor: { + StrBuf *FlatFrom; + from = NewStrBufPlain(ChrPtr(Line) + 5, StrLength(Line) - 5); + FlatFrom = NewStrBufPlain(NULL, StrLength(from)); + StrBuf_RFC822_to_Utf8(FlatFrom, from, NULL, NULL); + FreeStrBuf(&from); + from = FlatFrom; + for (i=0; i 0) { + + if ((StrLength(replyto) > 0) && (ReplyMode == eReplyAll)) { + to_rcpt = NewStrBuf(); + StrBufAppendBuf(to_rcpt, replyto, 0); + } + + else if ( (StrLength(rfca) > 0) && (message_originated_locally == 0) ) { to_rcpt = NewStrBuf(); StrBufAppendBuf(to_rcpt, from, 0); StrBufAppendBufPlain(to_rcpt, HKEY(" <"), 0); StrBufAppendBuf(to_rcpt, rfca, 0); StrBufAppendBufPlain(to_rcpt, HKEY(">"), 0); } + else { to_rcpt = from; from = NULL; - if ( (StrLength(node) > 0) - && (strcasecmp(ChrPtr(node), ChrPtr(WC->serv_info->serv_nodename))) - ) { - StrBufAppendBufPlain(to_rcpt, HKEY(" @ "), 0); - StrBufAppendBuf(to_rcpt, node, 0); - } } PutBstr(HKEY("recp"), to_rcpt); } @@ -1541,48 +1598,60 @@ void display_enter(void) /* * Only if this is a ReplyAll, copy all recipients into the Cc: field */ - if ( (!strcasecmp(bstr("replying_mode"), "replyall")) - ) { + if (ReplyMode == eReplyAll) { StrBuf *cc_rcpt = rcpt; rcpt = NULL; - if (StrLength(cccc) > 0) { + if ((StrLength(cccc) > 0) && (StrLength(replyto) == 0)) { if (cc_rcpt != NULL) { StrBufAppendPrintf(cc_rcpt, ", "); StrBufAppendBuf(cc_rcpt, cccc, 0); - } else { + } + else { cc_rcpt = cccc; cccc = NULL; } } - if (cc_rcpt != NULL) + if (cc_rcpt != NULL) { PutBstr(HKEY("cc"), cc_rcpt); + } } + + // We might not need these logs anymore. + syslog(LOG_DEBUG, "wefw = %s", ChrPtr(wefw)); + syslog(LOG_DEBUG, "msgn = %s", ChrPtr(msgn)); + syslog(LOG_DEBUG, "from = %s", ChrPtr(from)); + syslog(LOG_DEBUG, "rfca = %s", ChrPtr(rfca)); + syslog(LOG_DEBUG, "rcpt = %s", ChrPtr(rcpt)); + syslog(LOG_DEBUG, "cccc = %s", ChrPtr(cccc)); + syslog(LOG_DEBUG, "replyto = %s", ChrPtr(replyto)); + syslog(LOG_DEBUG, "nvto = %s", ChrPtr(nvto)); + syslog(LOG_DEBUG, "local = %d" , message_originated_locally); + FreeStrBuf(&wefw); FreeStrBuf(&msgn); FreeStrBuf(&from); - FreeStrBuf(&node); FreeStrBuf(&rfca); FreeStrBuf(&rcpt); FreeStrBuf(&cccc); } FreeStrBuf(&Line); + /* * Otherwise proceed normally. * Do a custom room banner with no navbar... */ - if (recipient_required) { const StrBuf *Recp = NULL; const StrBuf *Cc = NULL; const StrBuf *Bcc = NULL; - char *wikipage = NULL; + StrBuf *wikipage = NULL; StrBuf *CmdBuf = NULL; const char CMD[] = "ENT0 0|%s|%d|0||%s||%s|%s|%s"; Recp = sbstr("recp"); Cc = sbstr("cc"); Bcc = sbstr("bcc"); - wikipage = strdup(bstr("page")); + wikipage = NewStrBufDup(sbstr("page")); str_wiki_index(wikipage); CmdBuf = NewStrBufPlain(NULL, @@ -1591,7 +1660,7 @@ void display_enter(void) StrLength(display_name) + StrLength(Cc) + StrLength(Bcc) + - strlen(wikipage)); + StrLength(wikipage)); StrBufPrintf(CmdBuf, CMD, @@ -1600,7 +1669,7 @@ void display_enter(void) ChrPtr(display_name), ChrPtr(Cc), ChrPtr(Bcc), - wikipage + ChrPtr(wikipage) ); serv_puts(ChrPtr(CmdBuf)); StrBuf_ServGetln(CmdBuf); @@ -1616,6 +1685,7 @@ void display_enter(void) else if (rc != 2) { /* Any other error means that we cannot continue */ AppendImportantMessage(ChrPtr(CmdBuf) + 4, StrLength(CmdBuf) - 4); FreeStrBuf(&CmdBuf); + fixview(); readloop(readnew, eUseDefault); return; } @@ -1634,11 +1704,11 @@ void display_enter(void) return; } + /* * delete a message */ -void delete_msg(void) -{ +void delete_msg(void) { long msgid; StrBuf *Line; @@ -1654,6 +1724,8 @@ void delete_msg(void) StrBuf_ServGetln(Line); GetServerStatusMsg(Line, NULL, 1, 0); + fixview(); + readloop(readnew, eUseDefault); } @@ -1661,8 +1733,7 @@ void delete_msg(void) /* * move a message to another room */ -void move_msg(void) -{ +void move_msg(void) { long msgid; msgid = lbstr("msgid"); @@ -1678,11 +1749,11 @@ void move_msg(void) AppendImportantMessage(_("The message was not moved."), -1); } + fixview(); readloop(readnew, eUseDefault); } - /* * Generic function to output an arbitrary MIME attachment from * message being composed @@ -1691,8 +1762,7 @@ void move_msg(void) * filename Fake filename to give * force_download Nonzero to force set the Content-Type: header to "application/octet-stream" */ -void postpart(StrBuf *partnum, StrBuf *filename, int force_download) -{ +void postpart(StrBuf *partnum, StrBuf *filename, int force_download) { void *vPart; StrBuf *content_type; wc_mime_attachment *part; @@ -1723,89 +1793,69 @@ void postpart(StrBuf *partnum, StrBuf *filename, int force_download) } -/* - * Generic function to output an arbitrary MIME part from an arbitrary - * message number on the server. - * - * msgnum Number of the item on the citadel server - * partnum The MIME part to be output - * force_download Nonzero to force set the Content-Type: header to "application/octet-stream" - */ -void mimepart(int force_download) -{ +// Generic function to output an arbitrary MIME part from an arbitrary +// message number on the server. +// +// msgnum message number on the citadel server +// partnum MIME part number to be output +// force_download Nonzero to force set the Content-Type: header to "application/octet-stream" + +void view_or_download_mimepart(int force_download) { long msgnum; - long ErrorDetail; - StrBuf *att; - wcsession *WCC = WC; - StrBuf *Buf; off_t bytes; - StrBuf *ContentType = NewStrBufPlain(HKEY("application/octet-stream")); - const char *CT; + StrBuf *Buf; + StrBuf *ContentType; + StrBuf *PartNum; - att = Buf = NewStrBuf(); - msgnum = StrBufExtract_long(WCC->Hdr->HR.ReqLine, 0, '/'); - StrBufExtract_token(att, WCC->Hdr->HR.ReqLine, 1, '/'); + PartNum = NewStrBuf(); - serv_printf("OPNA %ld|%s", msgnum, ChrPtr(att)); + msgnum = StrBufExtract_long(WC->Hdr->HR.ReqLine, 0, '/'); + StrBufExtract_token(PartNum, WC->Hdr->HR.ReqLine, 1, '/'); + + Buf = NewStrBuf(); + serv_printf("DLAT %ld|%s", msgnum, ChrPtr(PartNum)); // DLAT will return: 6XX length|-1|filename|cbtype|cbcharset StrBuf_ServGetln(Buf); - if (GetServerStatus(Buf, &ErrorDetail) == 2) { - StrBufCutLeft(Buf, 4); - bytes = StrBufExtract_long(Buf, 0, '|'); - if (!force_download) { - StrBufExtract_token(ContentType, Buf, 3, '|'); - } + FreeStrBuf(&PartNum); - serv_read_binary(WCC->WBuf, bytes, Buf); - serv_puts("CLOS"); - StrBuf_ServGetln(Buf); - CT = ChrPtr(ContentType); + if (GetServerStatus(Buf, NULL) != 6) { + FreeStrBuf(&Buf); + hprintf("HTTP/1.1 500 error\r\n" + "Pragma: no-cache\r\n" + "Cache-Control: no-store\r\n" + "Expires: -1\r\n" + "Content-Type: text/plain\r\n" + ); + begin_burst(); + wc_printf(_("An error occurred while retrieving this part: %s\n"), "--"); + return; + } - if (!force_download) { - if (!strcasecmp(ChrPtr(ContentType), "application/octet-stream")) { - StrBufExtract_token(Buf, WCC->Hdr->HR.ReqLine, 2, '/'); - CT = GuessMimeByFilename(SKEY(Buf)); - } - if (!strcasecmp(ChrPtr(ContentType), "application/octet-stream")) { - CT = GuessMimeType(SKEY(WCC->WBuf)); - } - } - http_transmit_thing(CT, 0); - } else { - StrBufCutLeft(Buf, 4); - switch (ErrorDetail) { - default: - case ERROR + MESSAGE_NOT_FOUND: - hprintf("HTTP/1.1 404 %s\n", ChrPtr(Buf)); - break; - case ERROR + NOT_LOGGED_IN: - hprintf("HTTP/1.1 401 %s\n", ChrPtr(Buf)); - break; + StrBufCutLeft(Buf, 4); + bytes = StrBufExtract_long(Buf, 0, '|'); - case ERROR + HIGHER_ACCESS_REQUIRED: - hprintf("HTTP/1.1 403 %s\n", ChrPtr(Buf)); - break; - case ERROR + INTERNAL_ERROR: - case ERROR + TOO_BIG: - hprintf("HTTP/1.1 500 %s\n", ChrPtr(Buf)); - break; - } - output_headers(0, 0, 0, 0, 0, 0); - hprintf("Content-Type: text/plain\r\n"); - begin_burst(); - wc_printf(_("An error occurred while retrieving this part: %s\n"), - ChrPtr(Buf)); - end_burst(); + if (force_download) { + ContentType = NewStrBufPlain(HKEY("application/octet-stream")); } - FreeStrBuf(&ContentType); + else { + ContentType = NewStrBuf(); + StrBufExtract_token(ContentType, Buf, 3, '|'); + } + FreeStrBuf(&Buf); + Buf = NewStrBuf(); + StrBuf_ServGetBLOBBuffered(Buf, bytes); + + WC->WBuf = Buf; + Buf = NULL; + http_transmit_thing(ChrPtr(ContentType), 0); + FreeStrBuf(&ContentType); } /* * Read any MIME part of a message, from the server, into memory. */ -StrBuf *load_mimepart(long msgnum, char *partnum) -{ +StrBuf *load_mimepart(long msgnum, char *partnum) { off_t bytes; StrBuf *Buf; @@ -1826,15 +1876,14 @@ StrBuf *load_mimepart(long msgnum, char *partnum) } } + /* * Read any MIME part of a message, from the server, into memory. */ -void MimeLoadData(wc_mime_attachment *Mime) -{ +void MimeLoadData(wc_mime_attachment *Mime) { StrBuf *Buf; const char *Ptr; off_t bytes; - /* TODO: is there a chance the content type is different from the one we know? */ serv_printf("DLAT %ld|%s", Mime->msgnum, ChrPtr(Mime->PartNum)); Buf = NewStrBuf(); @@ -1846,26 +1895,28 @@ void MimeLoadData(wc_mime_attachment *Mime) if (Mime->Charset == NULL) Mime->Charset = NewStrBuf(); StrBufExtract_NextToken(Mime->Charset, Buf, &Ptr, '|'); - if (Mime->Data == NULL) + if (Mime->Data == NULL) { Mime->Data = NewStrBufPlain(NULL, bytes); + } StrBuf_ServGetBLOBBuffered(Mime->Data, bytes); } else { FlushStrBuf(Mime->Data); - /* TODO XImportant message */ } FreeStrBuf(&Buf); } void view_mimepart(void) { - mimepart(0); + view_or_download_mimepart(0); } + void download_mimepart(void) { - mimepart(1); + view_or_download_mimepart(1); } + void view_postpart(void) { StrBuf *filename = NewStrBuf(); StrBuf *partnum = NewStrBuf(); @@ -1879,6 +1930,7 @@ void view_postpart(void) { FreeStrBuf(&partnum); } + void download_postpart(void) { StrBuf *filename = NewStrBuf(); StrBuf *partnum = NewStrBuf(); @@ -1893,7 +1945,6 @@ void download_postpart(void) { } - void show_num_attachments(void) { wc_printf("%d", GetCount(WC->attachments)); } @@ -1908,7 +1959,6 @@ void h_readgt(void) { readloop(readgt, eUseDefault);} void h_readlt(void) { readloop(readlt, eUseDefault);} - /* Output message list in JSON format */ void jsonMessageList(void) { StrBuf *View = NewStrBuf(); @@ -1920,6 +1970,17 @@ void jsonMessageList(void) { readloop(oper, eUseDefault); } + +void FreeReadLoopHandlerSet(void *v) { + RoomRenderer *Handler = (RoomRenderer *) v; + FreeStrBuf(&Handler->FetchMessageList); + if (Handler->MessageFieldList != NULL) { + free(Handler->MessageFieldList); + } + free(Handler); +} + + void RegisterReadLoopHandlerset( int RoomType, GetParamsGetServerCall_func GetParamsGetServerCall, @@ -1928,9 +1989,12 @@ void RegisterReadLoopHandlerset( load_msg_ptrs_detailheaders LH, LoadMsgFromServer_func LoadMsgFromServer, RenderView_or_Tail_func RenderView_or_Tail, - View_Cleanup_func ViewCleanup + View_Cleanup_func ViewCleanup, + const char **browseListFields ) { + long count = 0; + long i = 0; RoomRenderer *Handler; Handler = (RoomRenderer*) malloc(sizeof(RoomRenderer)); @@ -1944,7 +2008,30 @@ void RegisterReadLoopHandlerset( Handler->ViewCleanup = ViewCleanup; Handler->LHParse = LH; - Put(ReadLoopHandler, IKEY(RoomType), Handler, NULL); + if (browseListFields != NULL) { + while (browseListFields[count] != NULL) { + count ++; + } + Handler->HeaderCount = count; + Handler->MessageFieldList = (eMessageField*) malloc(sizeof(eMessageField) * count); + Handler->FetchMessageList = NewStrBufPlain(NULL, 5 * count + 4 + 5); + StrBufPlain(Handler->FetchMessageList, HKEY("time\n")); + for (i = 0; i < count; i++) { + if (!GetFieldFromMnemonic(&Handler->MessageFieldList[i], browseListFields[i])) { + fprintf(stderr, "Unknown message header: %s\n", browseListFields[i]); + exit(1); + } + StrBufAppendBufPlain(Handler->FetchMessageList, browseListFields[i], 4, 0); + StrBufAppendBufPlain(Handler->FetchMessageList, HKEY("\n"), 0); + } + StrBufAppendBufPlain(Handler->FetchMessageList, HKEY("000"), 0); + } + else { + Handler->FetchMessageList = NULL; + Handler->MessageFieldList = NULL; + } + + Put(ReadLoopHandler, IKEY(RoomType), Handler, FreeReadLoopHandlerSet); } void @@ -1956,7 +2043,7 @@ InitModule_MSG PRF_YESNO, NULL); RegisterPreference("signature", _("Use this signature:"), PRF_QP_STRING, NULL); - RegisterPreference("default_header_charset", + RegisterPreference("default_header_charset", _("Default character set for email headers:"), PRF_STRING, NULL); @@ -1997,17 +2084,6 @@ InitModule_MSG /* json */ WebcitAddUrlHandler(HKEY("roommsgs"), "", 0, jsonMessageList,0); - - l_subj = FourHash("subj", 4); - l_wefw = FourHash("wefw", 4); - l_msgn = FourHash("msgn", 4); - l_from = FourHash("from", 4); - l_rcpt = FourHash("rcpt", 4); - l_cccc = FourHash("cccc", 4); - l_node = FourHash("node", 4); - l_rfca = FourHash("rfca", 4); - - return ; } void