X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fmessages.c;h=015e36187ac86ab10c84e46a21b379cb660da29f;hb=2f1c296e40e5696c014407334a4e714966809b0d;hp=3fce730f34356a3d1a5063045030cdf6b02fa608;hpb=04cb9dabd731218dfde1e646b0bf44938bbeefb4;p=citadel.git diff --git a/webcit/messages.c b/webcit/messages.c index 3fce730f3..015e36187 100644 --- a/webcit/messages.c +++ b/webcit/messages.c @@ -18,16 +18,9 @@ int 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); -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); /*----------------------------------------------------------------------------*/ @@ -88,6 +81,7 @@ int read_message(StrBuf *Target, const char *tmpl, long tmpllen, long msgnum, in 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) && @@ -241,7 +235,7 @@ int read_message(StrBuf *Target, const char *tmpl, long tmpllen, long msgnum, in } DeleteHashPos(&it); memset(&SubTP, 0, sizeof(WCTemplputParams)); - SubTP.ContextType = CTX_MAILSUM; + SubTP.Filter.ContextType = CTX_MAILSUM; SubTP.Context = Msg; DoTemplate(tmpl, tmpllen, Target, &SubTP); @@ -401,8 +395,7 @@ int load_msg_ptrs(char *servcmd, int with_headers) int skipit; if (WCC->summ != NULL) { - if (WCC->summ != NULL) - DeleteHash(&WCC->summ); + DeleteHash(&WCC->summ); } WCC->summ = NewHash(1, Flathash); maxload = 10000; @@ -461,7 +454,7 @@ int load_msg_ptrs(char *servcmd, int with_headers) 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) && @@ -518,7 +511,7 @@ long DrawMessageDropdown(StrBuf *Selector, long maxmsgs, long startmsg, int nMes 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); @@ -663,6 +656,12 @@ void readloop(long oper) 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)); @@ -698,17 +697,26 @@ void readloop(long oper) } 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: @@ -729,12 +737,11 @@ void readloop(long oper) } } - output_headers(1, 1, 1, 0, 0, 0); nummsgs = load_msg_ptrs(cmd, with_headers); if (nummsgs == 0) { if (care_for_empty_list) { - wprintf("

"); + wprintf("

"); switch (oper) { case readnew: wprintf(_("No new messages.")); @@ -745,18 +752,18 @@ void readloop(long oper) default: wprintf(_("No messages here.")); } - wprintf("
\n"); + wprintf("
\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); @@ -779,9 +786,6 @@ void readloop(long oper) * 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(); @@ -796,14 +800,25 @@ void readloop(long oper) } 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. */ @@ -834,14 +849,6 @@ void readloop(long oper) 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) { @@ -856,19 +863,19 @@ void readloop(long oper) 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 */ @@ -883,7 +890,7 @@ void readloop(long oper) 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); @@ -915,10 +922,14 @@ DONE: break; } /** Note: wDumpContent() will output one additional tag. */ - wprintf("\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); } @@ -1623,6 +1634,31 @@ void h_readfwd(void) { readloop(readfwd);} 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) @@ -1667,5 +1703,13 @@ InitModule_MSG 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 ; }