X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fmessages.c;h=812e438f983c7cafe197b55bcbd187001df09f48;hb=5332c415ad54cf9d3748b80a0d417dccc093a854;hp=8060e2248a3b0e6b996dd3caef29f5a1eea40672;hpb=54fe998e164cbe292653f7f6206ad700adfdb18b;p=citadel.git
diff --git a/webcit/messages.c b/webcit/messages.c
index 8060e2248..812e438f9 100644
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -1,8 +1,21 @@
/*
- * $Id$
- *
* Functions which deal with the fetching and displaying of messages.
*
+ * Copyright (c) 1996-2011 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 as
+ * published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "webcit.h"
@@ -12,6 +25,7 @@
HashList *MsgHeaderHandler = NULL;
HashList *MsgEvaluators = NULL;
HashList *MimeRenderHandler = NULL;
+HashList *ReadLoopHandler = NULL;
int dbg_analyze_msg = 0;
#define SUBJ_COL_WIDTH_PCT 50 /* Mailbox view column width */
@@ -42,7 +56,6 @@ int load_message(message_summary *Msg,
int state=0;
Buf = NewStrBuf();
- lprintf(9, "MSG4 %ld|%s\n", Msg->msgnum, ChrPtr(Msg->PartNum));
if (Msg->PartNum != NULL) {
serv_printf("MSG4 %ld|%s", Msg->msgnum, ChrPtr(Msg->PartNum));
}
@@ -55,26 +68,25 @@ int load_message(message_summary *Msg,
*Error = NewStrBuf();
StrBufAppendPrintf(*Error, "");
StrBufAppendPrintf(*Error, _("ERROR:"));
- StrBufAppendPrintf(*Error, " %s
\n", &buf[4]);
+ StrBufAppendPrintf(*Error, " %s
\n", &buf[4]);
FreeStrBuf(&Buf);
return 0;
}
/* begin everythingamundo table */
HdrToken = NewStrBuf();
- while ((StrBuf_ServGetln(Buf)>=0) && !Done) {
+ while (!Done && StrBuf_ServGetln(Buf)>=0) {
if ( (StrLength(Buf)==3) &&
!strcmp(ChrPtr(Buf), "000"))
{
Done = 1;
if (state < 2) {
- lprintf(1, _("unexpected end of message"));
if (Msg->MsgBody->Data == NULL)
Msg->MsgBody->Data = NewStrBuf();
Msg->MsgBody->ContentType = NewStrBufPlain(HKEY("text/html"));
StrBufAppendPrintf(Msg->MsgBody->Data, "");
- StrBufAppendPrintf(Msg->MsgBody->Data, _("unexpected end of message"));
- StrBufAppendPrintf(Msg->MsgBody->Data, " (1)
\n");
+ StrBufAppendPrintf(Msg->MsgBody->Data, _("Empty message"));
+ StrBufAppendPrintf(Msg->MsgBody->Data, "
\n");
StrBufAppendPrintf(Msg->MsgBody->Data, "
\n");
}
break;
@@ -229,11 +241,12 @@ int read_message(StrBuf *Target, const char *tmpl, long tmpllen, long msgnum, co
FreeStrBuf(&Error);
}
- /* strip the bare contenttype, so we ommit charset etc. */
+ /* Extract just the content-type (omit attributes such as "charset") */
StrBufExtract_token(Buf, Msg->MsgBody->ContentType, 0, ';');
StrBufTrim(Buf);
StrBufLowerCase(Buf);
- /* look up the renderer, that will convert this mimeitem into the htmlized form */
+
+ /* Locate a renderer capable of converting this MIME part into HTML */
if (GetHash(MimeRenderHandler, SKEY(Buf), &vHdr) &&
(vHdr != NULL)) {
RenderMimeFuncStruct *Render;
@@ -380,7 +393,7 @@ void handle_one_message(void)
break;
case eDELETE:
CmdBuf = NewStrBuf ();
- if (WCC->wc_is_trash) { /* Delete from Trash is a real delete */
+ if ((WCC->CurRoom.RAFlags & UA_ISTRASH) != 0) { /* Delete from Trash is a real delete */
serv_printf("DELE %ld", msgnum);
}
else { /* Otherwise move it to Trash */
@@ -440,7 +453,7 @@ void embed_message(void) {
break;
case eDELETE:
CmdBuf = NewStrBuf ();
- if (WCC->wc_is_trash) { /* Delete from Trash is a real delete */
+ if ((WCC->CurRoom.RAFlags & UA_ISTRASH) != 0) { /* Delete from Trash is a real delete */
serv_printf("DELE %ld", msgnum);
}
else { /* Otherwise move it to Trash */
@@ -478,22 +491,6 @@ void print_message(void) {
wDumpContent(0);
}
-/*
- * Mobile browser view of message
- */
-void mobile_message_view(void)
-{
- long msgnum = 0L;
- const StrBuf *Mime;
-
- msgnum = StrBufExtract_long(WC->Hdr->HR.ReqLine, 0, '/');
- output_headers(1, 0, 0, 0, 0, 1);
- begin_burst();
- do_template("msgcontrols", NULL);
- read_message(WC->WBuf, HKEY("view_message"), msgnum, NULL, &Mime);
- wDumpContent(0);
-}
-
/*
* Display a message's headers
*/
@@ -514,7 +511,7 @@ void display_headers(void) {
serv_getln(buf, sizeof buf);
if (buf[0] == '1') {
while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
- wprintf("%s\n", buf);
+ wc_printf("%s\n", buf);
}
}
@@ -569,41 +566,38 @@ message_summary *ReadOneMessageSummary(StrBuf *RawMessage, const char *DefaultSu
* load message pointers from the server for a "read messages" operation
*
* servcmd: the citadel command to send to the citserver
- * with_headers: also include some of the headers with the message numbers (more expensive)
*/
-int load_msg_ptrs(const char *servcmd, int with_headers, long *lowest_found, long *highest_found)
+int load_msg_ptrs(const char *servcmd,
+ SharedMessageStatus *Stat,
+ load_msg_ptrs_detailheaders LH)
{
- StrBuf* FoundCharset = NULL;
wcsession *WCC = WC;
message_summary *Msg;
StrBuf *Buf, *Buf2;
- int nummsgs = 0;
- int maxload = 0;
long len;
int n;
int skipit;
const char *Ptr = NULL;
- if (lowest_found) *lowest_found = LONG_MAX;
- if (highest_found) *highest_found = LONG_MIN;
+ Stat->lowest_found = LONG_MAX;
+ Stat->highest_found = LONG_MIN;
if (WCC->summ != NULL) {
DeleteHash(&WCC->summ);
}
WCC->summ = NewHash(1, Flathash);
- maxload = 10000;
Buf = NewStrBuf();
serv_puts(servcmd);
StrBuf_ServGetln(Buf);
if (GetServerStatus(Buf, NULL) != 1) {
FreeStrBuf(&Buf);
- return (nummsgs);
+ return (Stat->nummsgs);
}
Buf2 = NewStrBuf();
while (len = StrBuf_ServGetln(Buf), ((len != 3) || strcmp(ChrPtr(Buf), "000")!= 0))
{
- if (nummsgs < maxload) {
+ if (Stat->nummsgs < Stat->maxload) {
skipit = 0;
Ptr = NULL;
Msg = (message_summary*)malloc(sizeof(message_summary));
@@ -612,12 +606,12 @@ int load_msg_ptrs(const char *servcmd, int with_headers, long *lowest_found, lon
Msg->msgnum = StrBufExtractNext_long(Buf, &Ptr, '|');
Msg->date = StrBufExtractNext_long(Buf, &Ptr, '|');
- if (nummsgs == 0) {
- if ((lowest_found) && (Msg->msgnum < *lowest_found)) {
- *lowest_found = Msg->msgnum;
+ if (Stat->nummsgs == 0) {
+ if (Msg->msgnum < Stat->lowest_found) {
+ Stat->lowest_found = Msg->msgnum;
}
- if ((highest_found) && (Msg->msgnum > *highest_found)) {
- *highest_found = Msg->msgnum;
+ if (Msg->msgnum > Stat->highest_found) {
+ Stat->highest_found = Msg->msgnum;
}
}
@@ -631,173 +625,62 @@ int load_msg_ptrs(const char *servcmd, int with_headers, long *lowest_found, lon
* nummsgs should be the same order as the message date.
*/
if (Msg->date == 0) {
- Msg->date = nummsgs;
+ Msg->date = Stat->nummsgs;
if (StrLength(Buf) < 32)
skipit = 1;
}
- if (!skipit) {
- Msg->from = NewStrBufPlain(NULL, StrLength(Buf));
- StrBufExtract_NextToken(Buf2, Buf, &Ptr, '|');
- if (StrLength(Buf2) != 0) {
- /* Handle senders with RFC2047 encoding */
- StrBuf_RFC822_to_Utf8(Msg->from, Buf2, WCC->DefaultCharset, FoundCharset);
- }
-
- /* node name */
- StrBufExtract_NextToken(Buf2, Buf, &Ptr, '|');
- if ((StrLength(Buf2) !=0 ) &&
- ( ((WCC->room_flags & QR_NETWORK)
- || ((strcasecmp(ChrPtr(Buf2), ChrPtr(WCC->serv_info->serv_nodename))
- && (strcasecmp(ChrPtr(Buf2), ChrPtr(WCC->serv_info->serv_fqdn))))))))
- {
- StrBufAppendBufPlain(Msg->from, HKEY(" @ "), 0);
- StrBufAppendBuf(Msg->from, Buf2, 0);
- }
-
- /* Internet address (not used)
- * StrBufExtract_token(Msg->inetaddr, Buf, 4, '|');
- */
- StrBufSkip_NTokenS(Buf, &Ptr, '|', 1);
- Msg->subj = NewStrBufPlain(NULL, StrLength(Buf));
- StrBufExtract_NextToken(Buf2, Buf, &Ptr, '|');
- if (StrLength(Buf2) == 0)
- StrBufAppendBufPlain(Msg->subj, _("(no subject)"), -1,0);
- else {
- StrBuf_RFC822_to_Utf8(Msg->subj, Buf2, WCC->DefaultCharset, FoundCharset);
- if ((StrLength(Msg->subj) > 75) &&
- (StrBuf_Utf8StrLen(Msg->subj) > 75)) {
- StrBuf_Utf8StrCut(Msg->subj, 72);
- StrBufAppendBufPlain(Msg->subj, HKEY("..."), 0);
- }
- }
-
- if ((StrLength(Msg->from) > 25) &&
- (StrBuf_Utf8StrLen(Msg->from) > 25)) {
- StrBuf_Utf8StrCut(Msg->from, 23);
- StrBufAppendBufPlain(Msg->from, HKEY("..."), 0);
- }
+ if ((!skipit) && (LH != NULL)) {
+ if (!LH(Buf, &Ptr, Msg, Buf2)){
+ free(Msg);
+ continue;
+ }
}
n = Msg->msgnum;
Put(WCC->summ, (const char *)&n, sizeof(n), Msg, DestroyMessageSummary);
}
- nummsgs++;
+ Stat->nummsgs++;
}
FreeStrBuf(&Buf2);
FreeStrBuf(&Buf);
- return (nummsgs);
+ return (Stat->nummsgs);
}
-inline message_summary* GetMessagePtrAt(int n, HashList *Summ)
-{
- const char *Key;
- long HKLen;
- void *vMsg;
-
- if (Summ == NULL)
- return NULL;
- GetHashAt(Summ, n, &HKLen, &Key, &vMsg);
- return (message_summary*) vMsg;
-}
-
-long DrawMessageDropdown(StrBuf *Selector, long maxmsgs, long startmsg, int nMessages)
+/**
+ * \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
+ */
+void SetFlagsFromMSet(HashList *ScanMe, MSet *MatchMSet, int FlagToSet, int Reverse)
{
- StrBuf *TmpBuf;
- wcsession *WCC = WC;
+ const char *HashKey;
+ long HKLen;
+ HashPos *at;
void *vMsg;
- int lo, hi;
- long ret;
- long hklen;
- const char *key;
- int done = 0;
- int nItems;
- HashPos *At;
- long vector[16];
- WCTemplputParams SubTP;
+ message_summary *Msg;
- memset(&SubTP, 0, sizeof(WCTemplputParams));
- SubTP.Filter.ContextType = CTX_LONGVECTOR;
- SubTP.Context = &vector;
- TmpBuf = NewStrBufPlain(NULL, SIZ);
- At = GetNewHashPos(WCC->summ, nMessages);
- nItems = GetCount(WCC->summ);
- ret = nMessages;
- vector[0] = 7;
- vector[2] = 1;
- vector[1] = startmsg;
- vector[3] = 0;
-
- while (!done) {
- vector[3] = abs(nMessages);
- lo = GetHashPosCounter(At);
- if (nMessages > 0) {
- if (lo + nMessages >= nItems) {
- hi = nItems - 1;
- vector[3] = nItems - lo;
- if (startmsg == lo)
- ret = vector[3];
- }
- else {
- hi = lo + nMessages - 1;
- }
- } else {
- if (lo + nMessages < -1) {
- hi = 0;
- }
- else {
- if ((lo % abs(nMessages)) != 0) {
- int offset = (lo % abs(nMessages) *
- (nMessages / abs(nMessages)));
- hi = lo + offset;
- vector[3] = abs(offset);
- if (startmsg == lo)
- ret = offset;
- }
- else
- hi = lo + nMessages;
- }
+ at = GetNewHashPos(ScanMe, 0);
+ while (GetNextHashPos(ScanMe, at, &HKLen, &HashKey, &vMsg)) {
+ /* Are you a new message, or an old message? */
+ Msg = (message_summary*) vMsg;
+ if (Reverse && IsInMSetList(MatchMSet, Msg->msgnum)) {
+ Msg->Flags = Msg->Flags | FlagToSet;
}
- done = !GetNextHashPos(WCC->summ, At, &hklen, &key, &vMsg);
-
- /*
- * Bump these because although we're thinking in zero base, the user
- * is a drooling idiot and is thinking in one base.
- */
- vector[4] = lo + 1;
- vector[5] = hi + 1;
- vector[6] = lo;
- FlushStrBuf(TmpBuf);
- dbg_print_longvector(vector);
- DoTemplate(HKEY("select_messageindex"), TmpBuf, &SubTP);
- StrBufAppendBuf(Selector, TmpBuf, 0);
- }
- vector[6] = 0;
- FlushStrBuf(TmpBuf);
- if (maxmsgs == 9999999) {
- vector[1] = 1;
- ret = maxmsgs;
- }
- else
- vector[1] = 0;
- vector[2] = 0;
- dbg_print_longvector(vector);
- DoTemplate(HKEY("select_messageindex_all"), TmpBuf, &SubTP);
- StrBufAppendBuf(Selector, TmpBuf, 0);
- FreeStrBuf(&TmpBuf);
- DeleteHashPos(&At);
- return ret;
+ else if (!Reverse && !IsInMSetList(MatchMSet, Msg->msgnum)) {
+ Msg->Flags = Msg->Flags | FlagToSet;
+ }
+ }
+ DeleteHashPos(&at);
}
+
void load_seen_flags(void)
{
- message_summary *Msg;
- const char *HashKey;
- long HKLen;
- HashPos *at;
- void *vMsg;
StrBuf *OldMsg;
wcsession *WCC = WC;
+ MSet *MatchMSet;
OldMsg = NewStrBuf();
serv_puts("GTSN");
@@ -809,351 +692,190 @@ void load_seen_flags(void)
FreeStrBuf(&OldMsg);
return;
}
- at = GetNewHashPos(WCC->summ, 0);
- while (GetNextHashPos(WCC->summ, at, &HKLen, &HashKey, &vMsg)) {
- /* Are you a new message, or an old message? */
- Msg = (message_summary*) vMsg;
- if (is_msg_in_mset(ChrPtr(OldMsg), Msg->msgnum)) {
- Msg->is_new = 0;
- }
- else {
- Msg->is_new = 1;
- }
+
+ if (ParseMSet(&MatchMSet, OldMsg))
+ {
+ SetFlagsFromMSet(WCC->summ, MatchMSet, MSGFLAG_READ, 0);
}
+ DeleteMSet(&MatchMSet);
FreeStrBuf(&OldMsg);
- DeleteHashPos(&at);
}
extern readloop_struct rlid[];
+typedef struct _RoomRenderer{
+ int RoomType;
+
+ GetParamsGetServerCall_func GetParamsGetServerCall;
+ PrintViewHeader_func PrintViewHeader;
+ LoadMsgFromServer_func LoadMsgFromServer;
+ RenderView_or_Tail_func RenderView_or_Tail;
+ View_Cleanup_func ViewCleanup;
+ load_msg_ptrs_detailheaders LHParse;
+} RoomRenderer;
+
+
/*
* command loop for reading messages
*
- * Set oper to "readnew" or "readold" or "readfwd" or "headers" or "readgt"
+ * Set oper to "readnew" or "readold" or "readfwd" or "headers" or "readgt" or "readlt" or "do_search"
*/
-void readloop(long oper)
+void readloop(long oper, eCustomRoomRenderer ForceRenderer)
{
- StrBuf *MessageDropdown = NULL;
- StrBuf *BBViewToolBar = NULL;
+ RoomRenderer *ViewMsg;
+ void *vViewMsg;
void *vMsg;
message_summary *Msg;
char cmd[256] = "";
- char buf[SIZ];
- int a = 0;
- int with_headers = 0;
- int nummsgs;
- long startmsg = 0;
- int maxmsgs = 0;
- long *displayed_msgs = NULL;
- int num_displayed = 0;
- int is_singlecard = 0;
- struct calview calv;
- int i;
- int lowest_displayed = (-1);
- int highest_displayed = 0;
- addrbookent *addrbook = NULL;
- int num_ab = 0;
- int bbs_reverse = 0;
+ int i, r;
wcsession *WCC = WC;
HashPos *at;
const char *HashKey;
long HKLen;
- int care_for_empty_list = 0;
- int load_seen = 0;
- int sortit = 0;
- int defaultsortorder = 0;
WCTemplputParams SubTP;
- char *ab_name;
- const StrBuf *Mime;
- long lowest_found = (-1);
- long highest_found = (-1);
+ SharedMessageStatus Stat;
+ void *ViewSpecific;
- if (havebstr("is_summary") && (1 == (ibstr("is_summary"))))
- WCC->wc_view = VIEW_MAILBOX;
+ if (havebstr("is_summary") && (1 == (ibstr("is_summary")))) {
+ WCC->CurRoom.view = VIEW_MAILBOX;
+ }
- if (!WCC->is_ajax) {
- output_headers(1, 1, 1, 0, 0, 0);
- } else if (WCC->wc_view == VIEW_MAILBOX) {
- jsonMessageListHdr();
+ if (havebstr("is_ajax") && (1 == (ibstr("is_ajax")))) {
+ WCC->is_ajax = 1;
}
- switch (WCC->wc_view) {
- case VIEW_WIKI:
- sprintf(buf, "wiki?room=%s&page=home", ChrPtr(WCC->wc_roomname));
- http_redirect(buf);
+ if ((oper == do_search) && (WCC->CurRoom.view == VIEW_WIKI)) {
+ display_wiki_pagelist();
return;
- case VIEW_CALBRIEF:
- case VIEW_CALENDAR:
- load_seen = 1;
- strcpy(cmd, "MSGS ALL");
- maxmsgs = 32767;
- parse_calendar_view_request(&calv);
- break;
- case VIEW_TASKS:
- strcpy(cmd, "MSGS ALL");
- maxmsgs = 32767;
- break;
- case VIEW_NOTES:
- strcpy(cmd, "MSGS ALL");
- maxmsgs = 32767;
- wprintf("\n");
- break;
- case VIEW_ADDRESSBOOK:
- is_singlecard = ibstr("is_singlecard");
- if (is_singlecard != 1) {
- if (oper == do_search) {
- snprintf(cmd, sizeof(cmd), "MSGS SEARCH|%s", bstr("query"));
- }
- else {
- strcpy(cmd, "MSGS ALL");
- }
- maxmsgs = 9999999;
- break;
- }
- break;
- case VIEW_MAILBOX:
- if (!WCC->is_ajax) {
- new_summary_view();
- return;
- } else {
- defaultsortorder = 2;
- sortit = 1;
- load_seen = 1;
- care_for_empty_list = 0;
- with_headers = 1;
- /* Generally using maxmsgs|startmsg is not required
- in mailbox view, but we have a 'safemode' for clients
- (*cough* Exploder) that simply can't handle too many */
- if (havebstr("maxmsgs")) maxmsgs = ibstr("maxmsgs");
- else maxmsgs = 9999999;
- if (havebstr("startmsg")) startmsg = lbstr("startmsg");
- snprintf(cmd, sizeof(cmd), "MSGS %s|%s||1",
- (oper == do_search) ? "SEARCH" : "ALL",
- (oper == do_search) ? bstr("query") : ""
- );
- }
- break;
- case VIEW_BBS:
- default:
- defaultsortorder = 1;
- startmsg = -1;
- sortit = 1;
- care_for_empty_list = 1;
+ }
- rlid[oper].cmd(cmd, sizeof(cmd));
+ if (WCC->CurRoom.view == VIEW_WIKI) {
+ http_redirect("wiki?page=home");
+ return;
+ }
- if (havebstr("maxmsgs"))
- maxmsgs = ibstr("maxmsgs");
- if (maxmsgs == 0) maxmsgs = DEFAULT_MAXMSGS;
+ memset(&Stat, 0, sizeof(SharedMessageStatus));
+ Stat.maxload = 10000;
+ Stat.lowest_found = (-1);
+ Stat.highest_found = (-1);
+ if (ForceRenderer == eUseDefault)
+ GetHash(ReadLoopHandler, IKEY(WCC->CurRoom.view), &vViewMsg);
+ else
+ GetHash(ReadLoopHandler, IKEY(ForceRenderer), &vViewMsg);
+ if (vViewMsg == NULL) {
+ WCC->CurRoom.view = VIEW_BBS;
+ GetHash(ReadLoopHandler, IKEY(WCC->CurRoom.view), &vViewMsg);
+ }
+ if (vViewMsg == NULL) {
+ return; // TODO: print message
+ }
- if (havebstr("startmsg")) {
- startmsg = lbstr("startmsg");
- }
-
+ ViewMsg = (RoomRenderer*) vViewMsg;
+ if (!WCC->is_ajax) {
+ output_headers(1, 1, 1, 0, 0, 0);
+ } else if (WCC->CurRoom.view == VIEW_MAILBOX) {
+ jsonMessageListHdr();
}
- nummsgs = load_msg_ptrs(cmd, with_headers, &lowest_found, &highest_found);
- if (nummsgs == 0) {
- if (care_for_empty_list) {
- wprintf("
");
- switch (oper) {
- case readnew:
- wprintf(_("No new messages."));
- break;
- case readold:
- wprintf(_("No old messages."));
- break;
- default:
- wprintf(_("No messages here."));
- }
- wprintf("
\n");
- goto DONE;
- }
+ if (ViewMsg->GetParamsGetServerCall != NULL) {
+ r = ViewMsg->GetParamsGetServerCall(
+ &Stat,
+ &ViewSpecific,
+ oper,
+ cmd, sizeof(cmd)
+ );
+ } else {
+ r = 0;
+ }
+ 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. */
+ return;
+ case 200:
+ default:
+ break;
}
+ if (!IsEmptyStr(cmd))
+ Stat.nummsgs = load_msg_ptrs(cmd, &Stat, ViewMsg->LHParse);
- if (sortit) {
+ if (Stat.sortit) {
CompareFunc SortIt;
memset(&SubTP, 0, sizeof(WCTemplputParams));
- SubTP.Filter.ContextType = CTX_NONE;
+ SubTP.Filter.ContextType = CTX_MAILSUM;
SubTP.Context = NULL;
SortIt = RetrieveSort(&SubTP, NULL, 0,
- HKEY("date"), defaultsortorder);
+ HKEY("date"), Stat.defaultsortorder);
if (SortIt != NULL)
SortByPayload(WCC->summ, SortIt);
- if (WCC->wc_view == VIEW_BBS) {
- if (lbstr("SortOrder") == 2) {
- bbs_reverse = 1;
- num_displayed = -DEFAULT_MAXMSGS;
- }
- else {
- bbs_reverse = 0;
- num_displayed = DEFAULT_MAXMSGS;
- }
- }
}
- if (startmsg < 0) startmsg = (bbs_reverse) ? nummsgs - 1 : 0;
+ if (Stat.startmsg < 0) {
+ Stat.startmsg = 0;
+ }
- if (load_seen) load_seen_flags();
+ if (Stat.load_seen) load_seen_flags();
/*
* Print any inforation above the message list...
*/
- switch (WCC->wc_view) {
- case VIEW_BBS:
- BBViewToolBar = NewStrBufPlain(NULL, SIZ);
- MessageDropdown = NewStrBufPlain(NULL, SIZ);
-
- maxmsgs = DrawMessageDropdown(MessageDropdown, maxmsgs, startmsg, num_displayed);
- if (num_displayed < 0) {
- startmsg += maxmsgs;
- if (num_displayed != maxmsgs)
- maxmsgs = abs(maxmsgs) + 1;
- else
- maxmsgs = abs(maxmsgs);
+ if (ViewMsg->PrintViewHeader != NULL)
+ ViewMsg->PrintViewHeader(&Stat, &ViewSpecific);
- }
- memset(&SubTP, 0, sizeof(WCTemplputParams));
- SubTP.Filter.ContextType = CTX_STRBUF;
- SubTP.Context = MessageDropdown;
- DoTemplate(HKEY("msg_listselector_top"), BBViewToolBar, &SubTP);
- StrBufAppendBuf(WCC->WBuf, BBViewToolBar, 0);
- FlushStrBuf(BBViewToolBar);
- break;
- }
- WCC->startmsg = startmsg;
- WCC->maxmsgs = maxmsgs;
+ WCC->startmsg = Stat.startmsg;
+ WCC->maxmsgs = Stat.maxmsgs;
WCC->num_displayed = 0;
/* Put some helpful data in vars for mailsummary_json */
- svputlong("READLOOP:TOTALMSGS", nummsgs);
- svputlong("READLOOP:STARTMSG", startmsg);
- svputlong("WCVIEW", WCC->wc_view);
+ {
+ StrBuf *Foo;
+
+ Foo = NewStrBuf ();
+ StrBufPrintf(Foo, "%ld", Stat.nummsgs);
+ PutBstr(HKEY("__READLOOP:TOTALMSGS"), NewStrBufDup(Foo));
+ StrBufPrintf(Foo, "%ld", Stat.startmsg);
+ PutBstr(HKEY("__READLOOP:STARTMSG"), Foo);
+ }
/*
* iterate over each message. if we need to load an attachment, do it here.
*/
- if (WCC->wc_view == VIEW_MAILBOX) goto NO_MSG_LOOP;
- at = GetNewHashPos(WCC->summ, 0);
- num_displayed = i = 0;
- while (GetNextHashPos(WCC->summ, at, &HKLen, &HashKey, &vMsg)) {
- Msg = (message_summary*) vMsg;
- if ((Msg->msgnum >= startmsg) && (num_displayed <= maxmsgs)) {
- switch (WCC->wc_view) {
- case VIEW_WIKI:
- break;
- case VIEW_CALBRIEF: /* load the mime attachments for special tasks... */
- case VIEW_CALENDAR:
- load_calendar_item(Msg, Msg->is_new, &calv);
- break;
- case VIEW_TASKS:
- display_task(Msg, Msg->is_new);
- break;
- case VIEW_NOTES:
- display_note(Msg, Msg->is_new);
- break;
- case VIEW_ADDRESSBOOK:
- ab_name = NULL;
- fetch_ab_name(Msg, &ab_name);
- if (ab_name == NULL)
- break;
- ++num_ab;
- addrbook = realloc(addrbook,
- (sizeof(addrbookent) * num_ab) );
- safestrncpy(addrbook[num_ab-1].ab_name, ab_name,
- sizeof(addrbook[num_ab-1].ab_name));
- addrbook[num_ab-1].ab_msgnum = Msg->msgnum;
- free(ab_name);
- break;
- case VIEW_BBS: /* Tag the mails we want to show in bbview... */
- default:
- if (displayed_msgs == NULL) {
- displayed_msgs = malloc(sizeof(long) *
- (maxmsgs= startmsg) && (i < startmsg + maxmsgs)) {
- displayed_msgs[num_displayed] = Msg->msgnum;
- if (lowest_displayed < 0) lowest_displayed = a;
- highest_displayed = a;
-
- num_displayed++;
- }
- }
- }
- i++;
+
+ if ((ViewMsg->LoadMsgFromServer != NULL) &&
+ (!IsEmptyStr(cmd)))
+ {
+ at = GetNewHashPos(WCC->summ, 0);
+ Stat.num_displayed = i = 0;
+ while ( GetNextHashPos(WCC->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);
+ }
+ i++;
+ }
+ DeleteHashPos(&at);
}
- DeleteHashPos(&at);
-NO_MSG_LOOP:
/*
* Done iterating the message list. now tasks we want to do after.
*/
- switch (WCC->wc_view) {
- case VIEW_MAILBOX:
- DoTemplate(HKEY("mailsummary_json"),NULL, &SubTP);
- break;
- case VIEW_BBS:
- if (displayed_msgs != NULL) {
- /* if we do a split bbview in the future, begin messages div here */
-
- for (a=0; aWBuf, HKEY("view_message"), displayed_msgs[a], NULL, &Mime);
- }
-
- /* if we do a split bbview in the future, end messages div here */
-
- free(displayed_msgs);
- displayed_msgs = NULL;
- }
- memset(&SubTP, 0, sizeof(WCTemplputParams));
- SubTP.Filter.ContextType = CTX_STRBUF;
- SubTP.Context = MessageDropdown;
- DoTemplate(HKEY("msg_listselector_bottom"), BBViewToolBar, &SubTP);
- StrBufAppendBuf(WCC->WBuf, BBViewToolBar, 0);
+ if (ViewMsg->RenderView_or_Tail != NULL)
+ ViewMsg->RenderView_or_Tail(&Stat, &ViewSpecific, oper);
- FreeStrBuf(&BBViewToolBar);
- FreeStrBuf(&MessageDropdown);
- }
+ if (ViewMsg->ViewCleanup != NULL)
+ ViewMsg->ViewCleanup(&ViewSpecific);
-
-DONE:
- switch (WCC->wc_view) {
- case VIEW_WIKI:
- break;
- case VIEW_CALBRIEF:
- case VIEW_CALENDAR:
- render_calendar_view(&calv);
- break;
- case VIEW_TASKS:
- do_tasks_view(); /* Render the task list */
- break;
- case VIEW_NOTES:
- break;
- case VIEW_ADDRESSBOOK:
- if (is_singlecard)
- read_message(WC->WBuf, HKEY("view_message"), lbstr("startmsg"), NULL, &Mime);
- else
- do_addrbook_view(addrbook, num_ab); /* Render the address book */
- break;
- case VIEW_MAILBOX:
- case VIEW_BBS:
- default:
- break;
- }
- /* Note: wDumpContent() will output one additional tag. */
- if (WCC->wc_view != VIEW_MAILBOX) {
- /* We ought to move this out into template */
- wDumpContent(1);
- } else {
- end_burst();
- }
WCC->startmsg = 0;
WCC->maxmsgs = 0;
if (WCC->summ != NULL) {
DeleteHash(&WCC->summ);
}
- if (addrbook != NULL) free(addrbook);
- FreeStrBuf(&BBViewToolBar);
}
@@ -1172,6 +894,7 @@ void post_mime_to_server(void) {
size_t encoded_length;
size_t encoded_strlen;
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),
@@ -1193,6 +916,11 @@ void post_mime_to_server(void) {
is_multipart = 1;
}
+ /* Only do multipart/alternative for mailboxes. BBS and Wiki rooms don't need it. */
+ if (WC->CurRoom.view == VIEW_MAILBOX) {
+ include_text_alt = 1;
+ }
+
if (is_multipart) {
/* Remember, serv_printf() appends an extra newline */
serv_printf("Content-type: multipart/mixed; boundary=\"%s\"\n", top_boundary);
@@ -1201,19 +929,21 @@ void post_mime_to_server(void) {
}
/* Remember, serv_printf() appends an extra newline */
- 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);
+ if (include_text_alt) {
+ 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);
+ 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);
- serv_printf("--%s", alt_boundary);
+ serv_printf("--%s", alt_boundary);
+ }
serv_puts("Content-type: text/html; charset=utf-8");
serv_puts("Content-Transfer-Encoding: quoted-printable");
@@ -1222,7 +952,9 @@ void post_mime_to_server(void) {
text_to_server_qp(bstr("msgtext")); /* Transmit message in quoted-printable encoding */
serv_puts("