X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fmessages.c;h=015e36187ac86ab10c84e46a21b379cb660da29f;hb=2f1c296e40e5696c014407334a4e714966809b0d;hp=652083d5ad30da864d89f2805d02d5a76d999b2c;hpb=a91d5e80ca1d7086fdf0c7d801ea32bd061b9c89;p=citadel.git diff --git a/webcit/messages.c b/webcit/messages.c index 652083d5a..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); /*----------------------------------------------------------------------------*/ @@ -242,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); @@ -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)); @@ -738,15 +737,11 @@ void readloop(long oper) } } - if (!WCC->is_ajax) { - output_headers(1, 1, 1, 0, 0, 0); - } else if (WCC->wc_view == VIEW_MAILBOX) { - jsonMessageListHdr(); - } + 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.")); @@ -757,7 +752,7 @@ void readloop(long oper) default: wprintf(_("No messages here.")); } - wprintf("
\n"); + wprintf("
\n"); goto DONE; } @@ -766,7 +761,7 @@ void readloop(long oper) 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, 0, HKEY("date"), defaultsortorder); @@ -805,7 +800,7 @@ 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); @@ -895,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); @@ -928,11 +923,10 @@ DONE: } /** Note: wDumpContent() will output one additional tag. */ if (WCC->wc_view != VIEW_MAILBOX) { - // We ought to move this out into template - wprintf("\n"); /** end of 'content' div */ - wDumpContent(1); + /* We ought to move this out into template */ + wDumpContent(1); } else { - end_burst(); + end_burst(); } WCC->startmsg = 0; WCC->maxmsgs = 0; @@ -1640,8 +1634,9 @@ 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 +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)); @@ -1649,9 +1644,8 @@ void jsonMessageListHdr(void) { 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 :) +/* 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) { - output_headers(1,1,1,0,0,1); begin_burst(); DoTemplate(HKEY("msg_listview"),NULL,&NoCtx); DoTemplate(HKEY("trailing"),NULL,&NoCtx); @@ -1659,7 +1653,7 @@ void new_summary_view(void) { } /** Output message list in JSON-format */ void jsonMessageList(void) { - StrBuf *room = sbstr("room"); + const StrBuf *room = sbstr("room"); WC->is_ajax = 1; smart_goto(room); WC->is_ajax = 0; @@ -1709,7 +1703,7 @@ InitModule_MSG WebcitAddUrlHandler(HKEY("postpart"), view_postpart, NEED_URL); WebcitAddUrlHandler(HKEY("postpart_download"), download_postpart, NEED_URL); - // json + /* json */ WebcitAddUrlHandler(HKEY("roommsgs"), jsonMessageList,0); WebcitAddUrlHandler(HKEY("mimepart"), view_mimepart, NEED_URL);