#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);
-int longcmp_r(const void *s1, const void *s2);
-int summcmp_subj(const void *s1, const void *s2);
-int summcmp_rsubj(const void *s1, const void *s2);
-int summcmp_sender(const void *s1, const void *s2);
-int summcmp_rsender(const void *s1, const void *s2);
-int summcmp_date(const void *s1, const void *s2);
-int summcmp_rdate(const void *s1, const void *s2);
/*----------------------------------------------------------------------------*/
Msg->PartNum = PartNum;
Msg->MsgBody = (wc_mime_attachment*) malloc(sizeof(wc_mime_attachment));
memset(Msg->MsgBody, 0, sizeof(wc_mime_attachment));
+ Msg->MsgBody->msgnum = msgnum;
FoundCharset = NewStrBuf();
while ((StrBuf_ServGetln(Buf)>=0) && !Done) {
if ( (StrLength(Buf)==3) &&
}
DeleteHashPos(&it);
memset(&SubTP, 0, sizeof(WCTemplputParams));
- SubTP.ContextType = CTX_MAILSUM;
+ SubTP.Filter.ContextType = CTX_MAILSUM;
SubTP.Context = Msg;
DoTemplate(tmpl, tmpllen, Target, &SubTP);
int skipit;
if (WCC->summ != NULL) {
- if (WCC->summ != NULL)
- DeleteHash(&WCC->summ);
+ DeleteHash(&WCC->summ);
}
WCC->summ = NewHash(1, Flathash);
maxload = 10000;
Msg->subj = NewStrBufPlain(NULL, StrLength(Buf));
StrBufExtract_token(Buf2, Buf, 5, '|');
if (StrLength(Buf2) == 0)
- StrBufAppendBufPlain(Msg->subj, _("(no subj)"), -1,0);
+ StrBufAppendBufPlain(Msg->subj, _("(no subject)"), -1,0);
else {
StrBuf_RFC822_to_Utf8(Msg->subj, Buf2, WCC->DefaultCharset, FoundCharset);
if ((StrLength(Msg->subj) > 75) &&
WCTemplputParams SubTP;
memset(&SubTP, 0, sizeof(WCTemplputParams));
- SubTP.ContextType = CTX_LONGVECTOR;
+ SubTP.Filter.ContextType = CTX_LONGVECTOR;
SubTP.Context = &vector;
TmpBuf = NewStrBuf();
At = GetNewHashPos(WCC->summ, nMessages);
if (havebstr("is_summary") && (1 == (ibstr("is_summary"))))
WCC->wc_view = VIEW_MAILBOX;
+ if (!WCC->is_ajax) {
+ output_headers(1, 1, 1, 0, 0, 0);
+ } else if (WCC->wc_view == VIEW_MAILBOX) {
+ jsonMessageListHdr();
+ }
+
switch (WCC->wc_view) {
case VIEW_WIKI:
sprintf(buf, "wiki?room=%s&page=home", ChrPtr(WCC->wc_roomname));
}
break;
case VIEW_MAILBOX:
+ if (!WCC->is_ajax) {
+ new_summary_view();
+ return;
+ } else {
defaultsortorder = 2;
sortit = 1;
load_seen = 1;
- care_for_empty_list = 1;
+ care_for_empty_list = 0;
with_headers = 1;
- if (WCC->is_mobile) maxmsgs = 20;
+ /* 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:
}
}
- output_headers(1, 1, 1, 0, 0, 0);
nummsgs = load_msg_ptrs(cmd, with_headers);
if (nummsgs == 0) {
if (care_for_empty_list) {
- wprintf("<div align=\"center\"><br /><em>");
+ wprintf("<div class=\"nomsgs\"><br><em>");
switch (oper) {
case readnew:
wprintf(_("No new messages."));
default:
wprintf(_("No messages here."));
}
- wprintf("</em><br /></div>\n");
+ wprintf("</em><br></div>\n");
+ goto DONE;
}
- goto DONE;
}
if (sortit) {
CompareFunc SortIt;
memset(&SubTP, 0, sizeof(WCTemplputParams));
- SubTP.ContextType = CTX_NONE;
+ SubTP.Filter.ContextType = CTX_NONE;
SubTP.Context = NULL;
- SortIt = RetrieveSort(&SubTP, NULL,
+ SortIt = RetrieveSort(&SubTP, NULL, 0,
HKEY("date"), defaultsortorder);
if (SortIt != NULL)
SortByPayload(WCC->summ, SortIt);
* If we're to print s.th. above the message list...
*/
switch (WCC->wc_view) {
- case VIEW_MAILBOX:
- do_template("summary_header", NULL);
- break;
case VIEW_BBS:
BBViewToolBar = NewStrBuf();
MessageDropdown = NewStrBuf();
}
memset(&SubTP, 0, sizeof(WCTemplputParams));
- SubTP.ContextType = CTX_STRBUF;
+ 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->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);
+ /*
+ * iterate over each message. if we need to load an attachment, do it here.
+ */
+ if (WCC->wc_view == VIEW_MAILBOX) goto NO_MSG_LOOP;
/*
* iterate over each message. if we need to load an attachment, do it here.
*/
sizeof(addrbook[num_ab-1].ab_name));
addrbook[num_ab-1].ab_msgnum = Msg->msgnum;
break;
- case VIEW_MAILBOX: /* here we just need the abstract, so render it now. */
- memset(&SubTP, 0, sizeof(WCTemplputParams));
- SubTP.ContextType = CTX_MAILSUM;
- SubTP.Context = Msg;
- DoTemplate(HKEY("section_mailsummary"), NULL, &SubTP);
-
- num_displayed++;
- break;
case VIEW_BBS: /* Tag the mails we want to show in bbview... */
default:
if (displayed_msgs == NULL) {
num_displayed++;
}
}
- }
+ }
i++;
}
DeleteHashPos(&at);
-
+ NO_MSG_LOOP:
/*
* Done iterating the message list. now tasks we want to do after.
*/
switch (WCC->wc_view) {
- case VIEW_MAILBOX:
- do_template("summary_trailer", NULL);
- break;
+ 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 */
displayed_msgs = NULL;
}
memset(&SubTP, 0, sizeof(WCTemplputParams));
- SubTP.ContextType = CTX_STRBUF;
+ SubTP.Filter.ContextType = CTX_STRBUF;
SubTP.Context = MessageDropdown;
DoTemplate(HKEY("msg_listselector_bottom"), BBViewToolBar, &SubTP);
StrBufAppendBuf(WCC->WBuf, BBViewToolBar, 0);
break;
}
/** Note: wDumpContent() will output one additional </div> tag. */
- wprintf("</div>\n"); /** end of 'content' div */
- wDumpContent(1);
-
- /** free the summary */
+ 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);
}
void h_headers(void) { readloop(headers);}
void h_do_search(void) { readloop(do_search);}
+void jsonMessageListHdr(void)
+{
+ /* TODO: make a generic function */
+ hprintf("HTTP/1.1 200 OK\r\n");
+ hprintf("Content-type: application/json; charset=utf-8\r\n");
+ hprintf("Server: %s / %s\r\n", PACKAGE_STRING, ChrPtr(serv_info.serv_software));
+ hprintf("Connection: close\r\n");
+ hprintf("Pragma: no-cache\r\nCache-Control: no-store\r\nExpires:-1\r\n");
+ begin_burst();
+}
+/* Spit out the new summary view. This is basically a static page, so clients can cache the layout, all the dirty work is javascript :) */
+void new_summary_view(void) {
+ begin_burst();
+ DoTemplate(HKEY("msg_listview"),NULL,&NoCtx);
+ DoTemplate(HKEY("trailing"),NULL,&NoCtx);
+ end_burst();
+}
+/** Output message list in JSON-format */
+void jsonMessageList(void) {
+ const StrBuf *room = sbstr("room");
+ WC->is_ajax = 1;
+ smart_goto(room);
+ WC->is_ajax = 0;
+}
+
void
InitModule_MSG
(void)
WebcitAddUrlHandler(HKEY("postpart"), view_postpart, NEED_URL);
WebcitAddUrlHandler(HKEY("postpart_download"), download_postpart, NEED_URL);
+ /* json */
+ WebcitAddUrlHandler(HKEY("roommsgs"), jsonMessageList,0);
+
+ WebcitAddUrlHandler(HKEY("mimepart"), view_mimepart, NEED_URL);
+ WebcitAddUrlHandler(HKEY("mimepart_download"), download_mimepart, NEED_URL);
+ WebcitAddUrlHandler(HKEY("postpart"), view_postpart, NEED_URL);
+ WebcitAddUrlHandler(HKEY("postpart_download"), download_postpart, NEED_URL);
+
return ;
}
projects / citadel.git / blobdiff