-/*
- * 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;
#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 state = 0;
+ int rc;
+
Buf = NewStrBuf();
if (Msg->PartNum != NULL) {
serv_printf("MSG4 %ld|%s", Msg->msgnum, ChrPtr(Msg->PartNum));
/* begin everythingamundo table */
HdrToken = NewStrBuf();
- while (!Done && StrBuf_ServGetln(Buf)>=0) {
- if ( (StrLength(Buf)==3) &&
- !strcmp(ChrPtr(Buf), "000"))
- {
+ while (!Done && StrBuf_ServGetln(Buf) >= 0) {
+ if ((StrLength(Buf) == 3) && !strcmp(ChrPtr(Buf), "000")) {
Done = 1;
if (state < 2) {
if (Msg->MsgBody->Data == NULL)
break;
}
switch (state) {
- case 0:/* Citadel Message Headers */
+ case 0: /* Citadel Message Headers */
if (StrLength(Buf) == 0) {
- state ++;
+ state++;
break;
}
StrBufExtract_token(HdrToken, Buf, 0, '=');
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:
- else LogError(Target,
- __FUNCTION__,
- "don't know how to handle message header[%s]\n",
- ChrPtr(HdrToken));
+ 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",
+ ChrPtr(HdrToken));
*/
break;
- case 1:/* Message Mime Header */
+ case 1: /* Message Mime Header */
if (StrLength(Buf) == 0) {
state++;
if (Msg->MsgBody->ContentType == NULL)
- /* end of header or no header? */
+ /* end of header or no header? */
Msg->MsgBody->ContentType = NewStrBufPlain(HKEY("text/plain"));
- /* usual end of mime header */
+ /* usual end of mime header */
}
- else
- {
+ else {
StrBufExtract_token(HdrToken, Buf, 0, ':');
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;
}
}
- case 2: /* Message Body */
-
+ case 2: /* Message Body */
+
if (Msg->MsgBody->size_known > 0) {
StrBuf_ServGetBLOBBuffered(Msg->MsgBody->Data, Msg->MsgBody->length);
- state ++;
+ state++;
/*/ todo: check next line, if not 000, append following lines */
}
- else if (1){
+ else if (1) {
if (StrLength(Msg->MsgBody->Data) > 0)
StrBufAppendBufPlain(Msg->MsgBody->Data, "\n", 1, 0);
StrBufAppendBuf(Msg->MsgBody->Data, Buf, 0);
}
if (Msg->AllAttach == NULL)
- Msg->AllAttach = NewHash(1,NULL);
+ Msg->AllAttach = NewHash(1, NULL);
/* now we put the body mimepart we read above into the mimelist */
Put(Msg->AllAttach, SKEY(Msg->MsgBody->PartNum), Msg->MsgBody, DestroyMime);
-
+
FreeStrBuf(&Buf);
FreeStrBuf(&HdrToken);
return 1;
}
-
/*
- * 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;
+ HashPos *it;
void *vMime;
message_summary *Msg = NULL;
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));
+ 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));
+ 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;
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);
- }
+ 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;
- 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(&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);
}
-long
-HttpStatus(long CitadelStatus)
-{
+long HttpStatus(long CitadelStatus) {
long httpstatus = 502;
-
- switch (MAJORCODE(CitadelStatus))
- {
+
+ switch (MAJORCODE(CitadelStatus)) {
case LISTING_FOLLOWS:
case CIT_OK:
httpstatus = 201;
break;
case ERROR:
- switch (MINORCODE(CitadelStatus))
- {
+ switch (MINORCODE(CitadelStatus)) {
case INTERNAL_ERROR:
httpstatus = 403;
break;
-
+
case TOO_BIG:
case ILLEGAL_VALUE:
case HIGHER_ACCESS_REQUIRED:
case ASYNC_MSG:
case MORE_DATA:
case SEND_LISTING:
- httpstatus = 502; /* aeh... whut? */
+ httpstatus = 502; /* aeh... whut? */
break;
}
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);
- else
- read_message(WCC->WBuf, HKEY("view_message"), msgnum, NULL, &Mime);
+ if (StrLength(Tmpl) > 0)
+ read_message(WC->WBuf, SKEY(Tmpl), msgnum, NULL, &Mime, NULL);
+ else
+ 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 */
- serv_printf("DELE %ld", msgnum);
+ CmdBuf = NewStrBuf();
+ 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 */
+ else { /* Otherwise move it to Trash */
serv_printf("MOVE %ld|_TRASH_|0", msgnum);
}
StrBuf_ServGetln(CmdBuf);
case eCOPY:
CopyMessage = 1;
case eMOVE:
- if (GetHash(WCC->Hdr->HTTPHeaders, HKEY("DESTINATION"), &vLine) &&
- (vLine!=NULL)) {
- Destination = (StrBuf*) vLine;
+ if (GetHash(WC->Hdr->HTTPHeaders, HKEY("DESTINATION"), &vLine) && (vLine != NULL)) {
+ Destination = (StrBuf *) vLine;
serv_printf("MOVE %ld|%s|%d", msgnum, ChrPtr(Destination), CopyMessage);
StrBuf_ServGetln(CmdBuf);
GetServerStatusMsg(CmdBuf, NULL, 1, 0);
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, '/');
- if (msgnum <= 0) return;
+ 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);
- else
- read_message(WCC->WBuf, HKEY("view_message"), msgnum, NULL, &Mime);
+ if (StrLength(Tmpl) > 0)
+ read_message(WC->WBuf, SKEY(Tmpl), msgnum, NULL, &Mime, NULL);
+ else
+ 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 */
- serv_printf("DELE %ld", msgnum);
+ CmdBuf = NewStrBuf();
+ 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 */
+ else { /* Otherwise move it to Trash */
serv_printf("MOVE %ld|_TRASH_|0", msgnum);
}
StrBuf_ServGetln(CmdBuf);
msgnum = StrBufExtract_long(WC->Hdr->HR.ReqLine, 0, '/');
output_headers(0, 0, 0, 0, 0, 0);
- hprintf("Content-type: text/html\r\n"
- "Server: " PACKAGE_STRING "\r\n"
- "Connection: close\r\n");
+ hprintf("Content-type: text/html\r\n" "Server: " PACKAGE_STRING "\r\n" "Connection: close\r\n");
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
*/
msgnum = StrBufExtract_long(WC->Hdr->HR.ReqLine, 0, '/');
output_headers(0, 0, 0, 0, 0, 0);
- hprintf("Content-type: text/plain\r\n"
- "Server: %s\r\n"
- "Connection: close\r\n",
- PACKAGE_STRING);
+ hprintf("Content-type: text/plain\r\n" "Server: %s\r\n" "Connection: close\r\n", 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")) {
}
-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
*
*/
int load_msg_ptrs(const char *servcmd,
const char *filter,
- SharedMessageStatus *Stat,
- load_msg_ptrs_detailheaders LH)
-{
- wcsession *WCC = WC;
+ StrBuf * FoundCharset,
+ SharedMessageStatus * Stat,
+ void **ViewSpecific,
+ load_msg_ptrs_detailheaders LH, StrBuf * FetchMessageList, eMessageField * MessageFieldList, long HeaderCount) {
message_summary *Msg;
StrBuf *Buf, *Buf2;
long len;
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);
StrBuf_ServGetln(Buf);
case 8:
if (filter != NULL) {
serv_puts(filter);
- serv_puts("000");
+ serv_puts("000");
+ break;
+ }
+ else if (FetchMessageList != NULL) {
+ serv_putbuf(FetchMessageList);
break;
}
/* fall back to empty filter in case of we were fooled... */
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));
+ 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.
*/
if (Msg->date == 0) {
Msg->date = Stat->nummsgs;
- if (StrLength(Buf) < 32)
+ if (StrLength(Buf) < 32)
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++;
}
}
-
-/**
- * \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;
at = GetNewHashPos(ScanMe, 0);
while (GetNextHashPos(ScanMe, at, &HKLen, &HashKey, &vMsg)) {
/* Are you a new message, or an old message? */
- Msg = (message_summary*) vMsg;
+ 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();
}
else {
FreeStrBuf(&OldMsg);
- return;
+ return 0;
}
- if (ParseMSet(&MatchMSet, OldMsg))
- {
- SetFlagsFromMSet(WCC->summ, MatchMSet, MSGFLAG_READ, 0);
+ if (ParseMSet(&MatchMSet, OldMsg)) {
+ count = SetFlagsFromMSet(WC->summ, MatchMSet, MSGFLAG_READ, 0);
}
DeleteMSet(&MatchMSet);
FreeStrBuf(&OldMsg);
+ return count;
}
extern readloop_struct rlid[];
-typedef struct _RoomRenderer{
+typedef struct _RoomRenderer {
int RoomType;
GetParamsGetServerCall_func GetParamsGetServerCall;
-
+
PrintViewHeader_func PrintPageHeader;
PrintViewHeader_func PrintViewHeader;
LoadMsgFromServer_func LoadMsgFromServer;
RenderView_or_Tail_func RenderView_or_Tail;
View_Cleanup_func ViewCleanup;
load_msg_ptrs_detailheaders LHParse;
+ long HeaderCount;
+ StrBuf *FetchMessageList;
+ eMessageField *MessageFieldList;
} 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;
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));
Stat.lowest_found = (-1);
Stat.highest_found = (-1);
if (ForceRenderer == eUseDefault)
- GetHash(ReadLoopHandler, IKEY(WCC->CurRoom.view), &vViewMsg);
- else
+ 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 */
+ return; /* TODO: print message */
}
- ViewMsg = (RoomRenderer*) vViewMsg;
+ ViewMsg = (RoomRenderer *) vViewMsg;
if (ViewMsg->PrintPageHeader == NULL)
output_headers(1, 1, 1, 0, 0, 0);
- else
+ else
ViewMsg->PrintPageHeader(&Stat, ViewSpecific);
if (ViewMsg->GetParamsGetServerCall != NULL) {
- r = ViewMsg->GetParamsGetServerCall(
- &Stat,
- &ViewSpecific,
- oper,
- cmd, sizeof(cmd),
- filter, sizeof(filter)
- );
- } else {
+ r = ViewMsg->GetParamsGetServerCall(&Stat, &ViewSpecific, oper, cmd, sizeof(cmd), filter, sizeof(filter)
+ );
+ }
+ else {
r = 0;
}
- switch(r)
- {
+ switch (r) {
case 400:
case 404:
return;
- case 300: /* the callback hook should do the work for us here, since he knows what to do. */
+ case 300: /* the callback hook should do the work for us here, since he knows what to do. */
return;
case 200:
default:
}
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;
+ 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...
*/
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 */
{
StrBuf *Foo;
-
- Foo = NewStrBuf ();
+
+ 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)) {
- Msg = (message_summary*) 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,
- &ViewSpecific,
- Msg,
- (Msg->Flags & MSGFLAG_READ) != 0,
- i);
- }
+ ViewMsg->LoadMsgFromServer(&Stat, &ViewSpecific, Msg, (Msg->Flags & MSGFLAG_READ) != 0, i);
+ }
i++;
}
DeleteHashPos(&at);
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;
char *txtmail = NULL;
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),
- getpid(),
- ++seq
- );
- sprintf(alt_boundary, "Citadel--Multipart--%s--%04x--%04x",
- ChrPtr(WCC->serv_info->serv_fqdn),
- getpid(),
- ++seq
- );
+ sprintf(top_boundary, "Citadel--Multipart--%s--%04x--%04x", ChrPtr(WC->serv_info->serv_fqdn), getpid(), ++seq);
+ sprintf(alt_boundary, "Citadel--Multipart--%s--%04x--%04x", ChrPtr(WC->serv_info->serv_fqdn), getpid(), ++seq);
/* RFC2045 requires this, and some clients look for it... */
serv_puts("MIME-Version: 1.0");
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;
}
/* 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);
serv_puts("Content-type: text/plain; charset=utf-8");
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 */
- free(txtmail);
+ txtmail = html_to_ascii(bstr("msgtext"), 0, 80);
+ 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);
}
serv_puts("Content-Transfer-Encoding: quoted-printable");
serv_puts("");
serv_puts("<html><body>\r\n");
- text_to_server_qp(bstr("msgtext")); /* Transmit message in quoted-printable encoding */
+ text_to_server_qp(sbstr("msgtext")); /* Transmit message in quoted-printable encoding */
serv_puts("</body></html>\r\n");
if (include_text_alt) {
serv_printf("--%s--", alt_boundary);
}
-
+
if (is_multipart) {
long len;
- const char *Key;
+ const char *Key;
void *vAtt;
- HashPos *it;
+ HashPos *it;
/* Add in the attachments */
- it = GetNewHashPos(WCC->attachments, 0);
- while (GetNextHashPos(WCC->attachments, it, &len, &Key, &vAtt)) {
- att = (wc_mime_attachment *)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));
* 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;
static long dont_post = (-1L);
int is_anonymous = 0;
const StrBuf *display_name = NULL;
- wcsession *WCC = WC;
StrBuf *Buf;
-
+
if (havebstr("force_room")) {
gotoroom(sbstr("force_room"));
}
if (!strcasecmp(bstr("submit_action"), "cancel")) {
AppendImportantMessage(_("Cancelled. Message was not posted."), -1);
- } else if (lbstr("postseq") == dont_post) {
- AppendImportantMessage(
- _("Automatically cancelled because you have already "
- "saved this message."), -1);
- } else {
+ }
+ else if (lbstr("postseq") == dont_post) {
+ AppendImportantMessage(_("Automatically cancelled because you have already " "saved this message."), -1);
+ }
+ else {
const char CMD[] = "ENT0 1|%s|%d|4|%s|%s||%s|%s|%s|%s|%s";
- StrBuf *Recp = NULL;
+ 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;
Buf = NewStrBuf();
if (saving_to_drafts) {
- /* temporarily change to the drafts room */
- serv_puts("GOTO _DRAFTS_");
+ /* temporarily change to the drafts room */
+ serv_puts("GOTO _DRAFTS_");
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);
}
}
- if (havebstr("references"))
- {
+ if (havebstr("references")) {
const StrBuf *ref = sbstr("references");
references = NewStrBufDup(ref);
if (*ChrPtr(references) == '|') { /* remove leading '|' if present */
* plus the QP header
*/
Subj = sbstr("subject");
-
+
StrBufRFC2047encode(&encoded_subject, Subj);
}
UserName = NewStrBuf();
FreeStrBuf(&EmailAddress);
FreeStrBuf(&EncBuf);
- wikipage = strdup(bstr("page"));
+ wikipage = NewStrBufDup(sbstr("page"));
str_wiki_index(wikipage);
my_email_addr = sbstr("my_email_addr");
-
- HeaderLen = StrLength(Recp) +
- StrLength(encoded_subject) +
- StrLength(Cc) +
- StrLength(Bcc) +
- strlen(wikipage) +
- StrLength(my_email_addr) +
- StrLength(references);
- CmdBuf = NewStrBufPlain(NULL, sizeof (CMD) + HeaderLen);
- StrBufPrintf(CmdBuf,
+
+ HeaderLen = StrLength(Recp) +
+ StrLength(encoded_subject) +
+ StrLength(Cc) + StrLength(Bcc) + StrLength(wikipage) + StrLength(my_email_addr) + StrLength(references);
+ CmdBuf = NewStrBufPlain(NULL, sizeof(CMD) + HeaderLen);
+ StrBufPrintf(CmdBuf,
CMD,
- saving_to_drafts?"":ChrPtr(Recp),
+ saving_to_drafts ? "" : ChrPtr(Recp),
is_anonymous,
ChrPtr(encoded_subject),
ChrPtr(display_name),
- saving_to_drafts?"":ChrPtr(Cc),
- saving_to_drafts?"":ChrPtr(Bcc),
- wikipage,
- ChrPtr(my_email_addr),
- ChrPtr(references));
+ saving_to_drafts ? "" : ChrPtr(Cc),
+ saving_to_drafts ? "" : ChrPtr(Bcc), ChrPtr(wikipage), ChrPtr(my_email_addr), ChrPtr(references));
FreeStrBuf(&references);
FreeStrBuf(&encoded_subject);
free(wikipage);
- if ((HeaderLen + StrLength(sbstr("msgtext")) < 10) &&
- (GetCount(WCC->attachments) == 0)){
+ if ((HeaderLen + StrLength(sbstr("msgtext")) < 10) && (GetCount(WC->attachments) == 0)) {
AppendImportantMessage(_("Refusing to post empty message.\n"), -1);
FreeStrBuf(&CmdBuf);
-
+
}
- else
- {
- syslog(9, "%s\n", ChrPtr(CmdBuf));
+ else {
+ syslog(LOG_DEBUG, "%s\n", ChrPtr(CmdBuf));
serv_puts(ChrPtr(CmdBuf));
FreeStrBuf(&CmdBuf);
StrBuf_ServGetln(Buf);
if (GetServerStatus(Buf, NULL) == 4) {
if (saving_to_drafts) {
- if ( (havebstr("recp"))
- || (havebstr("cc" ))
- || (havebstr("bcc" )) ) {
+ if ((havebstr("recp"))
+ || (havebstr("cc"))
+ || (havebstr("bcc"))) {
/* save recipient headers or room to post to */
serv_printf("To: %s", ChrPtr(Recp));
serv_printf("Cc: %s", ChrPtr(Cc));
serv_printf("Bcc: %s", ChrPtr(Bcc));
- } else {
+ }
+ else {
serv_printf("X-Citadel-Room: %s", ChrPtr(WC->CurRoom.name));
}
}
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;
- } else if ( (havebstr("recp"))
- || (havebstr("cc" ))
- || (havebstr("bcc" ))
- ) {
+ }
+ else if ((havebstr("recp"))
+ || (havebstr("cc"))
+ || (havebstr("bcc"))
+ ) {
AppendImportantMessage(_("Message has been sent.\n"), -1);
}
else {
AppendImportantMessage(_("Message has been posted.\n"), -1);
}
dont_post = lbstr("postseq");
- } else {
- syslog(9, "%s:%d: server post error: %s", __FILE__, __LINE__, ChrPtr(Buf) + 4);
+ }
+ else {
+ 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);
FreeStrBuf(&Bcc);
}
- DeleteHash(&WCC->attachments);
+ DeleteHash(&WC->attachments);
/*
* We may have been supplied with instructions regarding the location
* Otherwise, just go to the "read messages" loop.
*/
else {
+ fixview();
readloop(readnew, eUseDefault);
}
}
* 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;
- syslog(9, "upload_attachment()\n");
- wc_printf("upload_attachment()<br>\n");
+ begin_burst();
+ syslog(LOG_DEBUG, "upload_attachment()");
+ if (!Tmpl) {
+ wc_printf("upload_attachment()<br>\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<br>\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<br>\n");
return;
}
- syslog(9, "Client is uploading %d bytes\n", WCC->upload_length);
- wc_printf("Client is uploading %d bytes<br>\n", WCC->upload_length);
- att = malloc(sizeof(wc_mime_attachment));
- 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);
+ 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<br>\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 = 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,
* 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);
}
* 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);
-
- att = (wc_mime_attachment*) vAtt;
- if ((att != NULL) &&
- (strcmp(ChrPtr(WhichAttachment),
- ChrPtr(att->FileName) ) == 0))
- {
- DeleteEntryFromHash(WCC->attachments, at);
+ vAtt = NULL;
+ GetHashPos(WC->attachments, at, &len, &key, &vAtt);
+
+ att = (wc_mime_attachment *) vAtt;
+ if ((att != NULL) &&
+ (!strcmp(ChrPtr(WhichAttachment), ChrPtr(att->FileName)) ||
+ ((att->PartNum != NULL) && !strcmp(ChrPtr(WhichAttachment), ChrPtr(att->PartNum)))
+ )) {
+ 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;
+const char *ReplyToModeStrings[3] = {
+ "reply",
+ "replyall",
+ "forward"
+};
- for (i = 0; i < 4; i++, ptr ++)
- ret = (ret << 8) |
- ( ((*ptr >= 'a') &&
- (*ptr <= 'z'))?
- *ptr - 'a' + 'A':
- *ptr);
-
- return ret;
-}
+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;
int recipient_required = 0;
int subject_required = 0;
int is_anonymous = 0;
- wcsession *WCC = WC;
int i = 0;
long replying_to;
StrBuf_ServGetln(Line);
rc = GetServerStatusMsg(Line, &Result, 0, 2);
- if (Result == 570) { /* 570 means that we need a recipient here */
+ if (Result == 570) { /* 570 means that we need a recipient here */
recipient_required = 1;
}
- else if (rc != 2) { /* Any other error means that we cannot continue */
+ 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;
* 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;
* 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
StrBuf *wefw = NULL;
StrBuf *msgn = NULL;
StrBuf *from = NULL;
- StrBuf *node = NULL;
StrBuf *rfca = NULL;
StrBuf *rcpt = NULL;
StrBuf *cccc = NULL;
- serv_printf("MSG0 %ld|1", replying_to);
+ 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);
+ }
+ }
+ 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);
}
- }
- 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);
+ break;
- PutBstr(HKEY("subject"), FlatSubject);
- }
+ case eIsLocal:{
+ message_originated_locally = 1;
+ break;
+ }
- else if (which == l_wefw)
- {
- int rrtok;
- int rrlen;
-
- 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, '|');
- }
- }
+ case eWeferences:
+ {
+ int rrtok;
+ int rrlen;
+
+ 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, '|');
+ }
+ 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 < StrLength(from); ++i) {
+ if (ChrPtr(from)[i] == ',')
+ StrBufPeek(from, NULL, i, ' ');
+ }
+ break;
+ }
+ case eRecipient:
+ rcpt = NewStrBufPlain(ChrPtr(Line) + 5, StrLength(Line) - 5);
+ break;
+ case eCarbonCopY:
+ cccc = NewStrBufPlain(ChrPtr(Line) + 5, StrLength(Line) - 5);
+ break;
+ case eReplyTo:
+ replyto = NewStrBufPlain(ChrPtr(Line) + 5, StrLength(Line) - 5);
+ break;
+ case erFc822Addr:{
+ StrBuf *FlatRFCA;
+ rfca = NewStrBufPlain(ChrPtr(Line) + 5, StrLength(Line) - 5);
+ FlatRFCA = NewStrBufPlain(NULL, StrLength(rfca));
+ StrBuf_RFC822_to_Utf8(FlatRFCA, rfca, NULL, NULL);
+ FreeStrBuf(&rfca);
+ rfca = FlatRFCA;
+ break;
+ }
+ case eenVelopeTo:
+ nvto = NewStrBufPlain(ChrPtr(Line) + 5, StrLength(Line) - 5);
+ putbstr("nvto", nvto);
+ break;
+ case eXclusivID:
+ case eJournal:
+ case eListID:
+ case eMesageText:
+ case eMessagePath:
+ case eSpecialField:
+ case eTimestamp:
+ case eHeaderOnly:
+ case eFormatType:
+ case eMessagePart:
+ case eSubFolder:
+ case eLastHeader:
+ break;
- else if (which == l_from) {
- 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<StrLength(from); ++i) {
- if (ChrPtr(from)[i] == ',')
- StrBufPeek(from, NULL, i, ' ');
}
- }
-
- else if (which == l_rcpt) {
- rcpt = NewStrBufPlain(ChrPtr(Line) + 5, StrLength(Line) - 5);
- }
-
- else if (which == l_cccc) {
- cccc = NewStrBufPlain(ChrPtr(Line) + 5, StrLength(Line) - 5);
- }
-
- else if (which == l_node) {
- node = NewStrBufPlain(ChrPtr(Line) + 5, StrLength(Line) - 5);
- }
-
- else if (which == l_rfca) {
- StrBuf *FlatRFCA;
- rfca = NewStrBufPlain(ChrPtr(Line) + 5, StrLength(Line) - 5);
- FlatRFCA = NewStrBufPlain(NULL, StrLength(rfca));
- StrBuf_RFC822_to_Utf8(FlatRFCA, rfca, NULL, NULL);
- FreeStrBuf(&rfca);
- rfca = FlatRFCA;
- }
}
if (StrLength(wefw) > 0) {
StrBufAppendBuf(refs, wefw, 0);
}
- if ( (StrLength(wefw) > 0) &&
- (StrLength(msgn) > 0) )
- {
+ if ((StrLength(wefw) > 0) && (StrLength(msgn) > 0)) {
StrBufAppendBufPlain(refs, HKEY("|"), 0);
}
if (StrLength(msgn) > 0) {
/*
* If this is a Reply or a ReplyAll, copy the sender's email into the To: field
*/
- if ( (!strcasecmp(bstr("replying_mode"), "reply"))
- || (!strcasecmp(bstr("replying_mode"), "replyall"))
- ) {
+ if ((ReplyMode == eReply) || (ReplyMode == eReplyAll)) {
StrBuf *to_rcpt;
- if (StrLength(rfca) > 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;
+ 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);
}
/*
* 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 (cc_rcpt != NULL) {
+ 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 *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,
- sizeof (CMD) +
- StrLength(Recp) +
- StrLength(display_name) +
- StrLength(Cc) +
- StrLength(Bcc) +
- strlen(wikipage));
-
- StrBufPrintf(CmdBuf,
- CMD,
- ChrPtr(Recp),
- is_anonymous,
- ChrPtr(display_name),
- ChrPtr(Cc),
- ChrPtr(Bcc),
- wikipage
- );
+
+ CmdBuf = NewStrBufPlain(NULL,
+ sizeof(CMD) +
+ StrLength(Recp) +
+ StrLength(display_name) + StrLength(Cc) + StrLength(Bcc) + StrLength(wikipage));
+
+ StrBufPrintf(CmdBuf,
+ CMD, ChrPtr(Recp), is_anonymous, ChrPtr(display_name), ChrPtr(Cc), ChrPtr(Bcc), ChrPtr(wikipage)
+ );
serv_puts(ChrPtr(CmdBuf));
StrBuf_ServGetln(CmdBuf);
free(wikipage);
rc = GetServerStatusMsg(CmdBuf, &Result, 0, 0);
- if ( (Result == 570) /* invalid or missing recipient(s) */
- || (Result == 550) /* higher access required to send Internet mail */
- ) {
+ if ((Result == 570) /* invalid or missing recipient(s) */
+ ||(Result == 550) /* higher access required to send Internet mail */
+ ) {
/* These errors will have been displayed and are excusable */
}
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;
}
return;
}
+
/*
* delete a message
*/
-void delete_msg(void)
-{
+void delete_msg(void) {
long msgid;
StrBuf *Line;
-
+
msgid = lbstr("msgid");
Line = NewStrBuf();
if ((WC->CurRoom.RAFlags & UA_ISTRASH) != 0) { /* Delete from Trash is a real delete */
- serv_printf("DELE %ld", msgid);
+ serv_printf("DELE %ld", msgid);
}
else { /* Otherwise move it to Trash */
serv_printf("MOVE %ld|_TRASH_|0", msgid);
StrBuf_ServGetln(Line);
GetServerStatusMsg(Line, NULL, 1, 0);
+ fixview();
+
readloop(readnew, eUseDefault);
}
/*
* move a message to another room
*/
-void move_msg(void)
-{
+void move_msg(void) {
long msgid;
msgid = lbstr("msgid");
StrBuf_ServGetln(Line);
GetServerStatusMsg(Line, NULL, 1, 0);
FreeStrBuf(&Line);
- } else {
+ }
+ else {
AppendImportantMessage(_("The message was not moved."), -1);
}
+ fixview();
readloop(readnew, eUseDefault);
}
-
/*
* Generic function to output an arbitrary MIME attachment from
* message being composed
* 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;
int i;
i = StrToi(partnum);
- if (GetHash(WC->attachments, IKEY(i), &vPart) &&
- (vPart != NULL)) {
- part = (wc_mime_attachment*) vPart;
+ if (GetHash(WC->attachments, IKEY(i), &vPart) && (vPart != NULL)) {
+ part = (wc_mime_attachment *) vPart;
if (force_download) {
content_type = NewStrBufPlain(HKEY("application/octet-stream"));
}
}
StrBufAppendBuf(WC->WBuf, part->Data, 0);
http_transmit_thing(ChrPtr(content_type), 0);
- } else {
+ }
+ else {
hprintf("HTTP/1.1 404 %s\n", ChrPtr(partnum));
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/%s\n"),
- ChrPtr(partnum), ChrPtr(filename));
+ wc_printf(_("An error occurred while retrieving this part: %s/%s\n"), ChrPtr(partnum), ChrPtr(filename));
end_burst();
}
FreeStrBuf(&content_type);
}
-/*
- * 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();
+
+ msgnum = StrBufExtract_long(WC->Hdr->HR.ReqLine, 0, '/');
+ StrBufExtract_token(PartNum, WC->Hdr->HR.ReqLine, 1, '/');
- serv_printf("OPNA %ld|%s", msgnum, ChrPtr(att));
+ 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;
-
+
Buf = NewStrBuf();
serv_printf("DLAT %ld|%s", msgnum, partnum);
StrBuf_ServGetln(Buf);
FreeStrBuf(&Buf);
Buf = NewStrBuf();
StrBuf_ServGetBLOBBuffered(Buf, bytes);
- return(Buf);
+ return (Buf);
}
else {
FreeStrBuf(&Buf);
- return(NULL);
+ return (NULL);
}
}
+
/*
* 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();
if (GetServerStatus(Buf, NULL) == 6) {
Ptr = &(ChrPtr(Buf)[4]);
bytes = StrBufExtractNext_long(Buf, &Ptr, '|');
- StrBufSkip_NTokenS(Buf, &Ptr, '|', 3); /* filename, cbtype, mimetype */
- if (Mime->Charset == NULL) Mime->Charset = NewStrBuf();
+ StrBufSkip_NTokenS(Buf, &Ptr, '|', 3); /* filename, cbtype, mimetype */
+ 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();
FreeStrBuf(&partnum);
}
+
void download_postpart(void) {
StrBuf *filename = NewStrBuf();
StrBuf *partnum = NewStrBuf();
}
-
void show_num_attachments(void) {
wc_printf("%d", GetCount(WC->attachments));
}
-void h_readnew(void) { readloop(readnew, eUseDefault);}
-void h_readold(void) { readloop(readold, eUseDefault);}
-void h_readfwd(void) { readloop(readfwd, eUseDefault);}
-void h_headers(void) { readloop(headers, eUseDefault);}
-void h_do_search(void) { readloop(do_search, eUseDefault);}
-void h_readgt(void) { readloop(readgt, eUseDefault);}
-void h_readlt(void) { readloop(readlt, eUseDefault);}
-
+void h_readnew(void) {
+ readloop(readnew, eUseDefault);
+}
+void h_readold(void) {
+ readloop(readold, eUseDefault);
+}
+void h_readfwd(void) {
+ readloop(readfwd, eUseDefault);
+}
+void h_headers(void) {
+ readloop(headers, eUseDefault);
+}
+void h_do_search(void) {
+ readloop(do_search, eUseDefault);
+}
+void h_readgt(void) {
+ readloop(readgt, eUseDefault);
+}
+void h_readlt(void) {
+ readloop(readlt, eUseDefault);
+}
/* Output message list in JSON format */
const StrBuf *room = sbstr("room");
long oper = (havebstr("query")) ? do_search : readnew;
StrBufPrintf(View, "%d", VIEW_JSON_LIST);
- putbstr("view", View);;
+ putbstr("view", View);;
gotoroom(room);
readloop(oper, eUseDefault);
}
-void RegisterReadLoopHandlerset(
- int RoomType,
- GetParamsGetServerCall_func GetParamsGetServerCall,
- PrintViewHeader_func PrintPageHeader,
- PrintViewHeader_func PrintViewHeader,
- load_msg_ptrs_detailheaders LH,
- LoadMsgFromServer_func LoadMsgFromServer,
- RenderView_or_Tail_func RenderView_or_Tail,
- View_Cleanup_func ViewCleanup
- )
-{
+
+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,
+ PrintViewHeader_func PrintPageHeader,
+ PrintViewHeader_func PrintViewHeader,
+ load_msg_ptrs_detailheaders LH,
+ LoadMsgFromServer_func LoadMsgFromServer,
+ RenderView_or_Tail_func RenderView_or_Tail,
+ View_Cleanup_func ViewCleanup, const char **browseListFields) {
+ long count = 0;
+ long i = 0;
RoomRenderer *Handler;
- Handler = (RoomRenderer*) malloc(sizeof(RoomRenderer));
+ Handler = (RoomRenderer *) malloc(sizeof(RoomRenderer));
Handler->RoomType = RoomType;
Handler->GetParamsGetServerCall = GetParamsGetServerCall;
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
-InitModule_MSG
-(void)
-{
- RegisterPreference("use_sig",
- _("Attach signature to email messages?"),
- PRF_YESNO,
- NULL);
+void InitModule_MSG(void) {
+ RegisterPreference("use_sig", _("Attach signature to email messages?"), PRF_YESNO, NULL);
RegisterPreference("signature", _("Use this signature:"), PRF_QP_STRING, NULL);
- RegisterPreference("default_header_charset",
- _("Default character set for email headers:"),
- PRF_STRING,
- NULL);
+ RegisterPreference("default_header_charset", _("Default character set for email headers:"), PRF_STRING, NULL);
RegisterPreference("defaultfrom", _("Preferred email address"), PRF_STRING, NULL);
- RegisterPreference("defaultname",
- _("Preferred display name for email messages"),
- PRF_STRING,
- NULL);
- RegisterPreference("defaulthandle",
- _("Preferred display name for bulletin board posts"),
- PRF_STRING,
- NULL);
- RegisterPreference("mailbox",_("Mailbox view mode"), PRF_STRING, NULL);
-
- WebcitAddUrlHandler(HKEY("readnew"), "", 0, h_readnew, ANONYMOUS|NEED_URL);
- WebcitAddUrlHandler(HKEY("readold"), "", 0, h_readold, ANONYMOUS|NEED_URL);
- WebcitAddUrlHandler(HKEY("readfwd"), "", 0, h_readfwd, ANONYMOUS|NEED_URL);
+ RegisterPreference("defaultname", _("Preferred display name for email messages"), PRF_STRING, NULL);
+ RegisterPreference("defaulthandle", _("Preferred display name for bulletin board posts"), PRF_STRING, NULL);
+ RegisterPreference("mailbox", _("Mailbox view mode"), PRF_STRING, NULL);
+
+ WebcitAddUrlHandler(HKEY("readnew"), "", 0, h_readnew, ANONYMOUS | NEED_URL);
+ WebcitAddUrlHandler(HKEY("readold"), "", 0, h_readold, ANONYMOUS | NEED_URL);
+ WebcitAddUrlHandler(HKEY("readfwd"), "", 0, h_readfwd, ANONYMOUS | NEED_URL);
WebcitAddUrlHandler(HKEY("headers"), "", 0, h_headers, NEED_URL);
- WebcitAddUrlHandler(HKEY("readgt"), "", 0, h_readgt, ANONYMOUS|NEED_URL);
- WebcitAddUrlHandler(HKEY("readlt"), "", 0, h_readlt, ANONYMOUS|NEED_URL);
+ WebcitAddUrlHandler(HKEY("readgt"), "", 0, h_readgt, ANONYMOUS | NEED_URL);
+ WebcitAddUrlHandler(HKEY("readlt"), "", 0, h_readlt, ANONYMOUS | NEED_URL);
WebcitAddUrlHandler(HKEY("do_search"), "", 0, h_do_search, 0);
WebcitAddUrlHandler(HKEY("display_enter"), "", 0, display_enter, 0);
WebcitAddUrlHandler(HKEY("post"), "", 0, post_message, PROHIBIT_STARTPAGE);
WebcitAddUrlHandler(HKEY("move_msg"), "", 0, move_msg, PROHIBIT_STARTPAGE);
WebcitAddUrlHandler(HKEY("delete_msg"), "", 0, delete_msg, PROHIBIT_STARTPAGE);
WebcitAddUrlHandler(HKEY("msg"), "", 0, embed_message, NEED_URL);
- WebcitAddUrlHandler(HKEY("message"), "", 0, handle_one_message, NEED_URL|XHTTP_COMMANDS|COOKIEUNNEEDED|FORCE_SESSIONCLOSE);
+ WebcitAddUrlHandler(HKEY("message"), "", 0, handle_one_message,
+ NEED_URL | XHTTP_COMMANDS | COOKIEUNNEEDED | FORCE_SESSIONCLOSE);
WebcitAddUrlHandler(HKEY("printmsg"), "", 0, print_message, NEED_URL);
WebcitAddUrlHandler(HKEY("msgheaders"), "", 0, display_headers, NEED_URL);
WebcitAddUrlHandler(HKEY("mimepart"), "", 0, view_mimepart, NEED_URL);
WebcitAddUrlHandler(HKEY("mimepart_download"), "", 0, download_mimepart, NEED_URL);
- WebcitAddUrlHandler(HKEY("postpart"), "", 0, view_postpart, NEED_URL|PROHIBIT_STARTPAGE);
- WebcitAddUrlHandler(HKEY("postpart_download"), "", 0, download_postpart, NEED_URL|PROHIBIT_STARTPAGE);
+ WebcitAddUrlHandler(HKEY("postpart"), "", 0, view_postpart, NEED_URL | PROHIBIT_STARTPAGE);
+ WebcitAddUrlHandler(HKEY("postpart_download"), "", 0, download_postpart, NEED_URL | PROHIBIT_STARTPAGE);
WebcitAddUrlHandler(HKEY("upload_attachment"), "", 0, upload_attachment, AJAX);
WebcitAddUrlHandler(HKEY("remove_attachment"), "", 0, remove_attachment, AJAX);
WebcitAddUrlHandler(HKEY("show_num_attachments"), "", 0, show_num_attachments, AJAX);
/* 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 ;
+ WebcitAddUrlHandler(HKEY("roommsgs"), "", 0, jsonMessageList, 0);
}
-void
-SessionDetachModule_MSG
-(wcsession *sess)
-{
+void SessionDetachModule_MSG(wcsession * sess) {
DeleteHash(&sess->summ);
}
projects / citadel.git / blobdiff